St 307 add guard clause to common x is undefined cases (#287)

* fix: type error * fix: guard close for prefix property
stationmoney · Feb 28, 2023 · ab867ba · ab867ba
1 parent 8a8d88d
commit ab867ba
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 15 deletions.
diff --git a/src/app/sections/LCDSetting.tsx b/src/app/sections/LCDSetting.tsx
@@ -44,8 +44,8 @@ const LCDSetting = () => {
     () =>
       Object.values(networks[network] ?? {})
         .sort((a, b) => {
-          if (a.prefix === "terra") return -1
-          if (b.prefix === "terra") return 1
+          if (a?.prefix === "terra") return -1
+          if (b?.prefix === "terra") return 1
           return 0
         })
         .map(({ chainID }) => chainID),

diff --git a/src/auth/hooks/useAuth.ts b/src/auth/hooks/useAuth.ts
@@ -149,7 +149,7 @@ const useAuth = () => {
     const { words } = wallet
     const address = addressFromWords(
       words[networks[txOptions.chainID].coinType] ?? "",
-      networks[txOptions.chainID].prefix
+      networks[txOptions.chainID]?.prefix
     )
 
     return await lcd.tx.create([{ address }], txOptions)

diff --git a/src/components/token/Read.tsx b/src/components/token/Read.tsx
@@ -37,7 +37,10 @@ const Read = forwardRef(
 
     const lessThanFloor = fixed && Math.pow(10, -fixed)
     const lessThanFixed =
-      amount && lessThanFloor && amount > 0 && amount < lessThanFloor
+      amount &&
+      lessThanFloor &&
+      Number(amount) > 0 &&
+      Number(amount) < lessThanFloor
 
     const config = { ...props, comma, fixed }
     const [integer, decimal] = readAmount(amount, config).split(".")

diff --git a/src/data/queries/chains.ts b/src/data/queries/chains.ts
@@ -73,7 +73,7 @@ export function useIBCChannels() {
       const isCW20 = AccAddress.validate(tokenAddress)
 
       // from Terra to other chains
-      if (networks[from].prefix === "terra") {
+      if (networks[from]?.prefix === "terra") {
         // non-CW20 ICS transfer
         if (!!icsChannel && networks[to].ibc?.ics?.fromTerra === icsChannel) {
           return icsChannel
@@ -85,7 +85,7 @@ export function useIBCChannels() {
             networks[to].ibc?.fromTerra
 
         // from other chains to Terra
-      } else if (networks[to].prefix === "terra") {
+      } else if (networks[to]?.prefix === "terra") {
         // non-CW20 ICS transfer
         if (
           !!icsChannel &&
@@ -108,9 +108,9 @@ export function useIBCChannels() {
       from: string
       to: string
     }): string | undefined => {
-      if (networks[from].prefix === "terra") {
+      if (networks[from]?.prefix === "terra") {
         return networks[to].ibc?.icsFromTerra?.contract
-      } else if (networks[to].prefix === "terra") {
+      } else if (networks[to]?.prefix === "terra") {
         return networks[from].ibc?.ics?.contract
       }
     },

diff --git a/src/pages/wallet/SendPage.tsx b/src/pages/wallet/SendPage.tsx
@@ -115,8 +115,8 @@ const SendPage = () => {
       availableAssets
         .find(({ denom }) => denom === (asset ?? defaultAsset))
         ?.chains.sort((a, b) => {
-          if (networks[a].prefix === "terra") return -1
-          if (networks[b].prefix === "terra") return 1
+          if (networks[a]?.prefix === "terra") return -1
+          if (networks[b]?.prefix === "terra") return 1
           return 0
         }),
     [asset, availableAssets, defaultAsset, networks]

diff --git a/src/pages/wallet/TransferPage.tsx b/src/pages/wallet/TransferPage.tsx
@@ -108,8 +108,8 @@ const TransferPage = () => {
       availableAssets
         .find(({ denom }) => denom === (asset ?? defaultAsset))
         ?.chains.sort((a, b) => {
-          if (networks[a].prefix === "terra") return -1
-          if (networks[b].prefix === "terra") return 1
+          if (networks[a]?.prefix === "terra") return -1
+          if (networks[b]?.prefix === "terra") return 1
           return 0
         }),
     [asset, availableAssets, defaultAsset, networks]
@@ -120,8 +120,8 @@ const TransferPage = () => {
       Object.keys(networks)
         .filter((chainID) => chainID !== chain)
         .sort((a, b) => {
-          if (networks[a].prefix === "terra") return -1
-          if (networks[b].prefix === "terra") return 1
+          if (networks[a]?.prefix === "terra") return -1
+          if (networks[b]?.prefix === "terra") return 1
           return 0
         }),
     [networks, availableChains, chain] // eslint-disable-line

diff --git a/src/txs/gov/SubmitProposalForm.tsx b/src/txs/gov/SubmitProposalForm.tsx
@@ -396,7 +396,7 @@ const SubmitProposalForm = ({ chain }: { chain: string }) => {
         {({ max, fee, submit }) => (
           <Form onSubmit={handleSubmit(submit.fn)}>
             <Grid gap={4}>
-              {networks[chain].prefix === "terra" && (
+              {networks[chain]?.prefix === "terra" && (
                 <FormHelp>
                   Upload proposal only after forum discussion on{" "}
                   <ExternalLink href="https://agora.terra.money">