[PAY-1794] Check correct balance in withdrawal flow (#4056)

AudiusProject · Sep 8, 2023 · d548f80 · d548f80
1 parent 6827827
commit d548f80
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 15 deletions.
diff --git a/packages/common/src/utils/wallet.ts b/packages/common/src/utils/wallet.ts
@@ -167,7 +167,7 @@ export const formatUSDCWeiToUSDString = (amount: StringUSDC, precision = 2) => {
 }
 
 /**
- * Formats a USDC BN (full precision) to a number suitable for display as a dollar amount.
+ * Formats a USDC BN (full precision) to a number of dollars.
  * Note: will lose precision by rounding _up_ to nearest cent.
  */
 export const formatUSDCWeiToCeilingDollarNumber = (amount: BNUSDC) => {
@@ -177,7 +177,23 @@ export const formatUSDCWeiToCeilingDollarNumber = (amount: BNUSDC) => {
 }
 
 /**
- * Formats a USDC BN (full precision) to a number of cents
+ * Formats a USDC BN (full precision) to a number of cents.
+ * Note: will lose precision by rounding _up_ to nearest cent.
+ */
+export const formatUSDCWeiToCeilingCentsNumber = (amount: BNUSDC) => {
+  return ceilingBNUSDCToNearestCent(amount).div(BN_USDC_CENT_WEI).toNumber()
+}
+
+/**
+ * Formats a USDC BN (full precision) to a number of dollars.
+ * Note: will lose precision by rounding _down_ to nearest cent.
+ */
+export const formatUSDCWeiToFloorDollarNumber = (amount: BNUSDC) => {
+  return floorBNUSDCToNearestCent(amount).div(BN_USDC_CENT_WEI).toNumber() / 100
+}
+
+/**
+ * Formats a USDC BN (full precision) to a number of cents.
  * Note: will lose precision by rounding _down_ to nearest cent.
  */
 export const formatUSDCWeiToFloorCentsNumber = (amount: BNUSDC) => {

diff --git a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx
@@ -11,7 +11,7 @@ import {
   BNUSDC,
   useWithdrawUSDCModal,
   WithdrawUSDCModalPages,
-  formatUSDCWeiToFloorCentsNumber
+  formatUSDCWeiToFloorDollarNumber
 } from '@audius/common'
 import {
   HarmonyButton,
@@ -58,8 +58,9 @@ export const EnterTransferDetails = () => {
   const { data: balance } = useUSDCBalance()
   const { setData } = useWithdrawUSDCModal()
 
-  const balanceNumber =
-    formatUSDCWeiToFloorCentsNumber((balance ?? new BN(0)) as BNUSDC) / 100
+  const balanceNumber = formatUSDCWeiToFloorDollarNumber(
+    (balance ?? new BN(0)) as BNUSDC
+  )
   const balanceFormatted = formatCurrencyBalance(balanceNumber)
 
   const [
@@ -86,7 +87,7 @@ export const EnterTransferDetails = () => {
     [setHumanizedValue, setAmountTouched]
   )
 
-  const [, { error: addressError }] = useField(ADDRESS)
+  const [{ value: address }, { error: addressError }] = useField(ADDRESS)
 
   const handleContinue = useCallback(() => {
     setData({ page: WithdrawUSDCModalPages.CONFIRM_TRANSFER_DETAILS })
@@ -136,7 +137,7 @@ export const EnterTransferDetails = () => {
         size={HarmonyButtonSize.DEFAULT}
         fullWidth
         text={messages.continue}
-        disabled={amountError || addressError}
+        disabled={amountError || addressError || !address}
         onClick={handleContinue}
       />
       <Hint

diff --git a/packages/web/src/components/withdraw-usdc-modal/components/TransferInProgress.tsx b/packages/web/src/components/withdraw-usdc-modal/components/TransferInProgress.tsx
@@ -2,7 +2,7 @@ import {
   useUSDCBalance,
   formatCurrencyBalance,
   BNUSDC,
-  formatUSDCWeiToFloorCentsNumber
+  formatUSDCWeiToFloorDollarNumber
 } from '@audius/common'
 import BN from 'bn.js'
 import { useField } from 'formik'
@@ -27,8 +27,9 @@ const messages = {
 
 export const TransferInProgress = () => {
   const { data: balance } = useUSDCBalance()
-  const balanceNumber =
-    formatUSDCWeiToFloorCentsNumber((balance ?? new BN(0)) as BNUSDC) / 100
+  const balanceNumber = formatUSDCWeiToFloorDollarNumber(
+    (balance ?? new BN(0)) as BNUSDC
+  )
   const balanceFormatted = formatCurrencyBalance(balanceNumber)
 
   const [{ value: amountValue }] = useField(AMOUNT)

diff --git a/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx b/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx
@@ -3,7 +3,7 @@ import {
   formatCurrencyBalance,
   BNUSDC,
   useWithdrawUSDCModal,
-  formatUSDCWeiToFloorCentsNumber
+  formatUSDCWeiToFloorDollarNumber
 } from '@audius/common'
 import {
   HarmonyPlainButton,
@@ -46,8 +46,9 @@ const openExplorer = (signature: string) => {
 export const TransferSuccessful = () => {
   const { data: balance } = useUSDCBalance()
   const { data: modalData } = useWithdrawUSDCModal()
-  const balanceNumber =
-    formatUSDCWeiToFloorCentsNumber((balance ?? new BN(0)) as BNUSDC) / 100
+  const balanceNumber = formatUSDCWeiToFloorDollarNumber(
+    (balance ?? new BN(0)) as BNUSDC
+  )
   const balanceFormatted = formatCurrencyBalance(balanceNumber)
 
   const [{ value: amountValue }] = useField(AMOUNT)

diff --git a/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts b/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts
@@ -7,7 +7,8 @@ import {
   getContext,
   TOKEN_LISTING_MAP,
   getUserbankAccountInfo,
-  BNUSDC
+  BNUSDC,
+  formatUSDCWeiToFloorDollarNumber
 } from '@audius/common'
 import {
   ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -236,7 +237,7 @@ function* doWithdrawUSDC({
           const latestBalance = (accountInfo?.amount ?? new BN(0)) as BNUSDC
           withdrawalAmount = Math.min(
             withdrawalAmount,
-            latestBalance.toNumber()
+            formatUSDCWeiToFloorDollarNumber(latestBalance)
           )
         }