Skip to content

Commit

Permalink
Merge pull request #351 from aura-nw/dev
Browse files Browse the repository at this point in the history
hotfix ui
  • Loading branch information
hoangndm3139 authored Dec 4, 2023
2 parents 7c2d04d + 13a6adb commit 2a0670d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const Row = styled.div`
`

const CoinWrapper = styled.div`
cursor: pointer;
margin: 8px 0px;
min-height: 40px;
display: flex;
Expand Down Expand Up @@ -71,7 +72,7 @@ const WrapToken = styled.div`

const CoinConfig = ({ token, isEnable, setToggle }) => {
return (
<CoinWrapper>
<CoinWrapper onClick={() => setToggle()}>
<Col>
<Checkbox checked={isEnable} onChange={() => setToggle()} />
<WrapToken>
Expand Down
27 changes: 14 additions & 13 deletions src/pages/Transactions/components/TxDetail/Message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const TransactionMemo = ({ memo }: { memo: string }) => {
return (
<WrapperTxMemo>
<strong>Transaction memo: </strong>
<p>{memo}</p>
<div>{memo}</div>
</WrapperTxMemo>
)
}
Expand Down Expand Up @@ -122,19 +122,20 @@ export default function TxMsg({ tx, txDetail, token, onImport }) {
</div>
</div>
))}
{msg[0]?.value?.funds.length > 0 ? <div className="function-name">Transaction funds:</div> : <></>}
{msg[0]?.value?.funds?.map((fund, index) => {
const foundToken = tokenList.find((token) => token.cosmosDenom === fund.denom || token.denom === fund.denom)
if (foundToken) {
return (
<div key={index}>
<p>
<div>
{msg[0]?.value?.funds.length > 0 ? <div className="function-name">Transaction funds:</div> : <></>}
{msg[0]?.value?.funds?.map((fund, index) => {
const foundToken = tokenList.find((token) => token.cosmosDenom === fund.denom || token.denom === fund.denom)
if (foundToken) {
return (
<div key={index}>
{convertAmount(fund.amount, false, +foundToken?.decimals)} {foundToken.symbol}
</p>
</div>
)
}
})}
</div>
)
}
})}
</div>

{txDetail?.txMemo && <TransactionMemo memo={txDetail?.txMemo} />}
</div>
)
Expand Down

0 comments on commit 2a0670d

Please sign in to comment.