Skip to content

Commit 36e5854

Browse files
authored
Merge pull request #18 from zorro11639/release/v1.2.5
Release/v1.2.5
2 parents 1422a98 + ae3c0d3 commit 36e5854

File tree

92 files changed

+1579
-2249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1579
-2249
lines changed

.husky/pre-commit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
. "$(dirname -- "$0")/_/husky.sh"
33

44
npx lint-staged
5+
node scripts/check-repo-version.js

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ tronwallet-adapter
182182
| | ├─okxwallet # adapter for Okx Wallet
183183
| | ├─imtoken # adapter for imToken Wallet
184184
| | ├─gatewallet # adapter for gate.io Wallet
185+
| | ├─foxwallet # adapter for FoxWallet
185186
| ├─react
186187
| | ├─react-hooks # react hooks to manage wallet state
187188
| | ├─react-ui # react ui components to select/connect wallets
@@ -215,6 +216,7 @@ You can use the `@tronweb3/tronwallet-adapters` package, or add the individual w
215216
| [okxwallet](https://www.okx.com/) | Adapter for Okx Wallet extension and App(Android) | [`@tronweb3/tronwallet-adapter-okxwallet`](https://www.npmjs.com/package/@tronweb3/tronwallet-adapter-okxwallet) |
216217
| [imtoken](https://token.im/) | Adapter for imToken Wallet App(IOS and Android) | [`@tronweb3/tronwallet-adapter-imtoken`](https://www.npmjs.com/package/@tronweb3/tronwallet-adapter-imtoken) |
217218
| [gatewallet](https://www.gate.io/web3) | Adapter for gate.io Wallet App(IOS and Android) | [`@tronweb3/tronwallet-adapter-gatewallet`](https://www.npmjs.com/package/@tronweb3/tronwallet-adapter-gatewallet) |
219+
| [foxwallet](https://foxwallet.com/) | Adapter for Fox Wallet App(IOS and Android) | [`@tronweb3/tronwallet-adapter-foxwallet`](https://www.npmjs.com/package/@tronweb3/tronwallet-adapter-foxwallet) |
218220

219221
### React Components
220222

@@ -239,6 +241,7 @@ This package contains all wallet adapters for Tron including:
239241
- [Okx Wallet](https://okx.com).
240242
- [imToken Wallet](https://token.im/).
241243
- [gate.io Wallet](https://www.gate.io/web3)
244+
- [Fox Wallet](https://foxwallet.com/)
242245

243246
Code example:
244247

demos/cdn-demo/adapters/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ adapter.on('readyStateChanged', () => {
4545
log('readyState: ', adapter.readyState);
4646
});
4747
adapter.on('connect', () => {
48-
log('connect2222: ', adapter.address);
48+
log('connect: ', adapter.address);
4949
address = adapter.address;
5050
adapter
5151
.network()

demos/cdn-demo/bitkeep/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
log('readyState: ', adapter.readyState);
3131
});
3232
adapter.on('connect', () => {
33-
log('connect2222: ', adapter.address);
33+
log('connect: ', adapter.address);
3434
address = adapter.address;
3535
adapter
3636
.network()

demos/cdn-demo/metamask/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
log('readyState: ', adapter.readyState);
2828
});
2929
adapter.on('connect', () => {
30-
log('connect2222: ', adapter.address);
30+
log('connect: ', adapter.address);
3131
address = adapter.address;
3232
});
3333
adapter.on('stateChanged', (state) => {

demos/cdn-demo/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
"@tronweb3/tronwallet-adapter-walletconnect": "^1.0.5",
2020
"@tronweb3/tronwallet-adapters": "^1.2.1",
2121
"@walletconnect/modal": "^2.6.2",
22-
"@walletconnect/sign-client": "^2.1.4",
23-
"serve": "^14.2.1"
22+
"@walletconnect/sign-client": "^2.1.4"
23+
},
24+
"devDependencies": {
25+
"serve": "^14.2.4"
2426
}
2527
}

demos/cdn-demo/tokenpocket/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
log('readyState: ', adapter.readyState);
3131
});
3232
adapter.on('connect', () => {
33-
log('connect2222: ', adapter.address);
33+
log('connect: ', adapter.address);
3434
address = adapter.address;
3535
adapter
3636
.network()

demos/cdn-demo/walletconnect/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h2>If you want to use WalletConnectAdapter by cdn, you must install <strong>@tr
4747
log('readyState: ', adapter.readyState);
4848
});
4949
adapter.on('connect', () => {
50-
log('connect2222: ', adapter.address);
50+
log('connect: ', adapter.address);
5151
address = adapter.address;
5252
adapter
5353
.network()

demos/dev-demo/.eslintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"node": true
66
},
77
"rules": {
8+
"react/self-closing-comp": "error",
89
"require-extensions/require-extensions": "off"
910
},
1011
"overrides": [

demos/dev-demo/.prettierrc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"printWidth": 180,
2+
"printWidth": 200,
33
"trailingComma": "es5",
4-
"tabWidth": 4,
4+
"tabWidth": 2,
55
"semi": true,
66
"singleQuote": true
77
}

0 commit comments

Comments
 (0)