fix: refactoring

ava-labs · Nov 15, 2024 · d3866c4 · d3866c4
1 parent d481576
commit d3866c4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/src/background/services/wallet/handlers/importLedger.ts b/src/background/services/wallet/handlers/importLedger.ts
@@ -39,9 +39,8 @@ export class ImportLedgerHandler implements HandlerType {
   }
 
   handle: HandlerType['handle'] = async ({ request }) => {
-    const [
-      { xpub, xpubXP, pubKeys, secretType, name, onlyCheckWalletIsExist },
-    ] = request.params;
+    const [{ xpub, xpubXP, pubKeys, secretType, name, dryRun }] =
+      request.params;
 
     if (
       secretType !== SecretType.Ledger &&
@@ -70,11 +69,12 @@ export class ImportLedgerHandler implements HandlerType {
       };
     }
 
-    if (onlyCheckWalletIsExist) {
+    if (dryRun) {
       return {
         ...request,
         result: {
           id: '0',
+          name,
           type: secretType,
         },
       };

diff --git a/src/background/services/wallet/handlers/models.ts b/src/background/services/wallet/handlers/models.ts
@@ -23,7 +23,7 @@ export type ImportLedgerWalletParams = {
   pubKeys?: PubKeyType[];
   secretType: SecretType.Ledger | SecretType.LedgerLive;
   name?: string;
-  onlyCheckWalletIsExist?: boolean;
+  dryRun?: boolean;
 };
 
 export type ImportWalletResult = {

diff --git a/src/components/ledger/LedgerConnector.tsx b/src/components/ledger/LedgerConnector.tsx
@@ -50,13 +50,13 @@ export interface LedgerConnectorData {
 interface LedgerConnectorProps {
   onSuccess: (data: LedgerConnectorData) => void;
   onTroubleshoot: () => void;
-  checkWalletIsExist?: boolean;
+  checkWalletExists?: boolean;
 }
 
 export function LedgerConnector({
   onSuccess,
   onTroubleshoot,
-  checkWalletIsExist,
+  checkWalletExists,
 }: LedgerConnectorProps) {
   const theme = useTheme();
   const { capture } = useAnalyticsContext();
@@ -128,7 +128,7 @@ export function LedgerConnector({
             derivationPath === DerivationPath.BIP44
               ? SecretType.Ledger
               : SecretType.LedgerLive,
-          onlyCheckWalletIsExist: true,
+          dryRun: true,
         });
       } catch (e) {
         setIsLedgerExistsError(true);
@@ -144,7 +144,7 @@ export function LedgerConnector({
       const xpubXPValue = await getExtendedPublicKey(
         Avalanche.LedgerWallet.getAccountPath('X')
       );
-      if (checkWalletIsExist) {
+      if (checkWalletExists) {
         await checkLedgerWalletIsExist({
           xpub: xpubValue,
           xpubXP: xpubXPValue,
@@ -170,7 +170,7 @@ export function LedgerConnector({
   }, [
     capture,
     checkLedgerWalletIsExist,
-    checkWalletIsExist,
+    checkWalletExists,
     getAddressFromXpubKey,
     getExtendedPublicKey,
     onSuccess,
@@ -225,7 +225,7 @@ export function LedgerConnector({
             ...pubKeys,
             { evm: pubKey.toString('hex'), xp: pubKeyXP.toString('hex') },
           ];
-          if (checkWalletIsExist) {
+          if (checkWalletExists) {
             await checkLedgerWalletIsExist({
               xpub: '',
               xpubXP: '',
@@ -251,7 +251,7 @@ export function LedgerConnector({
     [
       capture,
       checkLedgerWalletIsExist,
-      checkWalletIsExist,
+      checkWalletExists,
       getAvaxBalance,
       getPublicKey,
       onSuccess,

diff --git a/src/pages/Accounts/AddWalletWithLedger.tsx b/src/pages/Accounts/AddWalletWithLedger.tsx
@@ -306,7 +306,7 @@ export function AddWalletWithLedger() {
                 <LedgerConnector
                   onSuccess={onSuccess}
                   onTroubleshoot={() => setStep(Step.Troubleshoot)}
-                  checkWalletIsExist
+                  checkWalletExists
                 />
               </Stack>
               <Stack sx={{ p: 2, mb: 2, rowGap: 1 }}>

diff --git a/src/pages/ImportPrivateKey/ImportPrivateKey.tsx b/src/pages/ImportPrivateKey/ImportPrivateKey.tsx
@@ -70,8 +70,6 @@ export function ImportPrivateKey() {
     [allAccounts]
   );
 
-  console.log('allAccounts: ', allAccounts);
-
   const isLoading = hasFocus && !derivedAddresses && !error;
 
   const handleImport = async () => {