Clear wallet service

Avoids Enkrypt loading previous selected option
rsksmart · Dec 5, 2024 · 6f9a042 · 6f9a042
1 parent e5e780e
commit 6f9a042
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 21 deletions.
diff --git a/src/common/components/exchange/SelectBitcoinWallet.vue b/src/common/components/exchange/SelectBitcoinWallet.vue
@@ -113,8 +113,7 @@ export default {
     }
 
     function setBitcoinWallet(wallet: BtcWallet): void {
-      addBitcoinWallet(wallet);
-      toSendBitcoin();
+      addBitcoinWallet(wallet).then(toSendBitcoin);
     }
 
     return {

diff --git a/src/common/utils/common.ts b/src/common/utils/common.ts
@@ -66,6 +66,7 @@ export const getClearPeginTxState = (): PegInTxState => ({
     safeFee: new SatoshiBig(0, 'btc'),
   },
   peginType: constants.peginType.POWPEG,
+  walletService: undefined,
 });
 
 export const getClearPegoutTxState = (): PegOutTxState => ({

diff --git a/src/pegin/store/PeginTx/actions.ts b/src/pegin/store/PeginTx/actions.ts
@@ -38,25 +38,30 @@ export const actions: ActionTree<PegInTxState, RootState> = {
   },
   [constants.PEGIN_TX_ADD_BITCOIN_WALLET]: ({ commit, state }, bitcoinWallet: BtcWallet) => {
     commit(constants.PEGIN_TX_SET_BITCOIN_WALLET, bitcoinWallet);
-    switch (bitcoinWallet) {
-      case constants.WALLET_NAMES.TREZOR.long_name:
-        commit(constants.PEGIN_TX_SET_WALLET_SERVICE, new TrezorService());
-        break;
-      case constants.WALLET_NAMES.LEDGER.long_name:
-        commit(constants.PEGIN_TX_SET_WALLET_SERVICE, new LedgerService());
-        break;
-      case constants.WALLET_NAMES.LEATHER.long_name:
-        commit(constants.PEGIN_TX_SET_WALLET_SERVICE, new LeatherService());
-        break;
-      case constants.WALLET_NAMES.XVERSE.long_name:
-        commit(constants.PEGIN_TX_SET_WALLET_SERVICE, new XverseService());
-        break;
-      case constants.WALLET_NAMES.ENKRYPT.long_name:
-        commit(constants.PEGIN_TX_SET_WALLET_SERVICE, new EnkryptService());
-        break;
-      default:
-        commit(constants.PEGIN_TX_SET_WALLET_SERVICE, undefined);
-        break;
+    try {
+      switch (bitcoinWallet) {
+        case constants.WALLET_NAMES.TREZOR.long_name:
+          commit(constants.PEGIN_TX_SET_WALLET_SERVICE, new TrezorService());
+          break;
+        case constants.WALLET_NAMES.LEDGER.long_name:
+          commit(constants.PEGIN_TX_SET_WALLET_SERVICE, new LedgerService());
+          break;
+        case constants.WALLET_NAMES.LEATHER.long_name:
+          commit(constants.PEGIN_TX_SET_WALLET_SERVICE, new LeatherService());
+          break;
+        case constants.WALLET_NAMES.XVERSE.long_name:
+          commit(constants.PEGIN_TX_SET_WALLET_SERVICE, new XverseService());
+          break;
+        case constants.WALLET_NAMES.ENKRYPT.long_name:
+          commit(constants.PEGIN_TX_SET_WALLET_SERVICE, new EnkryptService());
+          break;
+        default:
+          commit(constants.PEGIN_TX_SET_WALLET_SERVICE, undefined);
+          break;
+      }
+    } catch (e) {
+      commit(constants.PEGIN_TX_SET_WALLET_SERVICE, undefined);
+      return;
     }
     commit(
       constants.PEGIN_TX_WALLET_SERVICE_SUBSCRIBE,