feat: add decode for assets name

Ref: EX-1124 EX-1123
cardano-foundation · Jan 20, 2021 · a800292 · a800292
1 parent 31f0256
commit a800292
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 7 deletions.
diff --git a/source/features/address/api/transformers.ts b/source/features/address/api/transformers.ts
@@ -6,6 +6,7 @@ import {
 } from '../../../../generated/typings/graphql-schema';
 import { IPaymentAddressSummary, IStakeAddressSummary } from '../types';
 import { sortTokensDesc } from '../../../lib/arrays';
+import { decodeHex } from '../../../lib/decodeHex';
 
 export const paymentAddressDetailTransformer = (
   address: string,
@@ -21,6 +22,7 @@ export const paymentAddressDetailTransformer = (
     tokensBalance:
       s
         .paymentAddresses![0]?.summary?.assetBalances?.filter(isDefined)
+        .map((t) => ({ ...t, assetName: decodeHex(t.assetName.substr(2)) }))
         .filter(({ assetName }) => assetName !== 'ada')
         .sort(sortTokensDesc) || [],
   };

diff --git a/source/features/address/ui/AddressSummary.module.scss b/source/features/address/ui/AddressSummary.module.scss
@@ -39,7 +39,6 @@
         }
 
         .infoValue {
-          flex: 1;
           font-weight: 300;
           word-break: break-all;
 

diff --git a/source/features/transactions/api/transformers.ts b/source/features/transactions/api/transformers.ts
@@ -2,6 +2,7 @@ import { Currency } from 'cardano-js';
 import { TransactionDetailsFragment } from '../../../../generated/typings/graphql-schema';
 import { isDefined } from '../../../lib/types';
 import { sortTokensDesc } from '../../../lib/arrays';
+import { decodeHex } from '../../../lib/decodeHex';
 import { ITransactionDetails } from '../types';
 
 export const transactionDetailsTransformer = (
@@ -21,11 +22,11 @@ export const transactionDetailsTransformer = (
     sourceTxId: i.sourceTxHash,
     value: Currency.Util.lovelacesToAda(i.value),
     tokens: i.tokens
-      .filter(({ assetName }) => assetName !== 'ada')
       .map((t) => ({
         ...t,
-        assetName: t.assetName || '-',
+        assetName: decodeHex(t.assetName!.substr(2)) || '-',
       }))
+      .filter(({ assetName }) => assetName !== 'ada')
       .sort(sortTokensDesc),
   })),
   metadata: tx.metadata?.filter(isDefined).map((i) => ({
@@ -36,11 +37,11 @@ export const transactionDetailsTransformer = (
     ...i,
     value: Currency.Util.lovelacesToAda(i.value),
     tokens: i.tokens
-      .filter(({ assetName }) => assetName !== 'ada')
       .map((t) => ({
         ...t,
-        assetName: t.assetName || '-',
+        assetName: decodeHex(t.assetName!.substr(2)) || '-',
       }))
+      .filter(({ assetName }) => assetName !== 'ada')
       .sort(sortTokensDesc),
   })),
   totalOutput: Currency.Util.lovelacesToAda(tx.totalOutput),
@@ -54,7 +55,7 @@ export const transactionDetailsTransformer = (
       ?.filter((m) => m.quantity > '0')
       .map((i) => ({
         ...i,
-        assetName: i.assetName || '-',
+        assetName: decodeHex(i.assetName!.substr(2)) || '-',
       }))
       .sort(sortTokensDesc) || [],
   burn:
@@ -63,7 +64,7 @@ export const transactionDetailsTransformer = (
       .map((i) => ({
         ...i,
         quantity: i.quantity.substring(1),
-        assetName: i.assetName || '-',
+        assetName: decodeHex(i.assetName!.substr(2)) || '-',
       }))
       .sort(sortTokensDesc) || [],
 });
diff --git a/source/features/transactions/components/TransactionInfo.module.scss b/source/features/transactions/components/TransactionInfo.module.scss
@@ -64,6 +64,16 @@ $wide-breakpoint: 768px;
   display: flex;
   justify-content: space-between;
   margin-top: 5px;
+
+  .amount {
+    display: none;
+    @media (min-width: $medium-breakpoint) {
+      color: var(--solid-text-color);
+      display: block;
+      margin-right: 10px;
+      margin-bottom: 5px;
+    }
+  }
   &:last-child {
     margin-bottom: 6px;
     @media (min-width: $wide-breakpoint) {

diff --git a/source/lib/decodeHex.ts b/source/lib/decodeHex.ts
@@ -0,0 +1,10 @@
+export const decodeHex = (hex: string) => {
+  if (!hex) return '';
+
+  let str = '';
+
+  for (let i = 0; i < hex.length; i += 2)
+    str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
+
+  return str.trim();
+};