Merge pull request #1061 from oasisprotocol/ml/fix-address-formatting…

…-on-empty-account-follow-up Fix address formatting on empty account follow up
oasisprotocol · Dec 5, 2023 · 196fd6d · 196fd6d
2 parents 4062b25 + d794cf3
commit 196fd6d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/.changelog/1061.bugfix.md b/.changelog/1061.bugfix.md
@@ -0,0 +1 @@
+Fix address formatting on empty account
diff --git a/src/app/hooks/useTransformToOasisAddress.ts b/src/app/hooks/useTransformToOasisAddress.ts
@@ -8,7 +8,7 @@ export const useTransformToOasisAddress = (ethOrOasisAddress: string): string |
     let shouldUpdate = true
 
     const transformToOasisAddress = async (addr: string) => {
-      const oasisAddr = await getOasisAddress(addr)
+      const oasisAddr = await getOasisAddress(addr).catch(() => Promise.resolve(null))
       if (shouldUpdate) {
         setOasisAddress(oasisAddr)
       }

diff --git a/src/app/pages/TokenDashboardPage/hook.ts b/src/app/pages/TokenDashboardPage/hook.ts
@@ -184,18 +184,19 @@ export const useAccountTokenInventory = (scope: SearchScope, address: string, to
   }
 
   const oasisAddress = useTransformToOasisAddress(address)
+  const oasisTokenAddress = useTransformToOasisAddress(tokenAddress)
   const query = useGetRuntimeAccountsAddressNfts(
     network,
     layer,
     oasisAddress!,
     {
       limit: NUMBER_OF_INVENTORY_ITEMS,
       offset: offset,
-      token_address: tokenAddress,
+      token_address: oasisTokenAddress!,
     },
     {
       query: {
-        enabled: !!oasisAddress,
+        enabled: !!oasisAddress && !!oasisTokenAddress,
       },
     },
   )

diff --git a/src/app/utils/route-utils.ts b/src/app/utils/route-utils.ts
@@ -141,11 +141,13 @@ const validateTxHashParam = (hash: string) => {
   return true
 }
 
-export const addressParamLoader = ({ params }: LoaderFunctionArgs): string => {
-  validateAddressParam(params.address!)
+export const addressParamLoader =
+  (queryParam: string = 'address') =>
+  ({ params }: LoaderFunctionArgs): string => {
+    validateAddressParam(params[queryParam]!)
 
-  return params.address!
-}
+    return params[queryParam]!
+  }
 
 export const blockHeightParamLoader = async ({ params }: LoaderFunctionArgs) => {
   return validateBlockHeightParam(params.blockHeight!)

diff --git a/src/routes.tsx b/src/routes.tsx
@@ -83,7 +83,7 @@ export const routes: RouteObject[] = [
           {
             path: `address/:address`,
             element: <AccountDetailsPage />,
-            loader: addressParamLoader,
+            loader: addressParamLoader(),
             children: [
               {
                 path: '',
@@ -107,7 +107,7 @@ export const routes: RouteObject[] = [
                   {
                     path: ':contractAddress',
                     Component: () => <AccountNFTCollectionCard {...useAccountDetailsProps()} />,
-                    loader: addressParamLoader,
+                    loader: addressParamLoader('contractAddress'),
                   },
                 ],
               },
@@ -133,7 +133,7 @@ export const routes: RouteObject[] = [
           {
             path: 'token/:address/instance/:instanceId',
             element: <NFTInstanceDashboardPage />,
-            loader: addressParamLoader,
+            loader: addressParamLoader(),
             children: [
               {
                 path: '',
@@ -144,7 +144,7 @@ export const routes: RouteObject[] = [
           {
             path: `token/:address`,
             element: <TokenDashboardPage />,
-            loader: addressParamLoader,
+            loader: addressParamLoader(),
             children: [
               {
                 path: '',