Merge branch 'development' into fix/mobile-login-camera-close

blockchain · Mar 1, 2019 · 23429dc · 23429dc
2 parents 4e14552 + 5e081e3
commit 23429dc
Show file tree

Hide file tree

Showing 15 changed files with 695 additions and 310 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Form/FooterShadowWrapper/index.js b/packages/blockchain-wallet-v4-frontend/src/components/Form/FooterShadowWrapper/index.js
@@ -22,7 +22,7 @@ const Footer = styled.div`
 
 const FooterShadowWrapper = ({ fields, footer, ...rest }) => (
   <Container {...rest}>
-    <Fields>{fields}</Fields>
+    <Fields id={rest.scrollRefId}>{fields}</Fields>
     <Footer>{footer}</Footer>
   </Container>
 )

diff --git a/...v4-frontend/src/components/IdentityVerification/TierCard/__snapshots__/index.spec.js.snap b/...v4-frontend/src/components/IdentityVerification/TierCard/__snapshots__/index.spec.js.snap
@@ -228,8 +228,8 @@ exports[`TierCard renders correctly with column view 1`] = `
       nature="primary"
     >
       <FormattedMessage
-        defaultMessage="Unlock Gold"
-        id="components.identityverification.tiercard.goldcta"
+        defaultMessage="Unlock Gold 🥇"
+        id="components.identityverification.tiercard.goldctamedal"
         values={Object {}}
       />
     </TierCard__ActionButton>

diff --git a/...es/blockchain-wallet-v4-frontend/src/components/IdentityVerification/TierCard/services.js b/...es/blockchain-wallet-v4-frontend/src/components/IdentityVerification/TierCard/services.js
@@ -174,8 +174,8 @@ export const ctas = {
   ),
   GOLD: (
     <FormattedMessage
-      id='components.identityverification.tiercard.goldcta'
-      defaultMessage='Unlock Gold'
+      id='components.identityverification.tiercard.goldctamedal'
+      defaultMessage='Unlock Gold 🥇'
     />
   )
 }
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/exchange/model.js b/packages/blockchain-wallet-v4-frontend/src/data/components/exchange/model.js
@@ -50,10 +50,23 @@ export const ORDER_ERROR = 'Amount exceeds maximum trade size'
 export const LATEST_TX_ERROR = 'Unconfirmed tx pending'
 export const LATEST_TX_FETCH_FAILED_ERROR = 'Failed to fetch latest tx data'
 export const MISSING_DEVICE_ERROR = 'missing_device'
-export const NO_TRADE_PERMISSION = 'NO_TRADE_PERMISSION'
 export const CREATE_ACCOUNT_ERROR = 'Not enough funds to create new account'
 export const NO_ACCOUNT_ERROR = 'Account does not exist'
 export const RESERVE_ERROR = 'Reserve exceeds remaining funds'
+export const NO_TRADE_PERMISSION = 'NO_TRADE_PERMISSION'
+export const ORDER_BELOW_MIN_LIMIT = 'ORDER_BELOW_MIN_LIMIT'
+export const ORDER_ABOVE_MAX_LIMIT = 'ORDER_ABOVE_MAX_LIMIT'
+export const DAILY_LIMIT_EXCEEDED = 'DAILY_LIMIT_EXCEEDED'
+export const WEEKLY_LIMIT_EXCEEDED = 'WEEKLY_LIMIT_EXCEEDED'
+export const ANNUAL_LIMIT_EXCEEDED = 'ANNUAL_LIMIT_EXCEEDED'
+
+export const SWAP_ERROR_CODES = {
+  41: ORDER_BELOW_MIN_LIMIT,
+  43: ORDER_ABOVE_MAX_LIMIT,
+  45: DAILY_LIMIT_EXCEEDED,
+  46: WEEKLY_LIMIT_EXCEEDED,
+  47: ANNUAL_LIMIT_EXCEEDED
+}
 
 const currenciesOrder = ['BTC', 'ETH', 'BCH', 'XLM', 'BSV']
 export const sortByOrder = sortBy(flip(indexOf)(currenciesOrder))

diff --git a/.../blockchain-wallet-v4-frontend/src/modals/Exchange/IdentityVerification/Personal/index.js b/.../blockchain-wallet-v4-frontend/src/modals/Exchange/IdentityVerification/Personal/index.js
@@ -12,6 +12,8 @@ import Personal from './template'
 import Loading from './template.loading'
 import DataError from 'components/DataError'
 
+export const SCROLL_REF_ID = 'scroll-ref-id'
+
 const getCountryElements = countries => [
   {
     group: '',
@@ -36,6 +38,11 @@ class PersonalContainer extends React.PureComponent {
     this.fetchData()
   }
 
+  scrollTop = () => {
+    const overflowElement = document.getElementById(SCROLL_REF_ID)
+    overflowElement.scrollTop = 0
+  }
+
   fetchData = () => {
     this.props.actions.fetchSupportedCountries()
     this.props.actions.fetchStates()
@@ -52,6 +59,12 @@ class PersonalContainer extends React.PureComponent {
     this.props.formActions.clearFields(PERSONAL_FORM, false, false, 'state')
   }
 
+  onPromptForEmailVerification = e => {
+    e.preventDefault()
+    this.scrollTop()
+    this.setState({ showEmailError: true })
+  }
+
   editEmail = () => {
     this.props.actions.setEmailStep(EMAIL_STEPS.edit)
   }
@@ -88,6 +101,7 @@ class PersonalContainer extends React.PureComponent {
         email: initialEmail
       }}
       showEmail={!this.state.initialEmailVerified}
+      showEmailError={!emailVerified && this.state.showEmailError}
       emailVerified={emailVerified}
       email={email}
       emailStep={emailStep}
@@ -103,7 +117,8 @@ class PersonalContainer extends React.PureComponent {
       activeFieldError={activeFieldError}
       editEmail={this.editEmail}
       updateEmail={actions.updateEmail}
-      sendEmailVerification={actions.sendEmailVerification}
+      sendEmailVerification={this.onSendEmailVerification}
+      onPromptForEmailVerification={this.onPromptForEmailVerification}
       onAddressSelect={this.selectAddress}
       onCountrySelect={this.onCountryChange}
       onSubmit={handleSubmit}