chore: update

metalet-labs · Aug 23, 2024 · a0efa49 · a0efa49
1 parent 928a384
commit a0efa49
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 10 deletions.
diff --git a/src/pages/wallet/Asset.vue b/src/pages/wallet/Asset.vue
@@ -185,7 +185,14 @@ const toReceive = () => {
 
     <div class="grow w-full flex flex-col gap-y-6 overflow-y-hidden">
       <div class="flex flex-col items-center">
-        <AssetLogo :logo="icon" :chain="asset.chain" :symbol="asset.symbol" type="network" class="w-15" />
+        <AssetLogo
+          :logo="icon"
+          :chain="asset.chain"
+          :symbol="asset.symbol"
+          :type="asset.isNative ? undefined : 'network'"
+          class="w-15"
+          logo-size="size-6"
+        />
 
         <div class="mt-3 text-2xl text-balance max-w-full text-center">
           <span v-if="balance" class="break-all">

diff --git a/src/pages/wallet/Bridge/components/BridgeSideWithInput.vue b/src/pages/wallet/Bridge/components/BridgeSideWithInput.vue
@@ -218,7 +218,7 @@ const clear = () => {
           :chain="asset?.chain"
           :symbol="asset?.symbol"
           class="size-6 text-xs"
-          type="network"
+          :type="asset?.isNative ? undefined : 'network'"
           logo-size="size-[10px]"
         />
         <div class="mr-1" :class="['text-sm font-medium']">

diff --git a/src/pages/wallet/MRC20.vue b/src/pages/wallet/MRC20.vue
@@ -73,7 +73,7 @@ const toSend = () => {
 <template>
   <div class="flex flex-col items-center space-y-6 w-full">
     <div class="flex flex-col items-center">
-      <AssetLogo :logo="logo" :chain="Chain.BTC" :symbol="symbol" type="network" class="w-15" />
+      <AssetLogo :logo="logo" :chain="Chain.BTC" :symbol="symbol" type="network" class="w-15" logoSize="size-6" />
 
       <div v-if="asset?.balance && asset?.balance?.unconfirmed.toNumber()" class="text-gray-primary mt-2">
         +{{ calcBalance(asset.balance.unconfirmed.toNumber(), asset.decimal, asset.symbol) }}

diff --git a/src/pages/wallet/Rune.vue b/src/pages/wallet/Rune.vue
@@ -76,7 +76,7 @@ const toSend = () => {
 <template>
   <div class="flex flex-col items-center space-y-6 w-full">
     <div class="flex flex-col items-center">
-      <AssetLogo :logo="logo" :chain="Chain.BTC" :symbol="symbol" type="network" class="w-15" />
+      <AssetLogo :logo="logo" :chain="Chain.BTC" :symbol="symbol" type="network" class="w-15" logoSize="size-6"/>
 
       <div class="mt-3 text-2xl text-balance max-w-full text-center">
         <span v-if="asset?.balance" class="break-all">

diff --git a/src/pages/wallet/Send.vue b/src/pages/wallet/Send.vue
@@ -126,10 +126,9 @@ const popConfirm = async () => {
     try {
       const needRawTx = currentBTCWallet.value!.getScriptType() === ScriptType.P2PKH
       const utxos = await getBtcUtxos(address.value, needRawTx, true)
-      console.log('amount', amount.value)
 
       const { fee, rawTx } = currentBTCWallet.value!.signTx(SignType.SEND, {
-        recipient: recipient.value,
+        recipient: recipient.value.trim(),
         amount: amountInSats.value.toNumber(),
         feeRate: currentRateFee.value!,
         utxos,
@@ -256,7 +255,13 @@ async function send() {
     <div class="grow w-full space-y-3">
       <div class="space-y-3 w-full">
         <FlexBox d="col" ai="center" :gap="3">
-          <AssetLogo :logo="logo" :symbol="symbol" :chain="asset.chain" type="network" class="w-15" />
+          <AssetLogo
+            :logo="logo"
+            :symbol="symbol"
+            :chain="asset.chain"
+            class="w-15"
+            :type="asset.isNative ? undefined : 'network'"
+          />
           <div class="text-base">{{ symbol }}</div>
         </FlexBox>
 

diff --git a/src/pages/wallet/SendMRC20.vue b/src/pages/wallet/SendMRC20.vue
@@ -252,7 +252,14 @@ async function send() {
 
     <div class="space-y-4 w-full">
       <FlexBox d="col" ai="center" :gap="3">
-        <AssetLogo :logo="logo" :symbol="asset.symbol" :chain="asset.chain" type="network" class="w-15" />
+        <AssetLogo
+          :logo="logo"
+          :symbol="asset.symbol"
+          :chain="asset.chain"
+          type="network"
+          class="w-15"
+          logo-size="size-6"
+        />
         <div
           :key="tag.name"
           v-for="tag in tags"

diff --git a/src/pages/wallet/SendRune.vue b/src/pages/wallet/SendRune.vue
@@ -209,7 +209,14 @@ async function send() {
 
     <div class="space-y-4 w-full">
       <FlexBox d="col" ai="center" :gap="3">
-        <AssetLogo :logo="logo" :symbol="asset.symbol" :chain="asset.chain" type="network" class="w-15" />
+        <AssetLogo
+          :logo="logo"
+          :symbol="asset.symbol"
+          :chain="asset.chain"
+          type="network"
+          class="w-15"
+          logoSize="size-6"
+        />
         <div
           :key="tag.name"
           v-for="tag in tags"

diff --git a/src/pages/wallet/SendToken.vue b/src/pages/wallet/SendToken.vue
@@ -156,7 +156,7 @@ async function send() {
 
     <div class="space-y-4">
       <FlexBox d="col" ai="center">
-        <AssetLogo :logo="logo" :symbol="symbol" :chain="asset.chain" type="network" class="w-15" />
+        <AssetLogo :logo="logo" :symbol="symbol" :chain="asset.chain" type="network" class="w-15" logo-size="size-6" />
 
         <div class="mt-3 text-base">{{ symbol }}</div>