Merge branch 'send' into desc

AmbossTech · Sep 19, 2024 · 9fda62e · 9fda62e
2 parents a2d7b48 + 63380b1
commit 9fda62e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 17 deletions.
diff --git a/public/images/landing/6.webp b/public/images/landing/6.webp
diff --git a/public/images/landing/7.webp b/public/images/landing/7.webp
diff --git a/public/images/landing/8.webp b/public/images/landing/8.webp
diff --git a/public/images/landing/9.webp b/public/images/landing/9.webp
diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -210,7 +210,7 @@ export default function Page() {
                     <Image
                       src={six}
                       alt="phone-pay"
-                      className="scale-150 transition-transform duration-500 hover:scale-[200%]"
+                      className="scale-125 transition-transform duration-500 hover:scale-150"
                     />
                   </div>
                 }

diff --git a/src/views/dashboard/Dashboard.tsx b/src/views/dashboard/Dashboard.tsx
@@ -27,14 +27,14 @@ const Warning: FC<{ id: string }> = ({ id }) => {
 
   const showAlert = useMemo(() => {
     const otherAssets = liquidAssets.filter(
-      a => a.asset_info.ticker !== 'BTC' && !!a.balance
+      a => a.asset_info.ticker !== 'BTC' && Number(a.balance)
     );
 
     const btcAsset = liquidAssets.filter(
-      a => a.asset_info.ticker == 'BTC' && !!a.balance
+      a => a.asset_info.ticker == 'BTC' && Number(a.balance)
     );
 
-    return !!otherAssets.length && !btcAsset.length;
+    return otherAssets.length && !btcAsset.length;
   }, [liquidAssets]);
 
   if (loading || error) return null;

diff --git a/src/views/wallet/Receive.tsx b/src/views/wallet/Receive.tsx
@@ -2,7 +2,7 @@ import { ArrowLeft, ArrowUpDown, ChevronsUpDown } from 'lucide-react';
 import Link from 'next/link';
 import { useTranslations } from 'next-intl';
 import { useQRCode } from 'next-qrcode';
-import { useEffect, useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
 import { useLocalStorage } from 'usehooks-ts';
 
 import { Button } from '@/components/ui/button-v2';
@@ -116,6 +116,8 @@ export const Receive = () => {
     { data: liquidData, loading: liquidLoading, error: liquidError },
   ] = useCreateOnchainAddressMutation({
     variables: { input: { wallet_account_id: liquidAccountId } },
+    onCompleted: data =>
+      setReceiveString(data.wallets.create_onchain_address.address),
     onError: err => {
       const messages = handleApolloError(err);
 
@@ -127,21 +129,15 @@ export const Receive = () => {
     },
   });
 
-  useEffect(() => {
-    if (!liquidAccountId || liquidData) return;
-
-    createLiquidAddress();
-  }, [liquidAccountId, liquidData, createLiquidAddress]);
-
-  const liquidAddress = useMemo(() => {
+  const liquidAddressFormatted = useMemo(() => {
     if (!liquidData?.wallets.create_onchain_address.address) {
-      return { address: '', formatted: '' };
+      return '';
     }
 
     const address = liquidData.wallets.create_onchain_address.address;
     const formatted = (address.match(/.{1,6}/g) || []).join(' - ');
 
-    return { address, formatted };
+    return formatted;
   }, [liquidData]);
 
   const [createLightningInvoice, { loading: invoiceLoading }] =
@@ -187,9 +183,9 @@ export const Receive = () => {
           : t('Wallet.amount-ln');
       case 'Liquid Bitcoin':
       case 'Tether USD':
-        return liquidAddress.formatted;
+        return liquidAddressFormatted;
     }
-  }, [receive, bancoCode, receiveString, liquidAddress, t]);
+  }, [receive, bancoCode, receiveString, liquidAddressFormatted, t]);
 
   const {
     data: priceData,
@@ -271,7 +267,7 @@ export const Receive = () => {
                         break;
                       case 'Liquid Bitcoin':
                       case 'Tether USD':
-                        setReceiveString(liquidAddress.address);
+                        createLiquidAddress();
                         break;
                     }
                   }}