Skip to content

Commit d2c47d5

Browse files
authored
Merge branch 'dev' into main
2 parents a580b38 + f11258a commit d2c47d5

File tree

158 files changed

+14740
-8554
lines changed

Some content is hidden

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

158 files changed

+14740
-8554
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ updates:
1414
- dependency-name: "@walletconnect/sign-client"
1515
- dependency-name: "better-sqlite3"
1616
- dependency-name: "big.js"
17-
- dependency-name: "bn.js"
1817
- dependency-name: "buffer"
1918
- dependency-name: "copy-to-clipboard"
2019
- dependency-name: "is-mobile"
@@ -26,7 +25,6 @@ updates:
2625
- dependency-name: "rxjs"
2726
- dependency-name: "tslib"
2827
- dependency-name: "@types/big.js"
29-
- dependency-name: "@types/bn.js"
3028
- dependency-name: "@types/gh-pages"
3129
- dependency-name: "@types/qrcode"
3230
- dependency-name: "@types/w3c-web-hid"

.github/workflows/add-to-devtools.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: 'Add to DevTools Project'
2+
3+
on:
4+
issues:
5+
types:
6+
- opened
7+
- reopened
8+
pull_request:
9+
types:
10+
- opened
11+
- reopened
12+
13+
jobs:
14+
add-to-project:
15+
name: Add issue/PR to project
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/add-to-project@v1.0.0
19+
with:
20+
# add to DevTools Project #156
21+
project-url: https://github.com/orgs/near/projects/156
22+
github-token: ${{ secrets.GH_TOKEN }}

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/out-tsc
1111

1212
# dependencies
13-
/node_modules
13+
node_modules
1414

1515
# IDEs and editors
1616
/.idea
@@ -44,7 +44,7 @@ testem.log
4444
Thumbs.db
4545

4646
.angular
47-
.npmrc
47+
package-lock.json
4848

4949
# Next.js
5050
.next

.npmrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
save-exact=true
2+
legacy-peer-deps=true

.vscode/settings.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"eslint.format.enable": true,
33
"prettier.enable": false,
44
"editor.codeActionsOnSave": {
5-
"source.fixAll.eslint":
6-
true
5+
"source.fixAll.eslint": "explicit"
76
},
87
"typescript.tsdk": "node_modules/typescript/lib"
98
}

.yarnrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
save-exact true

