diff --git a/.github/workflows/test-swap.yml b/.github/workflows/test-swap.yml new file mode 100644 index 000000000..5fcc50756 --- /dev/null +++ b/.github/workflows/test-swap.yml @@ -0,0 +1,16 @@ +name: Test all swap providers + +on: [push] + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: "22.10.0" + cache: "yarn" + - run: yarn install + - run: yarn build:all + - run: cd packages/swap && yarn test diff --git a/README.md b/README.md index 038482383..f371e2771 100644 --- a/README.md +++ b/README.md @@ -100,6 +100,7 @@ Enkrypt is a web3 wallet built from the ground up to support the multi-chain fut - Shiden EVM - Sepolia - Syscoin NEVM +- Taraxa - Telos EVM - Unique - Vara Network @@ -109,6 +110,12 @@ Enkrypt is a web3 wallet built from the ground up to support the multi-chain fut - zkSync - zkSync Goerli - 5ireChain +- Story +- Abstract +- Berachain +- Ink Onchain +- Unichain +- Gravity - More coming soon! Looking to add your project? [Contact us!](https://mewwallet.typeform.com/enkrypt-inquiry?typeform-source=www.enkrypt.com) diff --git a/package.json b/package.json index 7ecff5a13..28fa7eda1 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ ] }, "scripts": { - "test": "yarn workspaces foreach --worktree -v run test", + "test": "yarn workspaces foreach --worktree -v --exclude packages/swap run test", "lint": "yarn workspaces foreach --worktree run lint", "build:all": "ultra -r build", "watch": "concurrently 'npm:watch-*'", @@ -32,9 +32,9 @@ "prepare": "husky" }, "devDependencies": { - "@commitlint/cli": "^19.7.1", - "@commitlint/config-conventional": "^19.7.1", - "@swc/core": "^1.10.14", + "@commitlint/cli": "^19.8.0", + "@commitlint/config-conventional": "^19.8.0", + "@swc/core": "^1.11.9", "concurrently": "^9.1.2", "husky": "^9.1.7", "node-notifier": "^10.0.1", diff --git a/packages/extension-bridge/package.json b/packages/extension-bridge/package.json index d28aba097..887e66382 100644 --- a/packages/extension-bridge/package.json +++ b/packages/extension-bridge/package.json @@ -44,23 +44,23 @@ "webextension-polyfill": "^0.12.0" }, "devDependencies": { - "@types/node": "^22.13.1", - "@types/webextension-polyfill": "^0.12.1", + "@types/node": "^22.13.10", + "@types/webextension-polyfill": "^0.12.3", "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", - "bumpp": "^10.0.2", - "eslint": "^9.20.0", + "bumpp": "^10.1.0", + "eslint": "^9.22.0", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-prettier": "^9.1.0", "eslint-import-resolver-alias": "^1.1.2", "eslint-plugin-import": "^2.31.0", "eslint-plugin-module-resolver": "^1.5.0", - "prettier": "^3.4.2", + "prettier": "^3.5.3", "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", - "tsup": "^8.3.6", - "type-fest": "^4.33.0", - "typescript": "^5.7.3", - "typescript-eslint": "8.23.0" + "tsup": "^8.4.0", + "type-fest": "^4.37.0", + "typescript": "^5.8.2", + "typescript-eslint": "8.26.1" } } diff --git a/packages/extension/package.json b/packages/extension/package.json index dc242daa0..b74481774 100644 --- a/packages/extension/package.json +++ b/packages/extension/package.json @@ -1,6 +1,6 @@ { "name": "@enkryptcom/extension", - "version": "2.4.3", + "version": "2.5.0", "private": true, "type": "module", "scripts": { @@ -23,7 +23,7 @@ "watch:firefox": "yarn prebuild && cross-env BROWSER='firefox' vite" }, "dependencies": { - "@amplitude/analytics-browser": "^2.11.11", + "@amplitude/analytics-browser": "^2.11.13", "@enkryptcom/extension-bridge": "workspace:^", "@enkryptcom/hw-wallets": "workspace:^", "@enkryptcom/keyring": "workspace:^", @@ -36,24 +36,24 @@ "@ethereumjs/tx": "^5.4.0", "@ethereumjs/util": "^9.1.0", "@ethereumjs/wallet": "^2.0.4", - "@kadena/client": "^1.16.0", - "@kadena/pactjs-cli": "^1.16.0", + "@kadena/client": "^1.17.1", + "@kadena/pactjs-cli": "^1.17.1", "@ledgerhq/hw-transport-webusb": "^6.29.4", "@metamask/eth-sig-util": "^8.2.0", "@metaplex-foundation/mpl-bubblegum": "^4.3.1", - "@metaplex-foundation/umi": "^1.0.0", - "@metaplex-foundation/umi-bundle-defaults": "^1.0.0", - "@polkadot/api": "^15.5.2", - "@polkadot/extension-inject": "^0.58.3", - "@polkadot/keyring": "^13.3.1", - "@polkadot/rpc-provider": "^15.5.2", - "@polkadot/types": "^15.5.2", - "@polkadot/types-known": "^15.5.2", - "@polkadot/ui-shared": "^3.12.1", - "@polkadot/util": "^13.3.1", + "@metaplex-foundation/umi": "^1.1.1", + "@metaplex-foundation/umi-bundle-defaults": "^1.1.1", + "@polkadot/api": "^15.8.1", + "@polkadot/extension-inject": "^0.58.5", + "@polkadot/keyring": "^13.4.3", + "@polkadot/rpc-provider": "^15.8.1", + "@polkadot/types": "^15.8.1", + "@polkadot/types-known": "^15.8.1", + "@polkadot/ui-shared": "^3.12.2", + "@polkadot/util": "^13.4.3", "@polkadot/wasm-crypto": "^7.4.1", - "@solana-developers/helpers": "^2.7.0", - "@solana/spl-token": "^0.4.12", + "@solana-developers/helpers": "^2.8.0", + "@solana/spl-token": "^0.4.13", "@solana/wallet-standard-features": "^1.3.0", "@solana/web3.js": "^1.98.0", "@wallet-standard/base": "^1.1.0", @@ -77,7 +77,7 @@ "qrcode.vue": "^3.6.0", "switch-ts": "^1.1.1", "url-parse": "^1.5.10", - "uuid": "^11.0.5", + "uuid": "^11.1.0", "vue": "^3.5.13", "vue-echarts": "7.0.3", "vue-router": "^4.5.0", @@ -89,23 +89,23 @@ "zxcvbn": "^4.4.2" }, "devDependencies": { - "@crxjs/vite-plugin": "^2.0.0-beta.31", - "@rollup/plugin-commonjs": "^28.0.2", + "@crxjs/vite-plugin": "^2.0.0-beta.32", + "@rollup/plugin-commonjs": "^28.0.3", "@rollup/plugin-inject": "^5.0.5", "@rollup/plugin-json": "^6.1.0", - "@rollup/plugin-node-resolve": "^16.0.0", + "@rollup/plugin-node-resolve": "^16.0.1", "@rollup/plugin-replace": "^6.0.2", "@rollup/plugin-terser": "^0.4.4", "@rollup/plugin-typescript": "^12.1.2", "@tsconfig/node20": "^20.1.4", "@types/bs58": "^4.0.4", - "@types/chrome": "^0.0.302", + "@types/chrome": "^0.0.309", "@types/ethereumjs-abi": "^0.6.5", "@types/events": "^3.0.3", "@types/fs-extra": "^11.0.4", "@types/less": "^3.0.8", - "@types/lodash": "^4.17.15", - "@types/node": "^22.13.1", + "@types/lodash": "^4.17.16", + "@types/node": "^22.13.10", "@types/url-parse": "^1.4.11", "@types/utf-8-validate": "^5.0.2", "@types/uuid": "^10.0.0", @@ -113,31 +113,31 @@ "@types/zxcvbn": "^4.4.5", "@vitejs/plugin-vue": "^5.2.1", "@vue/eslint-config-prettier": "^10.2.0", - "@vue/eslint-config-typescript": "^14.3.0", + "@vue/eslint-config-typescript": "^14.5.0", "@vue/tsconfig": "^0.7.0", - "@vueuse/core": "^12.5.0", + "@vueuse/core": "^12.8.2", "cross-env": "^7.0.3", - "eslint": "^9.20.0", - "eslint-plugin-vue": "^9.32.0", + "eslint": "^9.22.0", + "eslint-plugin-vue": "^9.33.0", "fs-extra": "^11.3.0", "jsdom": "^26.0.0", "less": "^4.2.2", "less-loader": "^12.2.0", "npm-run-all2": "^7.0.2", - "prettier": "^3.4.2", + "prettier": "^3.5.3", "rimraf": "^6.0.1", - "rollup": "^4.34.6", + "rollup": "^4.35.0", "rollup-plugin-visualizer": "^5.14.0", "semver": "^7.7.1", "systeminformation": "^5.25.11", - "tsup": "^8.3.6", - "typescript": "~5.7.3", + "tsup": "^8.4.0", + "typescript": "~5.8.2", "url": "^0.11.4", - "vite": "^6.1.0", + "vite": "^6.2.1", "vite-plugin-node-polyfills": "0.23.0", "vite-tsconfig-paths": "^5.1.4", - "vitest": "^3.0.5", - "vue-tsc": "^2.2.0", + "vitest": "^3.0.8", + "vue-tsc": "^2.2.8", "webextension-polyfill": "^0.12.0" }, "installConfig": { diff --git a/packages/extension/src/libs/menu-state/index.ts b/packages/extension/src/libs/menu-state/index.ts new file mode 100644 index 000000000..23e9be459 --- /dev/null +++ b/packages/extension/src/libs/menu-state/index.ts @@ -0,0 +1,38 @@ +import BrowserStorage from '../common/browser-storage'; +import { InternalStorageNamespace } from '@/types/provider'; +import { IState, StorageKeys } from './types'; + +class MenuState { + private storage: BrowserStorage; + + constructor() { + this.storage = new BrowserStorage(InternalStorageNamespace.menuState); + } + + async setState(state: IState): Promise { + return this.storage.set(StorageKeys.menuState, state); + } + + async getState(): Promise { + const state = await this.storage.get(StorageKeys.menuState); + if (!state) { + const newState: IState = { + isExpanded: true, + }; + return newState; + } + return state; + } + + async getIsExpanded(): Promise { + const state: IState = await this.getState(); + return state?.isExpanded ?? true; + } + async setIsExpanded(isExpanded: boolean): Promise { + const state: IState = await this.getState(); + const newState: IState = { ...state, isExpanded }; + await this.setState(newState); + } +} + +export default MenuState; diff --git a/packages/extension/src/libs/menu-state/types.ts b/packages/extension/src/libs/menu-state/types.ts new file mode 100644 index 000000000..5c31d4a48 --- /dev/null +++ b/packages/extension/src/libs/menu-state/types.ts @@ -0,0 +1,7 @@ +export enum StorageKeys { + menuState = 'menu-state-info', +} + +export interface IState { + isExpanded: boolean; +} diff --git a/packages/extension/src/libs/nft-handlers/simplehash.ts b/packages/extension/src/libs/nft-handlers/simplehash.ts index 094ac337d..38d09339e 100644 --- a/packages/extension/src/libs/nft-handlers/simplehash.ts +++ b/packages/extension/src/libs/nft-handlers/simplehash.ts @@ -39,6 +39,8 @@ export default async ( [NetworkNames.Palm]: 'palm', [NetworkNames.ProofOfPlayApex]: 'proof-of-play', [NetworkNames.Scroll]: 'scroll', + [NetworkNames.Unichain]: 'unichain', + [NetworkNames.Bera]: 'berachain' }; if (!Object.keys(supportedNetworks).includes(network.name)) throw new Error('Simplehash: network not supported'); @@ -46,9 +48,8 @@ export default async ( const fetchAll = (continuation?: string): Promise => { const query = continuation ? continuation - : `${SH_ENDPOINT}owners_v2?chains=${ - supportedNetworks[network.name as keyof typeof supportedNetworks] - }&wallet_addresses=${address}&filters=spam_score__lte=75`; + : `${SH_ENDPOINT}owners_v2?chains=${supportedNetworks[network.name as keyof typeof supportedNetworks] + }&wallet_addresses=${address}&filters=spam_score__lte=75`; return cacheFetch( { url: query, diff --git a/packages/extension/src/libs/settings-state/index.ts b/packages/extension/src/libs/settings-state/index.ts index cc8099daa..5c69d8c9f 100644 --- a/packages/extension/src/libs/settings-state/index.ts +++ b/packages/extension/src/libs/settings-state/index.ts @@ -8,6 +8,7 @@ import { SettingsType, BtcSettingsType, EnkryptSettingsType, + CurrencySettingsType, } from './types'; import { merge } from 'lodash'; @@ -71,16 +72,31 @@ class SettingsState { async setBtcSettings(state: BtcSettingsType): Promise { await this.#storage.set(StorageKeys.btcState, state); } + + async setCurrencySettings(state: CurrencySettingsType): Promise { + await this.#storage.set(StorageKeys.currencyState, state); + } + + async getCurrencySettings(): Promise { + const state = await this.getStateByKey(StorageKeys.currencyState); + const settings: CurrencySettingsType = { + value: 'USD', + }; + return merge(settings, state); + } + async getAllSettings(): Promise { const evmstate = await this.getEVMSettings(); const substratestate = await this.getSubstrateSettings(); const btcstate = await this.getBtcSettings(); const enkryptState = await this.getEnkryptSettings(); + const currencySettingsState = await this.getCurrencySettings(); return { evm: evmstate, substrate: substratestate, btc: btcstate, enkrypt: enkryptState, + currencySettingsState: currencySettingsState, manifestVersion: Browser.runtime.getManifest().manifest_version, }; } diff --git a/packages/extension/src/libs/settings-state/types.ts b/packages/extension/src/libs/settings-state/types.ts index 864bc75d3..2790e7561 100644 --- a/packages/extension/src/libs/settings-state/types.ts +++ b/packages/extension/src/libs/settings-state/types.ts @@ -3,6 +3,7 @@ export enum StorageKeys { substrateState = 'substrate-settings-state', btcState = 'btc-settings-state', enkryptState = 'enkrypt-settings-state', + currencyState = 'currency-settings-state', } export interface EVMInjectSettings { disabled: boolean; @@ -22,10 +23,15 @@ export interface EnkryptSettingsType { randomUserID: string; isMetricsEnabled: boolean; } + +export interface CurrencySettingsType { + value: string; +} export interface SettingsType { evm: EVMSettingsType; substrate: SubstrateSettingsType; btc: BtcSettingsType; enkrypt: EnkryptSettingsType; + currencySettingsState: CurrencySettingsType; manifestVersion: number; } diff --git a/packages/extension/src/libs/updates-state/index.ts b/packages/extension/src/libs/updates-state/index.ts index 83a6c97f0..b2aceaaf2 100644 --- a/packages/extension/src/libs/updates-state/index.ts +++ b/packages/extension/src/libs/updates-state/index.ts @@ -14,7 +14,7 @@ class UpdatesState { } async getState(): Promise { - const state = this.storage.get(StorageKeys.updatesInfo); + const state = await this.storage.get(StorageKeys.updatesInfo); if (!state) { const newState: IState = { lastVersionViewed: '', diff --git a/packages/extension/src/providers/bitcoin/libs/ss-fee-handler.ts b/packages/extension/src/providers/bitcoin/libs/ss-fee-handler.ts index d157cc046..ff31267bf 100644 --- a/packages/extension/src/providers/bitcoin/libs/ss-fee-handler.ts +++ b/packages/extension/src/providers/bitcoin/libs/ss-fee-handler.ts @@ -23,10 +23,10 @@ const SSFeeHandler = async ( json.average.satsPerKiloByte = json.slow.satsPerKiloByte; return { [GasPriceTypes.FASTEST]: - Math.ceil(json.fast.satsPerKiloByte / 1024) + 5, - [GasPriceTypes.FAST]: Math.ceil(json.fast.satsPerKiloByte / 1024) + 3, + Math.ceil(json.fast.satsPerKiloByte / 1024) + 20, + [GasPriceTypes.FAST]: Math.ceil(json.fast.satsPerKiloByte / 1024) + 12, [GasPriceTypes.REGULAR]: - Math.ceil(json.average.satsPerKiloByte / 1024) + 2, + Math.ceil(json.average.satsPerKiloByte / 1024) + 10, [GasPriceTypes.ECONOMY]: Math.ceil(json.slow.satsPerKiloByte / 1024), }; }); diff --git a/packages/extension/src/providers/bitcoin/networks/bitcoin-testnet.ts b/packages/extension/src/providers/bitcoin/networks/bitcoin-testnet.ts index 7201ce351..04010dade 100644 --- a/packages/extension/src/providers/bitcoin/networks/bitcoin-testnet.ts +++ b/packages/extension/src/providers/bitcoin/networks/bitcoin-testnet.ts @@ -1,4 +1,4 @@ -import icon from './icons/tbtc.svg'; +import icon from './icons/tbtc.webp'; import { NetworkNames } from '@enkryptcom/types'; import { BitcoinNetwork, diff --git a/packages/extension/src/providers/bitcoin/networks/bitcoin.ts b/packages/extension/src/providers/bitcoin/networks/bitcoin.ts index 45157a4c0..9a619f54b 100644 --- a/packages/extension/src/providers/bitcoin/networks/bitcoin.ts +++ b/packages/extension/src/providers/bitcoin/networks/bitcoin.ts @@ -1,4 +1,4 @@ -import icon from './icons/btc.svg'; +import icon from './icons/btc.webp'; import { NetworkNames } from '@enkryptcom/types'; import { BitcoinNetwork, diff --git a/packages/extension/src/providers/bitcoin/networks/dogecoin.ts b/packages/extension/src/providers/bitcoin/networks/dogecoin.ts index 977d213c6..6fd8f21b7 100644 --- a/packages/extension/src/providers/bitcoin/networks/dogecoin.ts +++ b/packages/extension/src/providers/bitcoin/networks/dogecoin.ts @@ -1,4 +1,4 @@ -import icon from './icons/doge.svg'; +import icon from './icons/doge.webp'; import { NetworkNames } from '@enkryptcom/types'; import { BitcoinNetwork, diff --git a/packages/extension/src/providers/bitcoin/networks/icons/btc.svg b/packages/extension/src/providers/bitcoin/networks/icons/btc.svg deleted file mode 100644 index f5889766e..000000000 --- a/packages/extension/src/providers/bitcoin/networks/icons/btc.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/packages/extension/src/providers/bitcoin/networks/icons/btc.webp b/packages/extension/src/providers/bitcoin/networks/icons/btc.webp new file mode 100644 index 000000000..04a8a2414 Binary files /dev/null and b/packages/extension/src/providers/bitcoin/networks/icons/btc.webp differ diff --git a/packages/extension/src/providers/bitcoin/networks/icons/doge.svg b/packages/extension/src/providers/bitcoin/networks/icons/doge.svg deleted file mode 100644 index c435731dc..000000000 --- a/packages/extension/src/providers/bitcoin/networks/icons/doge.svg +++ /dev/null @@ -1 +0,0 @@ -Dogecoin (DOGE) \ No newline at end of file diff --git a/packages/extension/src/providers/bitcoin/networks/icons/doge.webp b/packages/extension/src/providers/bitcoin/networks/icons/doge.webp new file mode 100644 index 000000000..f0b4b7046 Binary files /dev/null and b/packages/extension/src/providers/bitcoin/networks/icons/doge.webp differ diff --git a/packages/extension/src/providers/bitcoin/networks/icons/ltc.svg b/packages/extension/src/providers/bitcoin/networks/icons/ltc.svg deleted file mode 100644 index 13e76a40e..000000000 --- a/packages/extension/src/providers/bitcoin/networks/icons/ltc.svg +++ /dev/null @@ -1 +0,0 @@ -litecoin-ltc-logo \ No newline at end of file diff --git a/packages/extension/src/providers/bitcoin/networks/icons/ltc.webp b/packages/extension/src/providers/bitcoin/networks/icons/ltc.webp new file mode 100644 index 000000000..bb9c21b60 Binary files /dev/null and b/packages/extension/src/providers/bitcoin/networks/icons/ltc.webp differ diff --git a/packages/extension/src/providers/bitcoin/networks/icons/tbtc.svg b/packages/extension/src/providers/bitcoin/networks/icons/tbtc.svg deleted file mode 100644 index 9323b5d8a..000000000 --- a/packages/extension/src/providers/bitcoin/networks/icons/tbtc.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/extension/src/providers/bitcoin/networks/icons/tbtc.webp b/packages/extension/src/providers/bitcoin/networks/icons/tbtc.webp new file mode 100644 index 000000000..e6932451f Binary files /dev/null and b/packages/extension/src/providers/bitcoin/networks/icons/tbtc.webp differ diff --git a/packages/extension/src/providers/bitcoin/networks/litecoin.ts b/packages/extension/src/providers/bitcoin/networks/litecoin.ts index 05c8b52f0..9dabd7a95 100644 --- a/packages/extension/src/providers/bitcoin/networks/litecoin.ts +++ b/packages/extension/src/providers/bitcoin/networks/litecoin.ts @@ -1,4 +1,4 @@ -import icon from './icons/ltc.svg'; +import icon from './icons/ltc.webp'; import { NetworkNames } from '@enkryptcom/types'; import { BitcoinNetwork, diff --git a/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue b/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue index bb8003b1c..fff4e91cd 100644 --- a/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue +++ b/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue @@ -56,11 +56,11 @@ /> @@ -80,11 +80,10 @@ /> diff --git a/packages/extension/src/providers/bitcoin/ui/send-transaction/verify-transaction/index.vue b/packages/extension/src/providers/bitcoin/ui/send-transaction/verify-transaction/index.vue index 35611496f..6585285f2 100644 --- a/packages/extension/src/providers/bitcoin/ui/send-transaction/verify-transaction/index.vue +++ b/packages/extension/src/providers/bitcoin/ui/send-transaction/verify-transaction/index.vue @@ -61,6 +61,7 @@
- +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/aa.webp b/packages/extension/src/providers/ethereum/networks/icons/aa.webp new file mode 100644 index 000000000..1c937c619 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/aa.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/abstract.webp b/packages/extension/src/providers/ethereum/networks/icons/abstract.webp new file mode 100644 index 000000000..4b06fa565 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/abstract.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/apex.png b/packages/extension/src/providers/ethereum/networks/icons/apex.png deleted file mode 100644 index 63a38a07d..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/apex.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/apex.webp b/packages/extension/src/providers/ethereum/networks/icons/apex.webp new file mode 100644 index 000000000..deb50f17d Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/apex.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/arbitrum-nova.png b/packages/extension/src/providers/ethereum/networks/icons/arbitrum-nova.png deleted file mode 100644 index 00ef9438d..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/arbitrum-nova.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/arbitrum-nova.webp b/packages/extension/src/providers/ethereum/networks/icons/arbitrum-nova.webp new file mode 100644 index 000000000..e3472402b Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/arbitrum-nova.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/arbitrum.svg b/packages/extension/src/providers/ethereum/networks/icons/arbitrum.svg deleted file mode 100644 index f50cbc8cc..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/arbitrum.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/packages/extension/src/providers/ethereum/networks/icons/arbitrum.webp b/packages/extension/src/providers/ethereum/networks/icons/arbitrum.webp new file mode 100644 index 000000000..82b3155ce Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/arbitrum.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/astr.png b/packages/extension/src/providers/ethereum/networks/icons/astr.png deleted file mode 100644 index 636d2e49d..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/astr.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/astr.webp b/packages/extension/src/providers/ethereum/networks/icons/astr.webp new file mode 100644 index 000000000..a34c7b902 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/astr.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/aurora.png b/packages/extension/src/providers/ethereum/networks/icons/aurora.png deleted file mode 100644 index 4cec752c4..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/aurora.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/aurora.webp b/packages/extension/src/providers/ethereum/networks/icons/aurora.webp new file mode 100644 index 000000000..20bb95ad0 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/aurora.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/avax.svg b/packages/extension/src/providers/ethereum/networks/icons/avax.svg deleted file mode 100644 index 55473a0f2..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/avax.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/avax.webp b/packages/extension/src/providers/ethereum/networks/icons/avax.webp new file mode 100644 index 000000000..c93caa1e0 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/avax.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/base.svg b/packages/extension/src/providers/ethereum/networks/icons/base.svg deleted file mode 100644 index f9f6a5ca3..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/base.svg +++ /dev/null @@ -1,531 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/base.webp b/packages/extension/src/providers/ethereum/networks/icons/base.webp new file mode 100644 index 000000000..966f56e1c Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/base.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/bera.webp b/packages/extension/src/providers/ethereum/networks/icons/bera.webp new file mode 100644 index 000000000..36f058ef6 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/bera.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/bitrock.svg b/packages/extension/src/providers/ethereum/networks/icons/bitrock.svg deleted file mode 100755 index 5bc9dd43a..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/bitrock.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/bitrock.webp b/packages/extension/src/providers/ethereum/networks/icons/bitrock.webp new file mode 100644 index 000000000..ad38e3d63 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/bitrock.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/blast.webp b/packages/extension/src/providers/ethereum/networks/icons/blast.webp index 8fdf07632..1cd535ab5 100644 Binary files a/packages/extension/src/providers/ethereum/networks/icons/blast.webp and b/packages/extension/src/providers/ethereum/networks/icons/blast.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/bsc.svg b/packages/extension/src/providers/ethereum/networks/icons/bsc.svg deleted file mode 100644 index 9bef8025d..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/bsc.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/bsc.webp b/packages/extension/src/providers/ethereum/networks/icons/bsc.webp new file mode 100644 index 000000000..c5a3ecb4d Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/bsc.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/caga.svg b/packages/extension/src/providers/ethereum/networks/icons/caga.svg deleted file mode 100644 index 8f84700ef..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/caga.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/caga.webp b/packages/extension/src/providers/ethereum/networks/icons/caga.webp new file mode 100644 index 000000000..bdb574f5e Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/caga.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/canto.svg b/packages/extension/src/providers/ethereum/networks/icons/canto.svg deleted file mode 100644 index 029028234..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/canto.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/canto.webp b/packages/extension/src/providers/ethereum/networks/icons/canto.webp new file mode 100644 index 000000000..11f60f37a Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/canto.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/celo.svg b/packages/extension/src/providers/ethereum/networks/icons/celo.svg deleted file mode 100644 index b2a7a51b2..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/celo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/extension/src/providers/ethereum/networks/icons/celo.webp b/packages/extension/src/providers/ethereum/networks/icons/celo.webp new file mode 100644 index 000000000..3a2ce7c47 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/celo.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/coti.png b/packages/extension/src/providers/ethereum/networks/icons/coti.png deleted file mode 100644 index e8dc17fac..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/coti.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/coti.webp b/packages/extension/src/providers/ethereum/networks/icons/coti.webp new file mode 100644 index 000000000..46b742ade Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/coti.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/degen.png b/packages/extension/src/providers/ethereum/networks/icons/degen.png deleted file mode 100644 index 5c4863f66..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/degen.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/degen.webp b/packages/extension/src/providers/ethereum/networks/icons/degen.webp new file mode 100644 index 000000000..eec6545ea Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/degen.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/edgeware.svg b/packages/extension/src/providers/ethereum/networks/icons/edgeware.svg deleted file mode 100644 index 6e190f19a..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/edgeware.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - Brand/Outline/LogoMark@2x - - - - - - - - - - \ No newline at end of file diff --git a/packages/extension/src/providers/ethereum/networks/icons/edgeware.webp b/packages/extension/src/providers/ethereum/networks/icons/edgeware.webp new file mode 100644 index 000000000..34c7112a6 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/edgeware.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/etc.svg b/packages/extension/src/providers/ethereum/networks/icons/etc.svg deleted file mode 100644 index db7eaa706..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/etc.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/etc.webp b/packages/extension/src/providers/ethereum/networks/icons/etc.webp new file mode 100644 index 000000000..7c8111f76 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/etc.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/eth.svg b/packages/extension/src/providers/ethereum/networks/icons/eth.svg deleted file mode 100644 index abfff247e..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/eth.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/eth.webp b/packages/extension/src/providers/ethereum/networks/icons/eth.webp new file mode 100644 index 000000000..cf96affb4 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/eth.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/form.png b/packages/extension/src/providers/ethereum/networks/icons/form.png deleted file mode 100644 index 4156b8201..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/form.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/form.webp b/packages/extension/src/providers/ethereum/networks/icons/form.webp new file mode 100644 index 000000000..1d2c2b7f2 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/form.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/forma.png b/packages/extension/src/providers/ethereum/networks/icons/forma.png deleted file mode 100644 index 15f45d6de..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/forma.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/forma.webp b/packages/extension/src/providers/ethereum/networks/icons/forma.webp new file mode 100644 index 000000000..ebb65746f Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/forma.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/fraxtal.svg b/packages/extension/src/providers/ethereum/networks/icons/fraxtal.svg deleted file mode 100755 index 158a6ac8d..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/fraxtal.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/fraxtal.webp b/packages/extension/src/providers/ethereum/networks/icons/fraxtal.webp new file mode 100644 index 000000000..ddc248485 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/fraxtal.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/ftm.svg b/packages/extension/src/providers/ethereum/networks/icons/ftm.svg deleted file mode 100644 index e501d1efe..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/ftm.svg +++ /dev/null @@ -1 +0,0 @@ -fa \ No newline at end of file diff --git a/packages/extension/src/providers/ethereum/networks/icons/ftm.webp b/packages/extension/src/providers/ethereum/networks/icons/ftm.webp new file mode 100644 index 000000000..cc6bfef21 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/ftm.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/gno.svg b/packages/extension/src/providers/ethereum/networks/icons/gno.svg deleted file mode 100644 index 97842427e..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/gno.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/gno.webp b/packages/extension/src/providers/ethereum/networks/icons/gno.webp new file mode 100644 index 000000000..b3286215e Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/gno.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/godwoken.png b/packages/extension/src/providers/ethereum/networks/icons/godwoken.png deleted file mode 100644 index 42cbbdebf..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/godwoken.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/godwoken.webp b/packages/extension/src/providers/ethereum/networks/icons/godwoken.webp new file mode 100644 index 000000000..d380fd499 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/godwoken.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/gravity.webp b/packages/extension/src/providers/ethereum/networks/icons/gravity.webp new file mode 100644 index 000000000..e71086801 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/gravity.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/ham.png b/packages/extension/src/providers/ethereum/networks/icons/ham.png deleted file mode 100644 index b3669038c..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/ham.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/ham.webp b/packages/extension/src/providers/ethereum/networks/icons/ham.webp new file mode 100644 index 000000000..f6029a713 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/ham.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/immutable-zkevm.png b/packages/extension/src/providers/ethereum/networks/icons/immutable-zkevm.png deleted file mode 100644 index 90f00f096..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/immutable-zkevm.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/immutable-zkevm.webp b/packages/extension/src/providers/ethereum/networks/icons/immutable-zkevm.webp new file mode 100644 index 000000000..ec1a6a304 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/immutable-zkevm.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/ink.webp b/packages/extension/src/providers/ethereum/networks/icons/ink.webp new file mode 100644 index 000000000..57347cc5b Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/ink.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/karura-evm.svg b/packages/extension/src/providers/ethereum/networks/icons/karura-evm.svg deleted file mode 100644 index 5bf6673b1..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/karura-evm.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/karura-evm.webp b/packages/extension/src/providers/ethereum/networks/icons/karura-evm.webp new file mode 100644 index 000000000..323dc6794 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/karura-evm.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/klaytn.webp b/packages/extension/src/providers/ethereum/networks/icons/klaytn.webp new file mode 100644 index 000000000..477e64172 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/klaytn.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/linea.png b/packages/extension/src/providers/ethereum/networks/icons/linea.png deleted file mode 100644 index 2be7f7cd4..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/linea.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/linea.webp b/packages/extension/src/providers/ethereum/networks/icons/linea.webp new file mode 100644 index 000000000..a65298d0f Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/linea.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/manta-pacific.png b/packages/extension/src/providers/ethereum/networks/icons/manta-pacific.png deleted file mode 100644 index 3e12ff06a..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/manta-pacific.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/manta-pacific.webp b/packages/extension/src/providers/ethereum/networks/icons/manta-pacific.webp new file mode 100644 index 000000000..368f64131 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/manta-pacific.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/matic.svg b/packages/extension/src/providers/ethereum/networks/icons/matic.svg deleted file mode 100644 index ea455626a..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/matic.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/matic.webp b/packages/extension/src/providers/ethereum/networks/icons/matic.webp new file mode 100644 index 000000000..5d6525a79 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/matic.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/mode.png b/packages/extension/src/providers/ethereum/networks/icons/mode.png deleted file mode 100644 index fa7daa3cb..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/mode.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/mode.webp b/packages/extension/src/providers/ethereum/networks/icons/mode.webp new file mode 100644 index 000000000..9f52c3508 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/mode.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/moonbeam.svg b/packages/extension/src/providers/ethereum/networks/icons/moonbeam.svg deleted file mode 100644 index 0ee688ae1..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/moonbeam.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/moonbeam.webp b/packages/extension/src/providers/ethereum/networks/icons/moonbeam.webp new file mode 100644 index 000000000..c0fd90a14 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/moonbeam.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/moonriver.svg b/packages/extension/src/providers/ethereum/networks/icons/moonriver.svg deleted file mode 100644 index f0b38342a..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/moonriver.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/moonriver.webp b/packages/extension/src/providers/ethereum/networks/icons/moonriver.webp new file mode 100644 index 000000000..a71b92d09 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/moonriver.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/okc.svg b/packages/extension/src/providers/ethereum/networks/icons/okc.svg deleted file mode 100644 index 83be3430f..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/okc.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/okc.webp b/packages/extension/src/providers/ethereum/networks/icons/okc.webp new file mode 100644 index 000000000..61e0f3946 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/okc.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/ont-evm.png b/packages/extension/src/providers/ethereum/networks/icons/ont-evm.png deleted file mode 100644 index 2c7015819..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/ont-evm.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/ont-evm.webp b/packages/extension/src/providers/ethereum/networks/icons/ont-evm.webp new file mode 100644 index 000000000..f1e160f28 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/ont-evm.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/op.svg b/packages/extension/src/providers/ethereum/networks/icons/op.svg deleted file mode 100644 index 336c6f8c0..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/op.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/op.webp b/packages/extension/src/providers/ethereum/networks/icons/op.webp new file mode 100644 index 000000000..4318de513 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/op.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/opbnb.png b/packages/extension/src/providers/ethereum/networks/icons/opbnb.png deleted file mode 100644 index 37745ea08..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/opbnb.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/opbnb.webp b/packages/extension/src/providers/ethereum/networks/icons/opbnb.webp new file mode 100644 index 000000000..43a7bcab6 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/opbnb.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/palm.svg b/packages/extension/src/providers/ethereum/networks/icons/palm.svg deleted file mode 100644 index 89b8ed677..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/palm.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/palm.webp b/packages/extension/src/providers/ethereum/networks/icons/palm.webp new file mode 100644 index 000000000..2e381cf44 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/palm.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/rari.png b/packages/extension/src/providers/ethereum/networks/icons/rari.png deleted file mode 100644 index af10f2f78..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/rari.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/rari.webp b/packages/extension/src/providers/ethereum/networks/icons/rari.webp new file mode 100644 index 000000000..1280c4569 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/rari.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/rootstock.svg b/packages/extension/src/providers/ethereum/networks/icons/rootstock.svg deleted file mode 100644 index e8c5ca6ea..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/rootstock.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/extension/src/providers/ethereum/networks/icons/rootstock.webp b/packages/extension/src/providers/ethereum/networks/icons/rootstock.webp new file mode 100644 index 000000000..711afaed2 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/rootstock.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/sanko.png b/packages/extension/src/providers/ethereum/networks/icons/sanko.png deleted file mode 100644 index bf697fc32..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/sanko.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/sanko.webp b/packages/extension/src/providers/ethereum/networks/icons/sanko.webp new file mode 100644 index 000000000..5c9a679be Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/sanko.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/scroll.png b/packages/extension/src/providers/ethereum/networks/icons/scroll.png deleted file mode 100644 index a5019f9c2..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/scroll.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/scroll.webp b/packages/extension/src/providers/ethereum/networks/icons/scroll.webp new file mode 100644 index 000000000..340f2c2a2 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/scroll.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/sdn.png b/packages/extension/src/providers/ethereum/networks/icons/sdn.png deleted file mode 100644 index dcfb85fcb..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/sdn.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/sdn.webp b/packages/extension/src/providers/ethereum/networks/icons/sdn.webp new file mode 100644 index 000000000..50d3676b7 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/sdn.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/shiba-inu.svg b/packages/extension/src/providers/ethereum/networks/icons/shiba-inu.svg deleted file mode 100644 index 413bb1051..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/shiba-inu.svg +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/shiba-inu.webp b/packages/extension/src/providers/ethereum/networks/icons/shiba-inu.webp new file mode 100644 index 000000000..ebcb3b309 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/shiba-inu.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleBlockBrawlers.png b/packages/extension/src/providers/ethereum/networks/icons/skaleBlockBrawlers.png deleted file mode 100644 index 6fb077c59..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/skaleBlockBrawlers.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleBlockBrawlers.webp b/packages/extension/src/providers/ethereum/networks/icons/skaleBlockBrawlers.webp new file mode 100644 index 000000000..33e61b92e Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/skaleBlockBrawlers.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleCalypsoNFTHub.png b/packages/extension/src/providers/ethereum/networks/icons/skaleCalypsoNFTHub.png deleted file mode 100644 index 178e55345..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/skaleCalypsoNFTHub.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleCalypsoNFTHub.webp b/packages/extension/src/providers/ethereum/networks/icons/skaleCalypsoNFTHub.webp new file mode 100644 index 000000000..ec55119da Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/skaleCalypsoNFTHub.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleCryptoBlades.png b/packages/extension/src/providers/ethereum/networks/icons/skaleCryptoBlades.png deleted file mode 100644 index 5b1ee2679..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/skaleCryptoBlades.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleCryptoBlades.webp b/packages/extension/src/providers/ethereum/networks/icons/skaleCryptoBlades.webp new file mode 100644 index 000000000..0f6eabb0f Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/skaleCryptoBlades.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleCryptoColloseum.png b/packages/extension/src/providers/ethereum/networks/icons/skaleCryptoColloseum.png deleted file mode 100644 index 39cea9def..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/skaleCryptoColloseum.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleCryptoColloseum.webp b/packages/extension/src/providers/ethereum/networks/icons/skaleCryptoColloseum.webp new file mode 100644 index 000000000..95e566492 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/skaleCryptoColloseum.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleEuropa.svg b/packages/extension/src/providers/ethereum/networks/icons/skaleEuropa.svg deleted file mode 100644 index 76654c8a9..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/skaleEuropa.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleEuropa.webp b/packages/extension/src/providers/ethereum/networks/icons/skaleEuropa.webp new file mode 100644 index 000000000..3d12a2f68 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/skaleEuropa.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleExorde.png b/packages/extension/src/providers/ethereum/networks/icons/skaleExorde.png deleted file mode 100644 index fb76b3886..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/skaleExorde.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleExorde.webp b/packages/extension/src/providers/ethereum/networks/icons/skaleExorde.webp new file mode 100644 index 000000000..87ed7dc7b Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/skaleExorde.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleNebula.png b/packages/extension/src/providers/ethereum/networks/icons/skaleNebula.png deleted file mode 100644 index c14b1bc5b..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/skaleNebula.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleNebula.webp b/packages/extension/src/providers/ethereum/networks/icons/skaleNebula.webp new file mode 100644 index 000000000..38a6f9732 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/skaleNebula.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleRazor.png b/packages/extension/src/providers/ethereum/networks/icons/skaleRazor.png deleted file mode 100644 index ab500a7ae..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/skaleRazor.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleRazor.webp b/packages/extension/src/providers/ethereum/networks/icons/skaleRazor.webp new file mode 100644 index 000000000..b5ed893b3 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/skaleRazor.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleTitan.png b/packages/extension/src/providers/ethereum/networks/icons/skaleTitan.png deleted file mode 100644 index 08a9a0d7d..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/skaleTitan.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skaleTitan.webp b/packages/extension/src/providers/ethereum/networks/icons/skaleTitan.webp new file mode 100644 index 000000000..4dc410bc8 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/skaleTitan.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skl-fuel.png b/packages/extension/src/providers/ethereum/networks/icons/skl-fuel.png deleted file mode 100644 index 01e4d0cc7..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/skl-fuel.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skl-fuel.webp b/packages/extension/src/providers/ethereum/networks/icons/skl-fuel.webp new file mode 100644 index 000000000..9fd763c63 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/skl-fuel.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skl.png b/packages/extension/src/providers/ethereum/networks/icons/skl.png deleted file mode 100644 index d9577381e..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/skl.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/skl.webp b/packages/extension/src/providers/ethereum/networks/icons/skl.webp new file mode 100644 index 000000000..c47ac006c Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/skl.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/story.webp b/packages/extension/src/providers/ethereum/networks/icons/story.webp new file mode 100644 index 000000000..225dae327 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/story.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/sys_nevm.svg b/packages/extension/src/providers/ethereum/networks/icons/sys_nevm.svg deleted file mode 100644 index 235f7571d..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/sys_nevm.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/sys_nevm.webp b/packages/extension/src/providers/ethereum/networks/icons/sys_nevm.webp new file mode 100644 index 000000000..1a987c42f Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/sys_nevm.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/sys_rollux.svg b/packages/extension/src/providers/ethereum/networks/icons/sys_rollux.svg deleted file mode 100644 index 40f6876f6..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/sys_rollux.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/sys_rollux.webp b/packages/extension/src/providers/ethereum/networks/icons/sys_rollux.webp new file mode 100644 index 000000000..190dcf41d Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/sys_rollux.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/tara.webp b/packages/extension/src/providers/ethereum/networks/icons/tara.webp new file mode 100644 index 000000000..57011a5d5 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/tara.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/telos.svg b/packages/extension/src/providers/ethereum/networks/icons/telos.svg deleted file mode 100644 index 49cc05f82..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/telos.svg and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/telos.webp b/packages/extension/src/providers/ethereum/networks/icons/telos.webp new file mode 100644 index 000000000..98bcf7d3e Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/telos.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/tsys_nevm.svg b/packages/extension/src/providers/ethereum/networks/icons/tsys_nevm.svg deleted file mode 100644 index 82f6622ff..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/tsys_nevm.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/tsys_nevm.webp b/packages/extension/src/providers/ethereum/networks/icons/tsys_nevm.webp new file mode 100644 index 000000000..dbf5d80de Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/tsys_nevm.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/tsys_rollux.svg b/packages/extension/src/providers/ethereum/networks/icons/tsys_rollux.svg deleted file mode 100644 index 5650aa0a4..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/tsys_rollux.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/tsys_rollux.webp b/packages/extension/src/providers/ethereum/networks/icons/tsys_rollux.webp new file mode 100644 index 000000000..97e4b8294 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/tsys_rollux.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/unichain.webp b/packages/extension/src/providers/ethereum/networks/icons/unichain.webp new file mode 100644 index 000000000..b1975b2eb Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/unichain.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/viction.png b/packages/extension/src/providers/ethereum/networks/icons/viction.png deleted file mode 100644 index 6b78e8b26..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/viction.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/viction.webp b/packages/extension/src/providers/ethereum/networks/icons/viction.webp new file mode 100644 index 000000000..bbce84e1e Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/viction.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/xlayer.png b/packages/extension/src/providers/ethereum/networks/icons/xlayer.png deleted file mode 100644 index 9786f15b4..000000000 Binary files a/packages/extension/src/providers/ethereum/networks/icons/xlayer.png and /dev/null differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/xlayer.webp b/packages/extension/src/providers/ethereum/networks/icons/xlayer.webp new file mode 100644 index 000000000..d6ee88924 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/xlayer.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/zcd.svg b/packages/extension/src/providers/ethereum/networks/icons/zcd.svg deleted file mode 100644 index 483efb727..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/zcd.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/zcd.webp b/packages/extension/src/providers/ethereum/networks/icons/zcd.webp new file mode 100644 index 000000000..9eda52edd Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/zcd.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/icons/zksync.svg b/packages/extension/src/providers/ethereum/networks/icons/zksync.svg deleted file mode 100644 index f0d79aa1e..000000000 --- a/packages/extension/src/providers/ethereum/networks/icons/zksync.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packages/extension/src/providers/ethereum/networks/icons/zksync.webp b/packages/extension/src/providers/ethereum/networks/icons/zksync.webp new file mode 100644 index 000000000..e8091cf86 Binary files /dev/null and b/packages/extension/src/providers/ethereum/networks/icons/zksync.webp differ diff --git a/packages/extension/src/providers/ethereum/networks/immutable-zkevm.ts b/packages/extension/src/providers/ethereum/networks/immutable-zkevm.ts index 45f0aeae5..8e9070467 100644 --- a/packages/extension/src/providers/ethereum/networks/immutable-zkevm.ts +++ b/packages/extension/src/providers/ethereum/networks/immutable-zkevm.ts @@ -1,9 +1,10 @@ -import icon from './icons/immutable-zkevm.png'; +import icon from './icons/immutable-zkevm.webp'; import { NetworkNames, CoingeckoPlatform } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; import { EtherscanActivity } from '../libs/activity-handlers'; import shNFTHandler from '@/libs/nft-handlers/simplehash'; +import assetsInfoHandler from '@/providers/ethereum/libs/assets-handlers/assetinfo-mew'; const immutableZkEvmOptions: EvmNetworkOptions = { name: NetworkNames.ImmutableZkevm, @@ -20,6 +21,7 @@ const immutableZkEvmOptions: EvmNetworkOptions = { coingeckoID: 'immutable-x', coingeckoPlatform: CoingeckoPlatform.ImmutableZkevm, NFTHandler: shNFTHandler, + assetsInfoHandler, activityHandler: wrapActivityHandler(EtherscanActivity), }; diff --git a/packages/extension/src/providers/ethereum/networks/index.ts b/packages/extension/src/providers/ethereum/networks/index.ts index a04048b8b..20f40c9a3 100755 --- a/packages/extension/src/providers/ethereum/networks/index.ts +++ b/packages/extension/src/providers/ethereum/networks/index.ts @@ -63,6 +63,14 @@ import holeskyNode from './holesky'; import bitrockNode from './bitrock'; import fraxtalNode from './fraxtal'; import _5ireNode from './5ire'; +import beraNode from './bera'; +import storyNode from './story'; +import gravityNode from './gravity'; +import unichainNode from './unichain'; +import abstractNode from './abstract'; +import inkNode from './inkonchain'; +import taraxa from './taraxa'; +import coti from './coti'; export default { sepolia: sepoliaNode, @@ -138,5 +146,13 @@ export default { holesky: holeskyNode, bitrock: bitrockNode, frax: fraxtalNode, + taraxa: taraxa, '5ire': _5ireNode, + bera: beraNode, + story: storyNode, + gravity: gravityNode, + unichain: unichainNode, + abstract: abstractNode, + ink: inkNode, + coti: coti }; diff --git a/packages/extension/src/providers/ethereum/networks/inkonchain.ts b/packages/extension/src/providers/ethereum/networks/inkonchain.ts new file mode 100644 index 000000000..95d155872 --- /dev/null +++ b/packages/extension/src/providers/ethereum/networks/inkonchain.ts @@ -0,0 +1,27 @@ +import icon from './icons/ink.webp'; +import { NetworkNames } from '@enkryptcom/types'; +import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; +import { EtherscanActivity } from '../libs/activity-handlers'; +import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; +import assetsInfoHandler from '@/providers/ethereum/libs/assets-handlers/assetinfo-mew'; + +const inkOptions: EvmNetworkOptions = { + name: NetworkNames.Ink, + name_long: 'Ink Onchain', + homePage: 'https://inkonchain.com/', + blockExplorerTX: 'https://explorer.inkonchain.com/tx/[[txHash]]', + blockExplorerAddr: 'https://explorer.inkonchain.com/address/[[address]]', + chainID: '0xDEF1', + isTestNetwork: false, + currencyName: 'ETH', + currencyNameLong: 'ETH', + node: 'https://rpc-gel.inkonchain.com', + icon, + coingeckoID: 'ethereum', + assetsInfoHandler, + activityHandler: wrapActivityHandler(EtherscanActivity), +}; + +const ink = new EvmNetwork(inkOptions); + +export default ink; diff --git a/packages/extension/src/providers/ethereum/networks/karura.ts b/packages/extension/src/providers/ethereum/networks/karura.ts index fe65bf9c1..bc06c713c 100644 --- a/packages/extension/src/providers/ethereum/networks/karura.ts +++ b/packages/extension/src/providers/ethereum/networks/karura.ts @@ -1,4 +1,4 @@ -import icon from './icons/karura-evm.svg'; +import icon from './icons/karura-evm.webp'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; import { CoingeckoPlatform, NetworkNames } from '@enkryptcom/types'; import { EtherscanActivity } from '../libs/activity-handlers'; diff --git a/packages/extension/src/providers/ethereum/networks/linea.ts b/packages/extension/src/providers/ethereum/networks/linea.ts index c70729a0e..e1da65c2e 100644 --- a/packages/extension/src/providers/ethereum/networks/linea.ts +++ b/packages/extension/src/providers/ethereum/networks/linea.ts @@ -1,4 +1,4 @@ -import icon from './icons/linea.png'; +import icon from './icons/linea.webp'; import { CoingeckoPlatform, NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import shNFTHandler from '@/libs/nft-handlers/simplehash'; diff --git a/packages/extension/src/providers/ethereum/networks/manta-pacific.ts b/packages/extension/src/providers/ethereum/networks/manta-pacific.ts index 776f2e2bd..0f59a0ac5 100644 --- a/packages/extension/src/providers/ethereum/networks/manta-pacific.ts +++ b/packages/extension/src/providers/ethereum/networks/manta-pacific.ts @@ -1,4 +1,4 @@ -import icon from './icons/manta-pacific.png'; +import icon from './icons/manta-pacific.webp'; import { NetworkNames, CoingeckoPlatform } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; diff --git a/packages/extension/src/providers/ethereum/networks/matic.ts b/packages/extension/src/providers/ethereum/networks/matic.ts index 626ea74c8..11951ca65 100644 --- a/packages/extension/src/providers/ethereum/networks/matic.ts +++ b/packages/extension/src/providers/ethereum/networks/matic.ts @@ -1,4 +1,4 @@ -import icon from './icons/matic.svg'; +import icon from './icons/matic.webp'; import { CoingeckoPlatform, NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import assetsInfoHandler from '@/providers/ethereum/libs/assets-handlers/assetinfo-mew'; diff --git a/packages/extension/src/providers/ethereum/networks/maticzk.ts b/packages/extension/src/providers/ethereum/networks/maticzk.ts index c546e667e..5b2791def 100644 --- a/packages/extension/src/providers/ethereum/networks/maticzk.ts +++ b/packages/extension/src/providers/ethereum/networks/maticzk.ts @@ -1,4 +1,4 @@ -import icon from './icons/matic.svg'; +import icon from './icons/matic.webp'; import { CoingeckoPlatform, NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import assetsInfoHandler from '@/providers/ethereum/libs/assets-handlers/assetinfo-mew'; diff --git a/packages/extension/src/providers/ethereum/networks/mode.ts b/packages/extension/src/providers/ethereum/networks/mode.ts index 02649c15d..feb8d1d99 100644 --- a/packages/extension/src/providers/ethereum/networks/mode.ts +++ b/packages/extension/src/providers/ethereum/networks/mode.ts @@ -1,4 +1,4 @@ -import icon from './icons/mode.png'; +import icon from './icons/mode.webp'; import { NetworkNames, CoingeckoPlatform } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; diff --git a/packages/extension/src/providers/ethereum/networks/movr.ts b/packages/extension/src/providers/ethereum/networks/movr.ts index e7f047005..d5e83c205 100644 --- a/packages/extension/src/providers/ethereum/networks/movr.ts +++ b/packages/extension/src/providers/ethereum/networks/movr.ts @@ -1,4 +1,4 @@ -import icon from './icons/moonriver.svg'; +import icon from './icons/moonriver.webp'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; import { CoingeckoPlatform, NetworkNames } from '@enkryptcom/types'; import { EtherscanActivity } from '../libs/activity-handlers'; diff --git a/packages/extension/src/providers/ethereum/networks/okc.ts b/packages/extension/src/providers/ethereum/networks/okc.ts index d1f16adf0..c5b57e064 100644 --- a/packages/extension/src/providers/ethereum/networks/okc.ts +++ b/packages/extension/src/providers/ethereum/networks/okc.ts @@ -1,4 +1,4 @@ -import icon from './icons/okc.svg'; +import icon from './icons/okc.webp'; import { CoingeckoPlatform, NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import { OkcActivity } from '../libs/activity-handlers'; diff --git a/packages/extension/src/providers/ethereum/networks/ontevm.ts b/packages/extension/src/providers/ethereum/networks/ontevm.ts index 7c8cae5f3..6e1dcee61 100644 --- a/packages/extension/src/providers/ethereum/networks/ontevm.ts +++ b/packages/extension/src/providers/ethereum/networks/ontevm.ts @@ -1,4 +1,4 @@ -import icon from './icons/ont-evm.png'; +import icon from './icons/ont-evm.webp'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import { NetworkNames } from '@enkryptcom/types'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; diff --git a/packages/extension/src/providers/ethereum/networks/op-bnb.ts b/packages/extension/src/providers/ethereum/networks/op-bnb.ts index a76288bac..8f2be8fbe 100644 --- a/packages/extension/src/providers/ethereum/networks/op-bnb.ts +++ b/packages/extension/src/providers/ethereum/networks/op-bnb.ts @@ -1,4 +1,4 @@ -import icon from './icons/opbnb.png'; +import icon from './icons/opbnb.webp'; import { CoingeckoPlatform, NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import assetsInfoHandler from '@/providers/ethereum/libs/assets-handlers/assetinfo-mew'; diff --git a/packages/extension/src/providers/ethereum/networks/op.ts b/packages/extension/src/providers/ethereum/networks/op.ts index dbab25136..7907f2e2f 100644 --- a/packages/extension/src/providers/ethereum/networks/op.ts +++ b/packages/extension/src/providers/ethereum/networks/op.ts @@ -1,4 +1,4 @@ -import icon from './icons/op.svg'; +import icon from './icons/op.webp'; import { CoingeckoPlatform, NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import { EtherscanActivity } from '../libs/activity-handlers'; diff --git a/packages/extension/src/providers/ethereum/networks/palm.ts b/packages/extension/src/providers/ethereum/networks/palm.ts index 12f2d37c7..b3d7b8a1c 100644 --- a/packages/extension/src/providers/ethereum/networks/palm.ts +++ b/packages/extension/src/providers/ethereum/networks/palm.ts @@ -1,4 +1,4 @@ -import icon from './icons/palm.svg'; +import icon from './icons/palm.webp'; import { NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import shNFTHandler from '@/libs/nft-handlers/simplehash'; diff --git a/packages/extension/src/providers/ethereum/networks/pop-apex.ts b/packages/extension/src/providers/ethereum/networks/pop-apex.ts index 34745507e..2825ca2a5 100644 --- a/packages/extension/src/providers/ethereum/networks/pop-apex.ts +++ b/packages/extension/src/providers/ethereum/networks/pop-apex.ts @@ -1,4 +1,4 @@ -import icon from './icons/apex.png'; +import icon from './icons/apex.webp'; import { NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; diff --git a/packages/extension/src/providers/ethereum/networks/puppy.ts b/packages/extension/src/providers/ethereum/networks/puppy.ts index 4abdb5175..ee9a9731e 100644 --- a/packages/extension/src/providers/ethereum/networks/puppy.ts +++ b/packages/extension/src/providers/ethereum/networks/puppy.ts @@ -1,4 +1,4 @@ -import icon from './icons/shiba-inu.svg'; +import icon from './icons/shiba-inu.webp'; import { NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import { EtherscanActivity } from '../libs/activity-handlers'; diff --git a/packages/extension/src/providers/ethereum/networks/rari.ts b/packages/extension/src/providers/ethereum/networks/rari.ts index cfb40f93b..23763f035 100644 --- a/packages/extension/src/providers/ethereum/networks/rari.ts +++ b/packages/extension/src/providers/ethereum/networks/rari.ts @@ -1,4 +1,4 @@ -import icon from './icons/rari.png'; +import icon from './icons/rari.webp'; import { NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; diff --git a/packages/extension/src/providers/ethereum/networks/rsk-testnet.ts b/packages/extension/src/providers/ethereum/networks/rsk-testnet.ts index 9758bbd60..c8e278ebb 100644 --- a/packages/extension/src/providers/ethereum/networks/rsk-testnet.ts +++ b/packages/extension/src/providers/ethereum/networks/rsk-testnet.ts @@ -1,4 +1,4 @@ -import icon from './icons/rootstock.svg'; +import icon from './icons/rootstock.webp'; import { NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import { EtherscanActivity } from '../libs/activity-handlers'; diff --git a/packages/extension/src/providers/ethereum/networks/rsk.ts b/packages/extension/src/providers/ethereum/networks/rsk.ts index 905accb6b..554061420 100644 --- a/packages/extension/src/providers/ethereum/networks/rsk.ts +++ b/packages/extension/src/providers/ethereum/networks/rsk.ts @@ -1,4 +1,4 @@ -import icon from './icons/rootstock.svg'; +import icon from './icons/rootstock.webp'; import { CoingeckoPlatform, NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import { EtherscanActivity } from '../libs/activity-handlers'; @@ -20,7 +20,7 @@ const rootstockOptions: EvmNetworkOptions = { isTestNetwork: false, currencyName: 'RBTC', currencyNameLong: 'Rootstock', - node: 'wss://public-node.rsk.co/websocket', + node: 'wss://nodes.mewapi.io/ws/rsk', icon, basePath: "m/44'/137'/0'/0", coingeckoID: CoingeckoPlatform.Rootstock, diff --git a/packages/extension/src/providers/ethereum/networks/scroll.ts b/packages/extension/src/providers/ethereum/networks/scroll.ts index f372c32e5..3d5f2aecb 100644 --- a/packages/extension/src/providers/ethereum/networks/scroll.ts +++ b/packages/extension/src/providers/ethereum/networks/scroll.ts @@ -1,4 +1,4 @@ -import icon from './icons/scroll.png'; +import icon from './icons/scroll.webp'; import { NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; diff --git a/packages/extension/src/providers/ethereum/networks/sdn.ts b/packages/extension/src/providers/ethereum/networks/sdn.ts index dea4e35c2..382080149 100644 --- a/packages/extension/src/providers/ethereum/networks/sdn.ts +++ b/packages/extension/src/providers/ethereum/networks/sdn.ts @@ -1,4 +1,4 @@ -import icon from './icons/sdn.png'; +import icon from './icons/sdn.webp'; import { CoingeckoPlatform, NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import { EtherscanActivity } from '../libs/activity-handlers'; diff --git a/packages/extension/src/providers/ethereum/networks/sepolia.ts b/packages/extension/src/providers/ethereum/networks/sepolia.ts index dd8d67e3f..f25081ccf 100644 --- a/packages/extension/src/providers/ethereum/networks/sepolia.ts +++ b/packages/extension/src/providers/ethereum/networks/sepolia.ts @@ -1,4 +1,4 @@ -import icon from './icons/eth.svg'; +import icon from './icons/eth.webp'; import { NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import { RivetActivity } from '../libs/activity-handlers'; diff --git a/packages/extension/src/providers/ethereum/networks/shib.ts b/packages/extension/src/providers/ethereum/networks/shib.ts index b20c7193d..ae74ff4af 100644 --- a/packages/extension/src/providers/ethereum/networks/shib.ts +++ b/packages/extension/src/providers/ethereum/networks/shib.ts @@ -1,4 +1,4 @@ -import icon from './icons/shiba-inu.svg'; +import icon from './icons/shiba-inu.webp'; import { NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import { EtherscanActivity } from '../libs/activity-handlers'; diff --git a/packages/extension/src/providers/ethereum/networks/skale/README.md b/packages/extension/src/providers/ethereum/networks/skale/README.md index 00569b979..e1300e5ff 100644 --- a/packages/extension/src/providers/ethereum/networks/skale/README.md +++ b/packages/extension/src/providers/ethereum/networks/skale/README.md @@ -30,7 +30,7 @@ const skaleOptions: SkaleParams = { chainName: "new-name-chain", // change to your SKALE chain actual name in the network chainID: "0x11111111", // change to your SKALE chain chainID isTestNetwork: true, // optional param (default: false) - icon: "newNameChain.png" // optional param - icon of your chain placed in `networks/icons` (default: "skl.png") + icon: "newNameChain.png" // optional param - icon of your chain placed in `networks/icons` (default: "skl.webp") }; export const assets: ICustomSKALEAsset[] = [ // optional param - array of preconfigured tokens (ETHC - is predeployed token) @@ -46,7 +46,7 @@ export const assets: ICustomSKALEAsset[] = [ // optional param - address: "0x7777777777777777777777777777777777777777", // address of your token on SKALE chain coingeckoID: "ethereum", // coingecko platform ID of your token showZero: true, // optional param - show token balance if balance is zero (default: false ) - icon: "yourToken.png", // optional param - icon of token placed in `networks/icons` (default: imported from coingecko or "skl.png" ) + icon: "yourToken.png", // optional param - icon of token placed in `networks/icons` (default: imported from coingecko or "skl.webp" ) decimals: 6, // optional param - decimals of token (default: 18 ) }, ]; diff --git a/packages/extension/src/providers/ethereum/networks/skale/blockBrawlers.ts b/packages/extension/src/providers/ethereum/networks/skale/blockBrawlers.ts index 16244df1c..a3570c773 100644 --- a/packages/extension/src/providers/ethereum/networks/skale/blockBrawlers.ts +++ b/packages/extension/src/providers/ethereum/networks/skale/blockBrawlers.ts @@ -12,7 +12,7 @@ const skaleOptions: SkaleParams = { name_long: 'BRAWL Chain | SKALE', chainName: 'frayed-decent-antares', chainID: '0x175b1806', - icon: 'skaleBlockBrawlers.png', + icon: 'skaleBlockBrawlers.webp', currencyName: 'BRAWL', currencyNameLong: 'BRAWL', }; diff --git a/packages/extension/src/providers/ethereum/networks/skale/calypso.ts b/packages/extension/src/providers/ethereum/networks/skale/calypso.ts index 0c645ddf4..9978e96fb 100644 --- a/packages/extension/src/providers/ethereum/networks/skale/calypso.ts +++ b/packages/extension/src/providers/ethereum/networks/skale/calypso.ts @@ -10,7 +10,7 @@ const skaleOptions: SkaleParams = { name_long: 'Calypso NFT Hub | SKALE', chainName: 'honorable-steel-rasalhague', chainID: '0x5d456c62', - icon: 'skaleCalypsoNFTHub.png', + icon: 'skaleCalypsoNFTHub.webp', }; const assets: ICustomSKALEAsset[] = [ diff --git a/packages/extension/src/providers/ethereum/networks/skale/cryptoBlades.ts b/packages/extension/src/providers/ethereum/networks/skale/cryptoBlades.ts index 882067d8e..867e79886 100644 --- a/packages/extension/src/providers/ethereum/networks/skale/cryptoBlades.ts +++ b/packages/extension/src/providers/ethereum/networks/skale/cryptoBlades.ts @@ -10,7 +10,7 @@ const skaleOptions: SkaleParams = { name_long: 'CryptoBlades | SKALE', chainName: 'affectionate-immediate-pollux', chainID: '0x3d28774d', - icon: 'skaleCryptoBlades.png', + icon: 'skaleCryptoBlades.webp', }; export const assets: ICustomSKALEAsset[] = [ diff --git a/packages/extension/src/providers/ethereum/networks/skale/cryptoColosseum.ts b/packages/extension/src/providers/ethereum/networks/skale/cryptoColosseum.ts index 1eece46f3..e7d27daf9 100644 --- a/packages/extension/src/providers/ethereum/networks/skale/cryptoColosseum.ts +++ b/packages/extension/src/providers/ethereum/networks/skale/cryptoColosseum.ts @@ -10,7 +10,7 @@ const skaleOptions: SkaleParams = { name_long: 'Crypto Rome | SKALE', chainName: 'haunting-devoted-deneb', chainID: '0x3d91725c', - icon: 'skaleCryptoColloseum.png', + icon: 'skaleCryptoColloseum.webp', }; const assets: ICustomSKALEAsset[] = [ diff --git a/packages/extension/src/providers/ethereum/networks/skale/europa.ts b/packages/extension/src/providers/ethereum/networks/skale/europa.ts index 5723ed906..860fdbeb3 100644 --- a/packages/extension/src/providers/ethereum/networks/skale/europa.ts +++ b/packages/extension/src/providers/ethereum/networks/skale/europa.ts @@ -10,7 +10,7 @@ const skaleOptions: SkaleParams = { name_long: 'Europa Liquidity Hub | SKALE', chainName: 'elated-tan-skat', chainID: '0x79f99296', - icon: 'skaleEuropa.svg', + icon: 'skaleEuropa.webp', }; const assets: ICustomSKALEAsset[] = [ diff --git a/packages/extension/src/providers/ethereum/networks/skale/exorde.ts b/packages/extension/src/providers/ethereum/networks/skale/exorde.ts index 060cd25b6..14a8340c2 100644 --- a/packages/extension/src/providers/ethereum/networks/skale/exorde.ts +++ b/packages/extension/src/providers/ethereum/networks/skale/exorde.ts @@ -6,7 +6,7 @@ const skaleOptions: SkaleParams = { name_long: 'Exorde | SKALE', chainName: 'light-vast-diphda', chainID: '0x7f8cb400', - icon: 'skaleExorde.png', + icon: 'skaleExorde.webp', }; export default createSkaleEvmNetwork(skaleOptions); diff --git a/packages/extension/src/providers/ethereum/networks/skale/nebula.ts b/packages/extension/src/providers/ethereum/networks/skale/nebula.ts index c766b8ce1..aa7ee435a 100644 --- a/packages/extension/src/providers/ethereum/networks/skale/nebula.ts +++ b/packages/extension/src/providers/ethereum/networks/skale/nebula.ts @@ -6,7 +6,7 @@ const skaleOptions: SkaleParams = { name_long: 'Nebula Gaming Hub | SKALE', chainName: 'green-giddy-denebola', chainID: '0x585eb4b1', - icon: 'skaleNebula.png', + icon: 'skaleNebula.webp', }; export default createSkaleEvmNetwork(skaleOptions); diff --git a/packages/extension/src/providers/ethereum/networks/skale/razor.ts b/packages/extension/src/providers/ethereum/networks/skale/razor.ts index 7d91b7a32..b3085a55f 100644 --- a/packages/extension/src/providers/ethereum/networks/skale/razor.ts +++ b/packages/extension/src/providers/ethereum/networks/skale/razor.ts @@ -10,7 +10,7 @@ const skaleOptions: SkaleParams = { name_long: 'Razor Network | SKALE', chainName: 'turbulent-unique-scheat', chainID: '0x109b4597', - icon: 'skaleRazor.png', + icon: 'skaleRazor.webp', }; const assets: ICustomSKALEAsset[] = [ diff --git a/packages/extension/src/providers/ethereum/networks/skale/skale-base.ts b/packages/extension/src/providers/ethereum/networks/skale/skale-base.ts index 1593b9e63..56c756d6d 100644 --- a/packages/extension/src/providers/ethereum/networks/skale/skale-base.ts +++ b/packages/extension/src/providers/ethereum/networks/skale/skale-base.ts @@ -15,7 +15,7 @@ import API from '@/providers/ethereum/libs/api'; import Sparkline from '@/libs/sparkline'; import { NATIVE_TOKEN_ADDRESS } from '../../libs/common'; import { Erc20Token, Erc20TokenOptions } from '../../types/erc20-token'; -import icon from '../icons/skl-fuel.png'; +import icon from '../icons/skl-fuel.webp'; const DEFAULT_DECIMALS = 18; @@ -150,7 +150,7 @@ async function getPreconfiguredTokens( icon: nativeAssetMarketData[index]?.image ?? new URL(`../icons/${asset.icon}`, import.meta.url).href ?? - new URL('../icons/skl.png', import.meta.url).href, + new URL('../icons/skl.webp', import.meta.url).href, balance: balanceAsset, balancef: formatFloatingPointValue(fromBase(balanceAsset, assetDecimals)) .value, @@ -163,9 +163,9 @@ async function getPreconfiguredTokens( decimals: assetDecimals, sparkline: nativeAssetMarketData[index] ? new Sparkline( - nativeAssetMarketData[index]?.sparkline_in_24h.price, - 25, - ).dataValues + nativeAssetMarketData[index]?.sparkline_in_24h.price, + 25, + ).dataValues : '', priceChangePercentage: nativeAssetMarketData[index]?.price_change_percentage_24h_in_currency ?? @@ -225,10 +225,9 @@ export function createSkaleEvmNetwork( isTestNetwork: params.isTestNetwork ?? false, currencyName: params.currencyName ?? 'sFUEL', currencyNameLong: params.currencyNameLong ?? 'SKALE FUEL', - node: `wss://${ - params.isTestNetwork ? 'staging-v3' : 'mainnet' - }.skalenodes.com/v1/ws/${params.chainName}`, - icon: new URL(`../icons/${params.icon ?? 'skl.png'}`, import.meta.url).href, + node: `wss://${params.isTestNetwork ? 'staging-v3' : 'mainnet' + }.skalenodes.com/v1/ws/${params.chainName}`, + icon: new URL(`../icons/${params.icon ?? 'skl.webp'}`, import.meta.url).href, coingeckoID: 'skale', coingeckoPlatform: CoingeckoPlatform.SKALE, assetsInfoHandler: getAssetHandler(assets), diff --git a/packages/extension/src/providers/ethereum/networks/skale/titan.ts b/packages/extension/src/providers/ethereum/networks/skale/titan.ts index 130dd2aad..1725012a2 100644 --- a/packages/extension/src/providers/ethereum/networks/skale/titan.ts +++ b/packages/extension/src/providers/ethereum/networks/skale/titan.ts @@ -6,7 +6,7 @@ const skaleOptions: SkaleParams = { name_long: 'Titan Community Hub | SKALE', chainName: 'parallel-stormy-spica', chainID: '0x507aaa2a', - icon: 'skaleTitan.png', + icon: 'skaleTitan.webp', }; export default createSkaleEvmNetwork(skaleOptions); diff --git a/packages/extension/src/providers/ethereum/networks/story.ts b/packages/extension/src/providers/ethereum/networks/story.ts new file mode 100644 index 000000000..6c01dea9b --- /dev/null +++ b/packages/extension/src/providers/ethereum/networks/story.ts @@ -0,0 +1,26 @@ +import icon from './icons/story.webp'; +import { NetworkNames } from '@enkryptcom/types'; +import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; +import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; +import assetsInfoHandler from '@/providers/ethereum/libs/assets-handlers/assetinfo-mew'; + +const storyOptions: EvmNetworkOptions = { + name: NetworkNames.Story, + name_long: 'Story', + homePage: 'https://www.story.foundation/', + blockExplorerTX: 'https://www.storyscan.xyz/tx/[[txHash]]', + blockExplorerAddr: 'https://www.storyscan.xyz/address/[[address]]', + chainID: '0x5EF', + isTestNetwork: false, + currencyName: 'IP', + currencyNameLong: 'IP', + node: 'https://mainnet.storyrpc.io', + icon, + coingeckoID: 'story-2', + assetsInfoHandler, + activityHandler: wrapActivityHandler(() => Promise.resolve([])), +}; + +const story = new EvmNetwork(storyOptions); + +export default story; diff --git a/packages/extension/src/providers/ethereum/networks/syscoin/nevm-testnet.ts b/packages/extension/src/providers/ethereum/networks/syscoin/nevm-testnet.ts index 254a541d5..eda036859 100644 --- a/packages/extension/src/providers/ethereum/networks/syscoin/nevm-testnet.ts +++ b/packages/extension/src/providers/ethereum/networks/syscoin/nevm-testnet.ts @@ -1,4 +1,4 @@ -import icon from '../icons/tsys_nevm.svg'; +import icon from '../icons/tsys_nevm.webp'; import { NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../../types/evm-network'; import { EtherscanActivity } from '../../libs/activity-handlers'; diff --git a/packages/extension/src/providers/ethereum/networks/syscoin/nevm.ts b/packages/extension/src/providers/ethereum/networks/syscoin/nevm.ts index 72901f021..d226bf636 100644 --- a/packages/extension/src/providers/ethereum/networks/syscoin/nevm.ts +++ b/packages/extension/src/providers/ethereum/networks/syscoin/nevm.ts @@ -1,4 +1,4 @@ -import icon from '../icons/sys_nevm.svg'; +import icon from '../icons/sys_nevm.webp'; import { CoingeckoPlatform, NetworkNames } from "@enkryptcom/types"; import { EvmNetwork, EvmNetworkOptions } from "../../types/evm-network"; import assetsInfoHandler from "@/providers/ethereum/libs/assets-handlers/assetinfo-mew"; diff --git a/packages/extension/src/providers/ethereum/networks/syscoin/rollux-testnet.ts b/packages/extension/src/providers/ethereum/networks/syscoin/rollux-testnet.ts index 933f65ace..76357883a 100644 --- a/packages/extension/src/providers/ethereum/networks/syscoin/rollux-testnet.ts +++ b/packages/extension/src/providers/ethereum/networks/syscoin/rollux-testnet.ts @@ -1,4 +1,4 @@ -import icon from '../icons/tsys_rollux.svg'; +import icon from '../icons/tsys_rollux.webp'; import { NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../../types/evm-network'; import { EtherscanActivity } from '../../libs/activity-handlers'; diff --git a/packages/extension/src/providers/ethereum/networks/syscoin/rollux.ts b/packages/extension/src/providers/ethereum/networks/syscoin/rollux.ts index bf3e2e3b9..50a7f5791 100644 --- a/packages/extension/src/providers/ethereum/networks/syscoin/rollux.ts +++ b/packages/extension/src/providers/ethereum/networks/syscoin/rollux.ts @@ -1,4 +1,4 @@ -import icon from '../icons/sys_rollux.svg'; +import icon from '../icons/sys_rollux.webp'; import { NetworkNames, CoingeckoPlatform } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../../types/evm-network'; import assetsInfoHandler from "@/providers/ethereum/libs/assets-handlers/assetinfo-mew"; diff --git a/packages/extension/src/providers/ethereum/networks/taraxa.ts b/packages/extension/src/providers/ethereum/networks/taraxa.ts new file mode 100644 index 000000000..c5ebb747c --- /dev/null +++ b/packages/extension/src/providers/ethereum/networks/taraxa.ts @@ -0,0 +1,24 @@ +import icon from './icons/tara.webp'; +import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; +import { CoingeckoPlatform, NetworkNames } from '@enkryptcom/types'; +import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; +const taraxaOptions: EvmNetworkOptions = { + name: NetworkNames.Taraxa, + name_long: 'Taraxa', + homePage: 'https://taraxa.io', + blockExplorerTX: 'https://tara.to/tx/[[txHash]]', + blockExplorerAddr: 'https://tara.to/address/[[address]]', + chainID: '0x349', + isTestNetwork: false, + currencyName: 'TARA', + currencyNameLong: 'Taraxa', + node: 'https://rpc.mainnet.taraxa.io', + icon, + coingeckoID: 'taraxa', + coingeckoPlatform: CoingeckoPlatform.Taraxa, + activityHandler: wrapActivityHandler(() => Promise.resolve([])), +}; + +const taraxa = new EvmNetwork(taraxaOptions); + +export default taraxa; diff --git a/packages/extension/src/providers/ethereum/networks/tlos.ts b/packages/extension/src/providers/ethereum/networks/tlos.ts index 893e4b359..86a5d1d59 100644 --- a/packages/extension/src/providers/ethereum/networks/tlos.ts +++ b/packages/extension/src/providers/ethereum/networks/tlos.ts @@ -1,4 +1,4 @@ -import icon from './icons/telos.svg'; +import icon from './icons/telos.webp'; import { CoingeckoPlatform, NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import assetsInfoHandler from '@/providers/ethereum/libs/assets-handlers/assetinfo-mew'; diff --git a/packages/extension/src/providers/ethereum/networks/unichain.ts b/packages/extension/src/providers/ethereum/networks/unichain.ts new file mode 100644 index 000000000..4a44c4cc5 --- /dev/null +++ b/packages/extension/src/providers/ethereum/networks/unichain.ts @@ -0,0 +1,28 @@ +import icon from './icons/unichain.webp'; +import { NetworkNames } from '@enkryptcom/types'; +import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; +import shNFTHandler from '@/libs/nft-handlers/simplehash'; +import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; +import assetsInfoHandler from '@/providers/ethereum/libs/assets-handlers/assetinfo-mew'; + +const unchainOptions: EvmNetworkOptions = { + name: NetworkNames.Unichain, + name_long: 'Unichain', + homePage: 'https://www.unichain.org/', + blockExplorerTX: 'https://uniscan.xyz/tx/[[txHash]]', + blockExplorerAddr: 'https://uniscan.xyz/address/[[address]]', + chainID: '0x82', + isTestNetwork: false, + currencyName: 'ETH', + currencyNameLong: 'ETH', + node: 'https://mainnet.unichain.org', + icon, + coingeckoID: 'ethereum', + NFTHandler: shNFTHandler, + assetsInfoHandler, + activityHandler: wrapActivityHandler(() => Promise.resolve([])), +}; + +const unchain = new EvmNetwork(unchainOptions); + +export default unchain; diff --git a/packages/extension/src/providers/ethereum/networks/vic.ts b/packages/extension/src/providers/ethereum/networks/vic.ts index f8b96bf6b..ad4af3505 100644 --- a/packages/extension/src/providers/ethereum/networks/vic.ts +++ b/packages/extension/src/providers/ethereum/networks/vic.ts @@ -1,4 +1,4 @@ -import icon from './icons/viction.png'; +import icon from './icons/viction.webp'; import { NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import assetsInfoHandler from '@/providers/ethereum/libs/assets-handlers/assetinfo-mew'; diff --git a/packages/extension/src/providers/ethereum/networks/xlayer.ts b/packages/extension/src/providers/ethereum/networks/xlayer.ts index da825abc5..26b5e7396 100644 --- a/packages/extension/src/providers/ethereum/networks/xlayer.ts +++ b/packages/extension/src/providers/ethereum/networks/xlayer.ts @@ -1,4 +1,4 @@ -import icon from './icons/xlayer.png'; +import icon from './icons/xlayer.webp'; import { NetworkNames, CoingeckoPlatform } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; diff --git a/packages/extension/src/providers/ethereum/networks/zcd.ts b/packages/extension/src/providers/ethereum/networks/zcd.ts index 9d486faaf..27d09fd6f 100644 --- a/packages/extension/src/providers/ethereum/networks/zcd.ts +++ b/packages/extension/src/providers/ethereum/networks/zcd.ts @@ -1,4 +1,4 @@ -import icon from './icons/zcd.svg'; +import icon from './icons/zcd.webp'; import { NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; diff --git a/packages/extension/src/providers/ethereum/networks/zkgoerli.ts b/packages/extension/src/providers/ethereum/networks/zkgoerli.ts index 069b0c3b1..a563b0191 100644 --- a/packages/extension/src/providers/ethereum/networks/zkgoerli.ts +++ b/packages/extension/src/providers/ethereum/networks/zkgoerli.ts @@ -1,4 +1,4 @@ -import icon from './icons/zksync.svg'; +import icon from './icons/zksync.webp'; import { NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; diff --git a/packages/extension/src/providers/ethereum/networks/zksync.ts b/packages/extension/src/providers/ethereum/networks/zksync.ts index bfc296a52..c86c24610 100644 --- a/packages/extension/src/providers/ethereum/networks/zksync.ts +++ b/packages/extension/src/providers/ethereum/networks/zksync.ts @@ -1,4 +1,4 @@ -import icon from './icons/zksync.svg'; +import icon from './icons/zksync.webp'; import { NetworkNames, CoingeckoPlatform } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; diff --git a/packages/extension/src/providers/ethereum/types/custom-evm-network.ts b/packages/extension/src/providers/ethereum/types/custom-evm-network.ts index 6025b883c..d6ab8e379 100644 --- a/packages/extension/src/providers/ethereum/types/custom-evm-network.ts +++ b/packages/extension/src/providers/ethereum/types/custom-evm-network.ts @@ -1,7 +1,7 @@ import { NetworkNames } from '@enkryptcom/types'; import { EvmNetwork, EvmNetworkOptions } from './evm-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; -import icon from '../networks/icons/eth.svg'; +import icon from '../networks/icons/eth.webp'; export interface CustomEvmNetworkOptions { name: string; diff --git a/packages/extension/src/providers/ethereum/ui/eth-verify-transaction.vue b/packages/extension/src/providers/ethereum/ui/eth-verify-transaction.vue index b11af3001..6ae31cb65 100644 --- a/packages/extension/src/providers/ethereum/ui/eth-verify-transaction.vue +++ b/packages/extension/src/providers/ethereum/ui/eth-verify-transaction.vue @@ -101,12 +101,11 @@ {{ errorMsg }}

diff --git a/packages/extension/src/providers/ethereum/ui/send-transaction/components/send-token-select.vue b/packages/extension/src/providers/ethereum/ui/send-transaction/components/send-token-select.vue index 341f889a7..0605d1207 100644 --- a/packages/extension/src/providers/ethereum/ui/send-transaction/components/send-token-select.vue +++ b/packages/extension/src/providers/ethereum/ui/send-transaction/components/send-token-select.vue @@ -75,6 +75,7 @@ const balance = computed(() => img { width: 100%; height: 100%; + object-fit: contain; } } diff --git a/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue b/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue index 145cc20e7..7154f38c3 100644 --- a/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue +++ b/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue @@ -58,11 +58,10 @@ /> @@ -74,11 +73,11 @@ /> @@ -100,11 +99,10 @@ /> @@ -177,6 +175,7 @@ import { NetworkNames } from '@enkryptcom/types'; import { trackSendEvents } from '@/libs/metrics'; import { SendEventType } from '@/libs/metrics/types'; import RecentlySentAddressesState from '@/libs/recently-sent-addresses'; +import { parseCurrency } from '@/ui/action/utils/filters'; const props = defineProps({ network: { @@ -247,10 +246,14 @@ const hasEnoughBalance = computed(() => { toBN(toBase(sendAmount.value ?? '0', selectedAsset.value.decimals!)), ); }); + const sendAmount = computed(() => { - if (amount.value && amount.value !== '') return amount.value; + if (isMaxSelected.value) { + return parseFloat(assetMaxValue.value) < 0 ? '0' : assetMaxValue.value; + } else if (amount.value && amount.value !== '') return amount.value; return '0'; }); + const isMaxSelected = ref(false); const selectedFee = ref( props.network.name === NetworkNames.Ethereum || NetworkNames.Binance @@ -448,9 +451,9 @@ const errorMsg = computed(() => { ) { return `Not enough funds. You are ~${formatFloatingPointValue(nativeBalanceAfterTransactionInHumanUnits.value).value} - ${props.network.currencyName} ($ ${ - formatFiatValue(balanceAfterInUsd.value).value - }) short.`; + ${props.network.currencyName} (${parseCurrency( + balanceAfterInUsd.value, + )}) short.`; } if (!props.network.isAddress(addressTo.value) && addressTo.value !== '') { diff --git a/packages/extension/src/providers/ethereum/ui/send-transaction/verify-transaction/index.vue b/packages/extension/src/providers/ethereum/ui/send-transaction/verify-transaction/index.vue index ebd8fb7fc..413d64e83 100644 --- a/packages/extension/src/providers/ethereum/ui/send-transaction/verify-transaction/index.vue +++ b/packages/extension/src/providers/ethereum/ui/send-transaction/verify-transaction/index.vue @@ -67,6 +67,7 @@ - - - - diff --git a/packages/extension/src/providers/kadena/networks/icons/kadena-kda-logo.webp b/packages/extension/src/providers/kadena/networks/icons/kadena-kda-logo.webp new file mode 100644 index 000000000..6736170af Binary files /dev/null and b/packages/extension/src/providers/kadena/networks/icons/kadena-kda-logo.webp differ diff --git a/packages/extension/src/providers/kadena/networks/kadena-testnet.ts b/packages/extension/src/providers/kadena/networks/kadena-testnet.ts index 1e2080f65..131b7ff4e 100644 --- a/packages/extension/src/providers/kadena/networks/kadena-testnet.ts +++ b/packages/extension/src/providers/kadena/networks/kadena-testnet.ts @@ -3,7 +3,7 @@ import { KadenaNetwork, KadenaNetworkOptions } from '../types/kadena-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; import { kadenaScanActivity } from '../libs/activity-handlers'; import { isValidAddress } from '../libs/network'; -import icon from './icons/kadena-kda-logo.svg'; +import icon from './icons/kadena-kda-logo.webp'; const kadenaOptions: KadenaNetworkOptions = { name: NetworkNames.KadenaTestnet, diff --git a/packages/extension/src/providers/kadena/networks/kadena.ts b/packages/extension/src/providers/kadena/networks/kadena.ts index eadfe6f91..1ebbc8423 100644 --- a/packages/extension/src/providers/kadena/networks/kadena.ts +++ b/packages/extension/src/providers/kadena/networks/kadena.ts @@ -3,7 +3,7 @@ import { KadenaNetwork, KadenaNetworkOptions } from '../types/kadena-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; import { kadenaScanActivity } from '../libs/activity-handlers'; import { isValidAddress } from '../libs/network'; -import icon from './icons/kadena-kda-logo.svg'; +import icon from './icons/kadena-kda-logo.webp'; const kadenaOptions: KadenaNetworkOptions = { name: NetworkNames.Kadena, diff --git a/packages/extension/src/providers/kadena/ui/send-transaction/components/send-fee-display.vue b/packages/extension/src/providers/kadena/ui/send-transaction/components/send-fee-display.vue index 7fe7c1e1f..10b3d3f4e 100644 --- a/packages/extension/src/providers/kadena/ui/send-transaction/components/send-fee-display.vue +++ b/packages/extension/src/providers/kadena/ui/send-transaction/components/send-fee-display.vue @@ -2,8 +2,8 @@

- Fee: {{ $filters.formatFiatValue(fee.fiatValue).value }} - {{ fee.fiatSymbol }} + Fee: + {{ $filters.parseCurrency(fee.fiatValue) }}

{{ $filters.formatFloatingPointValue(fee.nativeValue).value }} diff --git a/packages/extension/src/providers/kadena/ui/send-transaction/components/send-fee-select.vue b/packages/extension/src/providers/kadena/ui/send-transaction/components/send-fee-select.vue index f5d720817..0c45ed1ca 100644 --- a/packages/extension/src/providers/kadena/ui/send-transaction/components/send-fee-select.vue +++ b/packages/extension/src/providers/kadena/ui/send-transaction/components/send-fee-select.vue @@ -3,8 +3,7 @@

Fee: - {{ fee.fiatValue ? $filters.formatFiatValue(fee.fiatValue).value : '' }} - {{ fee.fiatSymbol ?? '' }} + {{ fee.fiatValue ? $filters.parseCurrency(fee.fiatValue) : '' }}

{{ diff --git a/packages/extension/src/providers/kadena/ui/send-transaction/index.vue b/packages/extension/src/providers/kadena/ui/send-transaction/index.vue index cc6bc55d1..90a5c1aee 100644 --- a/packages/extension/src/providers/kadena/ui/send-transaction/index.vue +++ b/packages/extension/src/providers/kadena/ui/send-transaction/index.vue @@ -54,11 +54,10 @@ /> @@ -128,6 +127,8 @@ import { ProviderName } from '@/types/provider'; import Browser from 'webextension-polyfill'; import { ICommandResult } from '@kadena/client'; import RecentlySentAddressesState from '@/libs/recently-sent-addresses'; +import { trackSendEvents } from '@/libs/metrics'; +import { SendEventType } from '@/libs/metrics/types'; const props = defineProps({ network: { @@ -180,6 +181,7 @@ const isAddress = computed(() => { }); onMounted(() => { + trackSendEvents(SendEventType.SendOpen, { network: props.network.name }); isLoadingAssets.value = true; fetchTokens(); }); @@ -384,6 +386,9 @@ const fetchTokens = async () => { }; const close = () => { + trackSendEvents(SendEventType.SendDecline, { + network: props.network.name, + }); router.go(-1); }; diff --git a/packages/extension/src/providers/kadena/ui/send-transaction/verify-transaction/index.vue b/packages/extension/src/providers/kadena/ui/send-transaction/verify-transaction/index.vue index 3f0ee4a5f..e717deb72 100644 --- a/packages/extension/src/providers/kadena/ui/send-transaction/verify-transaction/index.vue +++ b/packages/extension/src/providers/kadena/ui/send-transaction/verify-transaction/index.vue @@ -64,6 +64,7 @@ (); @@ -134,6 +137,7 @@ onBeforeMount(async () => { symbol: 'loading', decimals: network.value.decimals, }); + trackSendEvents(SendEventType.SendVerify, { network: network.value.name }); }); const close = () => { if (getCurrentContext() === 'popup') { @@ -145,22 +149,22 @@ const close = () => { const sendAction = async () => { isProcessing.value = true; - + trackSendEvents(SendEventType.SendApprove, { + network: network.value.name, + }); try { const transaction = await kdaToken.value!.buildTransaction!( txData.toAddress, account.value!, txData.TransactionData.value, network.value as KadenaNetwork, - chainId.value!, ); const networkApi = (await network.value.api()) as KadenaAPI; - const transactionDescriptor = await networkApi.sendTransaction( - transaction, - chainId.value!, - ); - + const transactionDescriptor = await networkApi.sendTransaction(transaction); + trackSendEvents(SendEventType.SendComplete, { + network: network.value.name, + }); const txActivity: Activity = { from: network.value.displayAddress(txData.fromAddress), to: network.value.displayAddress(txData.toAddress), @@ -203,10 +207,14 @@ const sendAction = async () => { } } catch (error: any) { isProcessing.value = false; - console.error('error', error); errorMsg.value = `Error: ${ error.message || 'Could not send the transaction' }`; + trackSendEvents(SendEventType.SendFailed, { + network: network.value.name, + error: errorMsg.value, + }); + console.error('error', error); } }; diff --git a/packages/extension/src/providers/polkadot/networks/acala/acala.ts b/packages/extension/src/providers/polkadot/networks/acala/acala.ts index 47bb0b91c..d1d90aa01 100644 --- a/packages/extension/src/providers/polkadot/networks/acala/acala.ts +++ b/packages/extension/src/providers/polkadot/networks/acala/acala.ts @@ -8,7 +8,7 @@ import { import { subscanActivity } from '../../libs/activity-handlers'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; import { toBN } from 'web3-utils'; -import icon from '../icons/acala.svg'; +import icon from '../icons/acala.webp'; const acalaOptions: SubstrateNetworkOptions = { name: NetworkNames.Acala, diff --git a/packages/extension/src/providers/polkadot/networks/acala/assets/acala-assets.ts b/packages/extension/src/providers/polkadot/networks/acala/assets/acala-assets.ts index 40e0e5df0..7d00bb1b1 100644 --- a/packages/extension/src/providers/polkadot/networks/acala/assets/acala-assets.ts +++ b/packages/extension/src/providers/polkadot/networks/acala/assets/acala-assets.ts @@ -1,6 +1,6 @@ import { KnownTokenDisplay } from '@/providers/polkadot/types'; import iconACA from './icons/ACA.png'; -import iconDOT from '../../icons/polkadot.svg'; +import iconDOT from '../../icons/polkadot.webp'; import iconLcDOT from './icons/LCDOT.png'; import iconLDOT from './icons/LDOT.png'; import iconAUSD from './icons/AUSD.png'; diff --git a/packages/extension/src/providers/polkadot/networks/acala/assets/karura-assets.ts b/packages/extension/src/providers/polkadot/networks/acala/assets/karura-assets.ts index 953cbf489..38312bfd1 100644 --- a/packages/extension/src/providers/polkadot/networks/acala/assets/karura-assets.ts +++ b/packages/extension/src/providers/polkadot/networks/acala/assets/karura-assets.ts @@ -1,5 +1,5 @@ import { KnownTokenDisplay } from '@/providers/polkadot/types'; -import iconKAR from '../../icons/karura.svg'; +import iconKAR from '../../icons/karura.webp'; import iconAUSD from './icons/AUSD.png'; import iconKSM from './icons/KSM.png'; import iconLKSM from './icons/LKSM.png'; diff --git a/packages/extension/src/providers/polkadot/networks/acala/karura.ts b/packages/extension/src/providers/polkadot/networks/acala/karura.ts index 34e6bc235..9cdf67e5f 100644 --- a/packages/extension/src/providers/polkadot/networks/acala/karura.ts +++ b/packages/extension/src/providers/polkadot/networks/acala/karura.ts @@ -9,7 +9,7 @@ import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; import ormlAssetHandler from './libs/assetinfo-orml'; import { toBN } from 'web3-utils'; import { toBase } from '@enkryptcom/utils'; -import icon from '../icons/karura.svg'; +import icon from '../icons/karura.webp'; const karuraOptions: SubstrateNetworkOptions = { name: NetworkNames.Karura, diff --git a/packages/extension/src/providers/polkadot/networks/assethub/assethub-dot.ts b/packages/extension/src/providers/polkadot/networks/assethub/assethub-dot.ts index 0feb942ed..2ea2f6013 100644 --- a/packages/extension/src/providers/polkadot/networks/assethub/assethub-dot.ts +++ b/packages/extension/src/providers/polkadot/networks/assethub/assethub-dot.ts @@ -9,7 +9,7 @@ import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; import assetHandler from '@/providers/polkadot/libs/asset-handler'; import assets from './assets-dot'; import { toBase } from '@enkryptcom/utils'; -import icon from '../icons/assethub.png'; +import icon from '../icons/assethub.webp'; const assetHubOptions: SubstrateNetworkOptions = { name: NetworkNames.AssetHubDOT, diff --git a/packages/extension/src/providers/polkadot/networks/assethub/assethub-ksm.ts b/packages/extension/src/providers/polkadot/networks/assethub/assethub-ksm.ts index a55769d93..04c8e9f89 100644 --- a/packages/extension/src/providers/polkadot/networks/assethub/assethub-ksm.ts +++ b/packages/extension/src/providers/polkadot/networks/assethub/assethub-ksm.ts @@ -9,7 +9,7 @@ import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; import assetHandler from '@/providers/polkadot/libs/asset-handler'; import assets from './assets-ksm'; import { toBase } from '@enkryptcom/utils'; -import icon from '../icons/assethub.png'; +import icon from '../icons/assethub.webp'; const assetHubOptions: SubstrateNetworkOptions = { name: NetworkNames.AssetHubKSM, diff --git a/packages/extension/src/providers/polkadot/networks/astar/assets/astar-assets.ts b/packages/extension/src/providers/polkadot/networks/astar/assets/astar-assets.ts index 9f0af1e67..8bb939775 100644 --- a/packages/extension/src/providers/polkadot/networks/astar/assets/astar-assets.ts +++ b/packages/extension/src/providers/polkadot/networks/astar/assets/astar-assets.ts @@ -1,6 +1,6 @@ import { KnownTokenDisplay } from '@/providers/polkadot/types'; import iconACA from './icons/ACA.png'; -import iconDOT from '../../icons/polkadot.svg'; +import iconDOT from '../../icons/polkadot.webp'; import iconLDOT from './icons/LDOT.png'; const assets: KnownTokenDisplay[] = [ diff --git a/packages/extension/src/providers/polkadot/networks/astar/astar.ts b/packages/extension/src/providers/polkadot/networks/astar/astar.ts index 4f2079f36..119652372 100644 --- a/packages/extension/src/providers/polkadot/networks/astar/astar.ts +++ b/packages/extension/src/providers/polkadot/networks/astar/astar.ts @@ -8,7 +8,7 @@ import { } from '../../types/substrate-network'; import assetHandler from '@/providers/polkadot/libs/asset-handler'; import { toBN } from 'web3-utils'; -import icon from '../icons/astar.png'; +import icon from '../icons/astar.webp'; const astarOptions: SubstrateNetworkOptions = { name: NetworkNames.Astar, diff --git a/packages/extension/src/providers/polkadot/networks/astar/shiden.ts b/packages/extension/src/providers/polkadot/networks/astar/shiden.ts index 1a8c52889..9aca23529 100644 --- a/packages/extension/src/providers/polkadot/networks/astar/shiden.ts +++ b/packages/extension/src/providers/polkadot/networks/astar/shiden.ts @@ -8,7 +8,7 @@ import { } from '../../types/substrate-network'; import assetHandler from '@/providers/polkadot/libs/asset-handler'; import { toBN } from 'web3-utils'; -import icon from '../icons/shiden.png'; +import icon from '../icons/shiden.webp'; const shidenOptions: SubstrateNetworkOptions = { name: NetworkNames.Shiden, diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/assets/bifrost-assets.ts b/packages/extension/src/providers/polkadot/networks/bifrost/assets/bifrost-assets.ts index fc15d0636..28df20d7b 100644 --- a/packages/extension/src/providers/polkadot/networks/bifrost/assets/bifrost-assets.ts +++ b/packages/extension/src/providers/polkadot/networks/bifrost/assets/bifrost-assets.ts @@ -8,8 +8,8 @@ import iconZLK from './icons/ZLK.png'; import iconUSDT from './icons/USDT.png'; import iconTUR from './icons/TUR.png'; import iconCRAB from './icons/CRAB.png'; -import iconDOT from '../../icons/polkadot.svg'; -import iconKSM from '../../icons/kusama.svg'; +import iconDOT from '../../icons/polkadot.webp'; +import iconKSM from '../../icons/kusama.webp'; const assets: KnownTokenDisplay[] = [ { diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/kusama.ts b/packages/extension/src/providers/polkadot/networks/bifrost/kusama.ts index dfa75b83a..bd4edaf1a 100644 --- a/packages/extension/src/providers/polkadot/networks/bifrost/kusama.ts +++ b/packages/extension/src/providers/polkadot/networks/bifrost/kusama.ts @@ -8,7 +8,7 @@ import { import { subscanActivity } from '../../libs/activity-handlers'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; import { toBN } from 'web3-utils'; -import icon from '../icons/bifrost.svg'; +import icon from '../icons/bifrost.webp'; const bifrostKusamaOptions: SubstrateNetworkOptions = { name: NetworkNames.BifrostKusama, diff --git a/packages/extension/src/providers/polkadot/networks/bifrost/polkadot.ts b/packages/extension/src/providers/polkadot/networks/bifrost/polkadot.ts index 072378118..ef0dfbe99 100644 --- a/packages/extension/src/providers/polkadot/networks/bifrost/polkadot.ts +++ b/packages/extension/src/providers/polkadot/networks/bifrost/polkadot.ts @@ -8,7 +8,7 @@ import { import { subscanActivity } from '../../libs/activity-handlers'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; import { toBN } from 'web3-utils'; -import icon from '../icons/bifrost.svg'; +import icon from '../icons/bifrost.webp'; const bifrostPolkadotOptions: SubstrateNetworkOptions = { name: NetworkNames.Bifrost, diff --git a/packages/extension/src/providers/polkadot/networks/edgeware.ts b/packages/extension/src/providers/polkadot/networks/edgeware.ts index ec27ffacc..e8a1f1f07 100644 --- a/packages/extension/src/providers/polkadot/networks/edgeware.ts +++ b/packages/extension/src/providers/polkadot/networks/edgeware.ts @@ -6,7 +6,7 @@ import { SubstrateNetworkOptions, } from '../types/substrate-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; -import icon from './icons/edgeware.svg'; +import icon from './icons/edgeware.webp'; const edgewareOptions: SubstrateNetworkOptions = { name: NetworkNames.Edgeware, diff --git a/packages/extension/src/providers/polkadot/networks/icons/acala.svg b/packages/extension/src/providers/polkadot/networks/icons/acala.svg deleted file mode 100644 index 56054cf42..000000000 --- a/packages/extension/src/providers/polkadot/networks/icons/acala.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/packages/extension/src/providers/polkadot/networks/icons/acala.webp b/packages/extension/src/providers/polkadot/networks/icons/acala.webp new file mode 100644 index 000000000..08434b0d0 Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/icons/acala.webp differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/amplitude.svg b/packages/extension/src/providers/polkadot/networks/icons/amplitude.svg deleted file mode 100644 index c8c584746..000000000 --- a/packages/extension/src/providers/polkadot/networks/icons/amplitude.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/extension/src/providers/polkadot/networks/icons/amplitude.webp b/packages/extension/src/providers/polkadot/networks/icons/amplitude.webp new file mode 100644 index 000000000..59afde7a4 Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/icons/amplitude.webp differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/assethub.png b/packages/extension/src/providers/polkadot/networks/icons/assethub.png deleted file mode 100644 index 4d65a43b0..000000000 Binary files a/packages/extension/src/providers/polkadot/networks/icons/assethub.png and /dev/null differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/assethub.webp b/packages/extension/src/providers/polkadot/networks/icons/assethub.webp new file mode 100644 index 000000000..89e0a90dd Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/icons/assethub.webp differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/astar.png b/packages/extension/src/providers/polkadot/networks/icons/astar.png deleted file mode 100644 index 636d2e49d..000000000 Binary files a/packages/extension/src/providers/polkadot/networks/icons/astar.png and /dev/null differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/astar.webp b/packages/extension/src/providers/polkadot/networks/icons/astar.webp new file mode 100644 index 000000000..40afd725c Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/icons/astar.webp differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/bifrost.svg b/packages/extension/src/providers/polkadot/networks/icons/bifrost.svg deleted file mode 100644 index 3f2a9b5e1..000000000 --- a/packages/extension/src/providers/polkadot/networks/icons/bifrost.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/packages/extension/src/providers/polkadot/networks/icons/bifrost.webp b/packages/extension/src/providers/polkadot/networks/icons/bifrost.webp new file mode 100644 index 000000000..81dbe3222 Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/icons/bifrost.webp differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/edgeware.svg b/packages/extension/src/providers/polkadot/networks/icons/edgeware.svg deleted file mode 100644 index 6e190f19a..000000000 --- a/packages/extension/src/providers/polkadot/networks/icons/edgeware.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - Brand/Outline/LogoMark@2x - - - - - - - - - - \ No newline at end of file diff --git a/packages/extension/src/providers/polkadot/networks/icons/edgeware.webp b/packages/extension/src/providers/polkadot/networks/icons/edgeware.webp new file mode 100644 index 000000000..5a2cb0b6e Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/icons/edgeware.webp differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/karura.svg b/packages/extension/src/providers/polkadot/networks/icons/karura.svg deleted file mode 100644 index 5bf6673b1..000000000 --- a/packages/extension/src/providers/polkadot/networks/icons/karura.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/packages/extension/src/providers/polkadot/networks/icons/karura.webp b/packages/extension/src/providers/polkadot/networks/icons/karura.webp new file mode 100644 index 000000000..84c85a29d Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/icons/karura.webp differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/kusama.svg b/packages/extension/src/providers/polkadot/networks/icons/kusama.svg deleted file mode 100644 index 9a6d20156..000000000 --- a/packages/extension/src/providers/polkadot/networks/icons/kusama.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/extension/src/providers/polkadot/networks/icons/kusama.webp b/packages/extension/src/providers/polkadot/networks/icons/kusama.webp new file mode 100644 index 000000000..50c92fc1b Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/icons/kusama.webp differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/opal.svg b/packages/extension/src/providers/polkadot/networks/icons/opal.svg deleted file mode 100644 index c3d1b9357..000000000 --- a/packages/extension/src/providers/polkadot/networks/icons/opal.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/extension/src/providers/polkadot/networks/icons/opal.webp b/packages/extension/src/providers/polkadot/networks/icons/opal.webp new file mode 100644 index 000000000..4496f1962 Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/icons/opal.webp differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/pendulum.svg b/packages/extension/src/providers/polkadot/networks/icons/pendulum.svg deleted file mode 100644 index 8f4288175..000000000 --- a/packages/extension/src/providers/polkadot/networks/icons/pendulum.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - diff --git a/packages/extension/src/providers/polkadot/networks/icons/pendulum.webp b/packages/extension/src/providers/polkadot/networks/icons/pendulum.webp new file mode 100644 index 000000000..4c53c688a Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/icons/pendulum.webp differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/polkadot.svg b/packages/extension/src/providers/polkadot/networks/icons/polkadot.svg deleted file mode 100644 index ba1668e12..000000000 --- a/packages/extension/src/providers/polkadot/networks/icons/polkadot.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/packages/extension/src/providers/polkadot/networks/icons/polkadot.webp b/packages/extension/src/providers/polkadot/networks/icons/polkadot.webp new file mode 100644 index 000000000..6567f877d Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/icons/polkadot.webp differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/quartz.svg b/packages/extension/src/providers/polkadot/networks/icons/quartz.svg deleted file mode 100644 index 9b68cdde3..000000000 --- a/packages/extension/src/providers/polkadot/networks/icons/quartz.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/extension/src/providers/polkadot/networks/icons/quartz.webp b/packages/extension/src/providers/polkadot/networks/icons/quartz.webp new file mode 100644 index 000000000..237ad0fed Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/icons/quartz.webp differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/shiden.png b/packages/extension/src/providers/polkadot/networks/icons/shiden.png deleted file mode 100644 index dcfb85fcb..000000000 Binary files a/packages/extension/src/providers/polkadot/networks/icons/shiden.png and /dev/null differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/shiden.webp b/packages/extension/src/providers/polkadot/networks/icons/shiden.webp new file mode 100644 index 000000000..50d3676b7 Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/icons/shiden.webp differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/unique.svg b/packages/extension/src/providers/polkadot/networks/icons/unique.svg deleted file mode 100644 index 1963c5e3d..000000000 --- a/packages/extension/src/providers/polkadot/networks/icons/unique.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/extension/src/providers/polkadot/networks/icons/unique.webp b/packages/extension/src/providers/polkadot/networks/icons/unique.webp new file mode 100644 index 000000000..d615d8e95 Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/icons/unique.webp differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/vara.svg b/packages/extension/src/providers/polkadot/networks/icons/vara.svg deleted file mode 100644 index e60ba3e1a..000000000 --- a/packages/extension/src/providers/polkadot/networks/icons/vara.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/extension/src/providers/polkadot/networks/icons/vara.webp b/packages/extension/src/providers/polkadot/networks/icons/vara.webp new file mode 100644 index 000000000..15889d518 Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/icons/vara.webp differ diff --git a/packages/extension/src/providers/polkadot/networks/icons/westend.svg b/packages/extension/src/providers/polkadot/networks/icons/westend.svg deleted file mode 100644 index 3e0599e60..000000000 --- a/packages/extension/src/providers/polkadot/networks/icons/westend.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/packages/extension/src/providers/polkadot/networks/icons/westend.webp b/packages/extension/src/providers/polkadot/networks/icons/westend.webp new file mode 100644 index 000000000..05b4eef82 Binary files /dev/null and b/packages/extension/src/providers/polkadot/networks/icons/westend.webp differ diff --git a/packages/extension/src/providers/polkadot/networks/kusama.ts b/packages/extension/src/providers/polkadot/networks/kusama.ts index 74cbbbe6c..96bb17938 100644 --- a/packages/extension/src/providers/polkadot/networks/kusama.ts +++ b/packages/extension/src/providers/polkadot/networks/kusama.ts @@ -6,7 +6,7 @@ import { SubstrateNetworkOptions, } from '../types/substrate-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; -import icon from './icons/kusama.svg'; +import icon from './icons/kusama.webp'; const ksmOptions: SubstrateNetworkOptions = { name: NetworkNames.Kusama, diff --git a/packages/extension/src/providers/polkadot/networks/pendulum/amplitude.ts b/packages/extension/src/providers/polkadot/networks/pendulum/amplitude.ts index 56cab71eb..72ec2445c 100644 --- a/packages/extension/src/providers/polkadot/networks/pendulum/amplitude.ts +++ b/packages/extension/src/providers/polkadot/networks/pendulum/amplitude.ts @@ -6,7 +6,7 @@ import { } from '../../types/substrate-network'; import assets from './assets/pendulum-assets'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; -import icon from '../icons/amplitude.svg'; +import icon from '../icons/amplitude.webp'; const amplitudeOptions: SubstrateNetworkOptions = { name: NetworkNames.Amplitude, diff --git a/packages/extension/src/providers/polkadot/networks/pendulum/assets/pendulum-assets.ts b/packages/extension/src/providers/polkadot/networks/pendulum/assets/pendulum-assets.ts index 25484127a..d9206cb48 100644 --- a/packages/extension/src/providers/polkadot/networks/pendulum/assets/pendulum-assets.ts +++ b/packages/extension/src/providers/polkadot/networks/pendulum/assets/pendulum-assets.ts @@ -1,8 +1,8 @@ import { KnownTokenDisplay } from '@/providers/polkadot/types'; import iconPen from '../icons/PEN.png'; import iconAmp from '../icons/AMPE.png'; -import iconDot from '../../icons/polkadot.svg'; -import iconKsm from '../../icons/kusama.svg'; +import iconDot from '../../icons/polkadot.webp'; +import iconKsm from '../../icons/kusama.webp'; const assets: KnownTokenDisplay[] = [ { diff --git a/packages/extension/src/providers/polkadot/networks/pendulum/pendulum.ts b/packages/extension/src/providers/polkadot/networks/pendulum/pendulum.ts index 0894aca02..18b4b0e2b 100644 --- a/packages/extension/src/providers/polkadot/networks/pendulum/pendulum.ts +++ b/packages/extension/src/providers/polkadot/networks/pendulum/pendulum.ts @@ -6,7 +6,7 @@ import { } from '../../types/substrate-network'; import assets from './assets/pendulum-assets'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; -import icon from '../icons/pendulum.svg'; +import icon from '../icons/pendulum.webp'; const pendulumOptions: SubstrateNetworkOptions = { name: NetworkNames.Pendulum, diff --git a/packages/extension/src/providers/polkadot/networks/polkadot.ts b/packages/extension/src/providers/polkadot/networks/polkadot.ts index f1594fda4..78d305532 100644 --- a/packages/extension/src/providers/polkadot/networks/polkadot.ts +++ b/packages/extension/src/providers/polkadot/networks/polkadot.ts @@ -6,7 +6,7 @@ import { } from '../types/substrate-network'; import { subscanActivity } from '../libs/activity-handlers'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; -import icon from './icons/polkadot.svg'; +import icon from './icons/polkadot.webp'; const polkadotOptions: SubstrateNetworkOptions = { name: NetworkNames.Polkadot, diff --git a/packages/extension/src/providers/polkadot/networks/unique/opal.ts b/packages/extension/src/providers/polkadot/networks/unique/opal.ts index a38fe3e91..909b634f8 100644 --- a/packages/extension/src/providers/polkadot/networks/unique/opal.ts +++ b/packages/extension/src/providers/polkadot/networks/unique/opal.ts @@ -5,7 +5,7 @@ import { } from '../../types/substrate-network'; import { getActivityHandler } from './libs/activity-handler'; import { toBN } from 'web3-utils'; -import icon from '../icons/opal.svg'; +import icon from '../icons/opal.webp'; const GRAPHQL_ENDPOINT = 'https://api-opal.uniquescan.io/v1/graphql'; diff --git a/packages/extension/src/providers/polkadot/networks/unique/quartz.ts b/packages/extension/src/providers/polkadot/networks/unique/quartz.ts index 20a585c5a..ca5765408 100644 --- a/packages/extension/src/providers/polkadot/networks/unique/quartz.ts +++ b/packages/extension/src/providers/polkadot/networks/unique/quartz.ts @@ -6,7 +6,7 @@ import { } from '../../types/substrate-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; import { toBN } from 'web3-utils'; -import icon from '../icons/quartz.svg'; +import icon from '../icons/quartz.webp'; const quartzOptions: SubstrateNetworkOptions = { name: NetworkNames.Quartz, diff --git a/packages/extension/src/providers/polkadot/networks/unique/unique.ts b/packages/extension/src/providers/polkadot/networks/unique/unique.ts index 48e632e3e..383543609 100644 --- a/packages/extension/src/providers/polkadot/networks/unique/unique.ts +++ b/packages/extension/src/providers/polkadot/networks/unique/unique.ts @@ -6,7 +6,7 @@ import { } from '../../types/substrate-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; import { toBN } from 'web3-utils'; -import icon from '../icons/unique.svg'; +import icon from '../icons/unique.webp'; const uniqueOptions: SubstrateNetworkOptions = { name: NetworkNames.Unique, diff --git a/packages/extension/src/providers/polkadot/networks/vara.ts b/packages/extension/src/providers/polkadot/networks/vara.ts index 4f6b11a30..a1fda3616 100644 --- a/packages/extension/src/providers/polkadot/networks/vara.ts +++ b/packages/extension/src/providers/polkadot/networks/vara.ts @@ -6,7 +6,7 @@ import { SubstrateNetworkOptions, } from '../types/substrate-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; -import icon from './icons/vara.svg'; +import icon from './icons/vara.webp'; const varaOptions: SubstrateNetworkOptions = { name: NetworkNames.Vara, diff --git a/packages/extension/src/providers/polkadot/networks/westend.ts b/packages/extension/src/providers/polkadot/networks/westend.ts index c3ee27edc..179327fcf 100644 --- a/packages/extension/src/providers/polkadot/networks/westend.ts +++ b/packages/extension/src/providers/polkadot/networks/westend.ts @@ -6,7 +6,7 @@ import { } from '../types/substrate-network'; import { subscanActivity } from '../libs/activity-handlers'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; -import icon from './icons/westend.svg'; +import icon from './icons/westend.webp'; const wndOptions: SubstrateNetworkOptions = { name: NetworkNames.Westend, diff --git a/packages/extension/src/providers/polkadot/ui/send-transaction/components/send-fee-display.vue b/packages/extension/src/providers/polkadot/ui/send-transaction/components/send-fee-display.vue index 7fe7c1e1f..10b3d3f4e 100644 --- a/packages/extension/src/providers/polkadot/ui/send-transaction/components/send-fee-display.vue +++ b/packages/extension/src/providers/polkadot/ui/send-transaction/components/send-fee-display.vue @@ -2,8 +2,8 @@

- Fee: {{ $filters.formatFiatValue(fee.fiatValue).value }} - {{ fee.fiatSymbol }} + Fee: + {{ $filters.parseCurrency(fee.fiatValue) }}

{{ $filters.formatFloatingPointValue(fee.nativeValue).value }} diff --git a/packages/extension/src/providers/polkadot/ui/send-transaction/components/send-fee-select.vue b/packages/extension/src/providers/polkadot/ui/send-transaction/components/send-fee-select.vue index f5d720817..0c45ed1ca 100644 --- a/packages/extension/src/providers/polkadot/ui/send-transaction/components/send-fee-select.vue +++ b/packages/extension/src/providers/polkadot/ui/send-transaction/components/send-fee-select.vue @@ -3,8 +3,7 @@

Fee: - {{ fee.fiatValue ? $filters.formatFiatValue(fee.fiatValue).value : '' }} - {{ fee.fiatSymbol ?? '' }} + {{ fee.fiatValue ? $filters.parseCurrency(fee.fiatValue) : '' }}

{{ diff --git a/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue b/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue index 38e6b6320..2b1ec61fc 100644 --- a/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue +++ b/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue @@ -52,11 +52,10 @@ /> diff --git a/packages/extension/src/providers/polkadot/ui/send-transaction/verify-transaction/index.vue b/packages/extension/src/providers/polkadot/ui/send-transaction/verify-transaction/index.vue index b1016ab33..299730846 100644 --- a/packages/extension/src/providers/polkadot/ui/send-transaction/verify-transaction/index.vue +++ b/packages/extension/src/providers/polkadot/ui/send-transaction/verify-transaction/index.vue @@ -66,6 +66,7 @@ \ No newline at end of file diff --git a/packages/extension/src/providers/solana/networks/icons/sol.webp b/packages/extension/src/providers/solana/networks/icons/sol.webp new file mode 100644 index 000000000..793fefb86 Binary files /dev/null and b/packages/extension/src/providers/solana/networks/icons/sol.webp differ diff --git a/packages/extension/src/providers/solana/networks/solana.ts b/packages/extension/src/providers/solana/networks/solana.ts index e34d3fe9e..db12f0ca3 100644 --- a/packages/extension/src/providers/solana/networks/solana.ts +++ b/packages/extension/src/providers/solana/networks/solana.ts @@ -3,7 +3,7 @@ import { SolanaNetwork, SolanaNetworkOptions } from '../types/sol-network'; import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler'; import assetsInfoHandler from '@/providers/ethereum/libs/assets-handlers/assetinfo-mew'; import shNFTHandler from '@/libs/nft-handlers/simplehash-solana'; -import icon from './icons/sol.svg'; +import icon from './icons/sol.webp'; const solanaOptions: SolanaNetworkOptions = { name: NetworkNames.Solana, diff --git a/packages/extension/src/providers/solana/ui/libs/get-priority-fees.ts b/packages/extension/src/providers/solana/ui/libs/get-priority-fees.ts index b7f567469..84e24a68f 100644 --- a/packages/extension/src/providers/solana/ui/libs/get-priority-fees.ts +++ b/packages/extension/src/providers/solana/ui/libs/get-priority-fees.ts @@ -1,73 +1,47 @@ -// https://docs.chainstack.com/docs/solana-estimate-priority-fees-getrecentprioritizationfees -import { Connection, PublicKey } from '@solana/web3.js'; - -interface PrioritizationFeeObject { - slot: number; - prioritizationFee: number; -} - -interface Config { - lockedWritableAccounts: PublicKey[]; -} +import { SolanaNetwork } from '../../types/sol-network'; const getPrioritizationFees = async ( - payer: PublicKey, - connection: Connection, + network: SolanaNetwork, ): Promise<{ low: number; medium: number; high: number }> => { - try { - const config: Config = { - lockedWritableAccounts: [payer], - }; - const prioritizationFeeObjects = - (await connection.getRecentPrioritizationFees( - config, - )) as PrioritizationFeeObject[]; - if (prioritizationFeeObjects.length === 0) { + return fetch(network.node, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + jsonrpc: '2.0', + id: 'rpd-op-123', + method: 'getPriorityFeeEstimate', + params: [ + { + options: { + includeAllPriorityFeeLevels: true, + }, + }, + ], + }), + }) + .then(res => res.json()) + .then(json => { + const typedJson = json as { + result: { + priorityFeeLevels: { + min: number; + low: number; + medium: number; + high: number; + }; + }; + }; return { - low: 1000, - medium: 1500, - high: 2000, + low: typedJson.result.priorityFeeLevels.low, + medium: typedJson.result.priorityFeeLevels.medium, + high: typedJson.result.priorityFeeLevels.high, }; - } - const averageFeeIncludingZeros = - prioritizationFeeObjects.length > 0 - ? Math.floor( - prioritizationFeeObjects.reduce( - (acc, feeObject) => acc + feeObject.prioritizationFee, - 0, - ) / prioritizationFeeObjects.length, - ) - : 0; - const nonZeroFees = prioritizationFeeObjects - .map(feeObject => feeObject.prioritizationFee) - .filter(fee => fee !== 0); - const averageFeeExcludingZeros = - nonZeroFees.length > 0 - ? Math.floor( - nonZeroFees.reduce((acc, fee) => acc + fee, 0) / nonZeroFees.length, - ) - : 0; - const sortedFees = nonZeroFees.sort((a, b) => a - b); - let medianFee = 0; - if (sortedFees.length > 0) { - const midIndex = Math.floor(sortedFees.length / 2); - medianFee = - sortedFees.length % 2 !== 0 - ? sortedFees[midIndex] - : Math.floor((sortedFees[midIndex - 1] + sortedFees[midIndex]) / 2); - } - return { - low: averageFeeIncludingZeros || 1000, - medium: medianFee || 1500, - high: averageFeeExcludingZeros || 2000, - }; - } catch (error) { - return { - low: 1000, - medium: 1500, - high: 2000, - }; - } + }) + .catch(e => { + return { low: 0, medium: 0, high: 0 }; + }); }; export default getPrioritizationFees; diff --git a/packages/extension/src/providers/solana/ui/send-transaction/components/send-fee-select.vue b/packages/extension/src/providers/solana/ui/send-transaction/components/send-fee-select.vue index b2e00e65f..7bf444ff2 100644 --- a/packages/extension/src/providers/solana/ui/send-transaction/components/send-fee-select.vue +++ b/packages/extension/src/providers/solana/ui/send-transaction/components/send-fee-select.vue @@ -2,8 +2,8 @@

- Fee: {{ $filters.formatFiatValue(fee.fiatValue).value }} - {{ fee.fiatSymbol }} + Fee: + {{ $filters.parseCurrency(fee.fiatValue) }}

{{ $filters.formatFloatingPointValue(fee.nativeValue).value }} diff --git a/packages/extension/src/providers/solana/ui/send-transaction/index.vue b/packages/extension/src/providers/solana/ui/send-transaction/index.vue index 6e581975e..a947cbc51 100644 --- a/packages/extension/src/providers/solana/ui/send-transaction/index.vue +++ b/packages/extension/src/providers/solana/ui/send-transaction/index.vue @@ -53,11 +53,10 @@ /> @@ -69,11 +68,11 @@ /> @@ -174,6 +173,7 @@ import getPriorityFees from '../libs/get-priority-fees'; import bs58 from 'bs58'; import SolanaAPI from '@/providers/solana/libs/api'; import RecentlySentAddressesState from '@/libs/recently-sent-addresses'; +import { parseCurrency } from '@/ui/action/utils/filters'; const props = defineProps({ network: { @@ -219,6 +219,13 @@ const hasValidDecimals = computed((): boolean => { const hasPositiveSendAmount = computed(() => { return isNumericPositive(sendAmount.value); }); + +const hasLessThanFees = computed(() => { + return BigNumber(gasCostValues.value[selectedFee.value].nativeValue).gt( + fromBase(nativeBalance.value, props.network.decimals), + ); +}); + const hasEnoughBalance = computed((): boolean => { if (!hasValidDecimals.value) { return false; @@ -226,6 +233,8 @@ const hasEnoughBalance = computed((): boolean => { if (!hasPositiveSendAmount.value) { return false; } + if (hasLessThanFees.value) return false; + return toBN(selectedAsset.value.balance ?? '0').gte( toBN(toBase(sendAmount.value ?? '0', selectedAsset.value.decimals!)), ); @@ -359,6 +368,8 @@ const balanceAfterInUsd = computed(() => { }); const errorMsg = computed(() => { + if (hasLessThanFees.value) return `Not enough funds for fees.`; + if (!hasValidDecimals.value) { return `Too many decimals.`; } @@ -373,9 +384,9 @@ const errorMsg = computed(() => { ) { return `Not enough funds. You are ~${formatFloatingPointValue(nativeBalanceAfterTransactionInHumanUnits.value).value} - ${props.network.currencyName} ($ ${ - formatFiatValue(balanceAfterInUsd.value).value - }) short.`; + ${props.network.currencyName} (${parseCurrency( + balanceAfterInUsd.value, + )}) short.`; } if ( @@ -486,17 +497,16 @@ const updateTransactionFees = async () => { const to = TxInfo.value.to ? new PublicKey(getAddress(TxInfo.value.to)) : from; - const priorityFee = ( - await getPriorityFees( - new PublicKey(getAddress(TxInfo.value.from)), - solConnection.value!.web3, - ) - ).high; - const transaction = new SolTransaction().add( - ComputeBudgetProgram.setComputeUnitPrice({ - microLamports: priorityFee * 100, - }), - ); + const priorityFee = (await getPriorityFees(props.network)).high; + const transaction = new SolTransaction(); + if (priorityFee !== 0) { + transaction.add( + ComputeBudgetProgram.setComputeUnitPrice({ + microLamports: priorityFee, + }), + ); + } + if (isSendToken.value && TxInfo.value.contract === NATIVE_TOKEN_ADDRESS) { const toBalance = await solConnection.value!.web3.getBalance(to); const rentExempt = diff --git a/packages/extension/src/providers/solana/ui/send-transaction/verify-transaction/index.vue b/packages/extension/src/providers/solana/ui/send-transaction/verify-transaction/index.vue index c1abfe9a7..7daceaa0b 100644 --- a/packages/extension/src/providers/solana/ui/send-transaction/verify-transaction/index.vue +++ b/packages/extension/src/providers/solana/ui/send-transaction/verify-transaction/index.vue @@ -67,6 +67,7 @@ { isPriorityFeesSet = true; }); const priorityFee = await getPrioritizationFees( - new PublicKey(network.value.displayAddress(account.value.address)), - solConnection.value!.web3, + network.value as SolanaNetwork, ); - if (!isPriorityFeesSet && priorityFee) { + if (!isPriorityFeesSet && !!priorityFee) { Tx.value.add( ComputeBudgetProgram.setComputeUnitPrice({ - microLamports: priorityFee.high * 100, + microLamports: priorityFee.high, }), ); } diff --git a/packages/extension/src/types/provider.ts b/packages/extension/src/types/provider.ts index 862fb1c81..224043ea2 100644 --- a/packages/extension/src/types/provider.ts +++ b/packages/extension/src/types/provider.ts @@ -54,6 +54,7 @@ export enum InternalStorageNamespace { recentlySentAddresses = 'RecentlySentAddresses', updatesState = 'UpdatesState', backupState = 'BackupState', + menuState = 'MenuState', } export enum EnkryptProviderEventMethods { persistentEvents = 'PersistentEvents', @@ -131,7 +132,7 @@ export abstract class BackgroundProviderInterface extends EventEmitter { export abstract class ProviderAPIInterface { abstract node: string; // eslint-disable-next-line @typescript-eslint/no-unused-vars - constructor(node: string, options?: unknown) {} + constructor(node: string, options?: unknown) { } abstract init(): Promise; abstract getBalance(address: string): Promise; abstract getTransactionStatus( diff --git a/packages/extension/src/ui/action/App.vue b/packages/extension/src/ui/action/App.vue index bb01b5366..f276f0909 100644 --- a/packages/extension/src/ui/action/App.vue +++ b/packages/extension/src/ui/action/App.vue @@ -1,68 +1,35 @@ @@ -127,17 +91,12 @@ import DomainState from '@/libs/domain-state'; import PublicKeyRing from '@/libs/keyring/public-keyring'; import { sendToBackgroundFromAction } from '@/libs/messenger/extension'; -import NetworksState from '@/libs/networks-state'; import { getAccountsByNetworkName, getOtherSigners, } from '@/libs/utils/accounts'; import ModalNewVersion from './views/modal-new-version/index.vue'; -import { - DEFAULT_EVM_NETWORK, - getAllNetworks, - getNetworkByName, -} from '@/libs/utils/networks'; +import { DEFAULT_EVM_NETWORK, getNetworkByName } from '@/libs/utils/networks'; import openOnboard from '@/libs/utils/open-onboard'; import BTCAccountState from '@/providers/bitcoin/libs/accounts-state'; import EVMAccountState from '@/providers/ethereum/libs/accounts-state'; @@ -154,14 +113,7 @@ import { useRoute, useRouter } from 'vue-router'; import Browser from 'webextension-polyfill'; import AccountsHeader from './components/accounts-header/index.vue'; import AppMenu from './components/app-menu/index.vue'; -import AppMenuTab from './components/app-menu/components/app-menu-tab.vue'; -import BaseSearch from './components/base-search/index.vue'; import NetworkMenu from './components/network-menu/index.vue'; -import MoreIcon from './icons/actions/more.vue'; -import HoldIcon from './icons/common/hold-icon.vue'; -import LogoMin from './icons/common/logo-min.vue'; -import ManageNetworksIcon from './icons/common/manage-networks-icon.vue'; -import SettingsIcon from './icons/common/settings-icon.vue'; import { AccountsHeaderData } from './types/account'; import AddNetwork from './views/add-network/index.vue'; import ModalRate from './views/modal-rate/index.vue'; @@ -169,37 +121,22 @@ import Settings from './views/settings/index.vue'; import ModalUpdates from './views/updates/index.vue'; import { KadenaNetwork } from '@/providers/kadena/types/kadena-network'; import { EnkryptProviderEventMethods, ProviderName } from '@/types/provider'; -import { onClickOutside } from '@vueuse/core'; import RateState from '@/libs/rate-state'; import SwapLookingAnimation from '@action/icons/swap/swap-looking-animation.vue'; -import { - trackBuyEvents, - trackNetwork, - trackUpdatesEvents, -} from '@/libs/metrics'; +import { trackBuyEvents, trackNetwork } from '@/libs/metrics'; import { getLatestEnkryptVersion } from '@action/utils/browser'; import { gt as semverGT } from 'semver'; -import { - BuyEventType, - NetworkChangeEvents, - UpdatesEventType, - UpdatesOpenLocation, -} from '@/libs/metrics/types'; -import { NetworksCategory } from '@action/types/network-category'; -import { newNetworks } from '@/providers/common/libs/new-features'; -import UpdatesState from '@/libs/updates-state'; -import UpdatedIcon from '@/ui/action/icons/updates/updated.vue'; -import HeartIcon from '@/ui/action/icons/updates/heart.vue'; -import { getLatestEnkryptUpdates } from '@action/utils/browser'; -import { Updates } from '@/ui/action/types/updates'; +import { useUpdatesStore } from './store/updates-store'; +import { useNetworksStore } from './store/networks-store'; +import { storeToRefs } from 'pinia'; +import { BuyEventType, NetworkChangeEvents } from '@/libs/metrics/types'; import BackupState from '@/libs/backup-state'; +import { useMenuStore } from './store/menu-store'; +import { useCurrencyStore, type Currency } from './views/settings/store'; const domainState = new DomainState(); -const networksState = new NetworksState(); const rateState = new RateState(); -const updatesState = new UpdatesState(); const backupState = new BackupState(); -const appMenuRef = ref(null); const showDepositWindow = ref(false); const accountHeaderData = ref({ activeAccounts: [], @@ -208,16 +145,9 @@ const accountHeaderData = ref({ activeBalances: [], }); -const isOpenMore = ref(false); -let timeout: ReturnType | null = null; -defineExpose({ appMenuRef }); const router = useRouter(); const route = useRoute(); const transitionName = 'fade'; -const searchInput = ref(''); -const activeCategory = ref(NetworksCategory.All); -const networks = ref([]); -const pinnedNetworks = ref([]); const defaultNetwork = DEFAULT_EVM_NETWORK; const currentNetwork = ref(defaultNetwork); const currentSubNetwork = ref(''); @@ -226,138 +156,44 @@ const addNetworkShow = ref(false); const settingsShow = ref(false); const rateShow = ref(false); const updateShow = ref(false); -const dropdown = ref(null); -const toggle = ref(null); const isLoading = ref(true); const currentVersion = __PACKAGE_VERSION__; const latestVersion = ref(''); -const enabledTestnetworks = ref([]); /** ------------------- - * Updates + * Exapnded Menu -------------------*/ -const releases = ref(null); -const loadedUpdates = ref(false); -const showUpdatesBtn = ref(false); -const showUpdatesDialog = ref(false); -const stateCurrentReleaseTimestamp = ref(0); +const menuStore = useMenuStore(); +const { isExpanded } = storeToRefs(menuStore); -/** - * Initializes the update state by performing the following actions: - * 1. Retrieves the current release from the state. - * 2. Updates the current release timestamp. - * 3. If the current release is empty or different from the current version in the app state, - * sets the current release and updates the release timestamp. - * 4. Fetches the latest Enkrypt updates and sets the releases state. - * 5. Displays the updates button if there are new releases. - * 6. Sets the loadedUpdates state to true if successful, otherwise false. - * - * @async - * @function initUpdateState - * @returns {Promise} A promise that resolves when the update state is initialized. - * @throws Will log an error message if the initialization fails. - */ -const initUpdateState = async () => { - try { - const currentReleaseInState = await updatesState.getCurrentRelease(); - stateCurrentReleaseTimestamp.value = - await updatesState.getCurrentReleaseTimestamp(); - if ( - currentReleaseInState === '' || - currentReleaseInState !== currentVersion - ) { - await updatesState.setCurrentRelease(currentVersion); - const newReleaseTimestamp = Date.now(); - await updatesState.setCurrentReleaseTimestamp(newReleaseTimestamp); - stateCurrentReleaseTimestamp.value = newReleaseTimestamp; - } - releases.value = await getLatestEnkryptUpdates(); - if (releases.value) { - await getShowUpdatesBtn(); - } - loadedUpdates.value = true; - } catch (error) { - console.error('Failed to init update state:', error); - loadedUpdates.value = false; - } -}; +/** ------------------- + * Currency + -------------------*/ +const currencyStore = useCurrencyStore(); +const { setCurrencyList } = currencyStore; -/** - * Asynchronously determines whether to show the updates button based on the last version viewed and the current version. - * - * The function performs the following steps: - * 1. Retrieves the last version viewed from the updates state. - * 2. Checks if the last version viewed is empty or if the current version is greater than the last version viewed. - * 3. If the above condition is true, calculates an expiration timestamp (2 weeks from the current release timestamp). - * 4. Sets the `showUpdatesBtn` value to true if the current release timestamp is less than the expiration timestamp. - * 5. Otherwise, sets the `showUpdatesBtn` value to false. - * - * If an error occurs during the process, it logs an error message to the console. - * - * @returns {Promise} A promise that resolves when the function completes. - */ -const getShowUpdatesBtn = async () => { - try { - const lastVersionViewed = await updatesState.getLastVersionViewed(); - if ( - lastVersionViewed === '' || - (currentVersion && semverGT(currentVersion, lastVersionViewed)) - ) { - const expireTimestamp = stateCurrentReleaseTimestamp.value + 12096e5; //2 weeks; - showUpdatesBtn.value = - stateCurrentReleaseTimestamp.value < expireTimestamp; - } else { - showUpdatesBtn.value = false; - } - } catch (error) { - console.error('Failed to get show updates button:', error); +/** ------------------- + * Updates + -------------------*/ +const updatesStore = useUpdatesStore(); +const { updatesIsLoaded } = storeToRefs(updatesStore); +const showUpdatesDialog = ref(false); +const setShowUpdatesDialog = (show: boolean) => { + showUpdatesDialog.value = show; + if (show) { + updatesStore.setLastVersionViewed(currentVersion); } }; -const openUpdatesDialog = (_location: UpdatesOpenLocation) => { - showUpdatesDialog.value = true; - updatesState.setLastVersionViewed(currentVersion); - showUpdatesBtn.value = false; - if (isOpenMore.value) { - closeMoreMenu(); - } - trackUpdatesEvents(UpdatesEventType.UpdatesOpen, { - network: currentNetwork.value.name, - location: _location, - }); -}; +/** ------------------- + * Networks + -------------------*/ -const closeUpdatesDialog = () => { - showUpdatesDialog.value = false; -}; +const networksStore = useNetworksStore(); /** ------------------- * Core -------------------*/ -const setActiveNetworks = async () => { - const pinnedNetworkNames = await networksState.getPinnedNetworkNames(); - const allNetworks = await getAllNetworks(); - enabledTestnetworks.value = await networksState.getEnabledTestNetworks(); - pinnedNetworks.value = []; - pinnedNetworkNames.forEach(name => { - const network = allNetworks.find(network => network.name === name); - if (network !== undefined) pinnedNetworks.value.push(network); - }); - networks.value = [ - ...pinnedNetworks.value, - ...allNetworks.filter( - network => !pinnedNetworkNames.includes(network.name), - ), - ]; -}; -const updateNetworkOrder = (newOrder: BaseNetwork[]) => { - if (searchInput.value === '') { - networks.value = newOrder; - } -}; -const updateSearchValue = (newval: string) => { - searchInput.value = newval; -}; const toggleDepositWindow = () => { showDepositWindow.value = !showDepositWindow.value; }; @@ -382,17 +218,13 @@ const openBuyPage = () => { }&platform=enkrypt`; } })(); - Browser.tabs.create({ - url: buyLink, - }); + Browser.tabs.create({ url: buyLink }); trackBuyEvents(BuyEventType.BuyClick, { network: currentNetwork.value.name }); }; + const isKeyRingLocked = async (): Promise => { return await sendToBackgroundFromAction({ - message: JSON.stringify({ - method: InternalMethods.isLocked, - params: [], - }), + message: JSON.stringify({ method: InternalMethods.isLocked, params: [] }), provider: currentNetwork.value.provider, tabId: await domainState.getCurrentTabId(), }).then(res => JSON.parse(res.result || 'true')); @@ -407,11 +239,30 @@ const init = async () => { } else { setNetwork(defaultNetwork); } - await setActiveNetworks(); + await networksStore.setActiveNetworks(); backupState.backup(true).catch(console.error); isLoading.value = false; }; +const fetchAndSetRates = async () => { + const rates = await fetch( + 'https://mainnet.mewwallet.dev/v2/prices/exchange-rates?includeImages=true', + ); + const ratesJson = await rates.json(); + setCurrencyList( + ratesJson.filter((currency: Currency) => { + if ( + currency.fiat_currency !== 'XAG' && + currency.fiat_currency !== 'XAU' && + currency.fiat_currency !== 'XDR' && + currency.fiat_currency !== 'BTC' + ) { + return currency; + } + }), + ); +}; + onMounted(async () => { const isInitialized = await kr.isInitialized(); if (isInitialized) { @@ -441,20 +292,18 @@ onMounted(async () => { }); }, 2000); } - initUpdateState(); + updatesStore.init(); + menuStore.init(); + fetchAndSetRates(); } else { openOnboard(); } }); + /** * Update the gradient of the app menu on the active network change */ -const updateGradient = (newGradient: string) => { - //hack may be there is a better way. less.modifyVars doesnt work - if (appMenuRef.value) - (appMenuRef.value as HTMLElement).style.background = - `radial-gradient(137.35% 97% at 100% 50%, rgba(250, 250, 250, 0.94) 0%, rgba(250, 250, 250, 0.96) 28.91%, rgba(250, 250, 250, 0.98) 100%), linear-gradient(180deg, ${newGradient} 80%, #684CFF 100%)`; -}; + const setNetwork = async (network: BaseNetwork) => { trackNetwork(NetworkChangeEvents.NetworkChangePopup, { provider: network.provider, @@ -611,114 +460,23 @@ const showNetworkMenu = computed(() => { route.name == 'dapps') ); }); + const isLocked = computed(() => { return route.name == 'lock-screen'; }); -/**------------------- - * Network Categories - -------------------*/ -const setActiveCategory = async (category: NetworksCategory) => { - await setActiveNetworks(); - activeCategory.value = category; -}; - -/** - * Display Networks - * Categories: All, Pinned, New - */ -const displayNetworks = computed(() => { - switch (activeCategory.value) { - case NetworksCategory.All: - return networks.value.filter(net => - net.isTestNetwork ? enabledTestnetworks.value.includes(net.name) : true, - ); - case NetworksCategory.Pinned: { - const hasCurrentNetwork = pinnedNetworks.value.some( - net => net.name === currentNetwork.value.name, - ); - return hasCurrentNetwork - ? pinnedNetworks.value - : [...pinnedNetworks.value, currentNetwork.value]; - } - case NetworksCategory.New: { - const hasCurrentNetwork = newNetworks.includes(currentNetwork.value.name); - const newNets = networks.value.filter(net => - newNetworks.includes(net.name), - ); - - return hasCurrentNetwork ? newNets : [...newNets, currentNetwork.value]; - } - default: - return networks.value; - } -}); - /** ------------------- * Menu Actions * ------------------- */ const lockAction = async () => { sendToBackgroundFromAction({ - message: JSON.stringify({ - method: InternalMethods.lock, - }), + message: JSON.stringify({ method: InternalMethods.lock }), provider: currentNetwork.value.provider, tabId: await domainState.getCurrentTabId(), }); router.push({ name: 'lock-screen' }); }; -const settingsAction = () => { - closeMoreMenu(); - settingsShow.value = !settingsShow.value; -}; -const otherNetworksAction = () => { - closeMoreMenu(); - addNetworkShow.value = !addNetworkShow.value; -}; -const toggleMoreMenu = () => { - if (timeout != null) { - clearTimeout(timeout); - - timeout = null; - } - if (isOpenMore.value) { - closeMoreMenu(); - } else { - isOpenMore.value = true; - } -}; -const closeMoreMenu = () => { - if (timeout != null) { - clearTimeout(timeout); - } - timeout = setTimeout(() => { - isOpenMore.value = false; - }, 50); -}; -onClickOutside( - dropdown, - () => { - closeMoreMenu(); - }, - { ignore: [toggle] }, -); -const setIsPinnedNetwork = async (network: string, isPinned: boolean) => { - try { - await networksState.setNetworkStatus(network, isPinned); - await setActiveNetworks(); - } catch (error) { - console.error('Failed to set pined network:', error); - } -}; - -const setIsToggledTestNetwork = async () => { - try { - await setActiveNetworks(); - } catch (error) { - console.error('Failed to set is toggled test network:', error); - } -}; diff --git a/packages/extension/src/ui/action/components/app-menu/components/app-menu-item.vue b/packages/extension/src/ui/action/components/app-menu/components/app-menu-item.vue index 5fca329e3..c08da3bdd 100644 --- a/packages/extension/src/ui/action/components/app-menu/components/app-menu-item.vue +++ b/packages/extension/src/ui/action/components/app-menu/components/app-menu-item.vue @@ -2,15 +2,25 @@ -

-
+ +
- {{ network.name_long }} +
+ + {{ network.name_long }}
-
- +
+
@@ -57,9 +87,12 @@ import NewIcon from '@action/icons/asset/new-icon.vue'; import SwapAddedIcon from '@/ui/action/icons/asset/swap-added-icon.vue'; import PinIcon from '@action/icons/actions/pin.vue'; import DragIcon from '@action/icons/common/drag-icon.vue'; - +import { useNetworksStore } from '@action/store/networks-store'; import { trackNetwork } from '@/libs/metrics'; import { NetworkChangeEvents, NetworkType } from '@/libs/metrics/types'; +import Tooltip from '@/ui/action/components/tooltip/index.vue'; + +const newtworkStore = useNetworksStore(); const props = defineProps({ network: { @@ -93,13 +126,16 @@ const props = defineProps({ return { networks: [], swap: [] }; }, }, + isExpanded: { + type: Boolean, + default: true, + }, }); const imageTag = ref(null); const emit = defineEmits<{ (e: 'update:gradient', data: string): void; - (e: 'update:pinNetwork', network: string, isPinned: boolean): void; }>(); /** @@ -190,7 +226,7 @@ const setPinned = async () => { networkType: networkType, isPinned: !props.isPinned, }); - emit('update:pinNetwork', props.network.name, !props.isPinned); + newtworkStore.setIsPinnedNetwork(props.network.name, !props.isPinned); }; /** ------------------------ @@ -257,7 +293,7 @@ onUnmounted(() => { color: #fff !important; border: 1px solid @white; position: absolute; - left: 23px; + left: 21px; top: -5px; &-new { padding: 1px 3px 0px 3px; @@ -278,14 +314,21 @@ onUnmounted(() => { } .app-menu { - &__link { + &__button-network { + &-expand { + width: 97%; + padding-right: 8px; + } + &-collapse { + width: 40px; + } text-decoration: none; display: flex; justify-content: space-between; justify-self: center; align-items: center; flex-direction: row; - width: 97%; + min-height: 40px !important; max-height: 40px; margin-bottom: 3px; @@ -293,9 +336,26 @@ onUnmounted(() => { cursor: pointer; position: relative; border-radius: 10px; - padding-right: 8px; transition: top 1s linear; transition: bottom 1s linear; + &__tooltip { + min-height: 40px !important; + max-height: 40px; + } + &__logo { + display: flex; + justify-content: flex-start; + align-items: center; + flex-direction: row; + gap: 8px; + position: relative; + img { + width: 24px; + height: 24px; + border-radius: 50%; + object-fit: contain; + } + } &:first-of-type { margin-top: 0; /* Removes top margin for the first element */ } @@ -336,12 +396,12 @@ onUnmounted(() => { } } &:hover { - .app-menu__link__block__drag, - .app-menu__link__block__pin { + .app-menu__button-network__block__drag, + .app-menu__button-network__block__pin { transition: opacity 300ms ease-in; opacity: 1 !important; } - .app-menu__link__block__pin__visible { + .app-menu__button-network__block__pin__visible { svg path { fill: #684cff; fill-opacity: 1; @@ -371,8 +431,8 @@ onUnmounted(() => { box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.16); position: -webkit-sticky; position: sticky; - z-index: 2; opacity: 1; + z-index: 2; span { font-weight: 500; } @@ -380,11 +440,11 @@ onUnmounted(() => { background: @white; } - .app-menu__link__block__pin { + .app-menu__button-network__block__pin { transition: opacity 300ms ease-in; opacity: 1; } - .app-menu__link__block__pin__visible { + .app-menu__button-network__block__pin__visible { svg path { fill: #684cff !important; fill-opacity: 1; diff --git a/packages/extension/src/ui/action/components/app-menu/components/app-menu-tab.vue b/packages/extension/src/ui/action/components/app-menu/components/app-menu-tab.vue index 7de225392..9aeb6bdc4 100644 --- a/packages/extension/src/ui/action/components/app-menu/components/app-menu-tab.vue +++ b/packages/extension/src/ui/action/components/app-menu/components/app-menu-tab.vue @@ -71,7 +71,7 @@ const setActiveCategory = (category: NetworksCategory) => { border-radius: 10px; padding: 4px; gap: 1px; - margin-top: 4px; + margin-top: 8px; margin-bottom: 4px; &-tab { diff --git a/packages/extension/src/ui/action/components/app-menu/index.vue b/packages/extension/src/ui/action/components/app-menu/index.vue index 48f354d13..ce5d1c027 100644 --- a/packages/extension/src/ui/action/components/app-menu/index.vue +++ b/packages/extension/src/ui/action/components/app-menu/index.vue @@ -1,14 +1,117 @@ -
+

Press Pin button @@ -51,14 +161,24 @@ diff --git a/packages/extension/src/ui/action/components/base-search/index.vue b/packages/extension/src/ui/action/components/base-search/index.vue index 9f4afbc68..c2b1c5c0d 100644 --- a/packages/extension/src/ui/action/components/base-search/index.vue +++ b/packages/extension/src/ui/action/components/base-search/index.vue @@ -3,6 +3,7 @@ diff --git a/packages/extension/src/ui/action/icons/social/twitter-icon.vue b/packages/extension/src/ui/action/icons/social/twitter-icon.vue index 91452e9ed..133d79ca2 100644 --- a/packages/extension/src/ui/action/icons/social/twitter-icon.vue +++ b/packages/extension/src/ui/action/icons/social/twitter-icon.vue @@ -2,15 +2,14 @@ diff --git a/packages/extension/src/ui/action/main.ts b/packages/extension/src/ui/action/main.ts index 46c09b367..b0fbc76d6 100644 --- a/packages/extension/src/ui/action/main.ts +++ b/packages/extension/src/ui/action/main.ts @@ -3,6 +3,7 @@ import App from './App.vue'; import router from './router'; import * as filters from './utils/filters'; import Vue3Lottie from 'vue3-lottie'; +import { createPinia } from 'pinia'; global.WeakMap = WeakMap; @@ -11,9 +12,9 @@ if (import.meta.env.DEV) { } const app = createApp(App); +const pinia = createPinia(); -app.use(router).use(Vue3Lottie, { name: 'vue3lottie' }); +app.use(router).use(Vue3Lottie, { name: 'vue3lottie' }).use(pinia); app.config.globalProperties.$filters = filters; - app.mount('#app'); diff --git a/packages/extension/src/ui/action/store/menu-store.ts b/packages/extension/src/ui/action/store/menu-store.ts new file mode 100644 index 000000000..057cad6bb --- /dev/null +++ b/packages/extension/src/ui/action/store/menu-store.ts @@ -0,0 +1,26 @@ +import { defineStore } from 'pinia' +import { ref, } from 'vue'; +import MenuState from '@/libs/menu-state'; + +export const useMenuStore = defineStore('useMenuStore', () => { + + const menuState = new MenuState(); + const isExpanded = ref(false); + + const setIsExpanded = async (value: boolean) => { + isExpanded.value = value; + menuState.setIsExpanded(value); + } + + const init = async () => { + isExpanded.value = await menuState.getIsExpanded(); + } + + return { + menuState, + isExpanded, + setIsExpanded, + init + } +}) + diff --git a/packages/extension/src/ui/action/store/networks-store.ts b/packages/extension/src/ui/action/store/networks-store.ts new file mode 100644 index 000000000..596c506b7 --- /dev/null +++ b/packages/extension/src/ui/action/store/networks-store.ts @@ -0,0 +1,131 @@ +/** + * @file Manages the state and actions related to networks in the application. + * + * This store uses Pinia to manage the state of networks, including fetching all networks, + * managing pinned networks, and handling test networks. + */ + +import { defineStore } from 'pinia'; +import { BaseNetwork } from '@/types/base-network'; +import NetworksState from '@/libs/networks-state'; +import { getAllNetworks } from '@/libs/utils/networks'; +import { NetworkNames } from '@enkryptcom/types'; +import { computed, ref } from 'vue'; + +/** + * Defines the store for managing networks. The store is initilized in App.vue on mount. + * + * @property {NetworksState} networksState - The state management instance for networks. + * @property {Ref} allNetworks - A reference to the list of all networks. + * @property {Ref} pinnedNetworkNames - A reference to the list of pinned network names. + * @property {Ref} enabledTestNetworks - A reference to the list of enabled test networks. + * + * @computed + * @computed {ComputedRef} pinnedNetworks - A computed reference to the list of pinned networks. + * @computed {ComputedRef} orderedNetworks - A computed reference to the ordered list of networks, with pinned networks first and test networks included only if enabled. + * + * @actions + * @method {Function} setIsPinnedNetwork - Sets the pinned network status. + * @method {Function} updateNetworkOrder - Updates the order of the pinned networks and refreshes the active networks. + * @method {Function} setActiveNetworks - Fetches and sets the active networks, pinned network names, and enabled test networks. + * @method {Function} setTestNetStatus - Sets the test network status. + */ +export const useNetworksStore = defineStore('useNetworksStore', () => { + const networksState = new NetworksState(); + const allNetworks = ref([]); + const pinnedNetworkNames = ref([]); + const enabledTestNetworks = ref([]); + + /** + * @property {ComputedRef} pinnedNetworks - A computed reference to the list of pinned networks. + */ + const pinnedNetworks = computed(() => { + return allNetworks.value.filter(network => { + if (pinnedNetworkNames.value.includes(network.name)) { + return true; + } + return false; + }); + }); + + /** + * @property {ComputedRef} orderedNetworks - A computed reference to the ordered list of networks, with pinned networks first and test networks included only if enabled. + * + * The list is composed of pinned networks followed by all other networks + * that are not pinned. Test networks are included only if they are enabled. + * + * @returns {BaseNetwork[]} An array of networks in the desired order. + */ + const orderedNetworks = computed(() => { + return [ + ...pinnedNetworks.value, + ...allNetworks.value.filter(network => { + if (pinnedNetworkNames.value.includes(network.name)) { + return false; + } + if (network.isTestNetwork) { + return enabledTestNetworks.value.includes(network.name); + } + return true; + }), + ]; + }); + + /** + * @method setActiveNetworks - Fetches and sets the active networks, pinned network names, and enabled test networks. + */ + const setActiveNetworks = async () => { + allNetworks.value = await getAllNetworks(); + pinnedNetworkNames.value = await networksState.getPinnedNetworkNames(); + enabledTestNetworks.value = await networksState.getEnabledTestNetworks(); + }; + + /** + * @method updateNetworkOrder - Updates the order of the pinned networks and refreshes the active networks. + * @param newOrder - The new order of the PINNED networks + */ + const updateNetworkOrder = async (newOrder: NetworkNames[]) => { + await networksState.reorderNetwork(newOrder); + await setActiveNetworks(); + }; + + /** + * @method setIsPinnedNetwork - sets the pinned network status + * @param network - Network name to be pinned or unpinned + * @param isPinned - Boolean value to determine if network is pinned or unpinned + */ + const setIsPinnedNetwork = async (network: string, isPinned: boolean) => { + try { + await networksState.setNetworkStatus(network, isPinned); + await setActiveNetworks(); + } catch (error) { + console.error('Failed to set pined network:', error); + } + }; + + /** + * + * @param network {string} - network to be updated + * @param status - boolean value to determine if network is enabled or disabled + */ + const setTestNetStatus = async (network: string, status: boolean) => { + try { + await networksState.setTestnetStatus(network, status); + } catch (error) { + console.error('Failed to set test network status:', error); + } + }; + + return { + networksState, + allNetworks, + orderedNetworks, + pinnedNetworks, + enabledTestNetworks, + pinnedNetworkNames, + setIsPinnedNetwork, + updateNetworkOrder, + setActiveNetworks, + setTestNetStatus, + }; +}); diff --git a/packages/extension/src/ui/action/store/updates-store.ts b/packages/extension/src/ui/action/store/updates-store.ts new file mode 100644 index 000000000..da6bfaea9 --- /dev/null +++ b/packages/extension/src/ui/action/store/updates-store.ts @@ -0,0 +1,123 @@ +import { defineStore } from 'pinia' +import { ref } from 'vue'; +import UpdatesState from '@/libs/updates-state'; +import { getLatestEnkryptUpdates } from '@action/utils/browser'; +import { Updates } from '@/ui/action/types/updates'; +import { gt as semverGT } from 'semver'; + +export const useUpdatesStore = defineStore('useUpdatesStore', () => { + + /** + * Curretnt version of the app + */ + const currentVersion = __PACKAGE_VERSION__; + /** + * @updatesState {UpdatesState} - An instance of the UpdatesState in I. + */ + const updatesState = new UpdatesState(); + /** + * @releases {Updates | null} - The latest Enkrypt updatesinn json object. + */ + const releases = ref(null); + + const stateCurrentReleaseTimestamp = ref(0); + /** + * @updateIsLoaded {boolean} - A boolean value that indicates whether the updates are loaded. + */ + const updatesIsLoaded = ref(false); + /** + * @showUpdatesBtn {boolean} - A boolean value that indicates whether to show the updates button + */ + const showUpdatesBtn = ref(false); + + + /** +* Asynchronously determines whether to show the updates button based on the last version viewed and the current version. +* +* The function performs the following steps: +* 1. Retrieves the last version viewed from the updates state. +* 2. Checks if the last version viewed is empty or if the current version is greater than the last version viewed. +* 3. If the above condition is true, calculates an expiration timestamp (2 weeks from the current release timestamp). +* 4. Sets the `showUpdatesBtn` value to true if the current release timestamp is less than the expiration timestamp. +* 5. Otherwise, sets the `showUpdatesBtn` value to false. +* +* If an error occurs during the process, it logs an error message to the console. +* +* @returns {Promise} A promise that resolves when the function completes. +*/ + const getShowUpdatesBtn = async () => { + try { + const lastVersionViewed = await updatesState.getLastVersionViewed(); + if ( + lastVersionViewed === '' || + (currentVersion && semverGT(currentVersion, lastVersionViewed)) + ) { + const expireTimestamp = stateCurrentReleaseTimestamp.value + 12096e5; //2 weeks; + showUpdatesBtn.value = + stateCurrentReleaseTimestamp.value < expireTimestamp; + } else { + showUpdatesBtn.value = false; + } + } catch (error) { + console.error('Failed to get show updates button:', error); + } + }; + /** +* Initializes the update state by performing the following actions: +* 1. Retrieves the current release from the state. +* 2. Updates the current release timestamp. +* 3. If the current release is empty or different from the current version in the app state, +* sets the current release and updates the release timestamp. +* 4. Fetches the latest Enkrypt updates and sets the releases state. +* 5. Displays the updates button if there are new releases. +* 6. Sets the updatesIsLoaded state to true if successful, otherwise false. +* +* @async +* @function initUpdateState +* @returns {Promise} A promise that resolves when the update state is initialized. +* @throws Will log an error message if the initialization fails. +*/ + const init = async () => { + try { + + const currentReleaseInState = await updatesState.getCurrentRelease(); + stateCurrentReleaseTimestamp.value = + await updatesState.getCurrentReleaseTimestamp(); + if ( + currentReleaseInState === '' || + currentReleaseInState !== currentVersion + ) { + await updatesState.setCurrentRelease(currentVersion); + const newReleaseTimestamp = Date.now(); + await updatesState.setCurrentReleaseTimestamp(newReleaseTimestamp); + stateCurrentReleaseTimestamp.value = newReleaseTimestamp; + } + releases.value = await getLatestEnkryptUpdates(); + if (releases.value) { + + await getShowUpdatesBtn(); + } + updatesIsLoaded.value = true; + } catch (error) { + console.error('Failed to init update state:', error); + updatesIsLoaded.value = false; + } + }; + + const setLastVersionViewed = async (_version: string) => { + return updatesState.setLastVersionViewed(_version); + } + + return { + updatesState, + releases, + updatesIsLoaded, + showUpdatesBtn, + init, + currentVersion, + stateCurrentReleaseTimestamp, + getShowUpdatesBtn, + setLastVersionViewed + } +}) + diff --git a/packages/extension/src/ui/action/types/filters.ts b/packages/extension/src/ui/action/types/filters.ts index bce420d08..ff947a4b0 100644 --- a/packages/extension/src/ui/action/types/filters.ts +++ b/packages/extension/src/ui/action/types/filters.ts @@ -1,10 +1,12 @@ + /* eslint-disable @typescript-eslint/no-namespace */ import { formatDuration, replaceWithEllipsis, formatFiatValue, formatFloatingPointValue, - truncate + truncate, + parseCurrency } from '../utils/filters'; declare global { namespace $filters { @@ -13,7 +15,8 @@ declare global { replaceWithEllipsis, formatFiatValue, formatFloatingPointValue, - truncate + truncate, + parseCurrency }; } } diff --git a/packages/extension/src/ui/action/utils/currencyConfig.ts b/packages/extension/src/ui/action/utils/currencyConfig.ts new file mode 100644 index 000000000..067ec6c39 --- /dev/null +++ b/packages/extension/src/ui/action/utils/currencyConfig.ts @@ -0,0 +1,173 @@ + +const LANG_INFO = { + "AED": { locale: "ar-AE" }, + "AFN": { locale: "prs-AF" }, + "ALL": { locale: "sq-AL" }, + "AMD": { locale: "hy-AM" }, + "ANG": { locale: "nl-CW" }, // Dutch (Curaçao) + "AOA": { locale: "pt-AO" }, + "ARS": { locale: "es-AR" }, + "AUD": { locale: "en-AU" }, + "AWG": { locale: "nl-AW" }, + "AZN": { locale: "az-Latn-AZ" }, + "BAM": { locale: "bs-Latn-BA" }, + "BBD": { locale: "en-BB" }, + "BDT": { locale: "bn-BD" }, + "BGN": { locale: "bg-BG" }, + "BHD": { locale: "ar-BH" }, + "BIF": { locale: "fr-BI" }, + "BMD": { locale: "en-BM" }, + "BND": { locale: "ms-BN" }, + "BOB": { locale: "es-BO" }, + "BRL": { locale: "pt-BR" }, + "BSD": { locale: "en-BS" }, + "BTN": { locale: "dz-BT" }, + "BWP": { locale: "en-BW" }, + "BYN": { locale: "be-BY" }, + "BYR": { locale: "be-BY" }, + "BZD": { locale: "en-BZ" }, + "CAD": { locale: "en-CA" }, + "CDF": { locale: "fr-CD" }, + "CHF": { locale: "de-CH" }, + "CLF": { locale: "es-CL" }, + "CLP": { locale: "es-CL" }, + "CNH": { locale: "zh-CN" }, + "CNY": { locale: "zh-CN" }, + "COP": { locale: "es-CO" }, + "CRC": { locale: "es-CR" }, + "CUC": { locale: "es-CU" }, + "CUP": { locale: "es-CU" }, + "CVE": { locale: "pt-CV" }, + "CZK": { locale: "cs-CZ" }, + "DJF": { locale: "fr-DJ" }, + "DKK": { locale: "da-DK" }, + "DOP": { locale: "es-DO" }, + "DZD": { locale: "ar-DZ" }, + "EGP": { locale: "ar-EG" }, + "ERN": { locale: "ti-ER" }, + "ETB": { locale: "am-ET" }, + "EUR": { locale: "fr-FR" }, // Varies by country + "FJD": { locale: "en-FJ" }, + "FKP": { locale: "en-FK" }, + "GBP": { locale: "en-GB" }, + "GEL": { locale: "ka-GE" }, + "GHS": { locale: "en-GH" }, + "GGP": { locale: "en-GG" }, + "GIP": { locale: "en-GI" }, + "GMD": { locale: "en-GM" }, + "GNF": { locale: "fr-GN" }, + "GTQ": { locale: "es-GT" }, + "GYD": { locale: "en-GY" }, + "HKD": { locale: "zh-HK" }, + "HNL": { locale: "es-HN" }, + "HRK": { locale: "hr-HR" }, + "HTG": { locale: "ht-HT" }, + "HUF": { locale: "hu-HU" }, + "IDR": { locale: "id-ID" }, + "ILS": { locale: "he-IL" }, + "IMP": { locale: "en-IM" }, + "INR": { locale: "hi-IN" }, + "IQD": { locale: "ar-IQ" }, + "IRR": { locale: "fa-IR" }, + "ISK": { locale: "is-IS" }, + "JEP": { locale: "en-JE" }, + "JMD": { locale: "en-JM" }, + "JOD": { locale: "ar-JO" }, + "JPY": { locale: "ja-JP" }, + "KES": { locale: "sw-KE" }, + "KGS": { locale: "ky-KG" }, + "KHR": { locale: "km-KH" }, + "KMF": { locale: "fr-KM" }, + "KPW": { locale: "ko-KP" }, + "KRW": { locale: "ko-KR" }, + "KWD": { locale: "ar-KW" }, + "KYD": { locale: "en-KY" }, + "KZT": { locale: "kk-KZ" }, + "LAK": { locale: "lo-LA" }, + "LBP": { locale: "ar-LB" }, + "LKR": { locale: "si-LK" }, + "LRD": { locale: "en-LR" }, + "LTL": { locale: "lt-LT" }, + "LSL": { locale: "st-LS" }, + "LVL": { locale: "lv-LV" }, + "LYD": { locale: "ar-LY" }, + "MAD": { locale: "ar-MA" }, + "MDL": { locale: "ro-MD" }, + "MGA": { locale: "mg-MG" }, + "MKD": { locale: "mk-MK" }, + "MMK": { locale: "my-MM" }, + "MNT": { locale: "mn-MN" }, + "MOP": { locale: "zh-MO" }, + "MRU": { locale: "ar-MR" }, + "MUR": { locale: "en-MU" }, + "MVR": { locale: "dv-MV" }, + "MWK": { locale: "ny-MW" }, + "MXN": { locale: "es-MX" }, + "MYR": { locale: "ms-MY" }, + "MZN": { locale: "pt-MZ" }, + "NAD": { locale: "af-NA" }, + "NGN": { locale: "en-NG" }, + "NIO": { locale: "es-NI" }, + "NOK": { locale: "no-NO" }, + "NPR": { locale: "ne-NP" }, + "NZD": { locale: "en-NZ" }, + "OMR": { locale: "ar-OM" }, + "PAB": { locale: "es-PA" }, + "PEN": { locale: "es-PE" }, + "PGK": { locale: "en-PG" }, + "PHP": { locale: "fil-PH" }, + "PKR": { locale: "ur-PK" }, + "PLN": { locale: "pl-PL" }, + "PYG": { locale: "es-PY" }, + "QAR": { locale: "ar-QA" }, + "RON": { locale: "ro-RO" }, + "RSD": { locale: "sr-RS" }, + "RUB": { locale: "ru-RU" }, + "RWF": { locale: "rw-RW" }, + "SAR": { locale: "ar-SA" }, + "SBD": { locale: "en-SB" }, + "SCR": { locale: "fr-SC" }, + "SDG": { locale: "ar-SD" }, + "SEK": { locale: "sv-SE" }, + "SGD": { locale: "en-SG" }, + "SHP": { locale: "en-SH" }, + "SLE": { locale: "en-SL" }, + "SLL": { locale: "en-SL" }, + "SOS": { locale: "so-SO" }, + "SRD": { locale: "nl-SR" }, + "SSP": { locale: "en-SS" }, + "STD": { locale: "pt-ST" }, + "STN": { locale: "pt-ST" }, + "SVC": { locale: "es-SV" }, + "SYP": { locale: "ar-SY" }, + "SZL": { locale: "ss-SZ" }, + "THB": { locale: "th-TH" }, + "TJS": { locale: "tg-TJ" }, + "TMT": { locale: "tk-TM" }, + "TND": { locale: "ar-TN" }, + "TOP": { locale: "to-TO" }, + "TRY": { locale: "tr-TR" }, + "TTD": { locale: "en-TT" }, + "TWD": { locale: "zh-TW" }, + "TZS": { locale: "sw-TZ" }, + "UAH": { locale: "uk-UA" }, + "UGX": { locale: "lg-UG" }, + "USD": { locale: "en-US" }, + "UYU": { locale: "es-UY" }, + "UZS": { locale: "uz-Latn-UZ" }, + "VES": { locale: "es-VE" }, + "VND": { locale: "vi-VN" }, + "VUV": { locale: "bi-VU" }, + "WST": { locale: "sm-WS" }, + "XAF": { locale: "fr-CM" }, + "XCD": { locale: "en-AG" }, + "XOF": { locale: "fr-SN" }, + "XPF": { locale: "fr-PF" }, + "YER": { locale: "ar-YE" }, + "ZAR": { locale: "zu-ZA" }, + "ZMW": { locale: "en-ZM" }, + "ZMK": { locale: "en-ZM" }, + "ZWL": { locale: "en-ZW" } +}; + +export { LANG_INFO }; \ No newline at end of file diff --git a/packages/extension/src/ui/action/utils/filters.ts b/packages/extension/src/ui/action/utils/filters.ts index 9cd4a793a..f4551b72a 100644 --- a/packages/extension/src/ui/action/utils/filters.ts +++ b/packages/extension/src/ui/action/utils/filters.ts @@ -1,8 +1,11 @@ +import { BigNumber } from 'bignumber.js'; import moment from 'moment'; +import { LANG_INFO } from './currencyConfig'; import { formatFiatValue, formatFloatingPointValue, } from '@/libs/utils/number-formatter'; +import { useCurrencyStore } from '../views/settings/store'; export const replaceWithEllipsis = ( value: string, keepLeft: number, @@ -17,12 +20,29 @@ export const replaceWithEllipsis = ( ); }; +export const parseCurrency = (value: string | number): string => { + const bnValue = BigNumber(value); + const parsedValue = bnValue.isNaN() || bnValue.isZero() || value === undefined ? "0" : bnValue.toString().replace(/,/g, ''); + const store = useCurrencyStore(); + const currency = store.currentSelectedCurrency; + const currencyCode = + LANG_INFO[currency as keyof typeof LANG_INFO].locale || 'en-US'; + const findRate = store.currencyList.find(c => c.fiat_currency === currency); + const rate = findRate || { exchange_rate: 1 }; + + return new Intl.NumberFormat(currencyCode, { + style: 'currency', + currency: currency, + }).format( + parseFloat(BigNumber(parsedValue).times(rate.exchange_rate).toString()), + ); +}; export const truncate = (value: string, length: number): string => { if (!value) return ''; value = value.toString(); return value.length > length ? value.substring(0, length) + '...' : value; -} +}; export const formatDuration = ( duration: moment.Duration, diff --git a/packages/extension/src/ui/action/utils/misc.ts b/packages/extension/src/ui/action/utils/misc.ts index 4109276ca..68420f312 100644 --- a/packages/extension/src/ui/action/utils/misc.ts +++ b/packages/extension/src/ui/action/utils/misc.ts @@ -1,5 +1,4 @@ import notfoundimg from '@action/assets/common/not-found.jpg'; - export const imageLoadError = (img: any) => { img.target.src = notfoundimg; }; diff --git a/packages/extension/src/ui/action/views/accounts/components/add-account-form.vue b/packages/extension/src/ui/action/views/accounts/components/add-account-form.vue index c907ce028..034b4706d 100644 --- a/packages/extension/src/ui/action/views/accounts/components/add-account-form.vue +++ b/packages/extension/src/ui/action/views/accounts/components/add-account-form.vue @@ -1,6 +1,10 @@ @@ -134,41 +151,8 @@ const addAccount = async () => { diff --git a/packages/extension/src/ui/action/views/lock-screen/index.vue b/packages/extension/src/ui/action/views/lock-screen/index.vue index 5c4afe123..004ff58d3 100644 --- a/packages/extension/src/ui/action/views/lock-screen/index.vue +++ b/packages/extension/src/ui/action/views/lock-screen/index.vue @@ -1,5 +1,12 @@