Merge branch 'develop' of https://github.com/unisat-wallet/extension …

…into develop
unisat-wallet · Jul 19, 2024 · baed8cb · baed8cb
2 parents 5223a70 + 1590e91
commit baed8cb
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/ui/pages/Approval/components/InscribeTransfer.tsx b/src/ui/pages/Approval/components/InscribeTransfer.tsx
@@ -22,11 +22,13 @@ import {
 } from '@/ui/state/transactions/hooks';
 import { fontSizes } from '@/ui/theme/font';
 import { spacing } from '@/ui/theme/spacing';
-import { satoshisToAmount, useApproval, useLocationState, useWallet } from '@/ui/utils';
+import { amountToSatoshis, satoshisToAmount, useApproval, useLocationState, useWallet } from '@/ui/utils';
 import { getAddressUtxoDust } from '@unisat/wallet-sdk/lib/transaction';
 
 import { useNavigate } from '../../MainRoute';
 import SignPsbt from './SignPsbt';
+import { TickUsdWithoutPrice } from '@/ui/components/TickUsd';
+import { BtcUsd } from '@/ui/components/BtcUsd';
 
 interface Props {
   params: {
@@ -281,9 +283,9 @@ function InscribeTransferStep({ contextData, updateContextData }: StepProps) {
             <Text text="Inscribe TRANSFER" preset="title-bold" textCenter my="lg" />
 
             <Column>
-              <Row justifyBetween>
+              <Row justifyBetween itemsCenter>
                 <Text text="Available" color="textDim" />
-
+                <TickUsdWithoutPrice tick={contextData.ticker} balance={inputAmount} type={'brc20'}/>
                 {tokenBalance ? (
                   <Column>
                     {tokenBalance.availableBalanceUnSafe != '0' ? (
@@ -439,7 +441,9 @@ function InscribeConfirmStep({ contextData, updateContextData }: StepProps) {
                 <Text text={`${amount}`} preset="title-bold" size="xxl" textCenter wrap digital/>
                 <BRC20Ticker tick={tokenBalance.ticker} preset="lg" />
               </Row>
-
+              <Row itemsCenter justifyCenter>
+                <TickUsdWithoutPrice tick={tokenBalance.ticker} balance={amount+''} type={'brc20'}/>
+              </Row>
               <Column mt="xxl">
                 <Text text="Preview" preset="sub-bold" />
                 <Card preset="style2">
@@ -487,6 +491,10 @@ function InscribeConfirmStep({ contextData, updateContextData }: StepProps) {
                 <Text text="Total" color="gold" />
                 <Text text={`${totalFee} BTC`} color="gold" />
               </Row>
+              <Row justifyBetween>
+                <div></div>
+                <BtcUsd sats={amountToSatoshis(totalFee)}/>
+              </Row>
             </Column>
           </Column>
         </Column>