Skip to content

Commit

Permalink
Merge pull request #1001 from near/dev
Browse files Browse the repository at this point in the history
v8.7.1 Release (dev -> main)
  • Loading branch information
kujtimprenkuSQA authored Nov 7, 2023
2 parents b0013db + 5fc273e commit 874e62b
Show file tree
Hide file tree
Showing 77 changed files with 136 additions and 1,537 deletions.
17 changes: 10 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,16 @@ Since `main` is the default branch of this project in case of regular release it
Criteria for Including New Wallets for Wallet Selector
# Wallet Product Criteria:

A wallet project must have comply the following product criteria to listed on Wallet Selector.

1. Non-custodial: The user controls their fund.
2. Conformity to Wallet Standards: The wallet product conforms to NEAR NEP wallet standards. (Injected Wallet https://github.com/near/NEPs/pull/408 and Bridged Wallet https://github.com/near/NEPs/pull/368)
3. Ease of use: The wallet product provides a usable interface for the end users. Please provide a user guide.
4. Ability to recover accounts: The wallet product allows users to be able to recover accounts.
5. Actively maintained: The wallet is actively maintained by a team and can provide user support.
A wallet project must implement and comply with the following product criteria to be listed on the Wallet Selector:

1. Custody of account must be fully disclosed. In the case of 3rd party identity services, the wallet's onboarding information must include the use of custodial identity services.
2. Encryption passwords per session are allowed. You must inform the user that a) the password prompt is to encrypt local data and b) that the password expires at the end of the session.
3. Conformity to Wallet Standards: The wallet product conforms to NEAR NEP wallet standards;
* Injected Wallet Standards - https://github.com/near/NEPs/pull/408
* Bridged Wallet Standards - https://github.com/near/NEPs/pull/368
5. Ease of use: The wallet product provides a usable interface for the end users. Please provide a user guide.
6. Ability to recover accounts: The wallet product allows users to be able to recover accounts.
7. Actively maintained: The wallet is actively maintained by a team and can provide user support.

# Wallet Security Criteria:

