Fix bugs with send form and home buttons

0xsend · Sep 23, 2024 · d6997bb · d6997bb
1 parent 102557c
commit d6997bb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/packages/app/components/FormFields/CoinField.tsx b/packages/app/components/FormFields/CoinField.tsx
@@ -28,7 +28,10 @@ import { useSendAccount } from 'app/utils/send-accounts'
 import { useId, useState } from 'react'
 import { useBalance, type UseBalanceReturnType } from 'wagmi'
 import { IconCoin } from '../icons/IconCoin'
-export const CoinField = ({ native = false, ...props }: Pick<SelectProps, 'size' | 'native'>) => {
+export const CoinField = ({
+  native = false,
+  ...props
+}: Pick<SelectProps, 'size' | 'native' | 'defaultValue'>) => {
   const [isOpen, setIsOpen] = useState(false)
 
   const {
@@ -48,9 +51,10 @@ export const CoinField = ({ native = false, ...props }: Pick<SelectProps, 'size'
           <Select
             native={native}
             id={id}
-            value={field.value || usdcAddress[baseMainnet.id]}
+            value={field.value}
             onValueChange={field.onChange}
             onOpenChange={setIsOpen}
+            defaultValue={usdcAddress[baseMainnet.id]}
             open={isOpen}
             {...props}
           >

diff --git a/packages/app/components/TopNav.tsx b/packages/app/components/TopNav.tsx
@@ -276,7 +276,7 @@ export function TopNav({
           <Separator w={'100%'} borderColor="$jet" $lg={{ display: 'none' }} />
         </Container>
       )}
-      <Separator w={'100%'} borderColor="$decay" $gtLg={{ display: 'none' }} />
+      <Separator w={'100%'} borderColor="$decay" $gtLg={{ display: 'none' }} mt="$2" />
       {!media.gtLg && selectedCoin && selectedCoin.label !== 'USDC' && (
         <Container pos="relative">
           <View

diff --git a/packages/app/features/home/HomeButtons.tsx b/packages/app/features/home/HomeButtons.tsx
@@ -16,6 +16,7 @@ import {
   useMedia,
   type LinkableButtonProps,
 } from '@my/ui'
+import { useSendAccount } from 'app/utils/send-accounts'
 
 const Row = styled(XStack, {
   w: '100%',
@@ -35,6 +36,7 @@ export const HomeButtonRow = ({
 }: XStackProps & { isVisible?: boolean }) => {
   const isPwa = usePwa()
   const media = useMedia()
+  const { isLoading: isSendAccountLoading } = useSendAccount()
   const { balances, isLoading: balancesIsLoading } = useSendAccountBalances()
   const usdcBalance = balances?.USDC
   const canSend =
@@ -43,7 +45,7 @@ export const HomeButtonRow = ({
 
   return (
     <AnimatePresence>
-      {!balancesIsLoading && isVisible && (
+      {!balancesIsLoading && !isSendAccountLoading && isVisible && (
         <Stack
           w={'100%'}
           pb={isPwa ? '$1' : '$5'}

diff --git a/packages/app/features/send/SendAmountForm.tsx b/packages/app/features/send/SendAmountForm.tsx
@@ -70,7 +70,6 @@ export function SendAmountForm() {
 
   async function onSubmit() {
     if (!canSubmit) return
-    const sendToken = sendParams.sendToken || usdcAddress[baseMainnet.id]
 
     const amount = formatUnits(parsedAmount, selectedCoin.decimals)
     router.push({
@@ -127,6 +126,9 @@ export function SendAmountForm() {
               form.setValue('amount', formattedText)
             },
           },
+          token: {
+            defaultValue: sendToken,
+          },
         }}
         formProps={{
           testID: 'SendForm',
@@ -137,7 +139,7 @@ export function SendAmountForm() {
           height: '100%',
         }}
         defaultValues={{
-          token: sendParams.sendToken || usdcAddress[baseMainnet.id],
+          token: sendToken,
           amount: sendParams.amount,
         }}
         renderAfter={({ submit }) => (