fix: display token transfer currency symbol + logo

AstraProtocol · Jan 6, 2023 · ee57652 · ee57652
1 parent 04bbb40
commit ee57652
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 12 deletions.
diff --git a/pages/tx/index.tsx b/pages/tx/index.tsx
@@ -1,5 +1,4 @@
 import { Pagination, useMobileLayout } from '@astraprotocol/astra-ui'
-import { CryptoIconNames } from '@astraprotocol/astra-ui/lib/es/components/CryptoIcon'
 import clsx from 'clsx'
 import Container from 'components/Container'
 import RowLoader from 'components/Loader/RowLoader'
@@ -84,7 +83,6 @@ const BlockDetailPage: React.FC<NextPage> = _ => {
 										from={item.from}
 										to={item.to}
 										value={item.value}
-										valueToken={process.env.NEXT_PUBLIC_NATIVE_TOKEN as CryptoIconNames}
 										labelStatus={item.evmType}
 										type={item.type}
 										newBlock={item.newTransaction}

diff --git a/utils/cosmos.ts b/utils/cosmos.ts
@@ -1,4 +1,5 @@
 import { astraToEth } from '@astradefi/address-converter'
+import { CryptoIconNames } from '@astraprotocol/astra-ui/lib/es/components/CryptoIcon'
 import { formatEther } from 'ethers/lib/utils'
 import { TransactionRowProps } from 'views/transactions/TransactionRow'
 import { caculateAmount } from 'views/transactions/utils'
@@ -40,7 +41,8 @@ const _parseCosmosMsgSend = (content: MsgSendContent, blockTime: string, status:
 		blockNumber: content.height,
 		updatedAt: blockTime,
 		value: formatEther(amountItem.amount || '0'),
-		valueCurrency: amountItem.denom,
+		valueCurrency: process.env.NEXT_PUBLIC_NATIVE_TOKEN as CryptoIconNames,
+		valueToken: process.env.NEXT_PUBLIC_NATIVE_TOKEN as CryptoIconNames,
 		hash: content.txHash,
 		type: getTransactionType(content?.msgName),
 		status,

diff --git a/views/accounts/hook/useAddressInternalTransaction.ts b/views/accounts/hook/useAddressInternalTransaction.ts
@@ -1,3 +1,4 @@
+import { CryptoIconNames } from '@astraprotocol/astra-ui/lib/es/components/CryptoIcon'
 import API_LIST from 'api/api_list'
 import { formatEther } from 'ethers/lib/utils'
 import { useEffect, useState } from 'react'
@@ -42,7 +43,7 @@ export default function useAddressInternalTransaction(
 				blockNumber: Number(d?.blockNumber),
 				updatedAt: Number(d?.timeStamp) * 1000,
 				value: formatEther(d?.value || '0'),
-				valueToken: 'asa',
+				valueToken: process.env.NEXT_PUBLIC_NATIVE_TOKEN as CryptoIconNames,
 				// valueCurrency: d.
 				hash: d?.transactionHash,
 				labelStatus: evmInternalTransactionType(d?.callType || d?.type),

diff --git a/views/accounts/tabs/AddressTransactionTab/AddressTransaction.tsx b/views/accounts/tabs/AddressTransactionTab/AddressTransaction.tsx
@@ -71,8 +71,8 @@ const AddressTransaction = ({ transaction }: Props) => {
 								<TypographyLib.Balance
 									size="2xs"
 									value={transaction.value}
-									currency={''}
-									icon={<CryptoIcon name={'asa'} size="sm" />}
+									currency={process.env.NEXT_PUBLIC_NATIVE_TOKEN?.toUpperCase()}
+									icon={<CryptoIcon name="asa" size="sm" />}
 								/>
 								<br />
 							</>

diff --git a/views/accounts/tabs/ContractTransactionTab/ContractTransaction.tsx b/views/accounts/tabs/ContractTransactionTab/ContractTransaction.tsx
@@ -107,7 +107,7 @@ const ContractTransaction = ({ transaction }: Props) => {
 								<TypographyLib.Balance
 									size="2xs"
 									value={convertBalanceToView(transaction.value)}
-									currency={''}
+									currency={process.env.NEXT_PUBLIC_NATIVE_TOKEN?.toUpperCase()}
 									icon={<CryptoIcon name={'asa'} size="sm" />}
 								/>
 								<br />

diff --git a/views/tokens/tabs/TokenTransactionTab/TokenTransaction.tsx b/views/tokens/tabs/TokenTransactionTab/TokenTransaction.tsx
@@ -1,4 +1,5 @@
-import { Typography as TypographyLib } from '@astraprotocol/astra-ui'
+import { CryptoIcon, Typography as TypographyLib } from '@astraprotocol/astra-ui'
+import { CryptoIconNames } from '@astraprotocol/astra-ui/lib/es/components/CryptoIcon'
 import clsx from 'clsx'
 import GradientRow from 'components/Row/GradientRow'
 import Timer from 'components/Timer'
@@ -95,6 +96,12 @@ const TokenTransaction = ({ transaction, tokenData }: Props) => {
 										size="xs"
 										value={convertBalanceToView(transaction.amount, parseInt(transaction.decimals))}
 										currency={transaction.tokenSymbol}
+										icon={
+											<CryptoIcon
+												name={transaction.tokenSymbol?.toLowerCase() as CryptoIconNames}
+												size="sm"
+											/>
+										}
 									/>
 									<br />
 								</>

diff --git a/views/transactions/TransactionRowContent.tsx b/views/transactions/TransactionRowContent.tsx
@@ -140,10 +140,8 @@ export default function TransactionRowContent({
 									value={value}
 									currency={
 										valueCurrency
-											? valueCurrency.toLowerCase() == 'aastra'
-												? process.env.NEXT_PUBLIC_NATIVE_TOKEN
-												: valueCurrency?.toUpperCase()
-											: 'ASA'
+											? valueCurrency.toUpperCase()
+											: process.env.NEXT_PUBLIC_NATIVE_TOKEN?.toUpperCase()
 									}
 									icon={valueToken && <CryptoIcon name={valueToken} size="sm" />}
 								/>