Merge pull request #404 from terra-money/staging

7.2.7
stationmoney · May 31, 2023 · 05b13dd · 05b13dd
2 parents 104965c + 741488c
commit 05b13dd
Show file tree

Hide file tree

Showing 48 changed files with 1,478 additions and 282 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,15 +18,16 @@
     "@ledgerhq/hw-transport-web-ble": "^6.27.1",
     "@mui/icons-material": "^5.8.0",
     "@mui/material": "^5.9.1",
+    "@sentry/react": "^7.53.1",
     "@terra-money/feather.js": "^1.0.4",
     "@terra-money/ledger-station-js": "^1.3.7",
     "@terra-money/log-finder-ruleset": "^3.0.0",
     "@terra-money/terra-utils": "^1.0.9",
     "@terra-money/terra.js": "^3.1.7",
     "@terra-money/terra.proto": "^2.0.0",
     "@terra-money/use-wallet": "4.0.0-beta.3",
-    "@terra-money/wallet-provider": "4.0.0-beta.3",
     "@terra-money/wallet-controller": "4.0.0-beta.3",
+    "@terra-money/wallet-provider": "4.0.0-beta.3",
     "@tippyjs/react": "^4.2.6",
     "axios": "^0.27.2",
     "bech32": "^2.0.0",

diff --git a/src/app/InitBankBalance.tsx b/src/app/InitBankBalance.tsx
@@ -29,16 +29,21 @@ const InitBankBalance = ({ children }: PropsWithChildren<{}>) => {
     [] as CoinBalance[]
   )
 
-  native.list.forEach(({ denom }) => {
-    if (!bankBalance.find((balance) => balance.denom === denom)) {
-      const token = whitelist[networkName][denom]
+  native.list.forEach(({ id }) => {
+    const [chain, denom] = id.split(":")
+    if (
+      !bankBalance.find(
+        (balance) => balance.denom === denom && balance.chain === chain
+      )
+    ) {
+      const token = whitelist[networkName][id]
 
       if (!token || !token.chains || token.chains.length === 0) return
 
       bankBalance.push({
         denom,
         amount: "0",
-        chain: token.chains[0],
+        chain,
       })
     }
   })

diff --git a/src/app/InitChains.tsx b/src/app/InitChains.tsx
@@ -11,10 +11,10 @@ const InitChains = ({ children }: PropsWithChildren<{}>) => {
 
   useEffect(() => {
     axios
-      .get("/coins.json", { baseURL: STATION_ASSETS })
+      .get("/denoms.json", { baseURL: STATION_ASSETS })
       .then(({ data }) => setWhitelist(data))
     axios
-      .get("/ibc_denoms.json", { baseURL: STATION_ASSETS })
+      .get("/ibc.json", { baseURL: STATION_ASSETS })
       .then(({ data }) => setIbcDenoms(data))
     axios
       .get("/station/coins.json", { baseURL: ASSETS })

diff --git a/src/app/sections/Links.tsx b/src/app/sections/Links.tsx
@@ -15,11 +15,10 @@ const Links = () => {
   const { name } = useTheme()
 
   const community = {
-    medium: "https://medium.com/terra-money",
     discord: "https://terra.sc/discord",
     telegram: "https://t.me/TerraNetworkLobby",
     twitter: "https://twitter.com/terra_money",
-    github: "https://github.com/terra-money",
+    github: "https://github.com/terra-money/station",
   }
 
   return (

diff --git a/src/auth/modules/create/RecoverWalletPage.tsx b/src/auth/modules/create/RecoverWalletPage.tsx
@@ -6,7 +6,7 @@ const RecoverWalletPage = () => {
   const { t } = useTranslation()
 
   return (
-    <Page title={t("Import from seed phrase")} backButton small>
+    <Page title={t("Import from seed phrase")} backButtonPath="/" small>
       <Card>
         <RecoverWalletForm />
       </Card>

diff --git a/src/components/form/Input.tsx b/src/components/form/Input.tsx
@@ -47,6 +47,7 @@ const Input = forwardRef(
 
         {actionButton && (
           <button
+            type="button"
             className={classNames(styles.symbol, styles.after)}
             onClick={(e) => {
               actionButton.onClick()

diff --git a/src/components/form/StandardDropDown.tsx b/src/components/form/StandardDropDown.tsx
@@ -25,6 +25,7 @@ const StandardDropdown = ({
   return (
     <div className={styles.container}>
       <button
+        type="button"
         className={styles.selector}
         onClick={(e) => {
           e.preventDefault()

diff --git a/src/components/layout/ChainFilter.tsx b/src/components/layout/ChainFilter.tsx
@@ -56,11 +56,9 @@ const ChainFilter = ({
   )
 
   const initNetwork =
-    networks.find((n) => n.chainID === savedChain) ?? networks[0]
+    network[savedChain ?? ""]?.chainID ?? (all ? undefined : chainID)
 
-  const [selectedChain, setChain] = useState<string | undefined>(
-    all ? undefined : initNetwork?.chainID
-  )
+  const [selectedChain, setChain] = useState<string | undefined>(initNetwork)
 
   let fixedChain: string | undefined
   if (terraOnly) {