chore(refactor): refactor login components folder (#6176)

blockchain · Dec 14, 2023 · 5b84609 · 5b84609
1 parent 9a159ce
commit 5b84609
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 118 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/components/BackArrowHeader/index.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/components/BackArrowHeader/index.tsx
@@ -11,7 +11,7 @@ const BackArrowWrapper = styled.div<{ hideBackArrow?: boolean; marginTop?: strin
   justify-content: ${(props) => (props.hideBackArrow ? 'flex-end' : 'space-between')};
   margin-bottom: 24px;
   align-items: center;
-  margin-top: ${(props) => (props.marginTop ? props.marginTop : 'auto')};
+  margin-top: ${(props) => props.marginTop || 'auto'};
 `
 const BackArrow = styled.div`
   display: flex;
@@ -24,70 +24,76 @@ const EmailAndGuid = styled.div`
   align-items: center;
 `
 
-const BackArrowHeader = (props: {
+type Props = {
   formValues: LoginFormType
   handleBackArrowClick: () => void
   hideGuid?: boolean
   marginTop?: string
   platform?: PlatformTypes
   product?: ProductAuthOptions
-}) => {
-  const isExchangeLogin = props.product === ProductAuthOptions.EXCHANGE
+}
+
+const BackArrowHeader = ({
+  formValues,
+  handleBackArrowClick,
+  hideGuid,
+  marginTop,
+  platform,
+  product
+}: Props) => {
+  const isExchangeLogin = product === ProductAuthOptions.EXCHANGE
   const email = isExchangeLogin
-    ? props.formValues.exchangeEmail
-    : props.formValues.email || props.formValues.sofiLoginEmail
-  const guid = props.formValues?.guid
-  const firstPartGuid = guid && guid.slice(0, 4)
-  const lastPartGuid = guid && guid.slice(-4)
-  const hideBackArrow =
-    props.platform === PlatformTypes.ANDROID || props.platform === PlatformTypes.IOS
+    ? formValues.exchangeEmail
+    : formValues.email || formValues.sofiLoginEmail
+  const guid = formValues?.guid
+  const firstPartGuid = guid?.slice(0, 4)
+  const lastPartGuid = guid?.slice(-4)
+  const hideBackArrow = platform === PlatformTypes.ANDROID || platform === PlatformTypes.IOS
   return (
-    <>
-      <BackArrowWrapper marginTop={props.marginTop} hideBackArrow={hideBackArrow}>
-        {!hideBackArrow && (
-          <BackArrow onClick={props.handleBackArrowClick}>
-            <Icon
-              data-e2e='signupBack'
-              name='arrow-back'
-              size='24px'
-              color='blue600'
-              style={{ marginRight: '8px' }}
-              role='button'
-            />
+    <BackArrowWrapper marginTop={marginTop} hideBackArrow={hideBackArrow}>
+      {!hideBackArrow && (
+        <BackArrow onClick={handleBackArrowClick}>
+          <Icon
+            data-e2e='signupBack'
+            name='arrow-back'
+            size='24px'
+            color='blue600'
+            style={{ marginRight: '8px' }}
+            role='button'
+          />
 
-            <Text color='grey900' size='14px' weight={500} lineHeight='1.5'>
-              <FormattedMessage id='copy.back' defaultMessage='Back' />
-            </Text>
-          </BackArrow>
+          <Text color='grey900' size='14px' weight={500} lineHeight='1.5'>
+            <FormattedMessage id='copy.back' defaultMessage='Back' />
+          </Text>
+        </BackArrow>
+      )}
+      <EmailAndGuid>
+        {hideGuid || (email && isMobile()) || isExchangeLogin ? (
+          <Text
+            color='blue600'
+            size='12px'
+            weight={600}
+            lineHeight='1.5'
+            style={{ marginRight: '2px' }}
+          >
+            {email}
+          </Text>
+        ) : (
+          <Text color='grey400' size='12px' weight={600} lineHeight='1.5'>
+            ({firstPartGuid}...{lastPartGuid})
+          </Text>
         )}
-        <EmailAndGuid>
-          {props.hideGuid || email || (email && isMobile()) || isExchangeLogin ? (
-            <Text
-              color='blue600'
-              size='12px'
-              weight={600}
-              lineHeight='1.5'
-              style={{ marginRight: '2px' }}
-            >
-              {email}
-            </Text>
-          ) : (
-            <Text color='grey400' size='12px' weight={600} lineHeight='1.5'>
+        {formValues.step !== LoginSteps.CHECK_EMAIL &&
+          formValues.email &&
+          !hideGuid &&
+          !isMobile() &&
+          !isExchangeLogin && (
+            <Text size='12px' weight={500} color='grey400'>
               ({firstPartGuid}...{lastPartGuid})
             </Text>
           )}
-          {props.formValues.step !== LoginSteps.CHECK_EMAIL &&
-            props.formValues.email &&
-            !props.hideGuid &&
-            !isMobile() &&
-            !isExchangeLogin && (
-              <Text size='12px' weight={500} color='grey400'>
-                ({firstPartGuid}...{lastPartGuid})
-              </Text>
-            )}
-        </EmailAndGuid>
-      </BackArrowWrapper>
-    </>
+      </EmailAndGuid>
+    </BackArrowWrapper>
   )
 }
 

diff --git a/...ages/blockchain-wallet-v4-frontend/src/scenes/Login/components/LoginSceneFooter/index.tsx b/...ages/blockchain-wallet-v4-frontend/src/scenes/Login/components/LoginSceneFooter/index.tsx
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/components/NeedHelpLink/index.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/components/NeedHelpLink/index.tsx
@@ -1,19 +1,19 @@
 import React from 'react'
 import { FormattedMessage } from 'react-intl'
-import { connect, ConnectedProps } from 'react-redux'
+import { useDispatch } from 'react-redux'
 import { LinkContainer } from 'react-router-bootstrap'
-import { bindActionCreators } from 'redux'
 
 import { Link } from 'blockchain-info-components'
-import { actions } from 'data'
+import { trackEvent } from 'data/analytics/slice'
 import { Analytics } from 'data/analytics/types'
 import { PlatformTypes, ProductAuthOptions } from 'data/types'
 
-const NeedHelpLink = ({ analyticsActions, origin, platform, product, unified }: Props) => (
-  <LinkContainer
-    to={product === ProductAuthOptions.WALLET || unified ? '/recover' : '/help-exchange'}
-    onClick={() => {
-      analyticsActions.trackEvent({
+const NeedHelpLink = ({ origin, platform, product, unified }: Props) => {
+  const dispatch = useDispatch()
+
+  const onClick = () => {
+    dispatch(
+      trackEvent({
         key: Analytics.LOGIN_FORGOT_PASSWORD_CLICKED,
         properties: {
           device_origin: platform,
@@ -22,26 +22,25 @@ const NeedHelpLink = ({ analyticsActions, origin, platform, product, unified }:
           unified
         }
       })
-    }}
-  >
-    <Link size='13px' weight={600} data-e2e='loginForgotPassword'>
-      <FormattedMessage id='scenes.help.forgotpassword' defaultMessage='Forgot your password?' />
-    </Link>
-  </LinkContainer>
-)
+    )
+  }
 
-const mapDispatchToProps = (dispatch) => ({
-  analyticsActions: bindActionCreators(actions.analytics, dispatch)
-})
+  const linkTo = product === ProductAuthOptions.WALLET || unified ? '/recover' : '/help-exchange'
 
-const connector = connect(null, mapDispatchToProps)
+  return (
+    <LinkContainer to={linkTo} onClick={onClick}>
+      <Link size='13px' weight={600} data-e2e='loginForgotPassword'>
+        <FormattedMessage id='scenes.help.forgotpassword' defaultMessage='Forgot your password?' />
+      </Link>
+    </LinkContainer>
+  )
+}
 
-type OwnProps = {
+type Props = {
   origin: string
   platform?: PlatformTypes
   product: ProductAuthOptions
   unified?: boolean
 }
-type Props = OwnProps & ConnectedProps<typeof connector>
 
-export default connector(NeedHelpLink)
+export default NeedHelpLink
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/components/SignupLink/index.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/components/SignupLink/index.tsx
@@ -37,10 +37,10 @@ const Row = styled.div`
   `}
 `
 
-const SignUpLink = (props) => {
-  const hideSignupLink =
-    props.platform === PlatformTypes.ANDROID || props.platform === PlatformTypes.IOS
-  return hideSignupLink ? null : (
+const SignUpLink = ({ platform }: { platform?: PlatformTypes }) => {
+  if (platform === PlatformTypes.ANDROID || platform === PlatformTypes.IOS) return null
+
+  return (
     <SubCard>
       <LinkContainer data-e2e='signupLink' to='/signup'>
         <Row>