Merge branch 'sync-8.0.8'

package.json

@@ -22,12 +22,12 @@
     "@mui/icons-material": "^5.8.0",
     "@mui/material": "^5.9.1",
     "@sentry/react": "^7.53.1",
-    "@terra-money/feather.js": "1.0.11",
+    "@terra-money/feather.js": "^2.0.4",
     "@terra-money/ledger-station-js": "^1.3.7",
     "@terra-money/log-finder-ruleset": "^3.0.3",
     "@terra-money/msg-reader": "^3.0.1",
-    "@terra-money/station-connector": "^1.0.17-beta.6",
-    "@terra-money/station-ui": "^1.0.6",
+    "@terra-money/station-connector": "^1.1.0",
+    "@terra-money/station-ui": "^1.0.12",
     "@terra-money/terra-utils": "^1.2.0-beta.8",
     "@terra-money/terra.js": "^3.1.9",
     "@terra-money/terra.proto": "^2.0.0",

public/manifest.json

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

scripts/contentScript.js

@@ -310,8 +310,9 @@ function setupEvents() {
   const createEvent = (changes, namespace) => {
     if (namespace === "local") {
       if (
-        changes.wallet &&
-        (changes.wallet.oldValue.address !== changes.wallet.newValue.address ||
+        changes.wallet && changes.wallet.oldValue && changes.wallet.newValue &&
+        (changes.wallet.oldValue.address !==
+          changes.wallet.newValue.address ||
           changes.wallet.oldValue.name !== changes.wallet.newValue.name ||
           Object.values(changes.wallet.oldValue.pubkey || {}).join(",") !==
             Object.values(changes.wallet.newValue.pubkey || {}).join(","))

src/app/InitNetworks.tsx

@@ -11,6 +11,8 @@ import { InterchainNetworks } from "types/network"
 export const [useNetworks, NetworksProvider] = createContext<{
   networks: InterchainNetworks
   networksLoading: boolean
+  validationResultLength: number
+  validNetworksLength: number
   filterEnabledNetworks: <T>(network: Record<string, T>) => Record<string, T>
   filterDisabledNetworks: <T>(network: Record<string, T>) => Record<string, T>
 }>("useNetworks")
@@ -82,6 +84,8 @@ const InitNetworks = ({ children }: PropsWithChildren<{}>) => {
           value={{
             networks,
             networksLoading: validationState.isLoading,
+            validationResultLength: validationResult.length,
+            validNetworksLength: validNetworks.length,
             filterEnabledNetworks: (networks) =>
               Object.fromEntries(
                 Object.entries(networks ?? {}).filter(

src/auth/hooks/useAuth.ts

@@ -294,7 +294,7 @@ const useAuth = () => {
           Buffer.from(pk[networks[txOptions?.chainID].coinType] ?? "", "hex")
         )
         const w = lcd.wallet(key)
-        return await w.createAndSignTx(txOptions)
+        return await w.createAndSignTx({ ...txOptions, signMode })
       }
     }
   }

src/extension/App.tsx

@@ -97,7 +97,14 @@ const App = () => {
       return <Welcome />
     }
     // main page
-    const hidePaths = ["/auth/", "/manage-wallet/", "/preferences"]
+    const hidePaths = [
+      "/auth/",
+      "/manage-wallet/",
+      "/preferences",
+      "/send",
+      "/swap",
+      "/receive",
+    ]
     const hideHeader = hidePaths.some((p) => location.pathname.startsWith(p))
 
     return (

src/extension/RequestContainer.tsx

@@ -13,6 +13,7 @@ import { SignBytesRequest, TxResponse } from "./utils"
 import { isBytes, isSign } from "./utils"
 import { parseBytes, parseDefault, useParseTx, toData } from "./utils"
 import { useChainID, useNetwork } from "data/wallet"
+import { Fee } from "@terra-money/feather.js"
 
 interface RequestContext {
   requests: {
@@ -27,7 +28,7 @@ interface RequestContext {
     tx: (
       requestType: RequestType,
       request: PrimitiveDefaultRequest,
-      response: TxResponse
+      response: TxResponse & { fee?: Fee }
     ) => void
     multisigTx: (request: PrimitiveDefaultRequest) => void
     pubkey: () => void
@@ -198,10 +199,14 @@ const RequestContainer = ({ children }: PropsWithChildren<{}>) => {
         ({ id, origin }) => id === request.id && origin === request.origin
       )
 
-      const result = toData(
-        response.result,
-        networks[defaultChainID]?.isClassic
-      )
+      const fee = response.fee?.toAmino()
+
+      const result = {
+        fee,
+        ...toData(response.result, networks[defaultChainID]?.isClassic),
+      }
+
+      // @ts-expect-error
       const next = update(index, { ...list[index], ...response, result }, list)
       browser.storage?.local.set({ [type]: next }).then(() => setTx(undefined))
     })

src/extension/modules/ConfirmTx.tsx

@@ -78,7 +78,8 @@ const ConfirmTx = (props: TxRequest | SignBytesRequest) => {
   const [feeDenom, setFeeDenom] = useState<string | undefined>(
     "tx" in props
       ? props.tx.fee?.amount?.toData()?.[0]?.denom ??
-          (baseAsset in gasPrices ? baseAsset : Object.keys(gasPrices ?? {})[0])
+          (gasPrices &&
+            (baseAsset in gasPrices ? baseAsset : Object.keys(gasPrices)[0]))
       : undefined
   )
 
@@ -143,7 +144,10 @@ const ConfirmTx = (props: TxRequest | SignBytesRequest) => {
     gas = tx.fee?.gas_limit || Math.ceil((estimatedGas ?? 0) * gasAdjustment)
 
     fee = isClassic
-      ? tx.fee
+      ? tx.fee ??
+        new Fee(gas, {
+          [feeDenom as string]: Math.ceil(gasPrices[feeDenom as string] * gas),
+        })
       : new Fee(gas, {
           [feeDenom as string]: Math.ceil(gasPrices[feeDenom as string] * gas),
         })
@@ -178,7 +182,7 @@ const ConfirmTx = (props: TxRequest | SignBytesRequest) => {
           else navigate({ pathname, search })
         } else {
           const result = await auth[requestType](txOptions, password, signMode)
-          const response = { result, success: true }
+          const response = { result, success: true, fee }
           actions.tx(requestType, props, response)
         }
       } catch (error) {

src/pages/activity/ActivityList.module.scss

@@ -6,6 +6,11 @@
   width: 100%;
 }
 
+.chain__loader__container {
+  padding: 10px 10px 0px;
+  margin-bottom: 12px;
+}
+
 .loader {
   color: var(--token-dark-900);
   display: flex;