[minor-fix] Fix language issue

Koniverse · Jul 13, 2023 · e8f65db · e8f65db
1 parent 6ae3174
commit e8f65db
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 58 deletions.
diff --git a/src/screens/MasterPassword/ApplyMasterPassword/index.tsx b/src/screens/MasterPassword/ApplyMasterPassword/index.tsx
@@ -35,14 +35,6 @@ const removeIcon = <Icon phosphorIcon={Trash} size={'lg'} iconColor={'#737373'}
 
 const nextIcon = <Icon phosphorIcon={ArrowCircleRight} size={'lg'} weight={'fill'} />;
 
-const formConfig: FormControlConfig = {
-  password: {
-    name: i18n.inputLabel.currentPassword,
-    value: '',
-    validateFunc: validatePassword,
-  },
-};
-
 const intersectionArray = (array1: AccountJson[], array2: AccountJson[]): AccountJson[] => {
   return array1.filter(account => array2.find(acc => acc.address === account.address));
 };
@@ -61,6 +53,13 @@ const ApplyMasterPassword = () => {
   const selectedAction = useRef<SelectedActionType>();
   useHandlerHardwareBackPress(true);
   const migrateAddressRef = useRef<string>('');
+  const formConfig: FormControlConfig = {
+    password: {
+      name: i18n.inputLabel.currentPassword,
+      value: '',
+      validateFunc: validatePassword,
+    },
+  };
 
   const migratedRef = useRef<AccountJson[]>(
     accounts.filter(acc => acc.address !== ALL_ACCOUNT_KEY && !acc.isExternal && acc.isMasterPassword),

diff --git a/src/screens/MasterPassword/ChangeMasterPassword/index.tsx b/src/screens/MasterPassword/ChangeMasterPassword/index.tsx
@@ -19,29 +19,6 @@ import i18n from 'utils/i18n/i18n';
 import AlertBox from 'components/design-system-ui/alert-box';
 import { FontSemiBold } from 'styles/sharedStyles';
 
-const formConfig = {
-  curPassword: {
-    name: i18n.inputLabel.currentPassword,
-    value: '',
-    validateFunc: validatePassword,
-    require: true,
-  },
-  password: {
-    name: i18n.inputLabel.newPassword,
-    value: '',
-    validateFunc: validatePassword,
-    require: true,
-  },
-  repeatPassword: {
-    name: i18n.inputLabel.confirmNewPassword,
-    value: '',
-    validateFunc: (value: string, formValue: Record<string, string>) => {
-      return validatePasswordMatched(value, formValue.password);
-    },
-    require: true,
-  },
-};
-
 function checkValidateForm(isValidated: Record<string, boolean>) {
   return isValidated.password && isValidated.repeatPassword;
 }
@@ -56,6 +33,28 @@ const ChangeMasterPassword = () => {
   const [isBusy, setIsBusy] = useState(false);
   const [errors, setErrors] = useState<string[]>([]);
   const [step, setStep] = useState<PageStep>('OldPassword');
+  const formConfig = {
+    curPassword: {
+      name: i18n.inputLabel.currentPassword,
+      value: '',
+      validateFunc: validatePassword,
+      require: true,
+    },
+    password: {
+      name: i18n.inputLabel.newPassword,
+      value: '',
+      validateFunc: validatePassword,
+      require: true,
+    },
+    repeatPassword: {
+      name: i18n.inputLabel.confirmNewPassword,
+      value: '',
+      validateFunc: (value: string, formValue: Record<string, string>) => {
+        return validatePasswordMatched(value, formValue.password);
+      },
+      require: true,
+    },
+  };
 
   useHandlerHardwareBackPress(isBusy);
 

diff --git a/src/screens/MasterPassword/CreateMasterPassword/index.tsx b/src/screens/MasterPassword/CreateMasterPassword/index.tsx
@@ -16,23 +16,6 @@ import { KeypairType } from '@polkadot/util-crypto/types';
 import useHandlerHardwareBackPress from 'hooks/screen/useHandlerHardwareBackPress';
 import AlertBox from 'components/design-system-ui/alert-box';
 
-const formConfig: FormControlConfig = {
-  password: {
-    name: i18n.common.walletPassword,
-    value: '',
-    validateFunc: validatePassword,
-    require: true,
-  },
-  repeatPassword: {
-    name: i18n.common.repeatWalletPassword,
-    value: '',
-    validateFunc: (value: string, formValue: Record<string, string>) => {
-      return validatePasswordMatched(value, formValue.password);
-    },
-    require: true,
-  },
-};
-
 function checkValidateForm(isValidated: Record<string, boolean>) {
   return isValidated.password && isValidated.repeatPassword;
 }
@@ -48,6 +31,22 @@ const CreateMasterPassword = ({
   const [isBusy, setIsBusy] = useState(false);
   const [errors, setErrors] = useState<string[]>([]);
   useHandlerHardwareBackPress(true);
+  const formConfig: FormControlConfig = {
+    password: {
+      name: i18n.common.walletPassword,
+      value: '',
+      validateFunc: validatePassword,
+      require: true,
+    },
+    repeatPassword: {
+      name: i18n.common.repeatWalletPassword,
+      value: '',
+      validateFunc: (value: string, formValue: Record<string, string>) => {
+        return validatePasswordMatched(value, formValue.password);
+      },
+      require: true,
+    },
+  };
 
   const onComplete = async () => {
     if (pathName === 'CreateAccount') {

diff --git a/src/screens/MasterPassword/Login/index.tsx b/src/screens/MasterPassword/Login/index.tsx
@@ -12,20 +12,18 @@ import { keyringUnlock } from 'messaging/index';
 
 type Props = {};
 
-const formConfig = {
-  password: {
-    name: i18n.common.walletPassword,
-    value: '',
-    validateFunc: validatePassword,
-    require: true,
-  },
-};
 const Login: React.FC<Props> = (props: Props) => {
   const {} = props;
-
   const theme = useSubWalletTheme().swThemes;
-
   const [loading, setLoading] = useState<boolean>(false);
+  const formConfig = {
+    password: {
+      name: i18n.common.walletPassword,
+      value: '',
+      validateFunc: validatePassword,
+      require: true,
+    },
+  };
 
   const onSubmit = () => {
     const password = formState.data.password;