fix(withdraw-amount): adjusted amount conversion

components/Pages/Dashboard/BondingActions/BondingActions.tsx

@@ -53,7 +53,7 @@ const BondingActions = ({ globalAction }) => {
   )
 
   const unbondingPeriodInNano = Number(bondingConfig?.unbonding_period)
-  const totalWithdrawable = withdrawableInfos?.reduce((acc, e) => acc + e?.amount,
+  const totalWithdrawable = withdrawableInfos?.reduce((acc, e) => acc + (e?.amount || 0),
     0)
 
   const buttonLabel = useMemo(() => {
@@ -249,14 +249,14 @@ const BondingActions = ({ globalAction }) => {
               txStep === TxStep.Posting ||
               txStep === TxStep.Broadcasting
             }
-            onClick={async () => {
+            onClick={ () => {
               if (isWalletConnected) {
                 let { denom } = config.bonding_tokens.find((token) => token.tokenSymbol === currentBondState.tokenSymbol)
                 if (globalAction === ActionType.withdraw) {
                   denom = getFirstDenomWithPositiveAmount(withdrawableInfos,
                     config)
                 }
-                await submit(
+                submit(
                   globalAction, currentBondState.amount, denom,
                 )
               } else {

components/Pages/Dashboard/BondingActions/Withdraw.tsx

@@ -15,9 +15,6 @@ import usePrices from 'hooks/usePrices'
 import { useTokenList } from 'hooks/useTokenList'
 import { useRecoilValue } from 'recoil'
 import { chainState } from 'state/chainState'
-import {
-  convertMicroDenomToDenom,
-} from 'util/conversion/index'
 import { calculateDurationString, nanoToMilli } from 'util/conversion/timeUtil'
 
 type Props = {
@@ -57,8 +54,7 @@ const Withdraw = ({
   const withdrawableTokens = withdrawableInfos?.map((row) => ({
     ...row,
     dollarValue:
-      (prices?.[row.tokenSymbol] ?? whalePrice) *
-      convertMicroDenomToDenom(row.amount, 6),
+      (prices?.[row.tokenSymbol] ?? whalePrice) * row.amount,
   }))
 
   const ProgressBar = ({ percent }) => (

components/Pages/Dashboard/BondingActions/hooks/useTransaction.tsx

@@ -87,7 +87,7 @@ export const useTransaction = () => {
 
   const { mutate } = useMutation(async (data: any) => {
     const adjustedAmount = convertDenomToMicroDenom(data.amount, 6)
-    if (data.bondingAction === ActionType.bond) { 
+    if (data.bondingAction === ActionType.bond) {
       return await bondTokens(
         signingClient,
         address,

components/Pages/Dashboard/hooks/getGlobalIndex.ts

@@ -3,35 +3,32 @@ import { CosmWasmClient, JsonObject } from '@cosmjs/cosmwasm-stargate'
 import { Config } from './useDashboardData'
 
 export interface GlobalIndexInfo {
-    bonded_amount: string
-    bonded_assets: any
+  bonded_amount: string
+  bonded_assets: any
   weight: string
   timestamp: string
 }
 
+const fetchGlobalIndex = async (client: CosmWasmClient,
+  config: Config): Promise<GlobalIndexInfo> => {
+  const result: JsonObject = await client.queryContractSmart(config.whale_lair,
+    {
+      global_index: {},
+    })
+
+  return result as GlobalIndexInfo
+}
+
 export const getGlobalIndex = async (client: CosmWasmClient,
   config: Config) => {
-  if (!client ) {
+  if (!client) {
     return null
   }
   try {
-    const globalIndexInfo = await fetchGlobalIndex(
-      client, config,
-    )
+    const globalIndexInfo = await fetchGlobalIndex(client, config)
     return { globalIndexInfo }
   } catch (e) {
     return 0
   }
 }
 
-const fetchGlobalIndex = async (
-  client: CosmWasmClient,
-  config: Config,
-): Promise<GlobalIndexInfo> => {
-  const result: JsonObject = await client.queryContractSmart(config.whale_lair,
-    {
-      global_index: {},
-    })
-
-  return result as GlobalIndexInfo
-}

hooks/useRefetchQueries.ts

@@ -1,7 +1,9 @@
 import { useCallback, useRef } from 'react'
 import { useQueryClient } from 'react-query'
 
-const sleep = (delayMs: number) => new Promise((resolve) => setTimeout(resolve, delayMs))
+const sleep = (delayMs: number) => new Promise((resolve) => {
+  setTimeout(resolve, delayMs)
+})
 
 export const useRefetchQueries = (queryKey?: string | Array<string>,
   delayMs?: number) => {

hooks/useTxInfo.ts

@@ -12,12 +12,12 @@ const useTxInfo = ({ txHash, signingClient }: TxInfo) => {
     ['txInfo', txHash],
     () => {
       if (!txHash) {
-        return
+        return null
       }
       return signingClient.getTx(txHash)
     },
     {
-      enabled: txHash != null,
+      enabled: Boolean(txHash),
       retry: true,
     },
   )

hooks/useTxStatus.tsx

@@ -71,7 +71,7 @@ const useTxStatus = ({ signingClient, transactionType }: Props) => {
   const reset = () => {
     setTxState({
       txStep: TxStep.Idle,
-      txHash: undefined,
+      txHash: null,
       error: null,
       buttonLabel: null,
     })