fix(SFOX): begin success modal after microdeposits

blockchain · Jun 19, 2018 · 6f43e7a · 6f43e7a
1 parent e30592a
commit 6f43e7a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/modules/sfox/sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/modules/sfox/sagas.js
@@ -1,4 +1,5 @@
 import { put, call, select } from 'redux-saga/effects'
+import { delay } from 'redux-saga'
 import * as A from './actions'
 import * as actions from '../../actions'
 import * as selectors from '../../selectors.js'
@@ -96,7 +97,8 @@ export default ({ coreSagas }) => {
       const result = yield call(coreSagas.data.sfox.verifyMicroDeposits, payload)
       if (result.status === 'active') {
         yield put(A.sfoxSuccess())
-        yield put(modalActions.closeAllModals())
+        yield call(delay, 1000)
+        // yield put(modalActions.closeAllModals())
       } else {
         yield put(A.sfoxNotAsked())
         throw new Error(result)

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/SfoxEnterMicroDeposits/index.js b/packages/blockchain-wallet-v4-frontend/src/modals/SfoxEnterMicroDeposits/index.js
@@ -13,13 +13,18 @@ class SfoxEnterMicroDeposits extends React.PureComponent {
 
     this.handleSubmit = this.handleSubmit.bind(this)
   }
+
+  componentDidMount () {
+    this.props.sfoxActions.sfoxNotAsked()
+  }
+
   handleSubmit (e) {
     const deposits = { amount1: parseFloat(this.props.deposit1), amount2: parseFloat(this.props.deposit2) }
     this.props.sfoxActions.submitMicroDeposits(deposits)
   }
 
   render () {
-    const status = this.props.status.cata({ Success: () => false, Failure: (err) => err, Loading: () => 'loading', NotAsked: () => false })
+    const status = this.props.status.cata({ Success: () => 'success', Failure: (err) => err, Loading: () => 'loading', NotAsked: () => false })
 
     return (
       <Template

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/SfoxEnterMicroDeposits/template.js b/packages/blockchain-wallet-v4-frontend/src/modals/SfoxEnterMicroDeposits/template.js
@@ -23,6 +23,23 @@ const ErrorText = styled(Text)`
 const MicroDeposits = (props) => {
   const { handleSubmit, close, position, total, invalid, status, tryAgain } = props
 
+  if (status === 'success') {
+    return (
+      <Modal size='medium' position={position} total={total}>
+        {/* <ModalHeader onClose={close}>
+          <Text>
+            <FormattedMessage id='sfoxmicrodeposits.header' defaultMessage='Verify Bank Deposits' />
+          </Text>
+        </ModalHeader> */}
+        <ModalBody>
+          <Text size='28px' weight={300}>
+            <FormattedMessage id='sfoxmicrodeposits.success' defaultMessage='YOU ARE NOW READY TO BUY & SELL' />
+          </Text>
+        </ModalBody>
+      </Modal>
+    )
+  }
+
   return (
     <Modal size='medium' position={position} total={total}>
       <ModalHeader onClose={close}>