fix a MobX warning and improve typing

Author: hyrious

packages/flat-components/src/components/LoginPage/LoginAccount/index.tsx

@@ -36,7 +36,7 @@ export interface LoginAccountProps {
 
     // history props
     password?: string;
-    accountHistory?: Array<{ key: string; password: string; countryCode: string | null }> | [];
+    accountHistory?: Array<{ key: string; password: string; countryCode?: string | null }> | [];
     onHistoryChange?: (options: any) => void;
 }
 

packages/flat-components/src/components/LoginPage/LoginWithPassword/index.tsx

@@ -41,7 +41,7 @@ export interface LoginWithPasswordProps {
     buttons?: LoginButtonProviderType[];
     privacyURL?: LoginAgreementProps["privacyURL"];
     serviceURL?: LoginAgreementProps["serviceURL"];
-    accountHistory: Array<{ key: string; password: string; countryCode: string | null }> | [];
+    accountHistory: Array<{ key: string; password: string; countryCode?: string | null }>;
     login: (type: PasswordLoginType, key: LoginKeyType, password: string) => Promise<boolean>;
     register: () => void;
     onClickButton: LoginButtonsProps["onClick"];
@@ -89,8 +89,9 @@ export const LoginWithPassword: React.FC<LoginWithPasswordProps> = ({
     const [agreed, setAgreed] = useState(false);
     const [clickedLogin, setClickedLogin] = useState(false);
     const [clickedReset, setClickedReset] = useState(false);
+    const firstAccount = accountHistory.length > 0 ? accountHistory[0] : null;
     const [countryCode, setCountryCode] = useState(
-        accountHistory?.[0]?.countryCode || defaultCountryCode,
+        (firstAccount && firstAccount.countryCode) || defaultCountryCode,
     );
     const [type, setType] = useState(PasswordLoginType.Phone);
 
@@ -102,8 +103,8 @@ export const LoginWithPassword: React.FC<LoginWithPasswordProps> = ({
     const [isAccountValidated, setIsAccountValidated] = useState(false);
 
     const defaultValues = {
-        key: accountHistory?.[0]?.key || "",
-        password: accountHistory?.[0]?.password || "",
+        key: firstAccount?.key || "",
+        password: firstAccount?.password || "",
         code: undefined,
     };
     const [password, setPassword] = useState(defaultValues.password);

packages/flat-stores/src/global-store.ts

@@ -38,7 +38,7 @@ export class GlobalStore {
 
     // login with password
     public currentAccount: Account | null = null;
-    public accountHistory: Account[] | [] = [];
+    public accountHistory: Account[] = [];
 
     public whiteboardRoomUUID: string | null = null;
     public whiteboardRoomToken: string | null = null;