Merge pull request #706 from near/dev

v7.8.1 Release (dev -> main)
near · Feb 20, 2023 · deed838 · deed838
2 parents 7b8c36b + 336cde6
commit deed838
Show file tree

Hide file tree

Showing 34 changed files with 129 additions and 61 deletions.
diff --git a/examples/angular/src/app/components/content/content.component.ts b/examples/angular/src/app/components/content/content.component.ts
@@ -15,6 +15,8 @@ import { distinctUntilChanged, map } from "rxjs";
 import { WalletSelectorModal } from "@near-wallet-selector/modal-ui";
 import { CONTRACT_ID } from "../../../constants";
 import { WalletSelector } from "@near-wallet-selector/core";
+import type { GetAccountBalanceProps } from "../../interfaces/account-balance";
+import BN from "bn.js";
 
 const SUGGESTED_DONATION = "0";
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -34,6 +36,7 @@ export class ContentComponent implements OnInit, OnDestroy {
   account: Account | null;
   messages: Array<Message>;
   subscription?: Subscription;
+  getAccountBalanceProps: GetAccountBalanceProps;
 
   async ngOnInit() {
     const [messages, account] = await Promise.all([
@@ -47,6 +50,20 @@ export class ContentComponent implements OnInit, OnDestroy {
     this.subscribeToEvents();
   }
 
+  async getAccountBalance({ provider, accountId }: GetAccountBalanceProps) {
+    try {
+      const { amount } = await provider.query<AccountView>({
+        request_type: "view_account",
+        finality: "final",
+        account_id: accountId,
+      });
+      const bn = new BN(amount);
+      return { hasBalance: !bn.isZero() };
+    } catch {
+      return { hasBalance: false };
+    }
+  }
+
   async getAccount() {
     if (!this.accountId) {
       return null;
@@ -55,6 +72,20 @@ export class ContentComponent implements OnInit, OnDestroy {
     const { network } = this.selector.options;
     const provider = new providers.JsonRpcProvider({ url: network.nodeUrl });
 
+    const { hasBalance } = await this.getAccountBalance({
+      provider,
+      accountId: this.accountId,
+    });
+
+    if (!hasBalance) {
+      window.alert(
+        `Account ID: ${this.accountId} has not been founded. Please send some NEAR into this account.`
+      );
+      const wallet = await this.selector.wallet();
+      await wallet.signOut();
+      return null;
+    }
+
     return provider
       .query<AccountView>({
         request_type: "view_account",

diff --git a/examples/angular/src/app/interfaces/account-balance.ts b/examples/angular/src/app/interfaces/account-balance.ts
@@ -0,0 +1,6 @@
+import type { providers } from "near-api-js";
+
+export interface GetAccountBalanceProps {
+  provider: providers.Provider;
+  accountId: string;
+}
diff --git a/examples/react/components/Content.tsx b/examples/react/components/Content.tsx
@@ -5,6 +5,7 @@ import type {
   CodeResult,
 } from "near-api-js/lib/providers/provider";
 import type { Transaction } from "@near-wallet-selector/core";
+import BN from "bn.js";
 
 import type { Account, Message } from "../interfaces";
 import { useWalletSelector } from "../contexts/WalletSelectorContext";
@@ -20,6 +21,28 @@ type Submitted = SubmitEvent & {
 const SUGGESTED_DONATION = "0";
 const BOATLOAD_OF_GAS = utils.format.parseNearAmount("0.00000000003")!;
 
+interface GetAccountBalanceProps {
+  provider: providers.Provider;
+  accountId: string;
+}
+
+const getAccountBalance = async ({
+  provider,
+  accountId,
+}: GetAccountBalanceProps) => {
+  try {
+    const { amount } = await provider.query<AccountView>({
+      request_type: "view_account",
+      finality: "final",
+      account_id: accountId,
+    });
+    const bn = new BN(amount);
+    return { hasBalance: !bn.isZero() };
+  } catch {
+    return { hasBalance: false };
+  }
+};
+
 const Content: React.FC = () => {
   const { selector, modal, accounts, accountId } = useWalletSelector();
   const [account, setAccount] = useState<Account | null>(null);
@@ -34,6 +57,20 @@ const Content: React.FC = () => {
     const { network } = selector.options;
     const provider = new providers.JsonRpcProvider({ url: network.nodeUrl });
 
+    const { hasBalance } = await getAccountBalance({
+      provider,
+      accountId,
+    });
+
+    if (!hasBalance) {
+      window.alert(
+        `Account ID: ${accountId} has not been founded. Please send some NEAR into this account.`
+      );
+      const wallet = await selector.wallet();
+      await wallet.signOut();
+      return null;
+    }
+
     return provider
       .query<AccountView>({
         request_type: "view_account",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "near-wallet-selector",
-  "version": "7.8.0",
+  "version": "7.8.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",

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": "7.8.0",
+  "version": "7.8.1",
   "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": "7.8.0",
+  "version": "7.8.1",
   "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": "7.8.0",
+  "version": "7.8.1",
   "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": "7.8.0",
+  "version": "7.8.1",
   "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": "7.8.0",
+  "version": "7.8.1",
   "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": "7.8.0",
+  "version": "7.8.1",
   "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": "7.8.0",
+  "version": "7.8.1",
   "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": "7.8.0",
+  "version": "7.8.1",
   "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": "7.8.0",
+  "version": "7.8.1",
   "description": "Meteor wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/meteor-wallet/src/lib/meteor-wallet.ts b/packages/meteor-wallet/src/lib/meteor-wallet.ts
@@ -62,15 +62,14 @@ const createMeteorWalletInjected: WalletBehaviourFactory<
       return [];
     }
 
+    const publicKey = await account.connection.signer.getPublicKey(
+      account.accountId,
+      options.network.networkId
+    );
     return [
       {
         accountId,
-        publicKey: (
-          await account.connection.signer.getPublicKey(
-            account.accountId,
-            options.network.networkId
-          )
-        ).toString(),
+        publicKey: publicKey ? publicKey.toString() : "",
       },
     ];
   };

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": "7.8.0",
+  "version": "7.8.1",
   "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": "7.8.0",
+  "version": "7.8.1",
   "description": "Modal UI package for NEAR wallet Selector",
   "keywords": [
     "near",

diff --git a/packages/modal-ui/src/lib/components/Modal.tsx b/packages/modal-ui/src/lib/components/Modal.tsx
@@ -109,7 +109,7 @@ export const Modal: React.FC<ModalProps> = ({
       }
       hide();
     },
-    [hide]
+    [hide, emitter]
   );
 
   useEffect(() => {

diff --git a/packages/modal-ui/src/lib/components/WalletConnected.tsx b/packages/modal-ui/src/lib/components/WalletConnected.tsx
@@ -15,7 +15,7 @@ export const WalletConnected: React.FC<WalletConnectedProps> = ({
   return (
     <Fragment>
       <div className="nws-modal-header">
-        <h3 className="middleTitle"></h3>
+        <h3 className="middleTitle">{``}</h3>
         <CloseButton onClick={onCloseModal} />
       </div>
       <div className="connecting-wrapper">

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": "7.8.0",
+  "version": "7.8.1",
   "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
@@ -82,25 +82,17 @@ const MyNearWallet: WalletBehaviourFactory<
     if (!accountId || !account) {
       return [];
     }
-    try {
-      const publicKey = await account.connection.signer.getPublicKey(
-        account.accountId,
-        options.network.networkId
-      );
-      return [
-        {
-          accountId,
-          publicKey: publicKey.toString(),
-        },
-      ];
-    } catch (e) {
-      return [
-        {
-          accountId,
-          publicKey: undefined,
-        },
-      ];
-    }
+
+    const publicKey = await account.connection.signer.getPublicKey(
+      account.accountId,
+      options.network.networkId
+    );
+    return [
+      {
+        accountId,
+        publicKey: publicKey ? publicKey.toString() : "",
+      },
+    ];
   };
 
   const transformTransactions = async (

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

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

diff --git a/packages/nearfi/package.json b/packages/nearfi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/nearfi",
-  "version": "7.8.0",
+  "version": "7.8.1",
   "description": "Nearfi package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/neth/package.json b/packages/neth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/neth",
-  "version": "7.8.0",
+  "version": "7.8.1",
   "description": "Control NEAR accounts with ETH accounts",
   "author": "mattlockyer",
   "keywords": [

diff --git a/packages/nightly-connect/package.json b/packages/nightly-connect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/nightly-connect",
-  "version": "7.8.0",
+  "version": "7.8.1",
   "description": "Nightly connect package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/nightly/package.json b/packages/nightly/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/nightly",
-  "version": "7.8.0",
+  "version": "7.8.1",
   "description": "Nightly wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/opto-wallet/package.json b/packages/opto-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/opto-wallet",
-  "version": "7.8.0",
+  "version": "7.8.1",
   "description": "Opto wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/sender/package.json b/packages/sender/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/sender",
-  "version": "7.8.0",
+  "version": "7.8.1",
   "description": "Sender wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/sender/src/lib/sender.ts b/packages/sender/src/lib/sender.ts
@@ -112,17 +112,20 @@ const Sender: WalletBehaviourFactory<InjectedWallet> = async ({
 
     const account = _state.wallet.account();
 
+    // When wallet is locked signer is empty an object {}.
+    if (!account!.connection.signer.getPublicKey) {
+      return [{ accountId, publicKey: undefined }];
+    }
+
+    const publicKey = await account!.connection.signer.getPublicKey(
+      account!.accountId,
+      options.network.networkId
+    );
+
     return [
       {
         accountId,
-        publicKey: account
-          ? (
-              await account.connection.signer.getPublicKey(
-                account.accountId,
-                options.network.networkId
-              )
-            ).toString()
-          : undefined,
+        publicKey: publicKey ? publicKey.toString() : undefined,
       },
     ];
   };
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,7 +109,7 @@ export const Modal: React.FC<ModalProps> = ({ @@
           }
           hide();
         },
-        [hide]
+        [hide, emitter]
       );
       useEffect(() => {
@@ Expand Down @@