feat: CP-9472 add duplicated account dialog

src/background/services/wallet/handlers/importLedger.test.ts

@@ -67,6 +67,22 @@ describe('src/background/services/wallet/handlers/importLedger', () => {
 
     expect(error).toEqual('This wallet already exists');
   });
+  it('should return with the id as `0` and the given `SecretType` after it checked the wallet is exist', async () => {
+    secretsService.isKnownSecret.mockResolvedValueOnce(false);
+
+    const { result } = await handle({
+      secretType: SecretType.Ledger,
+      xpub: 'xpubValue',
+      name: 'name',
+      dryRun: true,
+    });
+
+    expect(result).toEqual({
+      id: '0',
+      name: 'name',
+      type: SecretType.Ledger,
+    });
+  });
 
   it('returns an ImportWalletResult if Ledger import is successful', async () => {
     const walletId = crypto.randomUUID();

src/background/services/wallet/handlers/importLedger.ts

@@ -39,7 +39,8 @@ export class ImportLedgerHandler implements HandlerType {
   }
 
   handle: HandlerType['handle'] = async ({ request }) => {
-    const [{ xpub, xpubXP, pubKeys, secretType, name }] = request.params;
+    const [{ xpub, xpubXP, pubKeys, secretType, name, dryRun }] =
+      request.params;
 
     if (
       secretType !== SecretType.Ledger &&
@@ -68,6 +69,17 @@ export class ImportLedgerHandler implements HandlerType {
       };
     }
 
+    if (dryRun) {
+      return {
+        ...request,
+        result: {
+          id: '0',
+          name,
+          type: secretType,
+        },
+      };
+    }
+
     let id: string;
     if (secretType === SecretType.Ledger) {
       id = await this.walletService.addPrimaryWallet({

src/background/services/wallet/handlers/models.ts

@@ -23,6 +23,7 @@ export type ImportLedgerWalletParams = {
   pubKeys?: PubKeyType[];
   secretType: SecretType.Ledger | SecretType.LedgerLive;
   name?: string;
+  dryRun?: boolean;
 };
 
 export type ImportWalletResult = {

src/components/ledger/LedgerConnector.tsx

@@ -19,6 +19,8 @@ import {
 } from '@avalabs/core-k2-components';
 import { DerivationPathDropdown } from '@src/pages/Onboarding/components/DerivationPathDropDown';
 import { DerivedAddresses } from '@src/pages/Onboarding/components/DerivedAddresses';
+import { SecretType } from '@src/background/services/secrets/models';
+import { useImportLedger } from '@src/pages/Accounts/hooks/useImportLedger';
 
 export interface AddressType {
   address: string;
@@ -48,11 +50,13 @@ export interface LedgerConnectorData {
 interface LedgerConnectorProps {
   onSuccess: (data: LedgerConnectorData) => void;
   onTroubleshoot: () => void;
+  isWalletExist?: boolean;
 }
 
 export function LedgerConnector({
   onSuccess,
   onTroubleshoot,
+  isWalletExist,
 }: LedgerConnectorProps) {
   const theme = useTheme();
   const { capture } = useAnalyticsContext();
@@ -69,6 +73,7 @@ export function LedgerConnector({
   const [publicKeyState, setPublicKeyState] = useState<LedgerStatus>(
     LedgerStatus.LEDGER_UNINITIATED
   );
+  const [isLedgerExistsError, setIsLedgerExistsError] = useState(false);
 
   const [pathSpec, setPathSpec] = useState<DerivationPath>(
     DerivationPath.BIP44
@@ -77,6 +82,7 @@ export function LedgerConnector({
   const [hasPublicKeys, setHasPublicKeys] = useState(false);
   const [dropdownDisabled, setDropdownDisabled] = useState(true);
   const { t } = useTranslation();
+  const { importLedger } = useImportLedger();
 
   const resetStates = () => {
     setPublicKeyState(LedgerStatus.LEDGER_LOADING);
@@ -110,12 +116,42 @@ export function LedgerConnector({
     [capture, getAvaxBalance]
   );
 
+  const isLedgerWalletExist = useCallback(
+    async ({ xpub, xpubXP, publicKeys, derivationPath }) => {
+      setIsLedgerExistsError(false);
+      try {
+        return await importLedger({
+          xpub,
+          xpubXP,
+          pubKeys: publicKeys,
+          secretType:
+            derivationPath === DerivationPath.BIP44
+              ? SecretType.Ledger
+              : SecretType.LedgerLive,
+          dryRun: true,
+        });
+      } catch (e) {
+        setIsLedgerExistsError(true);
+        throw new Error('wallet already exists');
+      }
+    },
+    [importLedger]
+  );
+
   const getXPublicKey = useCallback(async () => {
     try {
       const xpubValue = await getExtendedPublicKey();
       const xpubXPValue = await getExtendedPublicKey(
         Avalanche.LedgerWallet.getAccountPath('X')
       );
+      if (isWalletExist) {
+        await isLedgerWalletExist({
+          xpub: xpubValue,
+          xpubXP: xpubXPValue,
+          publicKeys: undefined,
+          derivationPath: DerivationPath.BIP44,
+        });
+      }
       setPublicKeyState(LedgerStatus.LEDGER_CONNECTED);
       capture('OnboardingLedgerConnected');
       await getAddressFromXpubKey(xpubValue, 0);
@@ -133,6 +169,8 @@ export function LedgerConnector({
     }
   }, [
     capture,
+    isLedgerWalletExist,
+    isWalletExist,
     getAddressFromXpubKey,
     getExtendedPublicKey,
     onSuccess,
@@ -187,6 +225,14 @@ export function LedgerConnector({
             ...pubKeys,
             { evm: pubKey.toString('hex'), xp: pubKeyXP.toString('hex') },
           ];
+          if (isWalletExist) {
+            await isLedgerWalletExist({
+              xpub: '',
+              xpubXP: '',
+              publicKeys: publicKeyValue,
+              derivationPath: DerivationPath.LedgerLive,
+            });
+          }
           setHasPublicKeys(true);
           onSuccess({
             xpub: '',
@@ -202,7 +248,15 @@ export function LedgerConnector({
         popDeviceSelection();
       }
     },
-    [capture, getAvaxBalance, getPublicKey, onSuccess, popDeviceSelection]
+    [
+      capture,
+      isLedgerWalletExist,
+      isWalletExist,
+      getAvaxBalance,
+      getPublicKey,
+      onSuccess,
+      popDeviceSelection,
+    ]
   );
 
   const tryPublicKey = useCallback(async () => {
@@ -336,21 +390,26 @@ export function LedgerConnector({
                 variant="caption"
                 sx={{ color: theme.palette.error.main }}
               >
-                <Trans
-                  i18nKey="Unable to connect. View the troubleshoot guide <linkText>here</linkText>"
-                  components={{
-                    linkText: (
-                      <span
-                        onClick={() => onTroubleshoot()}
-                        style={{
-                          cursor: 'pointer',
-                          textDecoration: 'underline',
-                          textDecorationColor: theme.palette.error.main,
-                        }}
-                      />
-                    ),
-                  }}
-                />
+                {!isLedgerExistsError && (
+                  <Trans
+                    i18nKey={
+                      'Unable to connect. View the troubleshoot guide <linkText>here</linkText>'
+                    }
+                    components={{
+                      linkText: (
+                        <span
+                          onClick={() => onTroubleshoot()}
+                          style={{
+                            cursor: 'pointer',
+                            textDecoration: 'underline',
+                            textDecorationColor: theme.palette.error.main,
+                          }}
+                        />
+                      ),
+                    }}
+                  />
+                )}
+                {isLedgerExistsError && t('This wallet already exists')}
               </Typography>
             </Stack>
             <Button onClick={() => tryPublicKey()} fullWidth>

src/localization/locales/en/translation.json

@@ -396,6 +396,7 @@
   "Import": "Import",
   "Import Account": "Import Account",
   "Import Details": "Import Details",
+  "Import Duplicate Account?": "Import Duplicate Account?",
   "Import Keystore File": "Import Keystore File",
   "Import Private Key": "Import Private Key",
   "Import with Fireblocks": "Import with Fireblocks",
@@ -832,6 +833,7 @@
   "This Feature": "This Feature",
   "This Ledger was not used to create this wallet. Please connect the original Ledger device to continue.": "This Ledger was not used to create this wallet. Please connect the original Ledger device to continue.",
   "This URL is invalid": "This URL is invalid",
+  "This account has already been imported, do you want to continue?": "This account has already been imported, do you want to continue?",
   "This action is only allowed for Seedless wallets.": "This action is only allowed for Seedless wallets.",
   "This address already exists in the address book": "This address already exists in the address book",
   "This application is malicious, do not proceed.": "This application is malicious, do not proceed.",
@@ -849,6 +851,7 @@
   "This transaction is malicious do not proceed.": "This transaction is malicious do not proceed.",
   "This transaction requires multiple approvals.": "This transaction requires multiple approvals.",
   "This transaction requires two approvals": "This transaction requires two approvals",
+  "This wallet already exists": "This wallet already exists",
   "This website": "This website",
   "Threshold": "Threshold",
   "Time Elapsed": "Time Elapsed",

src/pages/Accounts/AddWalletWithLedger.tsx

@@ -306,6 +306,7 @@ export function AddWalletWithLedger() {
                 <LedgerConnector
                   onSuccess={onSuccess}
                   onTroubleshoot={() => setStep(Step.Troubleshoot)}
+                  isWalletExist
                 />
               </Stack>
               <Stack sx={{ p: 2, mb: 2, rowGap: 1 }}>