Merge branch 'develop' into chore/ddw-1034-refactor-error-handling-in-rewards-only-wallets

Author: shawnbusuttil

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixes
 
 - Ensured non-recommended decimal place setting alert is correctly shown ([PR 3007](https://github.com/input-output-hk/daedalus/pull/3007))
+- Disabled the possibility to choose a syncing wallet for ITN rewards and delegation ([PR 3015](https://github.com/input-output-hk/daedalus/pull/3015))
 
 ### Chores
 

source/main/trezor/connection.ts

@@ -14,7 +14,6 @@ export const initTrezorConnect = async () => {
     logger.info('[TREZOR-CONNECT] Called TrezorConnect.init()');
   } catch (error) {
     logger.info('[TREZOR-CONNECT] Failed to call TrezorConnect.init()');
-    throw error;
   }
 };
 

source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsChooseWalletDialog.tsx

@@ -16,6 +16,7 @@ import DialogBackButton from '../../widgets/DialogBackButton';
 import Dialog from '../../widgets/Dialog';
 import WalletsDropdown from '../../widgets/forms/WalletsDropdown';
 import Wallet from '../../../domains/Wallet';
+import LocalizableError from '../../../i18n/LocalizableError';
 
 const messages = defineMessages({
   title: {
@@ -116,6 +117,30 @@ export default class DelegationStepsChooseWalletDialog extends Component<
     this.props.onSelectWallet(selectedWalletId);
   };
 
+  getErrorMessage = (wallet?: Wallet): LocalizableError | null => {
+    if (!wallet) {
+      return null;
+    }
+
+    const { amount, reward, isRestoring } = wallet;
+
+    if (isRestoring) {
+      return messages.errorRestoringWallet;
+    }
+
+    if (!this.props.isWalletAcceptable(amount, reward)) {
+      // Wallet only has Reward balance
+      if (!amount.isZero() && amount.isEqualTo(reward)) {
+        return messages.errorMinDelegationFundsRewardsOnly;
+      }
+
+      // Wallet balance < min delegation funds
+      return messages.errorMinDelegationFunds;
+    }
+
+    return null;
+  };
+
   render() {
     const { intl } = this.context;
     const { selectedWalletId } = this.state;
@@ -125,25 +150,13 @@ export default class DelegationStepsChooseWalletDialog extends Component<
       minDelegationFunds,
       onClose,
       onBack,
-      isWalletAcceptable,
       numberOfStakePools,
       getStakePoolById,
     } = this.props;
     const selectedWallet: Wallet | null | undefined = wallets.find(
       (wallet: Wallet) => wallet && wallet.id === selectedWalletId
     );
-    const { amount, reward, isRestoring } = selectedWallet || {};
-    let errorMessage;
-
-    if (selectedWallet && !isWalletAcceptable(amount, reward)) {
-      // Wallet is restoring
-      if (isRestoring) errorMessage = messages.errorRestoringWallet;
-      // Wallet only has Reward balance
-      else if (!amount.isZero() && amount.isEqualTo(reward))
-        errorMessage = messages.errorMinDelegationFundsRewardsOnly;
-      // Wallet balance < min delegation funds
-      else errorMessage = messages.errorMinDelegationFunds;
-    }
+    const errorMessage = this.getErrorMessage(selectedWallet);
 
     const error = errorMessage && (
       <p className={styles.errorMessage}>

source/renderer/app/containers/staking/dialogs/redeem-itn-rewards/Step1ConfigurationContainer.tsx

@@ -10,6 +10,7 @@ import validWords from '../../../../../../common/config/crypto/valid-words.en';
 import { isValidMnemonic } from '../../../../../../common/config/crypto/decrypt';
 import { MIN_REWARDS_REDEMPTION_RECEIVER_BALANCE } from '../../../../config/stakingConfig';
 import Wallet from '../../../../domains/Wallet';
+import LocalizableError from '../../../../i18n/LocalizableError';
 
 type Props = InjectedDialogContainerStepProps;
 const DefaultProps = InjectedDialogContainerStepDefaultProps;
@@ -34,15 +35,32 @@ const messages = defineMessages({
 @observer
 class Step1ConfigurationContainer extends Component<Props> {
   static defaultProps = DefaultProps;
-  onWalletAcceptable = (walletAmount?: BigNumber) => {
+  hasEnoughAdaToCoverFees = (walletAmount?: BigNumber) => {
     const minRewardsFunds = new BigNumber(
       MIN_REWARDS_REDEMPTION_RECEIVER_BALANCE
     );
     return walletAmount && walletAmount.gte(minRewardsFunds);
   };
 
+  getErrorMessage = (wallet?: Wallet): LocalizableError | null => {
+    if (!wallet) {
+      return null;
+    }
+
+    const { amount, isRestoring } = wallet;
+
+    if (isRestoring) {
+      return messages.errorRestoringWallet;
+    }
+    if (!this.hasEnoughAdaToCoverFees(amount)) {
+      return messages.errorMinRewardFunds;
+    }
+
+    return null;
+  };
+
   render() {
-    const { actions, stores, onBack, onClose } = this.props;
+    const { actions, stores, onClose } = this.props;
     const { app, staking, wallets } = stores;
     const { allWallets } = wallets;
     const {
@@ -59,23 +77,13 @@ class Step1ConfigurationContainer extends Component<Props> {
     const selectedWallet: Wallet | null | undefined = allWallets.find(
       (current: Wallet) => current && current.id === selectedWalletId
     );
-    const { amount, isRestoring } = selectedWallet || {};
-    let errorMessage = null;
-
-    if (selectedWallet && !this.onWalletAcceptable(amount)) {
-      // Wallet is restoring
-      if (isRestoring) errorMessage = messages.errorRestoringWallet;
-      // Wallet balance < min rewards redemption funds
-      else errorMessage = messages.errorMinRewardFunds;
-    }
+    const errorMessage = this.getErrorMessage(selectedWallet);
 
     return (
       <Step1ConfigurationDialog
         error={errorMessage}
         isCalculatingReedemFees={isCalculatingReedemFees}
         mnemonicValidator={isValidMnemonic}
-        // @ts-ignore ts-migrate(2769) FIXME: No overload matches this call.
-        onBack={onBack}
         onClose={onClose}
         onContinue={onConfigurationContinue.trigger}
         onSelectWallet={(walletId, recoveryPhrase) =>