Merge branch 'daedalus-demo' of github.com:input-output-hkt checkout :wq

/daedalus into daedalus-demo
input-output-hk · Jul 1, 2020 · 1714744 · 1714744
2 parents 0f48d22 + 4af206f
commit 1714744
Showing 1 changed file with 33 additions and 10 deletions.
diff --git a/source/renderer/app/components/staking/redeem-itn-rewards/Step1ConfigurationDialog.js b/source/renderer/app/components/staking/redeem-itn-rewards/Step1ConfigurationDialog.js
@@ -17,12 +17,13 @@ import Dialog from '../../widgets/Dialog';
 import styles from './Step1ConfigurationDialog.scss';
 import redeemDialogOverride from './RedeemDialogOverride.scss';
 import ReactToolboxMobxForm /* ,  {handleFormErrors } */ from '../../../utils/ReactToolboxMobxForm';
-// import globalMessages from '../../../i18n/global-messages';
+import globalMessages from '../../../i18n/global-messages';
 import LocalizableError from '../../../i18n/LocalizableError';
 import { WALLET_RECOVERY_PHRASE_WORD_COUNT } from '../../../config/cryptoConfig';
 import { FORM_VALIDATION_DEBOUNCE_WAIT } from '../../../config/timingConfig';
 
-const generateWallet = (name, amount) => ({
+const generateWallet = (id, name, amount) => ({
+  id,
   name,
   amount: new BigNumber(amount),
 });
@@ -85,6 +86,12 @@ const messages = defineMessages({
     defaultMessage: '!!!url',
     description: 'learnMoreLinkUrl for Redeem Incentivized Testnet - Step 1',
   },
+  invalidRecoveryPhrase: {
+    id:
+      'wallet.restore.dialog.step.mnemonics.autocomplete.invalidRecoveryPhrase',
+    defaultMessage: 'Invalid recovery phrase',
+    description: 'Label for invalid recovery phrase',
+  },
 });
 
 type Props = {
@@ -110,6 +117,10 @@ export default class Step1ConfigurationDialog extends Component<Props> {
     error: null,
   };
 
+  state = {
+    wallet: null,
+  };
+
   recoveryPhraseAutocomplete: Autocomplete;
 
   // componentDidUpdate() {
@@ -132,11 +143,19 @@ export default class Step1ConfigurationDialog extends Component<Props> {
             const value = enteredWords.join(' ');
             const isPhraseComplete = wordCount === expectedWordCount;
             if (!isPhraseComplete) {
-              return [false, 'INCOMPLETE'];
+              return [
+                false,
+                this.context.intl.formatMessage(
+                  globalMessages.incompleteMnemonic,
+                  {
+                    expected: 15,
+                  }
+                ),
+              ];
             }
             return [
               this.props.mnemonicValidator(value, expectedWordCount),
-              'this.context.intl.formatMessage(messages.invalidRecoveryPhrase)',
+              this.context.intl.formatMessage(messages.invalidRecoveryPhrase),
             ];
           },
         },
@@ -228,8 +247,8 @@ export default class Step1ConfigurationDialog extends Component<Props> {
     } = this.props;
 
     const wallets = [
-      generateWallet('Wallet with funds', '1000000000'),
-      generateWallet('Wallet with no funds', '0'),
+      generateWallet('1', 'Wallet with funds', '1000000000'),
+      generateWallet('2', 'Wallet with no funds', '0'),
     ];
 
     const recoveryPhraseField = form.$('recoveryPhrase');
@@ -291,16 +310,20 @@ export default class Step1ConfigurationDialog extends Component<Props> {
             {...walletsDropdownField.bind()}
             numberOfStakePools={4}
             wallets={wallets}
-            onChange={onSelectWallet}
+            onChange={wallet => this.setState({ wallet })}
             placeholder={
-              'WalletsDropdown Placeholder'
+              'Choose a wallet'
               /* intl.formatMessage(
               messages.selectWalletInputPlaceholder
             ) */
             }
-            value={redeemWalletId}
+            value={this.state.wallet || null}
             getStakePoolById={() => {}}
-            error={this.walletsDropdownError}
+            error={
+              this.state.wallet === '2'
+                ? intl.formatMessage(messages.walletsDropdownError)
+                : ''
+            }
           />
 
           <hr />