Merge pull request #1003 from internxt/feat/-update-create-account-lo…

…st-password-text [PB-1524]: feat/allow the user to download the backup key when registering
internxt · Feb 12, 2024 · d2b9aa7 · d2b9aa7
2 parents 8c4ba31 + 8c23341
commit d2b9aa7
Show file tree

Hide file tree

Showing 17 changed files with 414 additions and 347 deletions.
diff --git a/src/app/auth/components/Button/Button.scss b/src/app/auth/components/Button/Button.scss
diff --git a/src/app/auth/components/Button/Button.tsx b/src/app/auth/components/Button/Button.tsx
diff --git a/src/app/auth/components/LogIn/LogIn.tsx b/src/app/auth/components/LogIn/LogIn.tsx
@@ -9,7 +9,6 @@ import QueryString from 'qs';
 import { initializeUserThunk, userActions } from 'app/store/slices/user';
 import { RootState } from 'app/store';
 import { useAppDispatch } from 'app/store/hooks';
-import Button from '../Button/Button';
 import { twoFactorRegexPattern } from 'app/core/services/validation.service';
 import authService, { is2FANeeded, doLogin } from '../../services/auth.service';
 import localStorageService from 'app/core/services/local-storage.service';
@@ -27,6 +26,7 @@ import { referralsThunks } from 'app/store/slices/referrals';
 import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
 import shareService from '../../../share/services/share.service';
 import notificationsService, { ToastType } from '../../../notifications/services/notifications.service';
+import Button from 'app/shared/components/Button/Button';
 import { trackAccountUnblockEmailSent } from '../../../analytics/services/analytics.service';
 
 export default function LogIn(): JSX.Element {
@@ -269,19 +269,15 @@ export default function LogIn(): JSX.Element {
               <span className="font-base w-56 text-sm text-red">{loginError}</span>
             </div>
           )}
-
           <Button
+            type="submit"
+            loading={isLoggingIn}
             buttonDataCy="loginButton"
-            textDataCy="loginButtonText"
+            variant="primary"
             disabled={isLoggingIn}
-            text={translate('auth.login.title')}
-            disabledText={
-              isValid ? (translate('auth.decrypting') as string) : (translate('auth.login.title') as string)
-            }
-            loading={isLoggingIn}
-            style="button-primary"
-            className="w-full"
-          />
+          >
+            {isLoggingIn && isValid ? translate('auth.decrypting') : translate('auth.login.title')}
+          </Button>
         </form>
 
         <Link