Merge pull request #976 from near/dev

v8.7.0 Release (dev -> main)
near · Oct 20, 2023 · 2436df8 · 2436df8
2 parents 11aa921 + 941aeb0
commit 2436df8
Show file tree

Hide file tree

Showing 53 changed files with 1,878 additions and 100 deletions.
diff --git a/README.md b/README.md
@@ -21,6 +21,7 @@ NEAR Wallet Selector makes it easy for users to interact with your dApp by provi
 - [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.
 
 ## Preview
 
@@ -71,7 +72,8 @@ yarn add \
   @near-wallet-selector/opto-wallet \
   @near-wallet-selector/neth \
   @near-wallet-selector/xdefi \
-  @near-wallet-selector/ramper-wallet
+  @near-wallet-selector/ramper-wallet \
+  @near-wallet-selector/near-mobile-wallet
 
 # Using NPM.
 npm install \
@@ -93,7 +95,8 @@ npm install \
   @near-wallet-selector/opto-wallet \
   @near-wallet-selector/neth \
   @near-wallet-selector/xdefi \
-  @near-wallet-selector/ramper-wallet
+  @near-wallet-selector/ramper-wallet \
+  @near-wallet-selector/near-mobile-wallet
 ```
 
 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:
@@ -131,6 +134,7 @@ 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";
+import { setupNearMobileWallet } from "@near-wallet-selector/near-mobile-wallet"; 
 
 const selector = await setupWalletSelector({
   network: "testnet",
@@ -169,6 +173,7 @@ const selector = await setupWalletSelector({
         icon: "https://near.org/wp-content/uploads/2020/09/cropped-favicon-192x192.png",
       },
     }),
+    setupNearMobileWallet(),
   ],
 });
 

diff --git a/examples/angular/project.json b/examples/angular/project.json
@@ -118,6 +118,11 @@
             "glob": "**/*",
             "input": "packages/ramper-wallet/assets/",
             "output": "assets/"
+          },
+          {
+            "glob": "**/*",
+            "input": "packages/near-mobile-wallet/assets/",
+            "output": "assets/"
           }
         ],
         "styles": ["examples/angular/src/styles.scss"],

diff --git a/examples/angular/src/app/pages/wallet-selector-export/wallet-selector-export.component.ts b/examples/angular/src/app/pages/wallet-selector-export/wallet-selector-export.component.ts
@@ -22,6 +22,7 @@ import { Component } from "@angular/core";
 import { setupExportSelectorModal } from "@near-wallet-selector/account-export";
 import { setupMyNearWallet } from "@near-wallet-selector/my-near-wallet";
 import { setupRamperWallet } from "@near-wallet-selector/ramper-wallet";
+import { setupNearMobileWallet } from "@near-wallet-selector/near-mobile-wallet";
 import { setupLedger } from "@near-wallet-selector/ledger";
 
 declare global {
@@ -91,6 +92,7 @@ export class WalletSelectorExportComponent implements OnInit {
           },
         }),
         setupRamperWallet(),
+        setupNearMobileWallet(),
       ],
     });
     /**

diff --git a/examples/angular/src/app/pages/wallet-selector/wallet-selector.component.ts b/examples/angular/src/app/pages/wallet-selector/wallet-selector.component.ts
@@ -24,6 +24,7 @@ import { Component } from "@angular/core";
 import { setupMyNearWallet } from "@near-wallet-selector/my-near-wallet";
 import { setupRamperWallet } from "@near-wallet-selector/ramper-wallet";
 import { setupLedger } from "@near-wallet-selector/ledger";
+import { setupNearMobileWallet } from "@near-wallet-selector/near-mobile-wallet";
 import { CONTRACT_ID } from "../../../constants";
 
 declare global {
@@ -94,6 +95,7 @@ export class WalletSelectorComponent implements OnInit {
           },
         }),
         setupRamperWallet(),
+        setupNearMobileWallet(),
       ],
     });
 

diff --git a/examples/react/contexts/WalletSelectorContext.tsx b/examples/react/contexts/WalletSelectorContext.tsx
@@ -22,6 +22,8 @@ import { setupMyNearWallet } from "@near-wallet-selector/my-near-wallet";
 import { setupLedger } from "@near-wallet-selector/ledger";
 import { setupXDEFI } from "@near-wallet-selector/xdefi";
 import { setupRamperWallet } from "@near-wallet-selector/ramper-wallet";
+import { setupNearMobileWallet } from "@near-wallet-selector/near-mobile-wallet";
+
 import type { ReactNode } from "react";
 import React, {
   useCallback,
@@ -104,6 +106,7 @@ export const WalletSelectorContextProvider: React.FC<{
             icon: "https://near.org/wp-content/uploads/2020/09/cropped-favicon-192x192.png",
           },
         }),
+        setupNearMobileWallet(),
       ],
     });
     const _modal = setupModal(_selector, {

diff --git a/examples/react/contexts/WalletSelectorExportContext.tsx b/examples/react/contexts/WalletSelectorExportContext.tsx
@@ -27,6 +27,7 @@ import { Loading } from "../components/Loading";
 import { setupMyNearWallet } from "@near-wallet-selector/my-near-wallet";
 import { setupLedger } from "@near-wallet-selector/ledger";
 import { setupRamperWallet } from "@near-wallet-selector/ramper-wallet";
+import { setupNearMobileWallet } from "@near-wallet-selector/near-mobile-wallet";
 
 declare global {
   interface Window {
@@ -89,6 +90,7 @@ export const ExportAccountSelectorContextProvider: React.FC<{
             icon: "https://near.org/wp-content/uploads/2020/09/cropped-favicon-192x192.png",
           },
         }),
+        setupNearMobileWallet(),
       ],
     });
     /**

diff --git a/examples/react/project.json b/examples/react/project.json
@@ -111,6 +111,11 @@
             "glob": "**/*",
             "input": "packages/ramper-wallet/assets/",
             "output": "assets/"
+          },
+          {
+            "glob": "**/*",
+            "input": "packages/near-mobile-wallet/assets/",
+            "output": "assets/"
           }
         ]
       },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "near-wallet-selector",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "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",
@@ -24,7 +24,8 @@
     "welldone-wallet",
     "opto-wallet",
     "finer-wallet",
-    "ramper-wallet"
+    "ramper-wallet",
+    "near-mobile-wallet"
   ],
   "homepage": "https://github.com/near/wallet-selector#README",
   "bugs": {
@@ -67,6 +68,7 @@
     "build:near-snap": "nx run-many --target=build --projects=near-snap --configuration=production",
     "build:account-export": "nx run-many --target=build --projects=account-export --configuration=production",
     "build:ramper-wallet": "nx run-many --target=build --projects=ramper-wallet --configuration=production",
+    "build:near-mobile-wallet": "nx run-many --target=build --projects=near-mobile-wallet --configuration=production",
     "lint": "nx workspace-lint && nx run-many --target=lint --all --parallel",
     "lint:fix": "nx run-many --target=lint --all --fix",
     "serve:react": "nx serve react --host=0.0.0.0",
@@ -93,6 +95,7 @@
     "@meteorwallet/sdk": "^0.8.0",
     "@near-snap/sdk": "^0.5.0",
     "@nightlylabs/connect-near": "0.0.15",
+    "@peersyst/near-mobile-signer": "1.0.7",
     "@ramper/near": "^0.0.30",
     "@walletconnect/modal": "^2.6.0",
     "@walletconnect/sign-client": "2.9.1",

diff --git a/packages/account-export/package.json b/packages/account-export/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/account-export",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "description": "This is the Export Selector UI package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/coin98-wallet/package.json b/packages/coin98-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/coin98-wallet",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "description": "Coin 98 wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/core",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "description": "This is the core package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/default-wallets/package.json b/packages/default-wallets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/default-wallets",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "description": "Default wallets package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/finer-wallet/package.json b/packages/finer-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/finer-wallet",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "description": "FiNER Wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/here-wallet/package.json b/packages/here-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/here-wallet",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "description": "Here wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/ledger/package.json b/packages/ledger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/ledger",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "description": "Ledger package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/math-wallet/package.json b/packages/math-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/math-wallet",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "description": "Math wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/meteor-wallet/package.json b/packages/meteor-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/meteor-wallet",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "description": "Meteor wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/modal-ui-js/package.json b/packages/modal-ui-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/modal-ui-js",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "description": "Modal UI package for NEAR wallet Selector",
   "keywords": [
     "near",

diff --git a/packages/modal-ui/package.json b/packages/modal-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/modal-ui",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "description": "Modal UI package for NEAR wallet Selector",
   "keywords": [
     "near",

diff --git a/packages/my-near-wallet/package.json b/packages/my-near-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/my-near-wallet",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "description": "My Near Wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/my-near-wallet/src/lib/my-near-wallet.ts b/packages/my-near-wallet/src/lib/my-near-wallet.ts
@@ -67,7 +67,7 @@ const setupWalletState = async (
 const MyNearWallet: WalletBehaviourFactory<
   BrowserWallet,
   { params: MyNearWalletExtraOptions }
-> = async ({ metadata, options, store, params, logger }) => {
+> = async ({ metadata, options, store, params, logger, id }) => {
   const _state = await setupWalletState(params, options.network);
   const getAccounts = async (): Promise<Array<Account>> => {
     const accountId = _state.wallet.getAccountId();
@@ -163,6 +163,12 @@ const MyNearWallet: WalletBehaviourFactory<
     async signMessage({ message, nonce, recipient, callbackUrl, state }) {
       logger.log("sign message", { message });
 
+      if (id !== "my-near-wallet") {
+        throw Error(
+          `The signMessage method is not supported by ${metadata.name}`
+        );
+      }
+
       const locationUrl =
         typeof window !== "undefined" ? window.location.href : "";
 

diff --git a/packages/narwallets/package.json b/packages/narwallets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/narwallets",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "description": "This is the Narwallets package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/near-mobile-wallet/.babelrc b/packages/near-mobile-wallet/.babelrc
@@ -0,0 +1,10 @@
+{
+  "presets": [
+    [
+      "@nrwl/js/babel",
+      {
+        "useBuiltIns": "usage"
+      }
+    ]
+  ]
+}
diff --git a/packages/near-mobile-wallet/.eslintrc.json b/packages/near-mobile-wallet/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/packages/near-mobile-wallet/README.md b/packages/near-mobile-wallet/README.md
@@ -0,0 +1,50 @@
+# @near-wallet-selector/near-mobile-wallet
+
+This is the [Near Mobile Wallet](https://nearmobile.app/) package for NEAR Wallet Selector.
+
+## Installation and Usage
+
+The easiest way to use this package is to install it from the NPM registry, this package requires `near-api-js` v1.0.0 or above:
+
+```bash
+# Using Yarn
+yarn add near-api-js
+
+# Using NPM.
+npm install near-api-js
+```
+
+```bash
+# Using Yarn
+yarn add @near-wallet-selector/near-mobile-wallet
+
+# Using NPM.
+npm install @near-wallet-selector/near-mobile-wallet
+```
+
+Then use it in your dApp:
+
+```ts
+import { setupWalletSelector } from "@near-wallet-selector/core";
+import { setupNearMobileWallet } from "@near-wallet-selector/near-mobile-wallet";
+
+const selector = await setupWalletSelector({
+  network: "testnet",
+  modules: [setupNearMobileWallet()],
+});
+```
+
+## Options
+
+- `dAppMetadata: DAppMetadata`  (optional): An object to provide data from your dApp to be displayed on Near Mobile Wallet when signing requests. 
+```ts
+export interface DAppMetadata {
+    name: string;
+    logoUrl: string;
+    url?: string;
+}
+```
+
+## License
+
+This repository is distributed under the terms of both the MIT license and the Apache License (Version 2.0).
diff --git a/packages/near-mobile-wallet/assets/icon.png b/packages/near-mobile-wallet/assets/icon.png
diff --git a/packages/near-mobile-wallet/jest.config.ts b/packages/near-mobile-wallet/jest.config.ts
@@ -0,0 +1,16 @@
+/* eslint-disable */
+export default {
+  displayName: "near-mobile-wallet",
+  preset: "../../jest.preset.js",
+  globals: {},
+  transform: {
+    "^.+\\.[tj]s$": [
+      "ts-jest",
+      {
+        tsconfig: "<rootDir>/tsconfig.spec.json",
+      },
+    ],
+  },
+  moduleFileExtensions: ["ts", "tsx", "js", "jsx"],
+  coverageDirectory: "../../coverage/packages/near-mobile-wallet",
+};