Skip to content

Commit 8a4efc6

Browse files
peronczykperonczyk
committed
feat: move constants to global config dir
1 parent a600599 commit 8a4efc6

File tree

110 files changed

+482
-487
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+482
-487
lines changed

‎src/background/deeplinkHandler.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { APP_LINK_WEB } from '../popup/utils/constants';
1+
import { APP_LINK_WEB } from '@/config';
22

33
export default () => browser.webRequest.onBeforeRequest.addListener(
44
({ url }) => ({

‎src/background/popupHandler.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { v4 as uuid } from 'uuid';
2-
import { Dictionary } from '../types';
2+
import type { Dictionary } from '@/types';
33
import {
4-
isTxOfASupportedType,
54
POPUP_TYPE_SIGN,
65
POPUP_TYPE_CONNECT,
76
POPUP_TYPE_RAW_SIGN,
8-
} from '../popup/utils';
7+
} from '@/config';
8+
import { isTxOfASupportedType } from '@/protocols/aeternity/helpers';
99

1010
const popups: Dictionary = {};
1111

‎src/background/utils.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { IS_FIREFOX } from '../lib/environment';
2-
import { CONNECTION_TYPES } from '../popup/utils';
1+
import { IS_FIREFOX } from '@/lib/environment';
2+
import { CONNECTION_TYPES } from '@/config';
33

44
export const detectConnectionType = (port) => {
55
const extensionProtocol = IS_FIREFOX ? 'moz-extension' : 'chrome-extension';

‎src/background/wallet.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { isEqual } from 'lodash-es';
22
import { BrowserRuntimeConnection } from '@aeternity/aepp-sdk';
3-
import { CONNECTION_TYPES } from '../popup/utils/constants';
3+
import { CONNECTION_TYPES } from '@/config';
44
import { removePopup, getPopup } from './popupHandler';
55
import { detectConnectionType } from './utils';
66
import store from './store';

‎src/composables/aeSdk.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ import {
2525
} from '@/lib/environment';
2626
import { watchUntilTruthy } from '@/utils';
2727
import {
28-
DEX_CONTRACTS,
2928
MODAL_CONFIRM_ACCOUNT_LIST,
3029
MODAL_CONFIRM_CONNECT,
3130
NODE_STATUS_CONNECTED,
3231
NODE_STATUS_CONNECTING,
3332
NODE_STATUS_ERROR,
3433
POPUP_TYPE_CONNECT,
3534
POPUP_TYPE_ACCOUNT_LIST,
36-
} from '@/popup/utils';
35+
} from '@/config';
3736
import { showPopup } from '@/background/popupHandler';
3837
import {
3938
AE_NETWORK_MAINNET_ID,
4039
AE_NETWORK_TESTNET_ID,
40+
DEX_CONTRACTS,
4141
} from '@/protocols/aeternity/config';
4242
import { useAccounts } from './accounts';
4343
import { useModals } from './modals';

‎src/composables/currencies.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import type {
66
ICoin,
77
ICurrency,
88
} from '@/types';
9+
import { CURRENCIES } from '@/config';
910
import {
1011
getLocalStorageItem,
1112
setLocalStorageItem,
1213
} from '@/utils';
1314
import {
14-
CURRENCIES,
1515
handleUnknownError,
1616
} from '@/popup/utils';
1717
import {

‎src/composables/latestTransactionList.ts

+5-6
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ import {
55
} from 'vue';
66
import { isEqual, uniqWith } from 'lodash-es';
77
import { Encoded } from '@aeternity/aepp-sdk';
8-
9-
import { IDefaultComposableOptions } from '@/types';
8+
import type { IDefaultComposableOptions } from '@/types';
9+
import { DASHBOARD_TRANSACTION_LIMIT } from '@/config';
1010
import {
11-
DASHBOARD_TRANSACTION_LIMIT,
12-
MDW_TO_NODE_APPROX_DELAY_TIME,
1311
sortTransactionsByDateCallback,
1412
handleUnknownError,
15-
} from '../popup/utils';
13+
} from '@/popup/utils';
14+
import { AE_MDW_TO_NODE_APPROX_DELAY_TIME } from '@/protocols/aeternity/config';
1615
import { useAccounts } from './accounts';
1716
import { useBalances } from './balances';
1817
import { createNetworkWatcher } from './composablesHelpers';
@@ -97,7 +96,7 @@ export function useLatestTransactionList({ store }: IDefaultComposableOptions) {
9796
balancesTotal,
9897
(val, oldVal) => {
9998
if (val !== oldVal) {
100-
setTimeout(() => updateTransactionListData(), MDW_TO_NODE_APPROX_DELAY_TIME);
99+
setTimeout(() => updateTransactionListData(), AE_MDW_TO_NODE_APPROX_DELAY_TIME);
101100
}
102101
},
103102
{ immediate: true },

‎src/composables/modals.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import type {
1111
ResolveCallback,
1212
StatusIconType,
1313
} from '@/types';
14-
import { handleUnknownError, MODAL_DEFAULT, MODAL_ERROR_LOG } from '../popup/utils';
14+
import { MODAL_DEFAULT, MODAL_ERROR_LOG } from '@/config';
15+
import { handleUnknownError } from '../popup/utils';
1516
import { IN_FRAME, IS_WEB } from '../lib/environment';
1617
import { ROUTE_WEB_IFRAME_POPUP } from '../popup/router/routeNames';
1718
import { usePopupProps } from './popupProps';

‎src/composables/multisigAccountCreate.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ import type {
1616
IMultisigCreationPhase,
1717
IRawMultisigAccount,
1818
} from '@/types';
19+
import { DEFAULT_WAITING_HEIGHT } from '@/config';
20+
import SimpleGAMultiSigAci from '@/lib/contracts/SimpleGAMultiSigACI.json';
1921
import {
20-
DEFAULT_WAITING_HEIGHT,
2122
MULTISIG_CREATION_PHASES,
2223
MULTISIG_SIMPLE_GA_BYTECODE,
23-
SUPPORTED_MULTISIG_CONTRACT_VERSION,
24-
} from '@/popup/utils';
25-
import SimpleGAMultiSigAci from '@/lib/contracts/SimpleGAMultiSigACI.json';
24+
MULTISIG_SUPPORTED_CONTRACT_VERSION,
25+
} from '@/protocols/aeternity/config';
2626
import {
2727
aettosToAe,
2828
} from '@/protocols/aeternity/helpers';
@@ -210,7 +210,7 @@ export function useMultisigAccountCreate({ store }: IDefaultComposableOptions) {
210210
proposedBy: '' as any,
211211
refusedBy: [],
212212
txHash: undefined, // set from propose
213-
version: SUPPORTED_MULTISIG_CONTRACT_VERSION,
213+
version: MULTISIG_SUPPORTED_CONTRACT_VERSION,
214214
expirationHeight: 0,
215215
signerId: signers[0],
216216
height: -1,

‎src/composables/multisigAccounts.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import {
1919
setLocalStorageItem,
2020
} from '@/utils';
2121
import {
22-
SUPPORTED_MULTISIG_CONTRACT_VERSION,
2322
handleUnknownError,
2423
} from '@/popup/utils';
2524
import {
2625
AE_COIN_PRECISION,
26+
MULTISIG_SUPPORTED_CONTRACT_VERSION,
2727
} from '@/protocols/aeternity/config';
2828

2929
import { createPollingBasedOnMountedComponents } from './composablesHelpers';
@@ -196,7 +196,7 @@ export function useMultisigAccounts({ store, pollOnce = false }: MultisigAccount
196196
*/
197197
const result: IMultisigAccount[] = (await Promise.all(
198198
rawMultisigData
199-
.filter(({ version }) => version === SUPPORTED_MULTISIG_CONTRACT_VERSION)
199+
.filter(({ version }) => version === MULTISIG_SUPPORTED_CONTRACT_VERSION)
200200
.map(async ({
201201
contractId,
202202
gaAccountId,

‎src/composables/multisigTransactions.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import {
2626
} from '@/utils';
2727
import {
2828
handleUnknownError,
29-
MULTISIG_SIMPLE_GA_BYTECODE,
3029
} from '@/popup/utils';
30+
import { MULTISIG_SIMPLE_GA_BYTECODE } from '@/protocols/aeternity/config';
3131
import { useAeSdk } from './aeSdk';
3232
import { useMultisigAccounts } from './multisigAccounts';
3333
import { useTopHeaderData } from './topHeader';

‎src/composables/notifications.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
NOTIFICATION_TYPE_WALLET,
1414
NOTIFICATION_ENTITY_TYPE_TIP,
1515
AGGREGATOR_URL,
16-
} from '../popup/utils';
16+
} from '@/config';
1717
import { useAccounts } from './accounts';
1818
import { createPollingBasedOnMountedComponents } from './composablesHelpers';
1919
import { useAeSdk } from './aeSdk';

‎src/composables/pendingMultisigTransaction.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ import {
55
} from 'vue';
66
import { Encoded } from '@aeternity/aepp-sdk';
77
import { isEqual } from 'lodash-es';
8-
import {
9-
TX_FUNCTIONS_MULTISIG,
10-
MULTISIG_VAULT_MIN_NUM_OF_SIGNERS,
11-
handleUnknownError,
12-
} from '../popup/utils';
8+
import { handleUnknownError } from '@/popup/utils';
139
import type {
1410
IAccount,
1511
IActiveMultisigTransaction,
1612
IDefaultComposableOptions,
1713
ITransaction,
18-
} from '../types';
14+
} from '@/types';
15+
import {
16+
MULTISIG_VAULT_MIN_NUM_OF_SIGNERS,
17+
TX_FUNCTIONS_MULTISIG,
18+
} from '@/protocols/aeternity/config';
1919
import { useAccounts } from './accounts';
2020
import { useMiddleware } from './middleware';
2121
import { useMultisigAccounts } from './multisigAccounts';

‎src/composables/transactionList.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ import type {
88
IDefaultComposableOptions,
99
} from '@/types';
1010
import {
11-
AEX9_TRANSFER_EVENT,
1211
TRANSACTIONS_LOCAL_STORAGE_KEY,
1312
TX_DIRECTION,
14-
} from '@/popup/utils';
13+
} from '@/config';
1514
import {
1615
fetchJson,
1716
getLocalStorageItem,
1817
setLocalStorageItem,
1918
} from '@/utils';
2019
import JsonBig from '@/lib/json-big';
20+
import { AEX9_TRANSFER_EVENT } from '@/protocols/aeternity/config';
2121

2222
import { useAccounts } from './accounts';
2323
import { useMiddleware } from './middleware';

‎src/composables/transactionTokens.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ import type {
77
ITransaction,
88
TxFunctionParsed,
99
} from '@/types';
10+
import { TX_DIRECTION } from '@/config';
11+
import { toShiftedBigNumber } from '@/utils';
1012
import {
1113
AE_COIN_PRECISION,
1214
AE_SYMBOL,
1315
} from '@/protocols/aeternity/config';
14-
import { toShiftedBigNumber } from '@/utils';
15-
import {
16-
TX_DIRECTION,
17-
} from '@/popup/utils';
1816
import {
1917
getInnerTransaction,
2018
getTransactionTokenInfoResolver,

‎src/composables/transactionTx.ts

+10-8
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,21 @@ import type {
1313
import {
1414
includes,
1515
} from '@/utils';
16+
import { TX_DIRECTION } from '@/config';
1617
import {
17-
TRANSACTION_OWNERSHIP_STATUS,
18-
TX_DIRECTION,
19-
TX_FUNCTIONS_MULTISIG,
2018
TX_FUNCTION_TRANSLATIONS,
21-
TX_FUNCTIONS,
2219
TX_TYPE_TRANSLATIONS,
2320
TX_TYPE_LIST_TRANSLATIONS,
24-
TX_RETURN_TYPE_OK,
2521
getOwnershipStatus,
2622
getTxDirection,
2723
getTxOwnerAddress,
2824
} from '@/popup/utils';
25+
import {
26+
AE_TRANSACTION_OWNERSHIP_STATUS,
27+
TX_RETURN_TYPE_OK,
28+
TX_FUNCTIONS,
29+
TX_FUNCTIONS_MULTISIG,
30+
} from '@/protocols/aeternity/config';
2931
import {
3032
getInnerTransaction,
3133
getTxTag,
@@ -163,7 +165,7 @@ export function useTransactionTx({
163165
outerTx.value?.payerId ? outerTx.value : innerTx.value,
164166
externalAddress
165167
|| (
166-
ownershipStatus.value !== TRANSACTION_OWNERSHIP_STATUS.current
168+
ownershipStatus.value !== AE_TRANSACTION_OWNERSHIP_STATUS.current
167169
&& txOwnerAddress.value
168170
)
169171
|| activeAccount.value.address,
@@ -181,9 +183,9 @@ export function useTransactionTx({
181183

182184
function getOwnershipAccount(externalOwnerAddress?: Encoded.AccountAddress): IAccountOverview {
183185
switch (ownershipStatus.value) {
184-
case TRANSACTION_OWNERSHIP_STATUS.current:
186+
case AE_TRANSACTION_OWNERSHIP_STATUS.current:
185187
return activeAccountExtended.value;
186-
case TRANSACTION_OWNERSHIP_STATUS.subAccount: {
188+
case AE_TRANSACTION_OWNERSHIP_STATUS.subAccount: {
187189
const { accountId, callerId } = innerTx.value || {};
188190

189191
return accounts.value.find(({ address }) => [accountId, callerId].includes(address))!;

‎src/composables/viewport.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { debounce } from 'lodash-es';
22
import { onBeforeUnmount, onMounted, ref } from 'vue';
3-
import { MOBILE_WIDTH } from '../popup/utils';
3+
import { MOBILE_WIDTH } from '@/config';
44

55
export interface IScrollCallbackParams {
66
isOutsideOfViewport: boolean

0 commit comments

Comments
 (0)