diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Sofi/VerifySSN/index.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Sofi/VerifySSN/index.tsx
index 53fe66269a8..91d35433f3e 100644
--- a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Sofi/VerifySSN/index.tsx
+++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Sofi/VerifySSN/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useEffect } from 'react'
 import { FormattedMessage } from 'react-intl'
 import { useDispatch } from 'react-redux'
 import { Field } from 'redux-form'
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Wallet/CheckEmail/index.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Wallet/CheckEmail/index.tsx
index eaedef124bf..66c6cbacba6 100644
--- a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Wallet/CheckEmail/index.tsx
+++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Wallet/CheckEmail/index.tsx
@@ -154,6 +154,7 @@ const CheckEmail = (props: Props) => {
 
 type Props = OwnProps & {
   handleSubmit: (e) => void
+  setStep: (step: LoginSteps) => void
 }
 
 export default CheckEmail
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/index.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/index.tsx
index 2926c404ee0..f1bb72e4f4e 100644
--- a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/index.tsx
+++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/index.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
-import { FormProps, getFormValues, reduxForm } from 'redux-form'
+import { getFormValues, reduxForm } from 'redux-form'
 
 import { RemoteDataType } from '@core/types'
 import Form from 'components/Form/Form'
@@ -129,7 +129,7 @@ const Login = (props) => {
       trackEvent({
         key: Analytics.LOGIN_VIEWED,
         properties: {
-          device_origin: productAuthMetadata?.platform || 'WEB',
+          device_origin: productAuthMetadata?.platform ?? 'WEB',
           originalTimestamp: new Date().toISOString()
         }
       })
@@ -182,7 +182,7 @@ const Login = (props) => {
             return <SofiSuccess />
 
           case LoginSteps.ENTER_EMAIL_GUID:
-          default:
+          default: {
             const LoginComponent =
               productAuthMetadata.product === ProductAuthOptions.EXCHANGE
                 ? ExchangeEnterEmail
@@ -194,6 +194,7 @@ const Login = (props) => {
                 <LoginComponent {...loginProps} />
               </>
             )
+          }
         }
       })()}
     </Form>
@@ -209,6 +210,7 @@ export type Props = {
   handleBackArrowClickWallet: () => void
   invalid?: boolean
   isMobilePlatform: boolean
+  isSofi: boolean
   pristine?: boolean
   productAuthMetadata: ProductAuthMetadata
   submitting: boolean