fix(SFOX): properly show/remove loader on signup

blockchain · May 31, 2018 · 34cd44d · 34cd44d
1 parent 79a5ceb
commit 34cd44d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 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
@@ -25,6 +25,7 @@ export default ({ coreSagas }) => {
 
   const sfoxSignup = function * () {
     try {
+      yield put(A.sfoxLoading())
       yield call(coreSagas.data.sfox.signup)
       const profile = yield select(selectors.core.data.sfox.getProfile)
       if (!profile.error) {

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/SfoxExchangeData/Create/AcceptTerms.js b/packages/blockchain-wallet-v4-frontend/src/modals/SfoxExchangeData/Create/AcceptTerms.js
@@ -96,7 +96,7 @@ class AcceptTerms extends Component {
     const busy = this.props.errorStatus.cata({
       Success: () => false,
       Failure: (err) => err,
-      Loading: () => true,
+      Loading: () => Remote.Loading,
       NotAsked: () => false
     })
 
@@ -168,9 +168,9 @@ class AcceptTerms extends Component {
             <ButtonWrapper>
               <Button uppercase type='submit' nature='primary' fullwidth disabled={invalid || busy || !smsNumber || !email}>
                 {
-                  !busy
-                    ? <span>Continue</span>
-                    : <HeartbeatLoader height='20px' width='20px' color='white' />
+                  Remote.Loading.is(busy)
+                    ? <HeartbeatLoader height='20px' width='20px' color='white' />
+                    : <span>Continue</span>
                 }
               </Button>
             </ButtonWrapper>