fix: saved account type check

CHANGELOG.md

@@ -71,6 +71,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Improvements
 
+- [#625](https://github.com/alleslabs/celatone-frontend/pull/625) Fix abi empty vector serialization
 - [#605](https://github.com/alleslabs/celatone-frontend/pull/605) Apply singleton class style to Amplitude structure
 - [#591](https://github.com/alleslabs/celatone-frontend/pull/591) Bump initia.js due to decimal serialization and dynamic buffer
 - [#564](https://github.com/alleslabs/celatone-frontend/pull/564) Handle multi bond denoms data in the delegation section

src/lib/app-provider/env.ts

@@ -16,6 +16,7 @@ export enum CELATONE_QUERY_KEYS {
   // ACCOUNT
   ACCOUNT_BALANCES_INFO = "CELATONE_QUERY_ACCOUNT_BALANCES_INFO",
   ACCOUNT_ID = "CELATONE_QUERY_ACCOUNT_ID",
+  ACCOUNT_TYPE = "CELATONE_QUERY_ACCOUNT_TYPE",
   // ASSET
   ASSET_INFOS = "CELATONE_QUERY_ASSET_INFOS",
   ASSET_INFO_LIST = "CELATONE_QUERY_ASSET_INFO_LIST",

src/lib/app-provider/hooks/useAddress.ts

@@ -2,8 +2,9 @@ import { fromBech32 } from "@cosmjs/encoding";
 import { useCallback, useMemo } from "react";
 
 import type { Option } from "lib/types";
-import { isHexWalletAddress, isHexModuleAddress } from "lib/utils";
+import { isHexModuleAddress, isHexWalletAddress } from "lib/utils";
 
+import { useMoveConfig } from "./useConfig";
 import { useCurrentChain } from "./useCurrentChain";
 import { useExampleAddresses } from "./useExampleAddresses";
 
@@ -97,53 +98,60 @@ export const useGetAddressType = () => {
   );
 };
 
-// TODO: refactor
 export const useValidateAddress = () => {
   const {
     chain: { bech32_prefix: bech32Prefix },
   } = useCurrentChain();
   const getAddressTypeByLength = useGetAddressTypeByLength();
+  const move = useMoveConfig({ shouldRedirect: false });
+
+  const validateContractAddress = useCallback(
+    (address: string) =>
+      validateAddress(
+        bech32Prefix,
+        address,
+        "contract_address",
+        getAddressTypeByLength
+      ),
+    [bech32Prefix, getAddressTypeByLength]
+  );
+  const validateUserAddress = useCallback(
+    (address: string) =>
+      validateAddress(
+        bech32Prefix,
+        address,
+        "user_address",
+        getAddressTypeByLength
+      ),
+    [bech32Prefix, getAddressTypeByLength]
+  );
+  const validateValidatorAddress = useCallback(
+    (address: string) =>
+      validateAddress(
+        bech32Prefix,
+        address,
+        "validator_address",
+        getAddressTypeByLength
+      ),
+    [bech32Prefix, getAddressTypeByLength]
+  );
 
   return {
-    validateContractAddress: useCallback(
-      (address: string) =>
-        validateAddress(
-          bech32Prefix,
-          address,
-          "contract_address",
-          getAddressTypeByLength
-        ),
-      [bech32Prefix, getAddressTypeByLength]
-    ),
-    validateUserAddress: useCallback(
-      (address: string) =>
-        validateAddress(
-          bech32Prefix,
-          address,
-          "user_address",
-          getAddressTypeByLength
-        ),
-      [bech32Prefix, getAddressTypeByLength]
-    ),
-    validateValidatorAddress: useCallback(
-      (address: string) =>
-        validateAddress(
-          bech32Prefix,
-          address,
-          "validator_address",
-          getAddressTypeByLength
-        ),
-      [bech32Prefix, getAddressTypeByLength]
-    ),
-    validateHexWalletAddress: useCallback(
-      (address: string) =>
-        !address.startsWith(bech32Prefix) && isHexWalletAddress(address),
-      [bech32Prefix]
-    ),
-    validateHexModuleAddress: useCallback(
-      (address: string) =>
-        !address.startsWith(bech32Prefix) && isHexModuleAddress(address),
-      [bech32Prefix]
+    validateContractAddress,
+    validateUserAddress,
+    validateValidatorAddress,
+    isSomeValidAddress: useCallback(
+      (address: string) => {
+        const errUser = validateUserAddress(address);
+        const errContract = validateContractAddress(address);
+        const isHex = isHexWalletAddress(address);
+        const isHexModule = isHexModuleAddress(address);
+
+        return (
+          !errUser || !errContract || (move.enabled && (isHex || isHexModule))
+        );
+      },
+      [move.enabled, validateContractAddress, validateUserAddress]
     ),
   };
 };

src/lib/components/abi/args-form/field/index.tsx

@@ -13,6 +13,7 @@ import { type Control, useController } from "react-hook-form";
 
 import { useValidateAddress } from "lib/app-provider";
 import type { AbiFormData } from "lib/types";
+import { isHexModuleAddress, isHexWalletAddress } from "lib/utils";
 
 import { ArgFieldWidget } from "./ArgFieldWidget";
 import { OBJECT_TYPE, STRING_TYPE } from "./constants";
@@ -30,31 +31,20 @@ export const ArgFieldTemplate = ({
   control,
 }: ArgFieldTemplateProps) => {
   const [isEditted, setIsEditted] = useState(false);
-  const {
-    validateUserAddress,
-    validateContractAddress,
-    validateHexWalletAddress,
-    validateHexModuleAddress,
-  } = useValidateAddress();
+  const { validateUserAddress, validateContractAddress } = useValidateAddress();
 
   const isValidArgAddress = useCallback(
     (input: string) =>
       validateUserAddress(input) === null ||
       validateContractAddress(input) === null ||
-      validateHexWalletAddress(input) ||
-      validateHexModuleAddress(input),
-    [
-      validateContractAddress,
-      validateHexModuleAddress,
-      validateHexWalletAddress,
-      validateUserAddress,
-    ]
+      isHexWalletAddress(input) ||
+      isHexModuleAddress(input),
+    [validateContractAddress, validateUserAddress]
   );
   const isValidArgObject = useCallback(
     (input: string) =>
-      validateContractAddress(input) === null ||
-      validateHexModuleAddress(input),
-    [validateContractAddress, validateHexModuleAddress]
+      validateContractAddress(input) === null || isHexModuleAddress(input),
+    [validateContractAddress]
   );
 
   const isOptional = param.startsWith("0x1::option::Option");

src/lib/components/forms/ControllerInput.tsx

@@ -45,6 +45,8 @@ export const ControllerInput = <T extends FieldValues>({
   rules = {},
   status,
   maxLength,
+  autoFocus,
+  cursor,
   helperAction,
   ...componentProps
 }: ControllerInputProps<T>) => {
@@ -94,6 +96,8 @@ export const ControllerInput = <T extends FieldValues>({
           value={watcher}
           onChange={field.onChange}
           maxLength={maxLength}
+          autoFocus={autoFocus}
+          cursor={cursor}
         />
         <InputRightElement h="full">
           {status && getStatusIcon(status.state)}

src/lib/components/modal/account/EditSavedAccount.tsx

@@ -94,6 +94,7 @@ export const EditSavedAccountModal = ({
           error={
             errors.name && getMaxLengthError(nameState.length, "account_name")
           }
+          autoFocus
         />
         <ControllerTextarea
           name="description"