fix - timer not redirecting at exactly 0:00

fix - min/max were not visible when the form is loading
blockchain · May 30, 2018 · 9667087 · 9667087
1 parent 5160978
commit 9667087
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Form/CountdownTimer/index.js b/packages/blockchain-wallet-v4-frontend/src/components/Form/CountdownTimer/index.js
@@ -23,7 +23,7 @@ class CountdownTimerContainer extends React.PureComponent {
   tick () {
     const { handleExpiry } = this.props
     const elapsed = moment.duration(moment(this.state.expiration).diff(moment()))
-    if (this.state.elapsed.as('milliseconds') < 1) {
+    if (this.state.elapsed.as('seconds') < 1) {
       // If we reach the end of the timer, we execute the expiry callback
       if (handleExpiry) { handleExpiry() }
     } else {

diff --git a/...lockchain-wallet-v4-frontend/src/scenes/Exchange/Shapeshift/FirstStep/template.success.js b/...lockchain-wallet-v4-frontend/src/scenes/Exchange/Shapeshift/FirstStep/template.success.js
@@ -158,7 +158,7 @@ const Success = props => {
           {formError === 'invalid' && <InvalidAmountMessage />}
         </Row>
         }
-        {!formError &&
+        {(!formError || formError === 'initial') &&
           <Row spaced>
             <OptionsContainer>
               <Text weight={300} size='12px'>