Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
9cd3295
devop: refactor updates state into pinia store
olgakup Feb 11, 2025
579a4e2
devop: create networks store
olgakup Feb 14, 2025
8f95d36
devop: refactor custom and test nets to use network store
olgakup Feb 14, 2025
9b844e2
devop: migrate networsk search
olgakup Feb 14, 2025
32870a2
devop: migrate menu under 1 component
olgakup Feb 14, 2025
16feaf8
feat: basic expand/collapse logic
olgakup Mar 10, 2025
6b089f7
feat: collapsed networks ui
olgakup Mar 10, 2025
a8ee9cc
fix: styles
olgakup Mar 10, 2025
a29de4f
fix: styles
olgakup Mar 10, 2025
8ced84b
feat: add secure clear from code rabbit
gamalielhere Mar 11, 2025
c6017f2
fix: popup button
gamalielhere Mar 11, 2025
954557e
feat: add render on scroll
olgakup Mar 11, 2025
347d9c5
Merge branch 'develop' of github.com:enkryptcom/enKrypt into fix/feed…
gamalielhere Mar 11, 2025
ab3bc1d
feat: update 0x api to reflect new changes
gamalielhere Mar 11, 2025
80678e5
fix: round out decimal to whole int
gamalielhere Mar 12, 2025
037e293
fix: solana not enough funds for fees error
gamalielhere Mar 12, 2025
febd329
fix: show error on swap
gamalielhere Mar 12, 2025
5ab8f20
fix: catch error transaction simulation failed for sol
gamalielhere Mar 12, 2025
ef4cd51
devop: upgrade packages
kvhnuke Mar 13, 2025
22f59b9
feat: add new networks
gamalielhere Mar 13, 2025
4cf21b6
fix: bera info
gamalielhere Mar 13, 2025
45ad966
fix: asset info
gamalielhere Mar 13, 2025
19cfbc1
devop: cleanup
gamalielhere Mar 13, 2025
475a675
Merge branch 'devop/pakage-updates' of github.com:enkryptcom/enKrypt …
gamalielhere Mar 13, 2025
fdeb66a
Merge branch 'devop/pakage-updates' of github.com:enkryptcom/enKrypt …
gamalielhere Mar 13, 2025
c9f5eb7
Merge branch 'devop/pakage-updates' of github.com:enkryptcom/enKrypt …
gamalielhere Mar 13, 2025
87090ee
Merge branch 'devop/pakage-updates' of github.com:enkryptcom/enKrypt …
gamalielhere Mar 13, 2025
099007e
Merge branch 'devop/pakage-updates' of github.com:enkryptcom/enKrypt …
gamalielhere Mar 13, 2025
7b54100
Merge branch 'devop/pakage-updates' of github.com:enkryptcom/enKrypt …
gamalielhere Mar 13, 2025
ec5b0b6
Merge branch 'devop/pakage-updates' of github.com:enkryptcom/enKrypt …
gamalielhere Mar 13, 2025
f66a311
fix: set fantom send to fastest
gamalielhere Mar 14, 2025
57375c4
Merge branch 'main' of github.com:enkryptcom/enKrypt into fix/ftm-und…
gamalielhere Mar 14, 2025
ef5351c
Merge branch 'devop/pakage-updates' of github.com:enkryptcom/enKrypt …
gamalielhere Mar 14, 2025
2d3c620
feat: update bitcoin icons
olgakup Mar 17, 2025
132022a
devop: update colana icons
olgakup Mar 17, 2025
08d204a
devop: update polkadot icons
olgakup Mar 17, 2025
d431543
devop: update kadena icon
olgakup Mar 17, 2025
70b7e43
devop: update ethereum icons
olgakup Mar 17, 2025
03509bc
devop: add search button in collapsed menu
olgakup Mar 17, 2025
98b1cc6
fix: collapsed scroll area height
olgakup Mar 17, 2025
fe10aa8
devop: make icon buttons accessible
olgakup Mar 18, 2025
cf9de4a
fix: icon class name
olgakup Mar 18, 2025
e12aeef
fix: icon class name again
olgakup Mar 18, 2025
15f1326
adds taraxa chain
Elod23 Mar 18, 2025
69485f4
chore: adds asset info handler
Elod23 Mar 18, 2025
36d7077
devop: settings state, cleanup backup
gamalielhere Mar 18, 2025
501f3e2
fix: increase gas price for fantom
gamalielhere Mar 18, 2025
dad0d89
feat: add tooltips to networks on collapsed
olgakup Mar 18, 2025
e39e715
devop: fix width
olgakup Mar 18, 2025
4e95d4f
devop: fix drag
olgakup Mar 18, 2025
217cad6
devop: merge with develop update amplitude icon
olgakup Mar 18, 2025
60bb7a2
fix: z index of menu
olgakup Mar 18, 2025
6567b91
feat: save expanded to store
olgakup Mar 19, 2025
9fed4d7
fix: max estimate gas issue
kvhnuke Mar 20, 2025
b8d0a81
feat: add currency change and flags
gamalielhere Mar 20, 2025
c017077
devop: change message catch
gamalielhere Mar 20, 2025
ec3ed6e
devop: add amplitude to kadena
kvhnuke Mar 20, 2025
40e3fdf
devop: remove activity fetch
gamalielhere Mar 21, 2025
5842271
fix: kaia swap
kvhnuke Mar 21, 2025
06e7b59
fix: taraxa
gamalielhere Mar 21, 2025
8c5ce8a
devop: add taraxa
gamalielhere Mar 21, 2025
d8040ec
fix: remove story as well
gamalielhere Mar 21, 2025
33228ee
fix: fees and activity
kvhnuke Mar 21, 2025
d3347e6
chore: error:
gamalielhere Mar 24, 2025
4be8224
Merge branch 'devop/pakage-updates' into feat/collapse-networks-menu
kvhnuke Mar 24, 2025
ac7fd61
chore: add caption under currency settings
gamalielhere Mar 24, 2025
643b681
devop: update and fix the missing network
kvhnuke Mar 24, 2025
f6aa784
fix: add border and sort some popular currencies higher
gamalielhere Mar 24, 2025
6970fed
chore: update copy
gamalielhere Mar 24, 2025
ab6fac5
fix: solana priority fees
kvhnuke Mar 25, 2025
0293a1d
feat: add isExpanded state
olgakup Mar 25, 2025
ea04df2
devop: intilize isExpanded state before mount
olgakup Mar 25, 2025
638c8e4
feat: add coti
gamalielhere Mar 26, 2025
b4c0949
chore: remove folder
gamalielhere Mar 26, 2025
879fa01
Merge pull request #628 from enkryptcom/feat/add-secure-clear
gamalielhere Mar 26, 2025
4fd1358
Merge pull request #629 from enkryptcom/fix/feedback-popup
gamalielhere Mar 26, 2025
52d01cb
Merge branch 'devop/pakage-updates' of github.com:enkryptcom/enKrypt …
gamalielhere Mar 26, 2025
e342205
Merge pull request #633 from enkryptcom/fix/solana-insufficient-funds
gamalielhere Mar 26, 2025
dc9e45e
Merge pull request #634 from enkryptcom/fix/swap-error
gamalielhere Mar 26, 2025
ea2fbaf
Merge pull request #635 from enkryptcom/fix/solana-swap-error
gamalielhere Mar 26, 2025
e74ec74
feat: app dialog
olgakup Mar 26, 2025
4f6846f
devop: select assets use dialog
olgakup Mar 26, 2025
d53ae8e
devop: update select fee to use app dialog
olgakup Mar 27, 2025
a1e9007
devop: update network select to use dialog
olgakup Mar 27, 2025
3211917
devop: fix padding in deposit screen
olgakup Mar 27, 2025
17e7045
devop: fix padding in nft detail screen
olgakup Mar 27, 2025
05e3ea3
devop: update network assets to use dialog
olgakup Mar 27, 2025
0c4744d
fix: icons squeeshing
olgakup Mar 27, 2025
cd40ec1
chore: add comments
olgakup Mar 27, 2025
a452f68
devop: update twitter icon
gamalielhere Mar 27, 2025
e615793
Merge pull request #632 from enkryptcom/feat/update-0x
gamalielhere Mar 27, 2025
8cb681a
fix: warning
olgakup Mar 27, 2025
1e9d84d
chore: remove comments
olgakup Mar 27, 2025
99b6022
chore: update to webps
gamalielhere Mar 27, 2025
3f3f908
devop: fix store
olgakup Mar 27, 2025
8d588c8
fix: warnings
kvhnuke Mar 27, 2025
72e4f11
Merge pull request #650 from enkryptcom/feat/app-dialog
olgakup Mar 27, 2025
fbdf5a3
devop: use api images
gamalielhere Mar 28, 2025
cea01d5
Merge pull request #651 from enkryptcom/fix/twitter-logo
gamalielhere Mar 28, 2025
a14ab0c
Merge pull request #639 from enkryptcom/fix/ftm-underpriced
gamalielhere Mar 28, 2025
c5fcbbd
Merge pull request #645 from enkryptcom/feat/currency-exchange
gamalielhere Mar 28, 2025
4719c7f
fix: significantly increased doge fees per #592
kvhnuke Mar 28, 2025
6ee8635
devop: seperate swap tests
kvhnuke Mar 28, 2025
6e2b552
fix: use mainnet api
gamalielhere Mar 28, 2025
24ed877
devop: add pinia to provider pages
kvhnuke Mar 28, 2025
980f05b
Merge pull request #656 from enkryptcom/devop/seperate-swap-tests
kvhnuke Mar 28, 2025
912dadf
fix: if collapsed dont show searched networks
olgakup Mar 31, 2025
98b8040
fix: catch error correctly, remove unsupported networks
gamalielhere Mar 31, 2025
0a2bbaf
fix: update approval address
gamalielhere Mar 31, 2025
337c300
fix: swap functionalities
gamalielhere Mar 31, 2025
d7388eb
fix: show message no result found
olgakup Mar 31, 2025
82e3340
fix: add account dialog
olgakup Mar 31, 2025
a5a5568
fix: import account dialog
olgakup Mar 31, 2025
0208125
fix: rename account dialog
olgakup Mar 31, 2025
2a9fc47
fix: delete account dialog
olgakup Mar 31, 2025
af83ea9
fix: padding in account scroll
olgakup Mar 31, 2025
f0c379b
devop: fix icon in confirmation screen
olgakup Mar 31, 2025
3ec7eca
fix: qr code tooltip pisition
olgakup Mar 31, 2025
ec1a660
fix: select nft to send dialog
olgakup Mar 31, 2025
962d81e
fix: search nfts
olgakup Mar 31, 2025
0871f4d
devop: do not rennder select nft dialog
olgakup Mar 31, 2025
c159055
fix: fallthrough atributes warning
olgakup Mar 31, 2025
30c1654
fix: tx sent dialog
olgakup Apr 1, 2025
ddcc15e
devop: add token balance support to base
kvhnuke Apr 1, 2025
f20ff94
devop: add token balance support to base
kvhnuke Apr 1, 2025
46e41b3
devop: add token balance support to immutablezk
kvhnuke Apr 1, 2025
620082e
devop: merge
olgakup Apr 1, 2025
2937523
Merge pull request #647 from enkryptcom/fix/sol-activity-and-fees
kvhnuke Apr 1, 2025
49fe49e
Merge pull request #646 from enkryptcom/devop/add-amp-kda
kvhnuke Apr 1, 2025
894e040
Merge pull request #657 from enkryptcom/fix/zerox
gamalielhere Apr 1, 2025
2599b2a
devop: update rsk node
kvhnuke Apr 1, 2025
915a8c9
Merge branch 'devop/pakage-updates' of github.com:enkryptcom/enKrypt …
kvhnuke Apr 1, 2025
000049d
chore: update rsk
gamalielhere Apr 1, 2025
e702f27
fix: conflicts
gamalielhere Apr 1, 2025
0882b95
fix: add v model back to file
olgakup Apr 1, 2025
5cde200
Merge branch 'devop/pakage-updates' of github.com:enkryptcom/enKrypt …
gamalielhere Apr 1, 2025
4fcbbe1
devop: remove commas from value when parsing
gamalielhere Apr 1, 2025
3b6ec29
fix: currency parsing
kvhnuke Apr 2, 2025
49a5dbb
fix: display tx verify for hw
olgakup Apr 2, 2025
b65e930
fix: close add account
olgakup Apr 2, 2025
e43ef4e
chore: pass string
gamalielhere Apr 2, 2025
d518e6b
Merge branch 'feat/collapse-networks-menu' of github.com:enkryptcom/e…
gamalielhere Apr 2, 2025
161d748
fix: tx event and padding
olgakup Apr 2, 2025
9fe9c09
devop: remove console
gamalielhere Apr 2, 2025
ff5b9db
Merge branch 'feat/collapse-networks-menu' of github.com:enkryptcom/e…
gamalielhere Apr 2, 2025
3b9b2d4
Merge pull request #655 from enkryptcom/fix/doge-tx-fees
kvhnuke Apr 2, 2025
96a664d
devop: cleanup some nfts, fix assets
gamalielhere Apr 2, 2025
1d1ed49
devop: revert
gamalielhere Apr 2, 2025
df34fa8
devop: add new networks to token list
gamalielhere Apr 2, 2025
bc40878
chore: remove tbName when bsEndpoint is supported
gamalielhere Apr 2, 2025
a0f2397
Merge pull request #654 from enkryptcom/devop/add-new-chains
kvhnuke Apr 2, 2025
95edcf0
devop: merge
olgakup Apr 2, 2025
fa1f4a8
Merge branch 'feat/collapse-networks-menu' of github.com:enkryptcom/e…
gamalielhere Apr 2, 2025
3c157fd
fix: build
gamalielhere Apr 2, 2025
1930f86
fix: build
gamalielhere Apr 2, 2025
b49781c
fix: rename account
olgakup Apr 3, 2025
24dd07a
fix: swap initiated dialog
olgakup Apr 3, 2025
f38d608
fix: swap dialog
olgakup Apr 3, 2025
6141a6a
fix: nan on send page
gamalielhere Apr 3, 2025
050918a
devop: remove formatting causing issues when values are too low
gamalielhere Apr 3, 2025
9c1ea55
fix: handle Nan, zero, etc
gamalielhere Apr 4, 2025
74b39b2
Merge pull request #643 from enkryptcom/feat/collapse-networks-menu
kvhnuke Apr 8, 2025
0435a64
fix: tests
kvhnuke Apr 8, 2025
3e68f1e
fix: warning
kvhnuke Apr 8, 2025
3706b62
fix: menu state
kvhnuke Apr 8, 2025
712324b
fix: missing await
olgakup Apr 8, 2025
813cb68
Merge pull request #662 from enkryptcom/fix/missing-await
olgakup Apr 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 16 additions & 0 deletions .github/workflows/test-swap.yml
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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-*'",
Expand All @@ -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",
Expand Down
18 changes: 9 additions & 9 deletions packages/extension-bridge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
68 changes: 34 additions & 34 deletions packages/extension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@enkryptcom/extension",
"version": "2.4.3",
"version": "2.5.0",
"private": true,
"type": "module",
"scripts": {
Expand All @@ -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:^",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -89,55 +89,55 @@
"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",
"@types/wif": "^2.0.5",
"@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": {
Expand Down
38 changes: 38 additions & 0 deletions packages/extension/src/libs/menu-state/index.ts
Original file line number Diff line number Diff line change
@@ -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<void> {
return this.storage.set(StorageKeys.menuState, state);
}

async getState(): Promise<IState> {
const state = await this.storage.get(StorageKeys.menuState);
if (!state) {
const newState: IState = {
isExpanded: true,
};
return newState;
}
return state;
}

async getIsExpanded(): Promise<IState['isExpanded']> {
const state: IState = await this.getState();
return state?.isExpanded ?? true;
}
async setIsExpanded(isExpanded: boolean): Promise<void> {
const state: IState = await this.getState();
const newState: IState = { ...state, isExpanded };
await this.setState(newState);
}
}

export default MenuState;
7 changes: 7 additions & 0 deletions packages/extension/src/libs/menu-state/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export enum StorageKeys {
menuState = 'menu-state-info',
}

export interface IState {
isExpanded: boolean;
}
7 changes: 4 additions & 3 deletions packages/extension/src/libs/nft-handlers/simplehash.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,17 @@ 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');
let allItems: SHNFTType[] = [];
const fetchAll = (continuation?: string): Promise<void> => {
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,
Expand Down
16 changes: 16 additions & 0 deletions packages/extension/src/libs/settings-state/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
SettingsType,
BtcSettingsType,
EnkryptSettingsType,
CurrencySettingsType,
} from './types';
import { merge } from 'lodash';

Expand Down Expand Up @@ -71,16 +72,31 @@ class SettingsState {
async setBtcSettings(state: BtcSettingsType): Promise<void> {
await this.#storage.set(StorageKeys.btcState, state);
}

async setCurrencySettings(state: CurrencySettingsType): Promise<void> {
await this.#storage.set(StorageKeys.currencyState, state);
}

async getCurrencySettings(): Promise<CurrencySettingsType> {
const state = await this.getStateByKey(StorageKeys.currencyState);
const settings: CurrencySettingsType = {
value: 'USD',
};
return merge(settings, state);
}

async getAllSettings(): Promise<SettingsType> {
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,
};
}
Expand Down
6 changes: 6 additions & 0 deletions packages/extension/src/libs/settings-state/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
2 changes: 1 addition & 1 deletion packages/extension/src/libs/updates-state/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class UpdatesState {
}

async getState(): Promise<IState> {
const state = this.storage.get(StorageKeys.updatesInfo);
const state = await this.storage.get(StorageKeys.updatesInfo);
if (!state) {
const newState: IState = {
lastVersionViewed: '',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
};
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import icon from './icons/tbtc.svg';
import icon from './icons/tbtc.webp';
import { NetworkNames } from '@enkryptcom/types';
import {
BitcoinNetwork,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import icon from './icons/btc.svg';
import icon from './icons/btc.webp';
import { NetworkNames } from '@enkryptcom/types';
import {
BitcoinNetwork,
Expand Down
Loading