[DDW-759] Fixed hardware wallet delegation (#2738)

* [DDW-759] Fixed hardware wallet delegation

* [DDW-759] Updated CHANGELOG

* [DDW-759] Updated localizations

Author: mchappell

CHANGELOG.md

@@ -5,7 +5,7 @@
 ### Features
 
 - Implemented "Catalyst Fund7" voting registration changes ([PR 2732](https://github.com/input-output-hk/daedalus/pull/2732))
-- Added "Over-saturation" warning in the delegation wizard ([PR 2733](https://github.com/input-output-hk/daedalus/pull/2733))
+- Added "Over-saturation" warning in the delegation wizard ([PR 2733](https://github.com/input-output-hk/daedalus/pull/2733), [PR 2738](https://github.com/input-output-hk/daedalus/pull/2738))
 - Added Catalyst footer links ([PR 2721](https://github.com/input-output-hk/daedalus/pull/2721))
 
 ### Fixes

source/renderer/app/components/staking/delegation-setup-wizard/DelegationSetupWizardDialog.js

@@ -43,6 +43,7 @@ type Props = {
   getStakePoolById: Function,
   hwDeviceStatus: HwDeviceStatus,
   isTrezor: boolean,
+  onThumbPoolSelect: Function,
 };
 
 const getOversaturationPercentage = (
@@ -108,6 +109,7 @@ export default class DelegationSetupWizardDialog extends Component<Props> {
       hwDeviceStatus,
       isTrezor,
       maxDelegationFunds,
+      onThumbPoolSelect,
     } = this.props;
 
     const selectedWalletId = get(selectedWallet, 'id', null);
@@ -156,9 +158,10 @@ export default class DelegationSetupWizardDialog extends Component<Props> {
             selectedPool={selectedPool}
             onClose={onClose}
             onBack={onBack}
-            onSelectPool={onSelectPool}
-            onContinue={onContinue}
+            onSelectPool={onThumbPoolSelect}
+            onContinue={onSelectPool}
             oversaturationPercentage={oversaturationPercentage}
+            onThumbPoolSelect={onThumbPoolSelect}
           />
         );
         break;

source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsChooseStakePoolDialog.js

@@ -50,6 +50,7 @@ type Props = {
   intl: intlShape.isRequired,
   onContinue: Function,
   oversaturationPercentage: number,
+  onThumbPoolSelect: Function,
 };
 
 type FooterProps = {
@@ -90,22 +91,25 @@ const DelegationStepsChooseStakePoolDialog = observer((props: Props) => {
     setSearchValue('');
   });
 
-  const handleSelect = useCallback((value: string) => {
-    const _selectedPool = find(
-      stakePoolsList,
-      (stakePool) => stakePool.id === value
-    );
-    setSelectedPool(_selectedPool);
-    props.onSelectPool(_selectedPool.id);
-  });
+  const handleSelect = useCallback(
+    (value: string) => {
+      const _selectedPool = find(
+        stakePoolsList,
+        (stakePool) => stakePool.id === value
+      );
+      setSelectedPool(_selectedPool);
+      props.onThumbPoolSelect(_selectedPool.id);
+    },
+    [props.onThumbPoolSelect, stakePoolsList]
+  );
 
   useEffect(() => {
     if (preselectedPool && preselectedPool.id) handleSelect(preselectedPool.id);
   }, [preselectedPool]);
 
   const onContinue = useCallback(() => {
-    props.onContinue();
-  }, [props.onContinue]);
+    props.onContinue(selectedPool);
+  }, [props.onContinue, selectedPool]);
 
   const {
     name: selectedWalletName,

source/renderer/app/containers/staking/dialogs/DelegationSetupWizardDialogContainer.js

@@ -12,6 +12,7 @@ import {
 } from '../../../config/stakingConfig';
 import type { DelegationCalculateFeeResponse } from '../../../api/staking/types';
 import type { InjectedDialogContainerProps } from '../../../types/injectedPropsType';
+import StakePool from '../../../domains/StakePool';
 
 const messages = defineMessages({
   learnMoreLinkUrl: {
@@ -155,11 +156,15 @@ export default class DelegationSetupWizardDialogContainer extends Component<
     this.handleContinue();
   };
 
-  handleSelectPool = (poolId: string) => {
-    this._handleCalculateTransactionFee(poolId);
+  handleChoosePool = (poolId: string) => {
     this.setState({ selectedPoolId: poolId });
   };
 
+  handleSelectPool = (pool: StakePool) => {
+    this._handleCalculateTransactionFee(pool.id);
+    this.handleContinue();
+  };
+
   render() {
     const {
       activeStep,
@@ -230,6 +235,7 @@ export default class DelegationSetupWizardDialogContainer extends Component<
         onContinue={this.handleContinue}
         onSelectWallet={this.handleSelectWallet}
         onSelectPool={this.handleSelectPool}
+        onThumbPoolSelect={this.handleChoosePool}
         onBack={this.onBack}
         onLearnMoreClick={this.handleLearnMoreClick}
         onConfirm={this.handleConfirm}

source/renderer/app/i18n/locales/defaultMessages.json

@@ -17105,55 +17105,55 @@
         "description": "\"Learn more\" link URL on the delegation setup \"intro\" dialog.",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 23
         },
         "file": "source/renderer/app/containers/staking/dialogs/DelegationSetupWizardDialogContainer.js",
         "id": "staking.delegationSetup.intro.step.dialog.learnMore.url",
         "start": {
           "column": 20,
-          "line": 17
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!Wallet",
         "description": "Step 1 label text on delegation steps dialog.",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 28
         },
         "file": "source/renderer/app/containers/staking/dialogs/DelegationSetupWizardDialogContainer.js",
         "id": "staking.delegationSetup.steps.step.1.label",
         "start": {
           "column": 29,
-          "line": 23
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Stake pool",
         "description": "Step 2 label text on delegation steps dialog.",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 33
         },
         "file": "source/renderer/app/containers/staking/dialogs/DelegationSetupWizardDialogContainer.js",
         "id": "staking.delegationSetup.steps.step.2.label",
         "start": {
           "column": 29,
-          "line": 28
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Confirmation",
         "description": "Step 3 label text on delegation steps dialog.",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 38
         },
         "file": "source/renderer/app/containers/staking/dialogs/DelegationSetupWizardDialogContainer.js",
         "id": "staking.delegationSetup.steps.step.3.label",
         "start": {
           "column": 29,
-          "line": 33
+          "line": 34
         }
       }
     ],

source/renderer/app/stores/StakingStore.js

@@ -291,6 +291,7 @@ export default class StakingStore extends Store {
       if (isHardwareWallet) {
         joinTransaction = await this.stores.hardwareWallets._sendMoney({
           isDelegationTransaction: true,
+          selectedWalletId: walletId,
         });
       } else {
         joinTransaction = await this.joinStakePoolRequest.execute({
@@ -327,6 +328,7 @@ export default class StakingStore extends Store {
       if (isHardwareWallet) {
         quitTransaction = await this.stores.hardwareWallets._sendMoney({
           isDelegationTransaction: true,
+          selectedWalletId: walletId,
         });
       } else {
         quitTransaction = await this.quitStakePoolRequest.execute({