Skip to content

Commit

Permalink
Support Onekey Wallet,Fix display issue,Optimize UI
Browse files Browse the repository at this point in the history
  • Loading branch information
ibrucelei committed Mar 24, 2024
1 parent c67199b commit 37049cf
Show file tree
Hide file tree
Showing 23 changed files with 472 additions and 240 deletions.
12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kasware-extension",
"version": "0.2.8.5",
"version": "0.3.0",
"private": true,
"homepage": "https://github.com/kasware-wallet/extension#readme",
"bugs": {
Expand All @@ -18,14 +18,13 @@
"build:brave": "gulp build --env=pro --browser=brave --manifest=mv2 --channel=github",
"build:edge": "gulp build --env=pro --browser=edge --manifest=mv2 --channel=github",
"build:chrome:mv3:dev": "webpack --progress --env browser=chrome manifest=mv3 config=dev channel=github version=0.0.0",
"build:chrome:mv3": "gulp build --env=pro --browser=chrome --manifest=mv3 --channel=store",
"build:chrome:mv3": "rm -rf dist/* && pnpm install && gulp build --env=pro --browser=chrome --manifest=mv3 --channel=store",
"translate": "node build/pull_translation",
"lint": "eslint src --fix --ext .js,.ts,.tsx,.json && npm run format",
"lint:fix": "eslint --fix src/**/*.{js,jsx,ts,tsx,json}",
"_prettier": "prettier --write .",
"fix:modules": "node scripts/fix-modules.js",
"format": "prettier --write \"src/**/*.{js,jsx,json,md,ts,tsx}\" --plugin-search-dir=./node_modules/ --plugin=./node_modules/@trivago/prettier-plugin-sort-imports/ ",
"prepare": "npm run fix:modules"
"format": "prettier --write \"src/**/*.{js,jsx,json,md,ts,tsx}\" --plugin-search-dir=./node_modules/ --plugin=./node_modules/@trivago/prettier-plugin-sort-imports/ "
},
"dependencies": {
"@ant-design/icons": "^4.7.0",
Expand All @@ -37,6 +36,8 @@
"@fortawesome/react-fontawesome": "^0.1.18",
"@kaspa/wallet": "^1.4.26",
"@metamask/obs-store": "^7.0.0",
"@noble/hashes": "^1.4.0",
"@noble/secp256k1": "1.7.1",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
"@reduxjs/toolkit": "^1.9.2",
"@sentry/browser": "^6.19.7",
Expand All @@ -63,6 +64,7 @@
"bfj": "^7.0.2",
"bignumber.js": "^9.1.1",
"bip39": "^3.1.0",
"bitcoinjs-lib": "^6.1.5",
"bitcore-lib": "^10.0.23",
"browser-passworder": "^2.0.3",
"browserify": "^17.0.0",
Expand Down Expand Up @@ -274,4 +276,4 @@
]
},
"__npminstall_done": false
}
}
59 changes: 55 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions release-notes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# KasWare Wallet Release Notes

## v0.3.0

- Support Onekey Wallet
- Fix display issue
- Optimize UI

## v0.2.8

- Fixed scan more addresses issue
Expand Down
6 changes: 4 additions & 2 deletions src/background/controller/wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,8 @@ export class WalletController extends BaseController {
activeIndexes,
activeChangeIndexes: accountCount > 1 ? activeIndexes : [],
hdPath,
passphrase
passphrase,
addressType
});
const displayedKeyring = await keyringService.displayForKeyring(originKeyring, addressType, -1);
return this.displayedKeyringToWalletKeyring(displayedKeyring, -1, false);
Expand All @@ -343,7 +344,8 @@ export class WalletController extends BaseController {
activeIndexes,
activeChangeIndexes: accountCount > 1 ? activeIndexes : [],
hdPath,
passphrase
passphrase,
addressType
});
const address_arr_final: string[] = [];
const satoshis_arr_final: number[] = [];
Expand Down
3 changes: 2 additions & 1 deletion src/background/service/keyring/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,8 @@ class KeyringService extends EventEmitter {
activeIndexes,
activeChangeIndexes,
hdPath,
passphrase
passphrase,
addressType
},
addressType
);
Expand Down
Loading

0 comments on commit 37049cf

Please sign in to comment.