Merge remote-tracking branch 'origin/sync-8.0.9'

package.json

@@ -19,24 +19,22 @@
     "@0xsquid/sdk": "^1.14.11",
     "@amplitude/analytics-browser": "^2.1.2",
     "@ledgerhq/hw-transport-web-ble": "^6.27.1",
-    "@mui/icons-material": "^5.8.0",
+    "@mui/icons-material": "^5.15.14",
     "@mui/material": "^5.9.1",
     "@sentry/react": "^7.53.1",
-    "@terra-money/feather.js": "^2.0.4",
-    "@terra-money/ledger-station-js": "^1.3.7",
+    "@terra-money/feather.js": "^3.0.0-beta.3",
+    "@terra-money/ledger-station-js": "^1.3.10",
     "@terra-money/log-finder-ruleset": "^3.0.3",
     "@terra-money/msg-reader": "^3.0.1",
-    "@terra-money/station-connector": "^1.1.0",
-    "@terra-money/station-ui": "^1.0.12",
+    "@terra-money/station-connector": "^1.1.1",
+    "@terra-money/station-ui": "^1.0.13",
     "@terra-money/terra-utils": "^1.2.0-beta.8",
     "@terra-money/terra.js": "^3.1.9",
     "@terra-money/terra.proto": "^2.0.0",
-    "@terra-money/wallet-kit": "^1.0.15",
     "@tippyjs/react": "^4.2.6",
     "axios": "^0.27.2",
     "bech32": "^2.0.0",
     "bignumber.js": "^9.0.2",
-    "buffer": "^6.0.3",
     "classnames": "^2.3.2",
     "crypto-js": "^4.1.1",
     "date-fns": "^2.28.0",
@@ -45,10 +43,8 @@
     "immutability-helper": "^3.1.1",
     "js-base64": "^3.7.2",
     "keccak256": "^1.0.6",
-    "lottie-react": "^2.3.1",
     "moment": "^2.29.4",
     "numeral": "^2.0.6",
-    "prettier": "^2.6.2",
     "qrcode.react": "^3.1.0",
     "qs": "^6.11.0",
     "ramda": "^0.28.0",

public/manifest.json

@@ -1,8 +1,8 @@
 {
   "manifest_version": 3,
   "name": "Station Wallet",
-  "version": "8.0.8",
-  "version_name": "8.0.8",
+  "version": "8.0.9",
+  "version_name": "8.0.9",
   "background": {
     "service_worker": "background.js"
   },

src/app/InitTheme.tsx

@@ -1,15 +1,12 @@
 import { useEffect } from "react"
-import { DefaultTheme } from "utils/localStorage"
-import { useThemeState, useValidateTheme } from "data/settings/Theme"
+import { useThemeState } from "data/settings/Theme"
 
 const InitTheme = () => {
   const [theme, setTheme] = useThemeState()
-  const validate = useValidateTheme()
-  const valid = validate(theme)
 
   useEffect(() => {
-    setTheme(valid ? theme : DefaultTheme)
-  }, [valid]) // eslint-disable-line
+    setTheme(theme)
+  }, [theme]) // eslint-disable-line
 
   return null
 }

src/app/LocalTerraError.tsx

@@ -1,10 +1,11 @@
 import { useTranslation } from "react-i18next"
 import Logo from "styles/images/LocalTerra.png"
 import { useNetworkState } from "data/wallet"
-import { Button, ExternalLink } from "components/general"
+import { ExternalLink } from "components/general"
 import { FlexColumn } from "components/layout"
 import styles from "./NetworkError.module.scss"
 import { useTheme } from "data/settings/Theme"
+import { Button } from "@terra-money/station-ui"
 
 const LocalTerraError = ({ refresh }: { refresh: () => void }) => {
   const { t } = useTranslation()
@@ -23,11 +24,11 @@ const LocalTerraError = ({ refresh }: { refresh: () => void }) => {
         </ExternalLink>
       </article>
       <FlexColumn gap={10}>
-        <Button onClick={refresh} size="small" color="primary">
+        <Button onClick={refresh} small variant="primary">
           {t("Refresh")}
         </Button>
 
-        <Button onClick={() => setNetwork("mainnet")} size="small" outline>
+        <Button onClick={() => setNetwork("mainnet")} small variant="secondary">
           {t("Back to mainnet")}
         </Button>
       </FlexColumn>

src/app/NetworkLoading.tsx

@@ -3,7 +3,7 @@ import styles from "./NetworkError.module.scss"
 import { useTheme } from "data/settings/Theme"
 import Overlay from "./components/Overlay"
 import { useEffect, useState } from "react"
-import { Button } from "components/general"
+import { Button } from "@terra-money/station-ui"
 import ReplayIcon from "@mui/icons-material/Replay"
 
 interface Props {
@@ -38,7 +38,7 @@ const NetworkLoading = ({ title, timeout }: Props) => {
             {timeout && showTimeout && (
               <FlexColumn gap={10}>
                 <p>Oops, something went wrong, this is taking too much time.</p>
-                <Button color="primary" onClick={timeout.fallback}>
+                <Button variant="primary" onClick={timeout.fallback}>
                   <ReplayIcon /> Reload Station
                 </Button>
               </FlexColumn>

src/app/containers/TxMessage.tsx

@@ -106,15 +106,9 @@ const TxMessage = ({ children: sentence, className }: Props) => {
       {sentence
         .split(" ")
         .filter((word, index) => index || word !== address)
-        .map((word, index) => {
-          const parsed = parse(word, index)
-
-          return !index ? (
-            <span key={index}>{parsed}</span>
-          ) : (
-            <span key={index}> {parsed}</span>
-          )
-        })}
+        .map((word, index) => (
+          <span key={index}>{parse(word, index)}</span>
+        ))}
     </p>
   )
 }