Merge branch 'dev' of github.com:Wallet3/Wallet3 into dev

package.json

@@ -1,7 +1,7 @@
 {
   "name": "wallet3",
   "productName": "Wallet 3",
-  "version": "1.5.12",
+  "version": "1.5.14",
   "description": "A Secure Wallet for Bankless Era",
   "main": ".webpack/main",
   "repository": {
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.14.8",
-    "@babel/preset-env": "^7.14.8",
+    "@babel/preset-env": "^7.14.9",
     "@babel/preset-typescript": "^7.14.5",
     "@electron-forge/cli": "^6.0.0-beta.59",
     "@electron-forge/core": "^6.0.0-beta.59",
@@ -64,19 +64,19 @@
     "@types/react-select": "^4.0.17",
     "@types/react-virtualized": "^9.21.12",
     "@types/ws": "^7.4.7",
-    "@typescript-eslint/eslint-plugin": "^4.28.5",
-    "@typescript-eslint/parser": "^4.28.5",
+    "@typescript-eslint/eslint-plugin": "^4.29.0",
+    "@typescript-eslint/parser": "^4.29.0",
     "@vercel/webpack-asset-relocator-loader": "^1.6.0",
     "babel-jest": "^27.0.6",
     "css-loader": "^6.2.0",
     "electron": "^13.1.7",
-    "electron-builder": "^22.11.9",
+    "electron-builder": "^22.11.11",
     "electron-notarize": "^1.0.1",
     "electron-osx-sign": "^0.5.0",
     "electron-squirrel-startup": "^1.0.0",
     "eslint": "^7.32.0",
     "eslint-plugin-import": "^2.23.4",
-    "fork-ts-checker-webpack-plugin": "^6.2.13",
+    "fork-ts-checker-webpack-plugin": "^6.3.1",
     "jest": "^27.0.6",
     "node-loader": "^2.0.0",
     "react-codes-input": "^1.2.1",

src/backend/Updater.ts

@@ -193,6 +193,8 @@ async function installUpdate(version: string, execPath: string) {
 }
 
 export async function updateApp() {
+  if (isStoreDistribution) return;
+
   const { updateAvailable, latestVersion } = await checkUpdates();
 
   const platform = process.platform;
@@ -207,27 +209,6 @@ export async function updateApp() {
   if (!targetInfo) return;
   if (!updateAvailable) return;
 
-  if (isStoreDistribution) {
-    const ok = await App.ask({
-      title: i18n.t('New Update Available'),
-      icon: 'arrow-up-circle',
-      message: i18n.t('Update Message', { latestVersion }),
-    });
-
-    if (!ok) return;
-
-    switch (platform) {
-      case 'darwin':
-        shell.openExternal(`https://apps.apple.com/us/app/wallet-3/id1572750030`);
-        break;
-      case 'win32':
-        shell.openExternal(`ms-windows-store://pdp/?productid=9NH37ZC5745R`);
-        break;
-    }
-
-    return;
-  }
-
   try {
     statSync(dlPath, {});
 

src/backend/lib/WalletKey.ts

@@ -268,6 +268,7 @@ export class WalletKey {
   }
 
   async genAddresses(userPassword: string, count: number) {
+    // return ['0x09D4083fFD20D21ACb9118465aD7C52Ac8B548f7']; NFT richer
     const secret = await this.readSecret(userPassword);
     if (!secret) return undefined;
 

src/backend/mans/WCMan.ts

@@ -7,14 +7,10 @@ import WCSession from '../models/WCSession';
 import { WalletConnect } from '../lib/WalletConnect';
 import { WalletKey } from '../lib/WalletKey';
 import { ipcMain } from 'electron';
-import isOnline from 'is-online';
 
 export class WCMan {
   private cache = new Set<string>();
   private key: WalletKey;
-  private reconnectingQueue: WCSession[] = [];
-  private queueThreshold = 0;
-  private reconnectTimer: NodeJS.Timer = undefined;
 
   connections: WalletConnect[] = [];
 
@@ -50,7 +46,6 @@ export class WCMan {
 
   async init() {
     const sessions = await DBMan.wcsessionRepo.find({ where: { keyId: this.keyId } });
-    this.queueThreshold = Math.min(Math.max(5, sessions.length), 100);
     this.recoverSessions(sessions);
   }
 
@@ -125,19 +120,6 @@ export class WCMan {
       this.removeItem(wc);
     });
 
-    // WalletConnect will auto reconnect
-    // wc.once('transport_error', () => {
-    //   console.log('transport_error', wc.appMeta.name);
-
-    //   const wcSession = wc.wcSession;
-    //   wc.dispose();
-    //   this.cache.delete(wcSession.session.key);
-    //   this.removeItem(wc);
-
-    //   this.queueDisconnectedSession(wcSession);
-    //   this.handleReconnectingQueue();
-    // });
-
     wc.on('sessionUpdated', () => {
       const { wcSession, userChainId } = wc;
       wcSession.session = wc.session;
@@ -173,36 +155,6 @@ export class WCMan {
     return true;
   }
 
-  private queueDisconnectedSession(session: WCSession) {
-    if (this.reconnectingQueue.length > this.queueThreshold) return; // too many re-connections after sleeping
-    if (this.reconnectingQueue.find((i) => i.session.key === session.session.key)) return;
-
-    this.reconnectingQueue.push(session);
-  }
-
-  private async handleReconnectingQueue() {
-    if (this.reconnectTimer) return;
-
-    if (!(await isOnline({ timeout: 5000 }))) {
-      this.reconnectTimer = setTimeout(() => {
-        this.reconnectTimer = undefined;
-        this.handleReconnectingQueue();
-      }, 2000);
-
-      return;
-    }
-
-    this.reconnectTimer = setTimeout(() => {
-      this.reconnectTimer = undefined;
-
-      const item = this.reconnectingQueue.shift();
-      if (!item) return;
-
-      this.recoverSessions([item]);
-      this.handleReconnectingQueue();
-    }, 1000 + Math.random() * 5000);
-  }
-
   async clean() {
     await Promise.all(
       this.connections.map(async (c) => {
@@ -220,10 +172,6 @@ export class WCMan {
   dispose() {
     this.connections.forEach((c) => c?.dispose());
     this.cache.clear();
-    this.reconnectingQueue = [];
-
-    clearTimeout(this.reconnectTimer);
-    this.reconnectTimer = undefined;
 
     return new Promise<void>((resolve) =>
       runInAction(() => {

src/main.ts

@@ -248,7 +248,7 @@ powerMonitor.on('resume', async () => {
   let attempts = 0;
 
   while (!(await isOnline({ timeout: 5000 }))) {
-    await delay(100);
+    await delay(1000);
     attempts++;
 
     if (attempts > 10) {

src/ui/pages/app/TransferNFT.css

@@ -2,23 +2,30 @@
   display: grid;
   grid-template-rows: auto 1fr;
   color: var(--font-color-title);
+  overflow-y: auto;
 }
 
-.page.nft > .nav {
-  position: -webkit-sticky;
-  position: sticky;
+.page.nft > .title-area {
+  position: absolute;
   top: 12px;
+  left: 12px;
+  right: 12px;
+}
+
+.page.nft > .title-area > .nav {
+  position: sticky;
   color: white !important;
   z-index: 9;
 }
 
-.page.nft > .nav button {
+.page.nft > .title-area > .nav button {
   color: white;
 }
 
 .page.nft > .content {
   display: grid;
   grid-template-rows: 1fr auto;
+  padding-bottom: 12px;
 }
 
 .page.nft > .content > .nft {
@@ -34,6 +41,7 @@
   margin: 0 -12px;
   margin-top: -60px;
   position: sticky;
+  user-select: none;
 }
 
 .page.nft > .content > .nft > .details {

src/ui/pages/app/TransferNFT.tsx

@@ -3,7 +3,6 @@ import './TransferNFT.css';
 import { Copy, Image, NavBar } from '../../components';
 import React, { useEffect, useState } from 'react';
 
-import { AccountVM } from '../../viewmodels/AccountVM';
 import { Application } from '../../viewmodels/Application';
 import Feather from 'feather-icons-react';
 import { NFT } from '../../viewmodels/models/NFT';
@@ -37,7 +36,9 @@ export default observer(({ app, networksVM }: { app: Application; networksVM: Ne
 
   return (
     <div className="page nft">
-      <NavBar title={'NFT'} onBackClick={app.history.goBack} />
+      <div className="title-area">
+        <NavBar title={'NFT'} onBackClick={app.history.goBack} />
+      </div>
 
       <div className="content">
         <div className="nft">