Merge pull request #307 from aura-nw/dev

Dev
aura-nw · Aug 22, 2023 · 167afee · 167afee
2 parents 4480da3 + ea79f91
commit 167afee
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/src/logic/safe/store/actions/fetchSafe.ts b/src/logic/safe/store/actions/fetchSafe.ts
@@ -141,16 +141,16 @@ export const fetchMSafe =
       let safeInfo: Partial<SafeRecordProps> = {}
       let remoteSafeInfo: SafeInfo | null = null
       let mSafeInfo: IMSafeInfo | null = null
+      let accountInfo: SequenceResponse | null = null
 
       try {
-        ;[mSafeInfo, remoteSafeInfo] = await _getSafeInfo(safeAddress, safeId)
+        ;[mSafeInfo, remoteSafeInfo, accountInfo] = await _getSafeInfo(safeAddress, safeId)
       } catch (err) {
         console.error(err)
       }
 
       const state = store.getState()
       const chainId = currentChainId(state)
-      const currentChainInfo = getChainInfo() as any
 
       // If the network has changed while the safe was being loaded,
       // ignore the result
@@ -161,7 +161,7 @@ export const fetchMSafe =
       // remote (client-gateway)
       if (remoteSafeInfo) {
         safeInfo = await extractRemoteSafeInfo(remoteSafeInfo)
-        const onlineData: SequenceResponse = (await getAccountInfo(safeAddress)).account[0]
+        const onlineData: SequenceResponse | null = accountInfo
 
         safeInfo.nextQueueSeq = mSafeInfo?.nextQueueSeq || onlineData?.sequence?.toString()
         safeInfo.sequence = mSafeInfo?.sequence || onlineData?.sequence?.toString()
@@ -213,11 +213,11 @@ export const fetchMSafe =
       return dispatch(updateSafe({ address, ...safeInfo, owners, safeId: safeId }))
     }
 
-async function _getSafeInfo(safeAddress: string, safeId: number): Promise<[IMSafeInfo, SafeInfo]> {
-  const chainInfo = getChainInfo() as any
+async function _getSafeInfo(safeAddress: string, safeId: number): Promise<[IMSafeInfo, SafeInfo, SequenceResponse]> {
   const getAccountAssetPromise = getAccountAsset(safeAddress)
   const getMSafeInfoPromise = getMSafeInfo(safeId)
   const getAccountInfoPromise = getAccountInfo(safeAddress)
+
   return Promise.all([getAccountAssetPromise, getMSafeInfoPromise, getAccountInfoPromise]).then(([accountAssetData, mSafeInfotData, accountInfoData]) => {
     const formatMSafeInfotData: IMSafeInfo = {
       ...mSafeInfotData,
@@ -302,7 +302,7 @@ async function _getSafeInfo(safeAddress: string, safeId: number): Promise<[IMSaf
       txHistoryTag: mSafeInfotData.txHistoryTag,
     }
 
-    return [formatMSafeInfotData, safeInfoData]
+    return [formatMSafeInfotData, safeInfoData, accountInfoData.account[0]]
   });
 
 

diff --git a/src/pages/Staking/index.tsx b/src/pages/Staking/index.tsx
@@ -14,7 +14,6 @@ import {
   simulate,
 } from 'src/services/index'
 
-import queryString from 'query-string'
 import { extractPrefixedSafeAddress, extractSafeAddress } from 'src/routes/routes'
 
 import { coin } from '@cosmjs/stargate'
@@ -24,12 +23,12 @@ import Breadcrumb from 'src/components/Breadcrumb'
 import { ConnectWalletModal } from 'src/components/ConnectWalletModal'
 import useConnectWallet from 'src/logic/hooks/useConnectWallet'
 import { MsgTypeUrl } from 'src/logic/providers/constants/constant'
+import { currentSafeWithNames } from 'src/logic/safe/store/selectors'
 import { loadedSelector } from 'src/logic/wallets/store/selectors'
 import { convertAmount, formatNumber } from 'src/utils'
 import { grantedSelector } from 'src/utils/safeUtils/selector'
 import MyDelegation from './MyDelegation'
 import TxActionModal from './TxActionModal'
-import { currentSafeWithNames } from 'src/logic/safe/store/selectors'
 
 export const defValidatorImage = 'https://validator-logos.s3.ap-southeast-1.amazonaws.com/validator-default.svg'
 function Staking(props): ReactElement {
@@ -160,7 +159,7 @@ function Staking(props): ReactElement {
   useEffect(() => {
     const dataTemp: any = []
     const formatDataDelegations = allDelegations.map((delegation: any) => {
-      const reward = allRewards.find(
+      const reward = allRewards?.find(
         (rw: any) => rw.validator_address === delegation.delegation.validator_address,
       ) as any
       return {
@@ -212,16 +211,16 @@ function Staking(props): ReactElement {
           },
         },
       }))
-      .find((item) => item.operatorAddress === address)
+      ?.find((item) => item.operatorAddress === address)
 
     const delegation = {
       claimedReward: {
         amount: rewardAmount[0]?.amount,
         denom: rewardAmount[0]?.denom,
       },
       delegatableBalance: {
-        amount: balances.find((balance) => balance.type === 'native')?.tokenBalance,
-        denom: balances.find((balance) => balance.type === 'native')?.denom,
+        amount: balances?.find((balance) => balance.type === 'native')?.tokenBalance,
+        denom: balances?.find((balance) => balance.type === 'native')?.denom,
       },
       delegationBalance: {
         amount: allDelegations?.find((item) => item.delegation.validator_address === address)?.balance.amount,