feat: update transactions amount format

CoreumFoundation · Jan 16, 2024 · 135fdd8 · 135fdd8
1 parent a33b4d5
commit 135fdd8
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 13 deletions.
diff --git a/apps/web-coreum/package.json b/apps/web-coreum/package.json
@@ -1,6 +1,6 @@
 {
   "name": "web-coreum",
-  "version": "2.19.3-58",
+  "version": "2.19.3-59",
   "license": "Apache-2.0",
   "private": true,
   "scripts": {

diff --git a/packages/ui/src/components/transactions_list/components/desktop/index.tsx b/packages/ui/src/components/transactions_list/components/desktop/index.tsx
@@ -129,8 +129,9 @@ const Desktop: FC<TransactionsListState> = ({
       </div>
     ),
     amount:
-      typeof x.amount === 'string' && (x.amount === '' || x.amount === '-') ? (
-        x.amount === '' ? (
+      (typeof x.amount === 'string' && (x.amount === '' || x.amount === '-')) ||
+      x.amount?.value === '' ? (
+        x.amount === '' || x.amount?.value === '' ? (
           <Link
             shallow
             prefetch={false}

diff --git a/packages/ui/src/components/transactions_list/components/mobile/index.tsx b/packages/ui/src/components/transactions_list/components/mobile/index.tsx
@@ -106,9 +106,10 @@ const ListItem: FC<ListItemProps> = ({
         </Link>
       ),
     amount:
-      typeof transaction.amount === 'string' &&
-      (transaction.amount === '' || transaction.amount === '-') ? (
-        transaction.amount === '' ? (
+      (typeof transaction.amount === 'string' &&
+        (transaction.amount === '' || transaction.amount === '-')) ||
+      transaction.amount?.value === '' ? (
+        transaction.amount === '' || transaction.amount?.value === '' ? (
           <Link shallow prefetch={false} href={TRANSACTION_DETAILS(transaction.hash)}>
             {t('transactions:more')}
           </Link>

diff --git a/packages/ui/src/components/transactions_list_details/components/list/index.tsx b/packages/ui/src/components/transactions_list_details/components/list/index.tsx
@@ -107,9 +107,10 @@ const ListItem: FC<ListItemProps> = ({ index, style, setRowHeight, isItemLoaded,
         </Tooltip>
       ),
     amount:
-      typeof transaction.amount === 'string' &&
-      (transaction.amount === '' || transaction.amount === '-') ? (
-        transaction.amount === '' ? (
+      (typeof transaction.amount === 'string' &&
+        (transaction.amount === '' || transaction.amount === '-')) ||
+      transaction.amount?.value === '' ? (
+        transaction.amount === '' || transaction.amount?.value === '' ? (
           <Link shallow prefetch={false} href={TRANSACTION_DETAILS(transaction.hash)}>
             {t('transactions:more')}
           </Link>

diff --git a/packages/ui/src/screens/account_details/hooks.ts b/packages/ui/src/screens/account_details/hooks.ts
@@ -277,7 +277,6 @@ export const useAccountDetails = () => {
   // Fetch Data
   // ==========================
   const { address: withdrawalAddress, error } = useAccountWithdrawalAddress(address);
-  console.log({ error, withdrawalAddress });
 
   useEffect(() => {
     handleSetState((prevState) => ({

diff --git a/packages/ui/src/screens/account_details/index.tsx b/packages/ui/src/screens/account_details/index.tsx
@@ -17,8 +17,6 @@ const AccountDetails = () => {
   const { classes } = useStyles();
   const { state } = useAccountDetails();
 
-  console.log({ exists: state.exists });
-
   return (
     <>
       <NextSeo

diff --git a/packages/ui/src/screens/transactions/hooks.ts b/packages/ui/src/screens/transactions/hooks.ts
@@ -99,6 +99,7 @@ const formatTransactions = (data: TransactionsListenerSubscription): Transaction
       x.logs,
       feeAmount.denom
     );
+
     const formatedAmount =
       amount !== '' && amount !== '-'
         ? formatToken(amount.replace(feeAmount.denom, ''), feeAmount.denom)

diff --git a/packages/ui/src/utils/format_token/index.ts b/packages/ui/src/utils/format_token/index.ts
@@ -34,7 +34,15 @@ export const formatToken = (value: number | string | null | undefined, denom = '
   }
 
   const ratio = Big(10 ** selectedDenom.exponent);
-  results.value = !ratio.eq(0) ? Big(value).div(ratio).toFixed(selectedDenom.exponent) : '';
+
+  const isValidToken = value.includes('ibc/') || value.includes(',');
+
+  if (isValidToken) {
+    results.value = '';
+  } else {
+    results.value = !ratio.eq(0) ? Big(value).div(ratio).toFixed(selectedDenom.exponent) : '';
+  }
+
   results.displayDenom = selectedDenom.display;
   return results;
 };