handleAccountToggle(index)}
>
@@ -98,8 +117,8 @@ function LedgerSelectWallets({
const list = hardwareWallets ?? [];
const fullClassName = buildClassName(
styles.accounts,
- list.length === 1 && styles.accounts_single,
- list.length === 2 && styles.accounts_two,
+ list.length === 1 && styles.accounts_two,
+ 'custom-scroll',
);
return (
@@ -112,6 +131,7 @@ function LedgerSelectWallets({
alreadyConnectedList.includes(address),
),
)}
+ {renderAddAccount()}
);
}
diff --git a/src/components/main/modals/QrScannerModal.tsx b/src/components/main/modals/QrScannerModal.tsx
index fb3dca7a..c34cbb30 100644
--- a/src/components/main/modals/QrScannerModal.tsx
+++ b/src/components/main/modals/QrScannerModal.tsx
@@ -9,7 +9,7 @@ import buildClassName from '../../../util/buildClassName';
import { vibrateOnSuccess } from '../../../util/capacitor';
import { pause } from '../../../util/schedulers';
import {
- CAN_DELEGATE_BOTTOM_SHEET, DPR, IS_IOS,
+ DPR, IS_DELEGATING_BOTTOM_SHEET, IS_IOS,
} from '../../../util/windowEnvironment';
import useEffectOnce from '../../../hooks/useEffectOnce';
@@ -105,7 +105,7 @@ function QrScannerModal({ isOpen, onScan, onClose }: OwnProps) {
});
useEffectWithPrevDeps(([prevIsOpen]) => {
- if (CAN_DELEGATE_BOTTOM_SHEET) return undefined;
+ if (IS_DELEGATING_BOTTOM_SHEET) return undefined;
let startScanTimeoutId: number;
let documentClassModifyTimeoutId: number;
diff --git a/src/components/settings/SettingsTokenList.tsx b/src/components/settings/SettingsTokenList.tsx
index 25ec48bd..ba869e18 100644
--- a/src/components/settings/SettingsTokenList.tsx
+++ b/src/components/settings/SettingsTokenList.tsx
@@ -26,7 +26,7 @@ function SettingsTokenList({
isActive={isActive}
onBack={handleBackClick}
onClose={handleBackClick}
- onlyPopular
+ isInsideSettings
/>
);
diff --git a/src/components/settings/SettingsTokens.tsx b/src/components/settings/SettingsTokens.tsx
index 8509144d..02d65342 100644
--- a/src/components/settings/SettingsTokens.tsx
+++ b/src/components/settings/SettingsTokens.tsx
@@ -185,7 +185,6 @@ function SettingsTokens({
{!isTON && (
- 
+
})
{
- if (CAN_DELEGATE_BOTTOM_SHEET || !isActive || !isBiometricAuthEnabled) {
+ if (IS_DELEGATING_BOTTOM_SHEET || !isActive || !isBiometricAuthEnabled) {
return;
}
diff --git a/src/components/ui/Switcher.tsx b/src/components/ui/Switcher.tsx
index a3aa5d82..c6768123 100644
--- a/src/components/ui/Switcher.tsx
+++ b/src/components/ui/Switcher.tsx
@@ -9,7 +9,7 @@ type OwnProps = {
id?: string;
name?: string;
value?: string;
- label: string;
+ label?: string;
checked?: boolean;
className?: string;
onChange?: (e: ChangeEvent) => void;
diff --git a/src/config.ts b/src/config.ts
index bf498965..8acf602e 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,3 +1,4 @@
+import type { ApiSwapAsset } from './api/types';
import type { LangItem } from './global/types';
export const APP_ENV = process.env.APP_ENV;
@@ -168,13 +169,14 @@ export const TOKEN_INFO = {
export const TON_BLOCKCHAIN = 'ton';
-export const INIT_SWAP_ASSETS = {
+export const INIT_SWAP_ASSETS: Record = {
toncoin: {
name: 'Toncoin',
symbol: TON_SYMBOL,
blockchain: TON_BLOCKCHAIN,
slug: TON_TOKEN_SLUG,
decimals: DEFAULT_DECIMAL_PLACES,
+ isPopular: true,
},
'ton-eqdcbkghmc': {
name: 'jWBTC',
@@ -185,6 +187,7 @@ export const INIT_SWAP_ASSETS = {
// eslint-disable-next-line max-len
image: 'https://cache.tonapi.io/imgproxy/LaFKdzahVX9epWT067gyVLd8aCa1lFrZd7Rp9siViEE/rs:fill:200:200:1/g:no/aHR0cHM6Ly9icmlkZ2UudG9uLm9yZy90b2tlbi8xLzB4MjI2MGZhYzVlNTU0MmE3NzNhYTQ0ZmJjZmVkZjdjMTkzYmMyYzU5OS5wbmc.webp',
contract: 'EQDcBkGHmC4pTf34x3Gm05XvepO5w60DNxZ-XT4I6-UGG5L5',
+ isPopular: false,
keywords: ['bitcoin'],
},
};
diff --git a/src/global/actions/api/auth.ts b/src/global/actions/api/auth.ts
index 22f8b710..16216c38 100644
--- a/src/global/actions/api/auth.ts
+++ b/src/global/actions/api/auth.ts
@@ -37,10 +37,11 @@ import {
} from '../../reducers';
import {
selectAccounts,
+ selectAllHardwareAccounts,
selectCurrentNetwork,
selectFirstNonHardwareAccount,
selectIsOneAccount,
- selectLastLedgerAccountIndex,
+ selectLedgerAccountIndexToImport,
selectNetworkAccountsMemoized,
selectNewestTxIds,
} from '../../selectors';
@@ -590,8 +591,14 @@ addActionHandler('connectHardwareWallet', async (global, actions) => {
global = getGlobal();
const { isRemoteTab } = global.hardware;
const network = selectCurrentNetwork(global);
- const lastIndex = selectLastLedgerAccountIndex(global, network);
- const hardwareWallets = isRemoteTab ? [] : await ledgerApi.getNextLedgerWallets(network, lastIndex);
+ const lastIndex = selectLedgerAccountIndexToImport(global);
+ const currentHardwareAccounts = selectAllHardwareAccounts(global) ?? [];
+ const currentHardwareAddresses = currentHardwareAccounts.map((account) => account.address);
+ const hardwareWallets = isRemoteTab ? [] : await ledgerApi.getNextLedgerWallets(
+ network,
+ lastIndex,
+ currentHardwareAddresses,
+ );
global = getGlobal();
@@ -618,6 +625,25 @@ addActionHandler('connectHardwareWallet', async (global, actions) => {
}
});
+addActionHandler('loadMoreHardwareWallets', async (global, actions, { lastIndex }) => {
+ const network = selectCurrentNetwork(global);
+ const oldHardwareWallets = global.hardware.hardwareWallets ?? [];
+ const ledgerApi = await import('../../../util/ledger');
+ const hardwareWallets = await ledgerApi.getNextLedgerWallets(network, lastIndex);
+
+ global = getGlobal();
+
+ if ('error' in hardwareWallets) {
+ actions.showError({ error: hardwareWallets.error });
+ throw Error(hardwareWallets.error);
+ }
+
+ global = updateHardware(global, {
+ hardwareWallets: oldHardwareWallets.concat(hardwareWallets),
+ });
+ setGlobal(global);
+});
+
addActionHandler('afterSelectHardwareWallets', (global, actions, { hardwareSelectedIndices }) => {
global = updateAuth(global, {
method: 'importHardwareWallet',
diff --git a/src/global/actions/api/dapps.ts b/src/global/actions/api/dapps.ts
index ddc70a25..c29cb754 100644
--- a/src/global/actions/api/dapps.ts
+++ b/src/global/actions/api/dapps.ts
@@ -41,14 +41,14 @@ addActionHandler('submitDappConnectRequestConfirm', async (global, actions, { pa
global = getGlobal();
global = updateIsPinPadPasswordAccepted(global);
setGlobal(global);
-
- await vibrateOnSuccess(true);
}
if (IS_DELEGATED_BOTTOM_SHEET) {
callActionInMain('submitDappConnectRequestConfirm', { password, accountId });
return;
+ } else if (IS_CAPACITOR) {
+ vibrateOnSuccess(true);
}
actions.switchAccount({ accountId });
diff --git a/src/global/actions/api/wallet.ts b/src/global/actions/api/wallet.ts
index 68c5f600..2c6d20e1 100644
--- a/src/global/actions/api/wallet.ts
+++ b/src/global/actions/api/wallet.ts
@@ -714,6 +714,12 @@ addActionHandler('setActiveContentTab', (global, actions, { tab }) => {
});
addActionHandler('addSwapToken', (global, actions, { token }) => {
+ const isAlreadyExist = token.slug in global.swapTokenInfo.bySlug;
+
+ if (isAlreadyExist) {
+ return;
+ }
+
const apiSwapAsset: ApiSwapAsset = {
name: token.name,
symbol: token.symbol,
@@ -723,6 +729,7 @@ addActionHandler('addSwapToken', (global, actions, { token }) => {
image: token.image,
contract: token.contract,
keywords: token.keywords,
+ isPopular: false,
};
setGlobal({
diff --git a/src/global/actions/apiUpdates/dapp.ts b/src/global/actions/apiUpdates/dapp.ts
index 299c2cae..34ade47f 100644
--- a/src/global/actions/apiUpdates/dapp.ts
+++ b/src/global/actions/apiUpdates/dapp.ts
@@ -1,6 +1,7 @@
import { DappConnectState, TransferState } from '../../types';
import { TON_TOKEN_SLUG } from '../../../config';
+import { IS_DELEGATING_BOTTOM_SHEET } from '../../../util/windowEnvironment';
import { bigStrToHuman } from '../../helpers';
import { addActionHandler, setGlobal } from '../../index';
import {
@@ -72,8 +73,11 @@ addActionHandler('apiUpdate', (global, actions, update) => {
}
case 'dappConnect': {
+ if (IS_DELEGATING_BOTTOM_SHEET) {
+ callActionInNative('apiUpdateDappConnect', update);
+ }
+
actions.apiUpdateDappConnect(update);
- callActionInNative('apiUpdateDappConnect', update);
break;
}
@@ -119,8 +123,11 @@ addActionHandler('apiUpdate', (global, actions, update) => {
}
case 'dappSendTransactions': {
+ if (IS_DELEGATING_BOTTOM_SHEET) {
+ callActionInNative('apiUpdateDappSendTransaction', update);
+ }
+
actions.apiUpdateDappSendTransaction(update);
- callActionInNative('apiUpdateDappSendTransaction', update);
break;
}
diff --git a/src/global/cache.ts b/src/global/cache.ts
index 520d1103..95ec50da 100644
--- a/src/global/cache.ts
+++ b/src/global/cache.ts
@@ -343,6 +343,13 @@ function migrateCache(cached: GlobalState, initialState: GlobalState) {
cached.stateVersion = 10;
}
+ if (cached.stateVersion === 10) {
+ if (cached.settings.areTokensWithNoBalanceHidden === undefined) {
+ cached.settings.areTokensWithNoBalanceHidden = true;
+ }
+ cached.stateVersion = 11;
+ }
+
// When adding migration here, increase `STATE_VERSION`
}
diff --git a/src/global/initialState.ts b/src/global/initialState.ts
index 7bb4fbe8..fdd81cde 100644
--- a/src/global/initialState.ts
+++ b/src/global/initialState.ts
@@ -18,7 +18,7 @@ import {
} from '../config';
import { USER_AGENT_LANG_CODE } from '../util/windowEnvironment';
-export const STATE_VERSION = 10;
+export const STATE_VERSION = 11;
export const INITIAL_STATE: GlobalState = {
appState: AppState.Auth,
@@ -70,6 +70,7 @@ export const INITIAL_STATE: GlobalState = {
dapps: [],
byAccountId: {},
areTokensWithNoPriceHidden: true,
+ areTokensWithNoBalanceHidden: true,
},
byAccountId: {},
diff --git a/src/global/selectors/index.ts b/src/global/selectors/index.ts
index b8d4d8d3..5c6b4def 100644
--- a/src/global/selectors/index.ts
+++ b/src/global/selectors/index.ts
@@ -1,4 +1,4 @@
-import type { ApiNetwork, ApiTxIdBySlug } from '../../api/types';
+import type { ApiNetwork, ApiSwapAsset, ApiTxIdBySlug } from '../../api/types';
import type {
Account,
AccountSettings,
@@ -103,59 +103,18 @@ export function selectCurrentAccountTokens(global: GlobalState) {
);
}
-export const selectPopularTokensMemoized = memoized((
- balancesBySlug: Record,
- tokenInfo: GlobalState['tokenInfo'],
-) => {
- return Object.entries(tokenInfo.bySlug)
- .filter(([slug, token]) => token.isPopular && !(slug in balancesBySlug))
- .map(([slug]) => {
- const {
- symbol, name, image, decimals, keywords, quote: {
- price, percentChange24h, percentChange7d, percentChange30d, history7d, history24h, history30d,
- },
- } = tokenInfo.bySlug[slug];
- const amount = bigStrToHuman('0', decimals);
-
- return {
- symbol,
- slug,
- amount,
- name,
- image,
- price,
- decimals,
- change24h: round(percentChange24h / 100, 4),
- change7d: round(percentChange7d / 100, 4),
- change30d: round(percentChange30d / 100, 4),
- history24h,
- history7d,
- history30d,
- keywords,
- } as UserToken;
- });
-});
-
-export function selectPopularTokensWithoutAccountTokens(global: GlobalState) {
- const balancesBySlug = selectCurrentAccountState(global)?.balances?.bySlug;
- if (!balancesBySlug || !global.tokenInfo) {
- return undefined;
- }
-
- return selectPopularTokensMemoized(balancesBySlug, global.tokenInfo);
-}
-
-const selectSwapTokensMemoized = memoized((
- balancesBySlug: Record,
+function createTokenList(
swapTokenInfo: GlobalState['swapTokenInfo'],
-) => {
- const tokenList: UserSwapToken[] = Object.entries(swapTokenInfo.bySlug)
- .map(([slug]) => {
- const {
- symbol, name, image, decimals, keywords, blockchain, contract,
- } = swapTokenInfo.bySlug[slug];
+ balancesBySlug: Record,
+ sortFn: (tokenA: ApiSwapAsset, tokenB: ApiSwapAsset) => number,
+ filterFn?: (token: ApiSwapAsset) => boolean,
+): UserSwapToken[] {
+ return Object.entries(swapTokenInfo.bySlug)
+ .filter(([, token]) => !filterFn || filterFn(token))
+ .map(([slug, {
+ symbol, name, image, decimals, keywords, blockchain, contract, isPopular,
+ }]) => {
const amount = bigStrToHuman(balancesBySlug[slug] ?? '0', decimals);
-
return {
symbol,
slug,
@@ -165,17 +124,55 @@ const selectSwapTokensMemoized = memoized((
decimals,
isDisabled: false,
canSwap: true,
+ isPopular,
keywords,
blockchain,
contract,
} satisfies UserSwapToken;
- });
+ })
+ .sort(sortFn);
+}
- const userTokenList = tokenList.slice()
- .sort((a, b) => a.name.trim().toLowerCase().localeCompare(b.name.trim().toLowerCase()));
+const selectPopularTokensMemoized = memoized(
+ (balancesBySlug, swapTokenInfo) => {
+ const popularTokenOrder = [
+ 'TON',
+ 'BTC',
+ 'ETH',
+ 'USDT',
+ 'jUSDT',
+ 'jWBTC',
+ ];
+ const orderMap = new Map(popularTokenOrder.map((item, index) => [item, index]));
+
+ const filterFn = (token: ApiSwapAsset) => token.isPopular;
+ const sortFn = (tokenA: ApiSwapAsset, tokenB: ApiSwapAsset) => {
+ const orderIndexA = orderMap.has(tokenA.symbol) ? orderMap.get(tokenA.symbol)! : popularTokenOrder.length;
+ const orderIndexB = orderMap.has(tokenB.symbol) ? orderMap.get(tokenB.symbol)! : popularTokenOrder.length;
+
+ return orderIndexA - orderIndexB;
+ };
+ return createTokenList(swapTokenInfo, balancesBySlug, sortFn, filterFn);
+ },
+);
+
+const selectSwapTokensMemoized = memoized(
+ (balancesBySlug, swapTokenInfo) => {
+ const sortFn = (tokenA: ApiSwapAsset, tokenB: ApiSwapAsset) => (
+ tokenA.name.trim().toLowerCase().localeCompare(tokenB.name.trim().toLowerCase())
+ );
+ return createTokenList(swapTokenInfo, balancesBySlug, sortFn);
+ },
+);
+
+export function selectPopularTokens(global: GlobalState) {
+ const balancesBySlug = selectCurrentAccountState(global)?.balances?.bySlug;
+ if (!balancesBySlug || !global.swapTokenInfo) {
+ return undefined;
+ }
- return userTokenList;
-});
+ return selectPopularTokensMemoized(balancesBySlug, global.swapTokenInfo);
+}
export function selectSwapTokens(global: GlobalState) {
const balancesBySlug = selectCurrentAccountState(global)?.balances?.bySlug;
@@ -270,6 +267,16 @@ export function selectIsHardwareAccount(global: GlobalState) {
return state?.isHardware;
}
+export function selectAllHardwareAccounts(global: GlobalState) {
+ const accounts = selectAccounts(global);
+
+ if (!accounts) {
+ return undefined;
+ }
+
+ return Object.values(accounts).filter((account) => account.isHardware);
+}
+
export function selectIsOneAccount(global: GlobalState) {
return Object.keys(selectAccounts(global) || {}).length === 1;
}
@@ -278,14 +285,26 @@ export const selectEnabledTokensCountMemoized = memoized((tokens?: UserToken[])
return (tokens ?? []).filter(({ isDisabled }) => !isDisabled).length;
});
-export function selectLastLedgerAccountIndex(global: GlobalState, network: ApiNetwork) {
- const byId = global.accounts?.byId ?? {};
- return Object.entries(byId).reduce((previousValue, [accountId, account]) => {
- if (!account.ledger || parseAccountId(accountId).network !== network) {
- return previousValue;
+export function selectLedgerAccountIndexToImport(global: GlobalState) {
+ const hardwareAccounts = selectAllHardwareAccounts(global) ?? [];
+ const hardwareAccountIndexes = hardwareAccounts?.map((account) => account.ledger!.index)
+ .sort((a, b) => a - b);
+
+ if (hardwareAccountIndexes.length === 0 || hardwareAccountIndexes[0] !== 0) {
+ return -1;
+ }
+
+ if (hardwareAccountIndexes.length === 1) {
+ return 0;
+ }
+
+ for (let i = 1; i < hardwareAccountIndexes.length; i++) {
+ if (hardwareAccountIndexes[i] - hardwareAccountIndexes[i - 1] !== 1) {
+ return i - 1;
}
- return Math.max(account.ledger.index, previousValue ?? 0);
- }, undefined as number | undefined);
+ }
+
+ return hardwareAccountIndexes.length - 1;
}
export function selectLocalTransactions(global: GlobalState, accountId: string) {
diff --git a/src/global/types.ts b/src/global/types.ts
index 467ec67e..5bd82dd1 100644
--- a/src/global/types.ts
+++ b/src/global/types.ts
@@ -212,6 +212,7 @@ export type UserToken = {
export type UserSwapToken = {
blockchain: string;
+ isPopular: boolean;
contract?: string;
} & Omit;
@@ -449,7 +450,7 @@ export type GlobalState = {
isPasswordNumeric?: boolean; // Backwards compatibility for non-numeric passwords from older versions
isTestnet?: boolean;
isSecurityWarningHidden?: boolean;
- areTokensWithNoBalanceHidden?: boolean;
+ areTokensWithNoBalanceHidden: boolean;
areTokensWithNoPriceHidden: boolean;
isSortByValueEnabled?: boolean;
importToken?: {
@@ -508,6 +509,7 @@ export interface ActionPayloads {
initializeHardwareWalletConnection: undefined;
connectHardwareWallet: undefined;
createHardwareAccounts: undefined;
+ loadMoreHardwareWallets: { lastIndex: number };
createAccount: { password: string; isImporting: boolean; isPasswordNumeric?: boolean };
afterSelectHardwareWallets: { hardwareSelectedIndices: number[] };
resetApiSettings: { areAllDisabled?: boolean } | undefined;
diff --git a/src/hooks/useDelegatedBottomSheet.ts b/src/hooks/useDelegatedBottomSheet.ts
index 1d72db7c..a8309cd5 100644
--- a/src/hooks/useDelegatedBottomSheet.ts
+++ b/src/hooks/useDelegatedBottomSheet.ts
@@ -93,6 +93,7 @@ export function useDelegatedBottomSheet(
useLayoutEffect(() => {
if (!IS_DELEGATED_BOTTOM_SHEET || !isOpen) return;
+ dialogRef.current!.style[forceFullNative ? 'maxHeight' : 'height'] = '';
dialogRef.current!.style[forceFullNative ? 'height' : 'maxHeight'] = `${maxHeight}px`;
}, [dialogRef, forceFullNative, isOpen, maxHeight]);
diff --git a/src/hooks/useDelegatingBottomSheet.ts b/src/hooks/useDelegatingBottomSheet.ts
index 4974fb9f..86583977 100644
--- a/src/hooks/useDelegatingBottomSheet.ts
+++ b/src/hooks/useDelegatingBottomSheet.ts
@@ -7,7 +7,7 @@ import { getActions, getGlobal } from '../global';
import type { ActionPayloads } from '../global/types';
import { pause } from '../util/schedulers';
-import { CAN_DELEGATE_BOTTOM_SHEET } from '../util/windowEnvironment';
+import { IS_DELEGATING_BOTTOM_SHEET } from '../util/windowEnvironment';
import useEffectWithPrevDeps from './useEffectWithPrevDeps';
const RACE_TIMEOUT = 1000;
@@ -15,7 +15,7 @@ const CLOSING_DURATION = 100;
const controlledByNative = new Map();
-if (CAN_DELEGATE_BOTTOM_SHEET) {
+if (IS_DELEGATING_BOTTOM_SHEET) {
BottomSheet.prepare();
BottomSheet.addListener(
@@ -43,7 +43,7 @@ export function useDelegatingBottomSheet(
isOpen: boolean | undefined,
onClose: AnyToVoidFunction,
) {
- const isDelegating = CAN_DELEGATE_BOTTOM_SHEET && key;
+ const isDelegating = IS_DELEGATING_BOTTOM_SHEET && key;
const shouldOpen = isOpen && isPortrait;
useEffectWithPrevDeps(([prevShouldOpen]) => {
@@ -90,7 +90,7 @@ export function useOpenFromNativeBottomSheet(
open: NoneToVoidFunction,
) {
useEffect(() => {
- if (!CAN_DELEGATE_BOTTOM_SHEET) return undefined;
+ if (!IS_DELEGATING_BOTTOM_SHEET) return undefined;
controlledByNative.set(key, open);
diff --git a/src/index.tsx b/src/index.tsx
index 1d8f0887..d4442039 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -12,7 +12,7 @@ import { enableStrict } from './lib/fasterdom/stricterdom';
import { betterView } from './util/betterView';
import { initCapacitor } from './util/capacitor';
import { initMultitab } from './util/multitab';
-import { CAN_DELEGATE_BOTTOM_SHEET, IS_DELEGATED_BOTTOM_SHEET } from './util/windowEnvironment';
+import { IS_DELEGATED_BOTTOM_SHEET, IS_DELEGATING_BOTTOM_SHEET } from './util/windowEnvironment';
import App from './components/App';
@@ -31,7 +31,7 @@ if (IS_CAPACITOR) {
void initCapacitor();
}
-if (CAN_DELEGATE_BOTTOM_SHEET) {
+if (IS_DELEGATING_BOTTOM_SHEET) {
initMultitab({ noPub: true });
} else if (IS_DELEGATED_BOTTOM_SHEET) {
initMultitab({ noSub: true });
diff --git a/src/util/ledger/index.ts b/src/util/ledger/index.ts
index 50e1202a..f0d47d13 100644
--- a/src/util/ledger/index.ts
+++ b/src/util/ledger/index.ts
@@ -390,7 +390,11 @@ export async function signLedgerProof(accountId: string, proof: ApiTonConnectPro
return result.signature.toString('base64');
}
-export async function getNextLedgerWallets(network: ApiNetwork, lastExistingIndex = -1) {
+export async function getNextLedgerWallets(
+ network: ApiNetwork,
+ lastExistingIndex = -1,
+ alreadyImportedAddresses: string[] = [],
+) {
const result: LedgerWalletInfo[] = [];
let index = lastExistingIndex + 1;
@@ -398,6 +402,12 @@ export async function getNextLedgerWallets(network: ApiNetwork, lastExistingInde
// eslint-disable-next-line no-constant-condition
while (true) {
const walletInfo = await getLedgerWalletInfo(network, index, IS_BOUNCEABLE);
+
+ if (alreadyImportedAddresses.includes(walletInfo.address)) {
+ index += 1;
+ continue;
+ }
+
if (walletInfo.balance !== '0') {
result.push(walletInfo);
index += 1;
@@ -407,6 +417,7 @@ export async function getNextLedgerWallets(network: ApiNetwork, lastExistingInde
if (!result.length) {
result.push(walletInfo);
}
+
return result;
}
} catch (err) {
diff --git a/src/util/processDeeplink.ts b/src/util/processDeeplink.ts
index 1e038055..a129907d 100644
--- a/src/util/processDeeplink.ts
+++ b/src/util/processDeeplink.ts
@@ -5,7 +5,7 @@ import { TON_TOKEN_SLUG } from '../config';
import { bigStrToHuman } from '../global/helpers';
import { parseTonDeeplink } from './ton/deeplinks';
import { pause } from './schedulers';
-import { CAN_DELEGATE_BOTTOM_SHEET } from './windowEnvironment';
+import { IS_DELEGATING_BOTTOM_SHEET } from './windowEnvironment';
// Both to close current Transfer Modal and delay when app launch
const PAUSE = 700;
@@ -13,7 +13,7 @@ export async function processDeeplink(url: string) {
const params = parseTonDeeplink(url);
if (!params) return false;
- if (CAN_DELEGATE_BOTTOM_SHEET) {
+ if (IS_DELEGATING_BOTTOM_SHEET) {
await BottomSheet.release({ key: '*' });
await pause(PAUSE);
}
diff --git a/src/util/windowEnvironment.ts b/src/util/windowEnvironment.ts
index 6585b127..fecc08c1 100644
--- a/src/util/windowEnvironment.ts
+++ b/src/util/windowEnvironment.ts
@@ -59,7 +59,7 @@ export const IS_BIOMETRIC_AUTH_SUPPORTED = Boolean(
!IS_CAPACITOR && window.navigator.credentials && (!IS_ELECTRON || IS_MAC_OS),
);
export const IS_DELEGATED_BOTTOM_SHEET = IS_CAPACITOR && global.location.search.startsWith('?bottom-sheet');
-export const CAN_DELEGATE_BOTTOM_SHEET = IS_CAPACITOR && IS_IOS && !IS_DELEGATED_BOTTOM_SHEET;
+export const IS_DELEGATING_BOTTOM_SHEET = IS_CAPACITOR && IS_IOS && !IS_DELEGATED_BOTTOM_SHEET;
export const IS_MULTITAB_SUPPORTED = 'BroadcastChannel' in window && !IS_LEDGER_EXTENSION_TAB;
export function setScrollbarWidthProperty() {