From a6bf03fe1ff879c05220f98674b1d887f6b9f575 Mon Sep 17 00:00:00 2001
From: alanrsoares <alan@axelar.network>
Date: Tue, 9 Jan 2024 16:09:44 -0300
Subject: [PATCH] fix: canonical token interchain transfer

---
 .../useInterchainTokenServiceTransferMutation.ts  |  1 +
 .../interchainToken/getMyInterchainTokens.ts      |  8 ++++++--
 .../ui/pages/InterchainTokensPage/TokenList.tsx   | 15 ++++++++++++---
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/apps/maestro/src/features/SendInterchainToken/hooks/useInterchainTokenServiceTransferMutation.ts b/apps/maestro/src/features/SendInterchainToken/hooks/useInterchainTokenServiceTransferMutation.ts
index c6ff4ffea..21822add8 100644
--- a/apps/maestro/src/features/SendInterchainToken/hooks/useInterchainTokenServiceTransferMutation.ts
+++ b/apps/maestro/src/features/SendInterchainToken/hooks/useInterchainTokenServiceTransferMutation.ts
@@ -138,6 +138,7 @@ export function useInterchainTokenServiceTransferMutation(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [
       address,
+      sendTokenData?.hash,
       approveERC20Recepit,
       config.destinationChainName,
       interchainTransferAsync,
diff --git a/apps/maestro/src/server/routers/interchainToken/getMyInterchainTokens.ts b/apps/maestro/src/server/routers/interchainToken/getMyInterchainTokens.ts
index 8b874f783..3e5242c05 100644
--- a/apps/maestro/src/server/routers/interchainToken/getMyInterchainTokens.ts
+++ b/apps/maestro/src/server/routers/interchainToken/getMyInterchainTokens.ts
@@ -32,11 +32,15 @@ export const getMyInterchainTokens = protectedProcedure
     const pageIndex = Math.floor(input.offset / input.limit);
 
     // return paginated results
-    const page = sorted.slice(input.offset, input.offset + input.limit);
+    const items = sorted.slice(input.offset, input.offset + input.limit);
+
+    const totalItems = sorted.length;
 
     return {
-      items: page,
+      items,
+      totalItems,
       totalPages,
       pageIndex,
+      pageSize: input.limit,
     };
   });
diff --git a/apps/maestro/src/ui/pages/InterchainTokensPage/TokenList.tsx b/apps/maestro/src/ui/pages/InterchainTokensPage/TokenList.tsx
index 0d71596dd..edfdddc51 100644
--- a/apps/maestro/src/ui/pages/InterchainTokensPage/TokenList.tsx
+++ b/apps/maestro/src/ui/pages/InterchainTokensPage/TokenList.tsx
@@ -21,7 +21,7 @@ function getChainNameSlug(chainId: number) {
   return chain?.axelarChainName.toLowerCase() ?? "";
 }
 
-const PAGE_LIMIT = 12;
+const PAGE_LIMIT = 15;
 
 type TokenListProps = {
   sessionAddress?: `0x${string}`;
@@ -46,7 +46,6 @@ const TokenList: FC<TokenListProps> = ({ sessionAddress }) => {
   const { computed } = useEVMChainConfigsQuery();
 
   const maybeTokens = Maybe.of(data).map((data) => data.items);
-
   const totalPages = Maybe.of(data).mapOr(0, (data) => data.totalPages);
 
   const filteredTokens = useMemo(
@@ -65,13 +64,23 @@ const TokenList: FC<TokenListProps> = ({ sessionAddress }) => {
     [computed.indexedById, maybeTokens]
   );
 
+  const totalTokens = Maybe.of(data).mapOr(0, (data) => data.totalItems);
+
   return (
     <>
       <Page.Title className="flex items-center gap-2">
         My Interchain Tokens
         {Boolean(filteredTokens?.length) && (
           <span className="text-base-content-secondary font-mono text-base">
-            ({filteredTokens?.length})
+            (
+            {totalPages > 1 ? (
+              <>
+                {offset + 1}-{offset + filteredTokens.length} of {totalTokens}
+              </>
+            ) : (
+              totalTokens
+            )}
+            )
           </span>
         )}
       </Page.Title>