Merge pull request #1492 from blockchain/fix/mobile-login-camera-close

Fix(Camera staying on after QR code login)
blockchain · Mar 1, 2019 · 4bd9fb4 · 4bd9fb4
2 parents 058f6f6 + 23429dc
commit 4bd9fb4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/auth/sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/auth/sagas.js
@@ -323,7 +323,6 @@ export default ({ api, coreSagas }) => {
         yield put(actions.alerts.displayError(C.MOBILE_LOGIN_ERROR))
       }
     }
-    yield put(actions.modals.closeModal())
   }
   const register = function*(action) {
     try {

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Mobile/MobileLogin/index.js b/packages/blockchain-wallet-v4-frontend/src/modals/Mobile/MobileLogin/index.js
@@ -6,22 +6,16 @@ import { isNil, isEmpty } from 'ramda'
 import * as C from 'services/AlertService'
 import { actions } from 'data'
 import modalEnhancer from 'providers/ModalEnhancer'
-import MobileLogin from './template.js'
+import MobileLogin from './template'
 
 class MobileLoginContainer extends React.PureComponent {
-  constructor (props) {
-    super(props)
-    this.handleScan = this.handleScan.bind(this)
-    this.handleError = this.handleError.bind(this)
-  }
-
-  handleScan (result) {
+  handleScan = result => {
     if (!isNil(result) && !isEmpty(result)) {
       this.props.authActions.mobileLogin(result)
     }
   }
 
-  handleError (error) {
+  handleError = error => {
     if (isNil(error) && isEmpty(error)) {
       this.props.alertsActions.displayError(C.MOBILE_LOGIN_SCAN_ERROR)
     }

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/index.js b/packages/blockchain-wallet-v4-frontend/src/modals/index.js
@@ -39,7 +39,7 @@ import {
   LockboxConnectionPrompt,
   LockboxShowXPubs
 } from './Lockbox'
-import { MobileLogin, MobileNumberChange, MobileNumberVerify } from './Mobile'
+import { MobileNumberChange, MobileNumberVerify } from './Mobile'
 import {
   AirdropReminder,
   SwapGetStarted,
@@ -99,7 +99,6 @@ const Modals = () => (
     <LockboxShowXPubs />
     <MobileNumberChange />
     <MobileNumberVerify />
-    <MobileLogin />
     <Onfido />
     <PairingCode />
     <PromptInput />

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/template.js
@@ -25,7 +25,6 @@ import {
   PasswordBox,
   TextBox
 } from 'components/Form'
-import Modals from 'modals'
 import MobileLogin from 'modals/Mobile/MobileLogin'
 
 const isSupportedBrowser =
@@ -99,9 +98,7 @@ const Login = props => {
 
   return (
     <Wrapper>
-      <Modals>
-        <MobileLogin />
-      </Modals>
+      <MobileLogin />
       <Header>
         <Text size='24px' weight={300} capitalize>
           <FormattedMessage