diff --git a/package-lock.json b/package-lock.json index c6df01845..bb12794bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,9 +11,9 @@ "@ledgerhq/hw-transport-web-ble": "^6.27.1", "@mui/icons-material": "^5.8.0", "@mui/material": "^5.9.1", - "@terra-money/feather.js": "^1.0.0-beta.15", + "@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/log-finder-ruleset": "^3.0.3", "@terra-money/msg-reader": "^3.0.1", "@terra-money/terra-utils": "^1.0.9", "@terra-money/terra.js": "^3.1.7", @@ -4266,12 +4266,12 @@ } }, "node_modules/@terra-money/feather.js": { - "version": "1.0.0-beta.15", - "resolved": "https://registry.npmjs.org/@terra-money/feather.js/-/feather.js-1.0.0-beta.15.tgz", - "integrity": "sha512-KKmwmLemorifApC7y7Rn8H8MzdPmHnTkpqncfHdvWLzhGxeRw0hv24ZPkOj+SOZbhdutwp2RtAH1IEZz23cHUQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@terra-money/feather.js/-/feather.js-1.0.4.tgz", + "integrity": "sha512-EevGNBJjz7igdYxX7joexXcU5/eYlyNxGnS88UnwK+vBJ+hTnIOKBIwcNOxttFsyNMZok3XefArloM34ccTvng==", "dependencies": { "@terra-money/legacy.proto": "npm:@terra-money/terra.proto@^0.1.7", - "@terra-money/terra.proto": "^2.2.0-beta.4", + "@terra-money/terra.proto": "3.0.5", "axios": "^0.27.2", "bech32": "^2.0.0", "bip32": "^2.0.6", @@ -4286,13 +4286,13 @@ "ws": "^7.5.9" }, "engines": { - "node": ">=14" + "node": ">=16" } }, "node_modules/@terra-money/feather.js/node_modules/@terra-money/terra.proto": { - "version": "2.2.0-beta.4", - "resolved": "https://registry.npmjs.org/@terra-money/terra.proto/-/terra.proto-2.2.0-beta.4.tgz", - "integrity": "sha512-M6ARaIYVPPC08RV9zNLKnTkiyiqAoTM0xugUz0L6YiMsEEnilpY5ju+thlkxcYYKKynO9WFy1zcRRugOw+VlKQ==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@terra-money/terra.proto/-/terra.proto-3.0.5.tgz", + "integrity": "sha512-8tvT41qte2mpiNoHq2dMmV7soMxwf4ckuJ+F2pMrb7iVcqaBo30/dIfyTdFm5mEH5i5P6cTJggm+UlIZBSPhwQ==", "dependencies": { "@improbable-eng/grpc-web": "^0.14.1", "google-protobuf": "^3.17.3", @@ -4334,14 +4334,24 @@ "integrity": "sha512-QYmkhlCu14foyy2szZfDjQnncoXvIUHMUsrxdW7Fcq1UOM7ecmeQC35eX5JXeX3tRiPVjFaukbNoIwFYFGTJWg==" }, "node_modules/@terra-money/log-finder-ruleset": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@terra-money/log-finder-ruleset/-/log-finder-ruleset-3.0.0.tgz", - "integrity": "sha512-+M6MrJMePQp2OWoliyYWyTBKF65lWCgHjY0Oq8Jka6apPBNCW/xCj17jd4o6bfN5mTa3ae8fnbc/0gK9ycdmgQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@terra-money/log-finder-ruleset/-/log-finder-ruleset-3.0.3.tgz", + "integrity": "sha512-uUCSJmEmLlvU6VkUW/j6D3UitgZjmQHIY+giPtXvRutbhcShh0BeAcQwy7iKBTy13bSCp/3jhLp+42Ihh8s3Gg==", "dependencies": { - "@terra-money/log-finder": "^1.1.6" + "@terra-money/log-finder": "^1.1.6", + "typescript": "^5.0.4" + } + }, + "node_modules/@terra-money/log-finder-ruleset/node_modules/typescript": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", + "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" }, - "peerDependencies": { - "@terra-money/terra.js": "^3" + "engines": { + "node": ">=12.20" } }, "node_modules/@terra-money/msg-reader": { @@ -31750,12 +31760,12 @@ } }, "@terra-money/feather.js": { - "version": "1.0.0-beta.15", - "resolved": "https://registry.npmjs.org/@terra-money/feather.js/-/feather.js-1.0.0-beta.15.tgz", - "integrity": "sha512-KKmwmLemorifApC7y7Rn8H8MzdPmHnTkpqncfHdvWLzhGxeRw0hv24ZPkOj+SOZbhdutwp2RtAH1IEZz23cHUQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@terra-money/feather.js/-/feather.js-1.0.4.tgz", + "integrity": "sha512-EevGNBJjz7igdYxX7joexXcU5/eYlyNxGnS88UnwK+vBJ+hTnIOKBIwcNOxttFsyNMZok3XefArloM34ccTvng==", "requires": { "@terra-money/legacy.proto": "npm:@terra-money/terra.proto@^0.1.7", - "@terra-money/terra.proto": "^2.2.0-beta.4", + "@terra-money/terra.proto": "3.0.5", "axios": "^0.27.2", "bech32": "^2.0.0", "bip32": "^2.0.6", @@ -31771,9 +31781,9 @@ }, "dependencies": { "@terra-money/terra.proto": { - "version": "2.2.0-beta.4", - "resolved": "https://registry.npmjs.org/@terra-money/terra.proto/-/terra.proto-2.2.0-beta.4.tgz", - "integrity": "sha512-M6ARaIYVPPC08RV9zNLKnTkiyiqAoTM0xugUz0L6YiMsEEnilpY5ju+thlkxcYYKKynO9WFy1zcRRugOw+VlKQ==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@terra-money/terra.proto/-/terra.proto-3.0.5.tgz", + "integrity": "sha512-8tvT41qte2mpiNoHq2dMmV7soMxwf4ckuJ+F2pMrb7iVcqaBo30/dIfyTdFm5mEH5i5P6cTJggm+UlIZBSPhwQ==", "requires": { "@improbable-eng/grpc-web": "^0.14.1", "google-protobuf": "^3.17.3", @@ -31813,11 +31823,19 @@ "integrity": "sha512-QYmkhlCu14foyy2szZfDjQnncoXvIUHMUsrxdW7Fcq1UOM7ecmeQC35eX5JXeX3tRiPVjFaukbNoIwFYFGTJWg==" }, "@terra-money/log-finder-ruleset": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@terra-money/log-finder-ruleset/-/log-finder-ruleset-3.0.0.tgz", - "integrity": "sha512-+M6MrJMePQp2OWoliyYWyTBKF65lWCgHjY0Oq8Jka6apPBNCW/xCj17jd4o6bfN5mTa3ae8fnbc/0gK9ycdmgQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@terra-money/log-finder-ruleset/-/log-finder-ruleset-3.0.3.tgz", + "integrity": "sha512-uUCSJmEmLlvU6VkUW/j6D3UitgZjmQHIY+giPtXvRutbhcShh0BeAcQwy7iKBTy13bSCp/3jhLp+42Ihh8s3Gg==", "requires": { - "@terra-money/log-finder": "^1.1.6" + "@terra-money/log-finder": "^1.1.6", + "typescript": "^5.0.4" + }, + "dependencies": { + "typescript": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", + "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==" + } } }, "@terra-money/msg-reader": { diff --git a/package.json b/package.json index 3ff03029c..c87c7a787 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,9 @@ "@ledgerhq/hw-transport-web-ble": "^6.27.1", "@mui/icons-material": "^5.8.0", "@mui/material": "^5.9.1", - "@terra-money/feather.js": "^1.0.0-beta.15", + "@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/log-finder-ruleset": "^3.0.3", "@terra-money/msg-reader": "^3.0.1", "@terra-money/terra-utils": "^1.0.9", "@terra-money/terra.js": "^3.1.7", diff --git a/public/firefox.manifest.json b/public/firefox.manifest.json index 830282a43..d0152b955 100644 --- a/public/firefox.manifest.json +++ b/public/firefox.manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Station Wallet", - "version": "7.2.3", + "version": "7.2.4", "background": { "scripts": ["background.js"], "persistent": true diff --git a/public/manifest.json b/public/manifest.json index 7fcab73b9..a5bd5badd 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 3, "name": "Station Wallet", - "version": "7.2.3", + "version": "7.2.4", "background": { "service_worker": "background.js", "type": "module" diff --git a/src/auth/modules/create/CreateWalletForm.tsx b/src/auth/modules/create/CreateWalletForm.tsx index 93630a887..5d5e332ca 100644 --- a/src/auth/modules/create/CreateWalletForm.tsx +++ b/src/auth/modules/create/CreateWalletForm.tsx @@ -45,6 +45,7 @@ const CreateWalletForm = () => { form.trigger("confirm")} type="password" /> diff --git a/src/pages/wallet/NetWorth.tsx b/src/pages/wallet/NetWorth.tsx index 9b99cf17a..ebf545069 100644 --- a/src/pages/wallet/NetWorth.tsx +++ b/src/pages/wallet/NetWorth.tsx @@ -16,6 +16,7 @@ import classNames from "classnames" import qs from "qs" import { useNetwork } from "data/wallet" import { useInterchainAddresses } from "auth/hooks/useAddress" +import { useNetworkName } from "data/wallet" const cx = classNames.bind(styles) @@ -28,6 +29,7 @@ const NetWorth = () => { const { setRoute, route } = useWalletRoute() const addresses = useInterchainAddresses() const network = useNetwork() + const networkName = useNetworkName() // TODO: show CW20 balances and staked tokens const coinsValue = coins?.reduce((acc, { amount, denom }) => { @@ -103,12 +105,14 @@ const NetWorth = () => {

{capitalize(t("receive"))}

-
- -

{t(capitalize("buy"))}

-
+ {networkName === "mainnet" && ( +
+ +

{t(capitalize("buy"))}

+
+ )} )