[DDW-197] Cancel all device action on tx dialog close. Reset listener…

…s on app refresh
input-output-hk · Oct 29, 2020 · d9f741a · d9f741a
1 parent e5b093c
commit d9f741a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/source/main/ipc/getHardwareWalletChannel.js b/source/main/ipc/getHardwareWalletChannel.js
@@ -243,6 +243,9 @@ export const handleHardwareWalletRequests = async (mainWindow) => {
 
   handleInitTrezorConnectChannel.onRequest(async () => {
     console.debug('>>> Trezor Init: ', TrezorConnect);
+    // Remove all listeners if exist - e.g. on app refresh
+    TrezorConnect.removeAllListeners();
+    // Initialize new device listeners
     TrezorConnect.on(TRANSPORT_EVENT, event => {
       console.debug('>>> TRANSPORT_EVENT: ', event);
 
@@ -458,10 +461,23 @@ export const handleHardwareWalletRequests = async (mainWindow) => {
       ttl,
       networkId,
       certificates,
+      reset
     } = params;
     if (!TrezorConnect) {
       throw new Error('Device not connected!');
     }
+
+    if (reset) {
+      TrezorConnect.cancel('Method_Cancel');
+      return {
+        success: false,
+        payload: {
+          code: 'Method_Cancel',
+          error: 'Signing Cancelled',
+        }
+      }
+    }
+
     try {
       console.debug('>>> Signing REQ: ', params);
       const signedTransaction = await TrezorConnect.cardanoSignTransaction({

diff --git a/source/renderer/app/containers/wallet/dialogs/WalletSendConfirmationDialogContainer.js b/source/renderer/app/containers/wallet/dialogs/WalletSendConfirmationDialogContainer.js
@@ -55,7 +55,7 @@ export default class WalletSendConfirmationDialogContainer extends Component<Pro
     } = this.props;
     const { stores } = this.props;
     const { sendMoneyRequest, active: activeWallet } = stores.wallets;
-    const { sendMoneyRequest: sendMoneyExternalRequest, isTransactionPending } = stores.hardwareWallets;
+    const { _resetTransaction: resetHardwareWalletTransaction, sendMoneyRequest: sendMoneyExternalRequest, isTransactionPending } = stores.hardwareWallets;
     const { isFlight } = global;
 
     if (!activeWallet)
@@ -77,7 +77,7 @@ export default class WalletSendConfirmationDialogContainer extends Component<Pro
         onCancel={() => {
           actions.dialogs.closeActiveDialog.trigger();
           sendMoneyRequest.reset();
-          sendMoneyExternalRequest.reset();
+          resetHardwareWalletTransaction({ cancelDeviceAction: true });
         }}
         error={error}
         currencyUnit={currencyUnit}

diff --git a/source/renderer/app/stores/HardwareWalletsStore.js b/source/renderer/app/stores/HardwareWalletsStore.js
@@ -751,14 +751,22 @@ export default class HardwareWalletsStore extends Store {
     }
   };
 
-  _resetTransaction = async () => {
-    this.selectCoinsRequest.reset();
+  _resetTransaction = async (params: ?{
+    cancelDeviceAction: boolean;
+  }) => {
+    const { cancelDeviceAction } = params;
+    console.debug('>>> CANCEL: ', cancelDeviceAction);
+    if (cancelDeviceAction) {
+      signTransactionTrezorChannel.request({
+        reset: true,
+      });
+    }
+    this.sendMoneyRequest.reset();
     runInAction(
       'HardwareWalletsStore:: reset Transaction verifying',
       () => {
         this.hwDeviceStatus = HwDeviceStatuses.READY;
         this.txBody = null;
-        this.txSignRequest = {};
       }
     );
   };