Expand Down
9 changes: 0 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ NEAR Wallet Selector makes it easy for users to interact with your dApp by provi
- [XDEFI Wallet](https://www.npmjs.com/package/@near-wallet-selector/xdefi) - Injected wallet.
- [Ledger](https://www.npmjs.com/package/@near-wallet-selector/ledger) - Hardware wallet.
- [WalletConnect](https://www.npmjs.com/package/@near-wallet-selector/wallet-connect) - Bridge wallet.
- [Nightly Connect](https://www.npmjs.com/package/@near-wallet-selector/nightly-connect) - Bridge wallet.
- [Here Wallet](https://www.npmjs.com/package/@near-wallet-selector/here-wallet) - Mobile wallet.
- [NearFi Wallet](https://www.npmjs.com/package/@near-wallet-selector/nearfi) - Mobile wallet.
- [Opto Wallet](https://www.npmjs.com/package/@near-wallet-selector/opto-wallet) - Mobile wallet & Browser wallet.
- [Ramper Wallet](https://www.npmjs.com/package/@near-wallet-selector/ramper-wallet) - Browser wallet.
- [Near Mobile Wallet](https://nearmobile.app/) - Mobile Wallet.

Expand Down Expand Up @@ -67,9 +65,7 @@ yarn add \
@near-wallet-selector/near-snap \
@near-wallet-selector/ledger \
@near-wallet-selector/wallet-connect \
@near-wallet-selector/nightly-connect \
@near-wallet-selector/coin98-wallet \
@near-wallet-selector/opto-wallet \
@near-wallet-selector/neth \
@near-wallet-selector/xdefi \
@near-wallet-selector/ramper-wallet \
Expand All @@ -90,9 +86,7 @@ npm install \
@near-wallet-selector/near-snap \
@near-wallet-selector/ledger \
@near-wallet-selector/wallet-connect \
@near-wallet-selector/nightly-connect \
@near-wallet-selector/coin98-wallet \
@near-wallet-selector/opto-wallet \
@near-wallet-selector/neth \
@near-wallet-selector/xdefi \
@near-wallet-selector/ramper-wallet \
Expand Down Expand Up @@ -127,10 +121,8 @@ import { setupWelldoneWallet } from "@near-wallet-selector/welldone-wallet";
import { setupNearSnap } from "@near-wallet-selector/near-snap";
import { setupLedger } from "@near-wallet-selector/ledger";
import { setupWalletConnect } from "@near-wallet-selector/wallet-connect";
import { setupNightlyConnect } from "@near-wallet-selector/nightly-connect";
import { setupNearFi } from "@near-wallet-selector/nearfi";
import { setupCoin98Wallet } from "@near-wallet-selector/coin98-wallet";
import { setupOptoWallet } from "@near-wallet-selector/opto-wallet";
import { setupNeth } from "@near-wallet-selector/neth";
import { setupXDEFI } from "@near-wallet-selector/xdefi";
import { setupRamperWallet } from "@near-wallet-selector/ramper-wallet";
Expand All @@ -152,7 +144,6 @@ const selector = await setupWalletSelector({
setupLedger(),
setupNearFi(),
setupCoin98Wallet(),
setupOptoWallet(),
setupNeth(),
setupXDEFI(),
setupWalletConnect({
Expand Down
10 changes: 0 additions & 10 deletions examples/angular/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@
"input": "packages/wallet-connect/assets/",
"output": "assets/"
},
{
"glob": "**/*",
"input": "packages/nightly-connect/assets/",
"output": "assets/"
},
{
"glob": "**/*",
"input": "packages/meteor-wallet/assets/",
Expand All @@ -84,11 +79,6 @@
"input": "packages/coin98-wallet/assets/",
"output": "assets/"
},
{
"glob": "**/*",
"input": "packages/opto-wallet/assets/",
"output": "assets/"
},
{
"glob": "**/*",
"input": "packages/finer-wallet/assets/",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ import { setupHereWallet } from "@near-wallet-selector/here-wallet";
import { setupCoin98Wallet } from "@near-wallet-selector/coin98-wallet";
import { setupNearFi } from "@near-wallet-selector/nearfi";
import { setupNeth } from "@near-wallet-selector/neth";
import { setupOptoWallet } from "@near-wallet-selector/opto-wallet";
import { setupFinerWallet } from "@near-wallet-selector/finer-wallet";
import { setupWalletConnect } from "@near-wallet-selector/wallet-connect";
import { setupNightlyConnect } from "@near-wallet-selector/nightly-connect";
import { Component } from "@angular/core";
import { setupExportSelectorModal } from "@near-wallet-selector/account-export";
import { setupMyNearWallet } from "@near-wallet-selector/my-near-wallet";
Expand Down Expand Up @@ -71,7 +69,6 @@ export class WalletSelectorExportComponent implements OnInit {
setupNeth({
bundle: false,
}),
setupOptoWallet(),
setupFinerWallet(),
setupWalletConnect({
projectId: "c4f79cc...",
Expand All @@ -82,15 +79,6 @@ export class WalletSelectorExportComponent implements OnInit {
icons: ["https://avatars.githubusercontent.com/u/37784886"],
},
}),
setupNightlyConnect({
url: "wss://relay.nightly.app/app",
appMetadata: {
additionalInfo: "",
application: "NEAR Wallet Selector",
description: "Example dApp used by NEAR Wallet Selector",
icon: "https://near.org/wp-content/uploads/2020/09/cropped-favicon-192x192.png",
},
}),
setupRamperWallet(),
setupNearMobileWallet(),
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ import { setupCoin98Wallet } from "@near-wallet-selector/coin98-wallet";
import { setupNearFi } from "@near-wallet-selector/nearfi";
import { setupNearSnap } from "@near-wallet-selector/near-snap";
import { setupNeth } from "@near-wallet-selector/neth";
import { setupOptoWallet } from "@near-wallet-selector/opto-wallet";
import { setupFinerWallet } from "@near-wallet-selector/finer-wallet";
import { setupWalletConnect } from "@near-wallet-selector/wallet-connect";
import { setupNightlyConnect } from "@near-wallet-selector/nightly-connect";
import { Component } from "@angular/core";
import { setupMyNearWallet } from "@near-wallet-selector/my-near-wallet";
import { setupRamperWallet } from "@near-wallet-selector/ramper-wallet";
Expand Down Expand Up @@ -74,7 +72,6 @@ export class WalletSelectorComponent implements OnInit {
setupNeth({
bundle: false,
}),
setupOptoWallet(),
setupFinerWallet(),
setupWalletConnect({
projectId: "c8cb6204543639c31aef44ea4837a554", // Replace this with your own projectId form WalletConnect.
Expand All @@ -85,15 +82,6 @@ export class WalletSelectorComponent implements OnInit {
icons: ["https://avatars.githubusercontent.com/u/37784886"],
},
}),
setupNightlyConnect({
url: "wss://relay.nightly.app/app",
appMetadata: {
additionalInfo: "",
application: "NEAR Wallet Selector",
description: "Example dApp used by NEAR Wallet Selector",
icon: "https://near.org/wp-content/uploads/2020/09/cropped-favicon-192x192.png",
},
}),
setupRamperWallet(),
setupNearMobileWallet(),
],
Expand Down
12 changes: 0 additions & 12 deletions examples/react/contexts/WalletSelectorContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@ import { setupModal } from "@near-wallet-selector/modal-ui";
import { setupNearWallet } from "@near-wallet-selector/near-wallet";
import { setupNearFi } from "@near-wallet-selector/nearfi";
import { setupNightly } from "@near-wallet-selector/nightly";
import { setupNightlyConnect } from "@near-wallet-selector/nightly-connect";
import { setupSender } from "@near-wallet-selector/sender";
import { setupWalletConnect } from "@near-wallet-selector/wallet-connect";
import { setupWelldoneWallet } from "@near-wallet-selector/welldone-wallet";
import { setupNearSnap } from "@near-wallet-selector/near-snap";
import { setupNeth } from "@near-wallet-selector/neth";
import { setupOptoWallet } from "@near-wallet-selector/opto-wallet";
import { setupFinerWallet } from "@near-wallet-selector/finer-wallet";
import { setupMyNearWallet } from "@near-wallet-selector/my-near-wallet";
import { setupLedger } from "@near-wallet-selector/ledger";
Expand Down Expand Up @@ -85,7 +83,6 @@ export const WalletSelectorContextProvider: React.FC<{
gas: "300000000000000",
bundle: false,
}),
setupOptoWallet(),
setupFinerWallet(),
setupXDEFI(),
setupWalletConnect({
Expand All @@ -97,15 +94,6 @@ export const WalletSelectorContextProvider: React.FC<{
icons: ["https://avatars.githubusercontent.com/u/37784886"],
},
}),
setupNightlyConnect({
url: "wss://relay.nightly.app/app",
appMetadata: {
additionalInfo: "",
application: "NEAR Wallet Selector",
description: "Example dApp used by NEAR Wallet Selector",
icon: "https://near.org/wp-content/uploads/2020/09/cropped-favicon-192x192.png",
},
}),
setupNearMobileWallet(),
],
});
Expand Down
12 changes: 0 additions & 12 deletions examples/react/contexts/WalletSelectorExportContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ import { setupMathWallet } from "@near-wallet-selector/math-wallet";
import { setupNightly } from "@near-wallet-selector/nightly";
import { setupMeteorWallet } from "@near-wallet-selector/meteor-wallet";
import { setupWelldoneWallet } from "@near-wallet-selector/welldone-wallet";
import { setupNightlyConnect } from "@near-wallet-selector/nightly-connect";
import { setupNearFi } from "@near-wallet-selector/nearfi";
import { setupWalletConnect } from "@near-wallet-selector/wallet-connect";
import { setupCoin98Wallet } from "@near-wallet-selector/coin98-wallet";
import { setupOptoWallet } from "@near-wallet-selector/opto-wallet";
import { Loading } from "../components/Loading";
import { setupMyNearWallet } from "@near-wallet-selector/my-near-wallet";
import { setupLedger } from "@near-wallet-selector/ledger";
Expand Down Expand Up @@ -70,7 +68,6 @@ export const ExportAccountSelectorContextProvider: React.FC<{
setupHereWallet(),
setupCoin98Wallet(),
setupNearFi(),
setupOptoWallet(),
setupRamperWallet(),
setupWalletConnect({
projectId: "c4f79cc...",
Expand All @@ -81,15 +78,6 @@ export const ExportAccountSelectorContextProvider: React.FC<{
icons: ["https://avatars.githubusercontent.com/u/37784886"],
},
}),
setupNightlyConnect({
url: "wss://relay.nightly.app/app",
appMetadata: {
additionalInfo: "",
application: "NEAR Wallet Selector",
description: "Example dApp used by NEAR Wallet Selector",
icon: "https://near.org/wp-content/uploads/2020/09/cropped-favicon-192x192.png",
},
}),
setupNearMobileWallet(),
],
});
Expand Down
10 changes: 0 additions & 10 deletions examples/react/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,6 @@
"input": "packages/wallet-connect/assets/",
"output": "assets/"
},
{
"glob": "**/*",
"input": "packages/nightly-connect/assets/",
"output": "assets/"
},
{
"glob": "**/*",
"input": "packages/meteor-wallet/assets/",
Expand All @@ -77,11 +72,6 @@
"input": "packages/coin98-wallet/assets/",
"output": "assets/"
},
{
"glob": "**/*",
"input": "packages/opto-wallet/assets/",
"output": "assets/"
},
{
"glob": "**/*",
"input": "packages/finer-wallet/assets/",
Expand Down
20 changes: 8 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "near-wallet-selector",
"version": "8.7.0",
"version": "8.7.1",
"description": "NEAR Wallet Selector makes it easy for users to interact with your dApp by providing an abstraction over various wallets within the NEAR ecosystem",
"keywords": [
"near",
Expand All @@ -18,11 +18,9 @@
"nightly",
"ledger",
"wallet-connect",
"nightly-connect",
"nearfi",
"meteor-wallet",
"welldone-wallet",
"opto-wallet",
"finer-wallet",
"ramper-wallet",
"near-mobile-wallet"
Expand All @@ -42,7 +40,7 @@
"types": "./lib/esm/index.d.ts",
"scripts": {
"prepublishOnly": "yarn build:core && yarn build:all",
"build:all": "nx run-many --target=build --all --exclude=react,angular --configuration=production",
"build:all": "nx run-many --target=build --all --exclude=react,angular --configuration=production && node ./scripts/update-package-json.js",
"build:core": "nx run-many --target=build --projects=core --configuration=production",
"build:modal-ui": "nx run-many --target=build --projects=modal-ui --configuration=production",
"build:modal-ui-js": "nx run-many --target=build --projects=modal-ui-js --configuration=production",
Expand All @@ -58,9 +56,7 @@
"build:meteor-wallet": "nx run-many --target=build --projects=meteor-wallet --configuration=production",
"build:welldone-wallet": "nx run-many --target=build --projects=welldone-wallet --configuration=production",
"build:wallet-connect": "nx run-many --target=build --projects=wallet-connect --configuration=production",
"build:nightly-connect": "nx run-many --target=build --projects=nightly-connect --configuration=production",
"build:narwallets": "nx run-many --target=build --projects=narwallets --configuration=production",
"build:opto-wallet": "nx run-many --target=build --projects=opto-wallet --configuration=production",
"build:finer-wallet": "nx run-many --target=build --projects=finer-wallet --configuration=production",
"build:xdefi-wallet": "nx run-many --target=build --projects=xdefi --configuration=production",
"build:wallet-utils": "nx run-many --target=build --projects=wallet-utils --configuration=production",
Expand Down Expand Up @@ -93,13 +89,13 @@
"@ledgerhq/hw-transport-webhid": "6.27.1",
"@metamask/detect-provider": "^2.0.0",
"@meteorwallet/sdk": "^0.8.0",
"@near-snap/sdk": "^0.5.0",
"@near-snap/sdk": "^0.6.0",
"@nightlylabs/connect-near": "0.0.15",
"@peersyst/near-mobile-signer": "1.0.7",
"@peersyst/near-mobile-signer": "1.0.9",
"@ramper/near": "^0.0.30",
"@walletconnect/modal": "^2.6.0",
"@walletconnect/sign-client": "2.9.1",
"better-sqlite3": "^8.7.0",
"better-sqlite3": "^9.0.0",
"big.js": "^6.1.1",
"bn.js": "^5.2.0",
"borsh": "^0.7.0",
Expand All @@ -124,7 +120,7 @@
"rxjs": "^7.8.1",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"tslib": "^2.6.1",
"tslib": "^2.6.2",
"tweetnacl": "^1.0.3",
"tweetnacl-util": "^0.15.1",
"url": "^0.11.0",
Expand Down Expand Up @@ -164,9 +160,9 @@
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/react": "13.4.0",
"@testing-library/react-hooks": "^7.0.2",
"@types/big.js": "^6.2.0",
"@types/big.js": "^6.2.1",
"@types/bn.js": "^5.1.1",
"@types/gh-pages": "^3.2.2",
"@types/gh-pages": "^5.0.0",
"@types/jest": "29.4.4",
"@types/node": "18.11.9",
"@types/qrcode": "^1.5.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/account-export/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@near-wallet-selector/account-export",
"version": "8.7.0",
"version": "8.7.1",
"description": "This is the Export Selector UI package for NEAR Wallet Selector.",
"keywords": [
"near",
Expand Down
18 changes: 10 additions & 8 deletions packages/account-export/src/lib/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from "react";
import type { Root } from "react-dom/client";
import { createRoot } from "react-dom/client";
import type { WalletSelector } from "@near-wallet-selector/core";

Expand All @@ -9,22 +10,23 @@ import { ExportSelector } from "./components/ExportSelector";
const MODAL_ELEMENT_ID = "near-wallet-selector-modal";

let importModalInstance: WalletSelectorModal | null = null;
let root: Root | null = null;

export const setupExportSelectorModal = (
selector: WalletSelector,
options: ExportSelectorOptions
): WalletSelectorModal => {
const el = document.createElement("div");
el.id = MODAL_ELEMENT_ID;
if (!document.getElementById(MODAL_ELEMENT_ID)) {
document.body.appendChild(el);
}
if (!root) {
const body = document.body;
const container = document.createElement("div");
container.id = MODAL_ELEMENT_ID;
body.appendChild(container);

const container = document.getElementById(MODAL_ELEMENT_ID);
const root = createRoot(container!);
root = createRoot(container);
}

const render = (visible: boolean) => {
root.render(
root!.render(
<ExportSelector
selector={selector}
options={options}
Expand Down
2 changes: 1 addition & 1 deletion packages/coin98-wallet/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@near-wallet-selector/coin98-wallet",
"version": "8.7.0",
"version": "8.7.1",
"description": "Coin 98 wallet package for NEAR Wallet Selector.",
"keywords": [
"near",
Expand Down
Loading

0 comments on commit 874e62b

Please sign in to comment.