Merge branch 'development' into fix/various-bugs

blockchain · May 2, 2019 · 962c91f · 962c91f
2 parents e862169 + 12523cf
commit 962c91f
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 25 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Form/CreatableInputField/index.js b/packages/blockchain-wallet-v4-frontend/src/components/Form/CreatableInputField/index.js
@@ -27,7 +27,7 @@ const CreatableInputField = props => {
   const errorState = touched && invalid ? 'invalid' : 'initial'
 
   return (
-    <Container maxWidth={props.maxWidth}>
+    <Container maxWidth={props.maxWidth} data-e2e={props.dataE2e}>
       <CreatableInput {...input} {...meta} {...rest} errorState={errorState} />
       {(touched || !pristine) && error && !hideErrors && (
         <Error errorBottom={errorBottom}>{error}</Error>

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Bch/SendBch/FirstStep/template.success.js b/packages/blockchain-wallet-v4-frontend/src/modals/Bch/SendBch/FirstStep/template.success.js
@@ -127,6 +127,7 @@ const FirstStep = props => {
               name='to'
               placeholder='Paste, scan, or select destination'
               component={SelectBoxBchAddresses}
+              dataE2e='sendBchAddressInput'
               validate={[required, validBchAddress]}
               exclude={[from.label]}
               openMenuOnClick={false}

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Btc/SendBtc/FirstStep/template.success.js b/packages/blockchain-wallet-v4-frontend/src/modals/Btc/SendBtc/FirstStep/template.success.js
@@ -181,6 +181,7 @@ const FirstStep = props => {
               name='to'
               placeholder='Paste, scan, or select destination'
               component={SelectBoxBtcAddresses}
+              dataE2e='sendBtcAddressInput'
               validate={[required, validBtcAddress]}
               exclude={[from.label]}
               openMenuOnClick={false}

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Eth/SendEth/FirstStep/template.success.js b/packages/blockchain-wallet-v4-frontend/src/modals/Eth/SendEth/FirstStep/template.success.js
@@ -159,6 +159,7 @@ const FirstStep = props => {
               placeholder='Paste, scan, or select destination'
               validate={[required, validEthAddress]}
               component={SelectBoxEthAddresses}
+              dataE2e='sendEthAddressInput'
               exclude={[from.label]}
               openMenuOnClick={false}
               includeAll={false}

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Eth/SendEth/FirstStep/validation.js b/packages/blockchain-wallet-v4-frontend/src/modals/Eth/SendEth/FirstStep/validation.js
@@ -39,7 +39,7 @@ export const maximumAmount = (value, allValues, props) => {
     ) ? (
       undefined
     ) : (
-      <MaximumAmountMessage coin={coin} />
+      <MaximumAmountMessage coin={props.coin} />
     )
   } catch (e) {}
 }

diff --git a/...ages/blockchain-wallet-v4-frontend/src/modals/Eth/SendEth/FirstStep/validationMessages.js b/...ages/blockchain-wallet-v4-frontend/src/modals/Eth/SendEth/FirstStep/validationMessages.js
@@ -24,13 +24,13 @@ export const InvalidAmountMessage = () => (
   />
 )
 
-export const MaximumAmountMessage = coin => (
+export const MaximumAmountMessage = props => (
   <Wrapper>
     <FormattedMessage
       id='modals.sendeth.maximumamountmessage'
       defaultMessage='Not enough funds. Use'
     />
-    <MaximumAmountLink coin={coin} />
+    <MaximumAmountLink coin={props.coin} />
   </Wrapper>
 )
 
@@ -41,22 +41,22 @@ export const InsufficientFundsMessage = () => (
   />
 )
 
-export const MaximumFeeMessage = coin => (
+export const MaximumFeeMessage = props => (
   <Wrapper>
     <FormattedMessage
       id='modals.sendeth.maximumfeemessage'
       defaultMessage='Unnecessarily high fee.'
     />
     <span>&nbsp;</span>
-    <MaximumFeeLink coin={coin} />
+    <MaximumFeeLink coin={props.coin} />
   </Wrapper>
 )
-export const MinimumFeeMessage = coin => (
+export const MinimumFeeMessage = props => (
   <Wrapper>
     <FormattedMessage
       id='modals.sendeth.minimumfeemessage'
       defaultMessage='Low fee not recommended. Use'
     />
-    <MinimumFeeLink coin={coin} />
+    <MinimumFeeLink coin={props.coin} />
   </Wrapper>
 )
diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Xlm/SendXlm/FirstStep/template.success.js b/packages/blockchain-wallet-v4-frontend/src/modals/Xlm/SendXlm/FirstStep/template.success.js
@@ -162,6 +162,7 @@ const FirstStep = props => {
                   name='to'
                   placeholder='Paste, scan, or select destination'
                   component={SelectBoxXlmAddresses}
+                  dataE2e='sendXlmAddressInput'
                   validate={[required, validXlmAddress]}
                   exclude={[from.label]}
                   openMenuOnClick={false}

diff --git a/packages/blockchain-wallet-v4-frontend/src/services/FormHelper/validationMessages.js b/packages/blockchain-wallet-v4-frontend/src/services/FormHelper/validationMessages.js
@@ -8,16 +8,20 @@ export const AgeOverEighteenMessage = () => (
   />
 )
 export const InvalidBtcAddressMessage = () => (
-  <FormattedMessage
-    id='formhelper.invalidbtcaddress'
-    defaultMessage='Invalid Bitcoin address'
-  />
+  <div data-e2e='invalidBtcAddress'>
+    <FormattedMessage
+      id='formhelper.invalidbtcaddress'
+      defaultMessage='Invalid Bitcoin address'
+    />
+  </div>
 )
 export const InvalidBchAddressMessage = () => (
-  <FormattedMessage
-    id='formhelper.invalidbchaddress'
-    defaultMessage='Invalid Bitcoin Cash address'
-  />
+  <div data-e2e='invalidBchAddress'>
+    <FormattedMessage
+      id='formhelper.invalidbchaddress'
+      defaultMessage='Invalid Bitcoin Cash address'
+    />
+  </div>
 )
 export const InvalidBtcPrivateKeyMessage = () => (
   <FormattedMessage
@@ -45,16 +49,20 @@ export const InvalidEmailMessage = () => (
 )
 export const ValidEmailNotAllowed = () => 'valid_email_not_allowed'
 export const InvalidEthAddressMessage = () => (
-  <FormattedMessage
-    id='formhelper.invalid_ethereum_address'
-    defaultMessage='Invalid Ethereum address'
-  />
+  <div data-e2e='invalidEthAddress'>
+    <FormattedMessage
+      id='formhelper.invalid_ethereum_address'
+      defaultMessage='Invalid Ethereum address'
+    />
+  </div>
 )
 export const InvalidXlmAddressMessage = () => (
-  <FormattedMessage
-    id='formhelper.invalidxlmaddress'
-    defaultMessage='Invalid Stellar address'
-  />
+  <div data-e2e='invalidXlmAddress'>
+    <FormattedMessage
+      id='formhelper.invalidxlmaddress'
+      defaultMessage='Invalid Stellar address'
+    />
+  </div>
 )
 export const InvalidIpListMessage = () => (
   <FormattedMessage
@@ -135,7 +143,9 @@ export const RequiredDOBMessage = () => (
   />
 )
 export const RequiredMessage = () => (
-  <FormattedMessage id='formhelper.required' defaultMessage='Required' />
+  <div data-e2e='requiredMessage'>
+    <FormattedMessage id='formhelper.required' defaultMessage='Required' />
+  </div>
 )
 export const RequiredNumberMessage = () => (
   <FormattedMessage