CONTRIBUTING.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,14 @@ Build and deploy angular example
3333
yarn nx build angular # build the angular example
3434
yarn nx deploy angular # deploys angular example to gh-pages
3535
```
36+
# Submitting a PR
37+
The initial comment has instructions. For your PR to be considered, you must select a template, include details, and make the appropriate selections from the checkboxes provided.
3638

39+
1. Select the preview tab.
40+
2. Select the applicable template. This replaces the comment with the correct placeholder text.
41+
42+
![Submit PR Step 1](https://github.com/near/wallet-selector/blob/main/images/submit_PR_step_1.png)
43+
![Submit PR Step 2](https://github.com/near/wallet-selector/blob/main/images/submit_PR_step_2.png)
3744

3845
# Branching
3946

README.md

Lines changed: 43 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,29 @@
22

33
NEAR Wallet Selector makes it easy for users to interact with your dApp by providing an abstraction over various wallets within the NEAR ecosystem:
44

5-
- [My NEAR Wallet](https://www.npmjs.com/package/@near-wallet-selector/my-near-wallet) - Browser wallet.
6-
- [Mintbase Wallet](https://www.npmjs.com/package/@near-wallet-selector/mintbase-wallet) - Browser wallet.
5+
- [Bitget Wallet](https://www.npmjs.com/package/@near-wallet-selector/bitget-wallet) - Injected wallet.
6+
- [Bitte Wallet](https://www.npmjs.com/package/@near-wallet-selector/bitte-wallet) - Browser wallet.
7+
- [Coin98 Wallet](https://www.npmjs.com/package/@near-wallet-selector/coin98-wallet) - Injected wallet.
8+
- [Ethereum wallets](https://www.npmjs.com/package/@near-wallet-selector/ethereum-wallets) - Injected wallet.
9+
- [Here Wallet](https://www.npmjs.com/package/@near-wallet-selector/here-wallet) - Mobile wallet.
710
- [Ledger](https://www.npmjs.com/package/@near-wallet-selector/ledger) - Hardware wallet.
8-
- [Sender](https://www.npmjs.com/package/@near-wallet-selector/sender) - Injected wallet.
911
- [Math Wallet](https://www.npmjs.com/package/@near-wallet-selector/math-wallet) - Injected wallet.
10-
- [Nightly](https://www.npmjs.com/package/@near-wallet-selector/nightly) - Injected wallet.
11-
- [Meteor Wallet](https://www.npmjs.com/package/@near-wallet-selector/meteor-wallet) - Injected wallet.
1212
- [Metamask Snap](https://www.npmjs.com/package/@near-wallet-selector/near-snap) - Injected wallet.
13+
- [Meteor Wallet](https://www.npmjs.com/package/@near-wallet-selector/meteor-wallet) - Injected wallet.
14+
- [Meteor Wallet App](https://www.npmjs.com/package/@near-wallet-selector/meteor-wallet-app) - Instant link wallet.
15+
- [Mintbase Wallet](https://www.npmjs.com/package/@near-wallet-selector/mintbase-wallet) - Browser wallet.
16+
- [My NEAR Wallet](https://www.npmjs.com/package/@near-wallet-selector/my-near-wallet) - Browser wallet.
1317
- [Narwallets](https://www.npmjs.com/package/@near-wallet-selector/narwallets) - Injected wallet.
14-
- [WELLDONE Wallet](https://www.npmjs.com/package/@near-wallet-selector/welldone-wallet) - Injected wallet.
15-
- [Coin98 Wallet](https://www.npmjs.com/package/@near-wallet-selector/coin98-wallet) - Injected wallet.
18+
- [Near Mobile Wallet](https://www.npmjs.com/package/@near-wallet-selector/near-mobile-wallet) - Mobile Wallet.
19+
- [NearFi Wallet](https://www.npmjs.com/package/@near-wallet-selector/nearfi) - Mobile wallet.
1620
- [Neth](https://www.npmjs.com/package/@near-wallet-selector/neth) - Injected wallet.
17-
- [XDEFI Wallet](https://www.npmjs.com/package/@near-wallet-selector/xdefi) - Injected wallet.
21+
- [Nightly](https://www.npmjs.com/package/@near-wallet-selector/nightly) - Injected wallet.
22+
- [OKX Wallet](https://www.npmjs.com/package/@near-wallet-selector/okx-wallet) - Injected wallet.
1823
- [Ramper Wallet](https://www.npmjs.com/package/@near-wallet-selector/ramper-wallet) - Injected wallet.
19-
- [Bitget Wallet](https://www.npmjs.com/package/@near-wallet-selector/bitget-wallet) - Injected wallet.
20-
- [Here Wallet](https://www.npmjs.com/package/@near-wallet-selector/here-wallet) - Mobile wallet.
21-
- [NearFi Wallet](https://www.npmjs.com/package/@near-wallet-selector/nearfi) - Mobile wallet.
22-
- [Near Mobile Wallet](https://www.npmjs.com/package/@near-wallet-selector/near-mobile-wallet) - Mobile Wallet.
24+
- [Sender](https://www.npmjs.com/package/@near-wallet-selector/sender) - Injected wallet.
2325
- [WalletConnect](https://www.npmjs.com/package/@near-wallet-selector/wallet-connect) - Bridge wallet.
26+
- [WELLDONE Wallet](https://www.npmjs.com/package/@near-wallet-selector/welldone-wallet) - Injected wallet.
27+
- [XDEFI Wallet](https://www.npmjs.com/package/@near-wallet-selector/xdefi) - Injected wallet.
2428

2529
## Preview
2630

@@ -61,6 +65,8 @@ yarn add \
6165
@near-wallet-selector/math-wallet \
6266
@near-wallet-selector/nightly \
6367
@near-wallet-selector/meteor-wallet \
68+
@near-wallet-selector/meteor-wallet-app \
69+
@near-wallet-selector/okx-wallet \
6470
@near-wallet-selector/narwallets \
6571
@near-wallet-selector/welldone-wallet \
6672
@near-wallet-selector/near-snap \
@@ -71,7 +77,11 @@ yarn add \
7177
@near-wallet-selector/xdefi \
7278
@near-wallet-selector/ramper-wallet \
7379
@near-wallet-selector/near-mobile-wallet \
74-
@near-wallet-selector/mintbase-wallet
80+
@near-wallet-selector/bitget-wallet \
81+
@near-wallet-selector/mintbase-wallet \
82+
@near-wallet-selector/bitte-wallet \
83+
@near-wallet-selector/ethereum-wallets
84+
7585

7686
# Using NPM.
7787
npm install \
@@ -83,6 +93,8 @@ npm install \
8393
@near-wallet-selector/math-wallet \
8494
@near-wallet-selector/nightly \
8595
@near-wallet-selector/meteor-wallet \
96+
@near-wallet-selector/meteor-wallet-app \
97+
@near-wallet-selector/okx-wallet \
8698
@near-wallet-selector/narwallets \
8799
@near-wallet-selector/welldone-wallet \
88100
@near-wallet-selector/near-snap \
@@ -93,7 +105,10 @@ npm install \
93105
@near-wallet-selector/xdefi \
94106
@near-wallet-selector/ramper-wallet \
95107
@near-wallet-selector/near-mobile-wallet \
96-
@near-wallet-selector/mintbase-wallet
108+
@near-wallet-selector/bitget-wallet \
109+
@near-wallet-selector/mintbase-wallet \
110+
@near-wallet-selector/bitte-wallet \
111+
@near-wallet-selector/ethereum-wallets
97112
```
98113

99114
Optionally, you can install our [`modal-ui`](https://www.npmjs.com/package/@near-wallet-selector/modal-ui) or [`modal-ui-js`](https://www.npmjs.com/package/@near-wallet-selector/modal-ui-js) package for a pre-built interface that wraps the `core` API and presents the supported wallets:
@@ -119,9 +134,10 @@ import { setupNearSnap } from "@near-wallet-selector/near-snap";
119134
import { setupMathWallet } from "@near-wallet-selector/math-wallet";
120135
import { setupNightly } from "@near-wallet-selector/nightly";
121136
import { setupMeteorWallet } from "@near-wallet-selector/meteor-wallet";
137+
import { setupMeteorWalletApp } from "@near-wallet-selector/meteor-wallet-app";
138+
import { setupOkxWallet } from "@near-wallet-selector/okx-wallet";
122139
import { setupNarwallets } from "@near-wallet-selector/narwallets";
123140
import { setupWelldoneWallet } from "@near-wallet-selector/welldone-wallet";
124-
import { setupNearSnap } from "@near-wallet-selector/near-snap";
125141
import { setupLedger } from "@near-wallet-selector/ledger";
126142
import { setupWalletConnect } from "@near-wallet-selector/wallet-connect";
127143
import { setupNearFi } from "@near-wallet-selector/nearfi";
@@ -131,6 +147,8 @@ import { setupXDEFI } from "@near-wallet-selector/xdefi";
131147
import { setupRamperWallet } from "@near-wallet-selector/ramper-wallet";
132148
import { setupNearMobileWallet } from "@near-wallet-selector/near-mobile-wallet";
133149
import { setupMintbaseWallet } from "@near-wallet-selector/mintbase-wallet";
150+
import { setupBitteWallet } from "@near-wallet-selector/bitte-wallet";
151+
import { setupEthereumWallets } from "@near-wallet-selector/ethereum-wallets";
134152

135153
const selector = await setupWalletSelector({
136154
network: "testnet",
@@ -142,7 +160,9 @@ const selector = await setupWalletSelector({
142160
setupMathWallet(),
143161
setupNightly(),
144162
setupMeteorWallet(),
163+
setupMeteorWalletApp({ contractId: "guest-book.testnet" }),
145164
setupNearSnap(),
165+
setupOkxWallet(),
146166
setupNarwallets(),
147167
setupWelldoneWallet(),
148168
setupLedger(),
@@ -165,7 +185,14 @@ const selector = await setupWalletSelector({
165185
walletUrl: "https://wallet.mintbase.xyz",
166186
callbackUrl: "https://www.mywebsite.com",
167187
deprecated: false,
168-
}),
188+
}),
189+
setupBitteWallet({
190+
networkId: "mainnet",
191+
walletUrl: "https://wallet.bitte.ai",
192+
callbackUrl: "https://www.mywebsite.com",
193+
deprecated: false,
194+
}),
195+
setupEthereumWallets({ wagmiConfig, web3Modal }),
169196
],
170197
});
171198

examples/angular/project.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,11 @@
108108
"glob": "**/*",
109109
"input": "packages/okx-wallet/assets/",
110110
"output": "assets/"
111+
},
112+
{
113+
"glob": "**/*",
114+
"input": "packages/ethereum-wallets/assets/",
115+
"output": "assets/"
111116
}
112117
],
113118
"styles": ["examples/angular/src/styles.scss"],
@@ -120,7 +125,7 @@
120125
{
121126
"type": "initial",
122127
"maximumWarning": "500kb",
123-
"maximumError": "5mb"
128+
"maximumError": "6mb"
124129
},
125130
{
126131
"type": "anyComponentStyle",

examples/angular/src/app/components/content/content.component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import { WalletSelectorModal } from "@near-wallet-selector/modal-ui-js";
2525
import { CONTRACT_ID } from "../../../constants";
2626
import { WalletSelector } from "@near-wallet-selector/core";
2727
import type { GetAccountBalanceProps } from "../../interfaces/account-balance";
28-
import BN from "bn.js";
2928

3029
const SUGGESTED_DONATION = "0";
3130
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -67,8 +66,8 @@ export class ContentComponent implements OnInit, OnDestroy {
6766
finality: "final",
6867
account_id: accountId,
6968
});
70-
const bn = new BN(amount);
71-
return { hasBalance: !bn.isZero() };
69+
const bn = BigInt(amount);
70+
return { hasBalance: bn !== BigInt(0) };
7271
} catch {
7372
return { hasBalance: false };
7473
}

examples/angular/src/app/pages/wallet-selector-export/wallet-selector-export.component.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { setupXDEFI } from "@near-wallet-selector/xdefi";
88
import { setupMathWallet } from "@near-wallet-selector/math-wallet";
99
import { setupNightly } from "@near-wallet-selector/nightly";
1010
import { setupMeteorWallet } from "@near-wallet-selector/meteor-wallet";
11+
import { setupMeteorWalletApp } from "@near-wallet-selector/meteor-wallet-app";
1112
import { setupNarwallets } from "@near-wallet-selector/narwallets";
1213
import { setupWelldoneWallet } from "@near-wallet-selector/welldone-wallet";
1314
import { setupHereWallet } from "@near-wallet-selector/here-wallet";
@@ -22,6 +23,8 @@ import { setupRamperWallet } from "@near-wallet-selector/ramper-wallet";
2223
import { setupNearMobileWallet } from "@near-wallet-selector/near-mobile-wallet";
2324
import { setupLedger } from "@near-wallet-selector/ledger";
2425
import { setupMintbaseWallet } from "@near-wallet-selector/mintbase-wallet";
26+
import { setupBitteWallet } from "@near-wallet-selector/bitte-wallet";
27+
import { CONTRACT_ID } from "../../../constants";
2528

2629
declare global {
2730
interface Window {
@@ -61,6 +64,7 @@ export class WalletSelectorExportComponent implements OnInit {
6164
setupMathWallet(),
6265
setupNightly(),
6366
setupMeteorWallet(),
67+
setupMeteorWalletApp({ contractId: CONTRACT_ID }),
6468
setupNarwallets(),
6569
setupWelldoneWallet(),
6670
setupHereWallet(),
@@ -80,7 +84,8 @@ export class WalletSelectorExportComponent implements OnInit {
8084
}),
8185
setupRamperWallet(),
8286
setupNearMobileWallet(),
83-
setupMintbaseWallet({ contractId: "guest-book.testnet" }),
87+
setupMintbaseWallet({ contractId: CONTRACT_ID }),
88+
setupBitteWallet({ contractId: CONTRACT_ID }),
8489
],
8590
});
8691
/**

0 commit comments

Comments
 (0)