[DDW-970] Remove unnecessary calls of the resetWalletPairing function

Author: szymonmaslowski

source/renderer/app/i18n/locales/ja-JP.json

@@ -1304,4 +1304,4 @@
   "wallet.transferFunds.dialog2.total.label": "合計",
   "widgets.itemsDropdown.syncingLabel": "同期",
   "widgets.itemsDropdown.syncingLabelProgress": "同期中 {syncingProgress}%"
-}
+}

source/renderer/app/stores/HardwareWalletsStore.ts

@@ -1377,38 +1377,33 @@ export default class HardwareWalletsStore extends Store {
       // @ts-ignore ts-migrate(2339) FIXME: Property 'path' does not exist on type '{}'.
       devicePath = activeDevice.path || path || newConnectionData.path || null;
 
-      try {
-        const extendedPublicKey = await this._requestExtendedPublicKey(
-          devicePath,
-          walletId,
-          address
-        );
-        const associatedWallet = await this._findAssociatedWalletByExtendedPublicKey(
-          { extendedPublicKey }
-        );
+      const extendedPublicKey = await this._requestExtendedPublicKey(
+        devicePath,
+        walletId,
+        address
+      );
+      const associatedWallet = await this._findAssociatedWalletByExtendedPublicKey(
+        { extendedPublicKey }
+      );
 
-        if (associatedWallet) {
-          await this._storeWalletDataInLocalStorageAndHandleTransactionOrAddressVerificationOrRouting(
-            {
-              address,
-              associatedWallet,
-              expectedWalletId: walletId,
-              extendedPublicKey,
-              path: devicePath,
-            }
-          );
-        } else {
-          logger.debug(
-            '[HW-DEBUG] HWStore - Software wallet not recognized - Setting error states'
-          );
-          this._discardConnectedDeviceAndReInitiateAddressVerification({
+      if (associatedWallet) {
+        await this._storeWalletDataInLocalStorageAndHandleTransactionOrAddressVerificationOrRouting(
+          {
             address,
-            walletId,
-          });
-        }
-      } catch (e) {
-        await this.resetWalletPairing();
-        throw e;
+            associatedWallet,
+            expectedWalletId: walletId,
+            extendedPublicKey,
+            path: devicePath,
+          }
+        );
+      } else {
+        logger.debug(
+          '[HW-DEBUG] HWStore - Software wallet not recognized - Setting error states'
+        );
+        this._discardConnectedDeviceAndReInitiateAddressVerification({
+          address,
+          walletId,
+        });
       }
     } else {
       logger.debug('[HW-DEBUG] Verify Address with Ledger: ', {
@@ -2771,40 +2766,35 @@ export default class HardwareWalletsStore extends Store {
           }
         );
 
-        try {
-          const extendedPublicKey = await this._requestExtendedPublicKey(
-            transportDevice.path,
-            walletId
+        const extendedPublicKey = await this._requestExtendedPublicKey(
+          transportDevice.path,
+          walletId
+        );
+        const associatedWallet = await this._findAssociatedWalletByExtendedPublicKey(
+          { extendedPublicKey }
+        );
+
+        if (associatedWallet) {
+          await this._storeWalletDataInLocalStorageAndHandleTransactionOrAddressVerificationOrRouting(
+            {
+              associatedWallet,
+              expectedWalletId: walletId,
+              extendedPublicKey,
+              path: transportDevice.path,
+            }
           );
-          const associatedWallet = await this._findAssociatedWalletByExtendedPublicKey(
-            { extendedPublicKey }
+        } else {
+          const deviceId =
+            extendedPublicKey.deviceId || this.transportDevice.deviceId;
+          logger.debug(
+            '[HW-DEBUG] HWStore - I don not have recognized wallet - reject TX: ',
+            {
+              deviceId,
+            }
           );
 
-          if (associatedWallet) {
-            await this._storeWalletDataInLocalStorageAndHandleTransactionOrAddressVerificationOrRouting(
-              {
-                associatedWallet,
-                expectedWalletId: walletId,
-                extendedPublicKey,
-                path: transportDevice.path,
-              }
-            );
-          } else {
-            const deviceId =
-              extendedPublicKey.deviceId || this.transportDevice.deviceId;
-            logger.debug(
-              '[HW-DEBUG] HWStore - I don not have recognized wallet - reject TX: ',
-              {
-                deviceId,
-              }
-            );
-
-            // Software Wallet not recognized and TX initiated. Show error
-            this._discardConnectedDeviceAndReInitiateTransaction({ walletId });
-          }
-        } catch (e) {
-          await this.resetWalletPairing();
-          throw e;
+          // Software Wallet not recognized and TX initiated. Show error
+          this._discardConnectedDeviceAndReInitiateTransaction({ walletId });
         }
       }
     } else {

yarn.lock

@@ -3155,10 +3155,6 @@
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/is-function/-/is-function-1.0.0.tgz#1b0b819b1636c7baf0d6785d030d12edf70c3e83"
 
-"@types/istanbul-lib-coverage@*":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44"
-
 "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
@@ -13558,14 +13554,7 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-[email protected]:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
-  dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.5"
-
-prompts@^2.0.1:
+[email protected], prompts@^2.0.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
   dependencies: