Merge branch 'x' into fix-desktop-build-failed

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,7 +11,6 @@ assignees: ''
 Please answer the following questions for yourself before submitting an issue. **YOU MAY DELETE THE PREREQUISITES SECTION.**
 
 - [ ] I checked to make sure that this issue has not already been filed
-- [ ] I've asked for help in the [OneKey Discord](https://discord.com/invite/onekey) before filing this issue.
 
 **Describe the bug**
 A clear and concise description of what the bug is.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -19,7 +19,6 @@ A clear and concise description of any alternative solutions or features you've
 **Community & Quick support**
 
 - [Community Forum](https://github.com/orgs/OneKeyHQ/discussions). Best for: help with building, discussion about best practices.
-- [Discord](https://discord.gg/onekey). Best for: sharing your ideas and hanging out with the community.
 
 **Additional context**
 Add any other context or screenshots about the feature request here.

README.md

@@ -6,7 +6,6 @@
 [![Last commit](https://img.shields.io/github/last-commit/OneKeyHQ/app-monorepo.svg?style=for-the-badge&labelColor=000)](https://github.com/OneKeyHQ/app-monorepo/commits/onekey)
 [![Issues](https://img.shields.io/github/issues-raw/OneKeyHQ/app-monorepo.svg?style=for-the-badge&labelColor=000)](https://github.com/OneKeyHQ/app-monorepo/issues?q=is%3Aissue+is%3Aopen)
 [![Pull Requests](https://img.shields.io/github/issues-pr-raw/OneKeyHQ/app-monorepo.svg?style=for-the-badge&labelColor=000)](https://github.com/OneKeyHQ/app-monorepo/pulls?q=is%3Apr+is%3Aopen)
-[![Discord](https://img.shields.io/discord/868309113942196295?style=for-the-badge&labelColor=000)](https://discord.gg/onekey)
 [![Twitter Follow](https://img.shields.io/twitter/follow/OneKeyHQ?style=for-the-badge&labelColor=000)](https://twitter.com/OneKeyHQ)
 
 
@@ -33,7 +32,6 @@
 
 - [Community Forum](https://github.com/orgs/OneKeyHQ/discussions). Best for: help with building, discussion about best practices.
 - [GitHub Issues](https://github.com/OneKeyHQ/app-monorepo/issues). Best for: bugs and errors you encounter using OneKey.
-- [Discord](https://discord.gg/onekey). Best for: sharing your ideas and hanging out with the community.
 
 ## Repo Status
 

apps/mobile/ios/OneKeyWallet.xcodeproj/project.pbxproj

@@ -429,7 +429,6 @@
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RevenueCat/RevenueCat.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RevenueCatUI/RevenueCat_RevenueCatUI.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/Sentry/Sentry.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
 			);
@@ -444,7 +443,6 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RevenueCat.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RevenueCat_RevenueCatUI.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Sentry.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);

apps/mobile/package.json

@@ -115,7 +115,6 @@
     "react-native-passkeys": "^0.3.0",
     "react-native-permissions": "^4.1.5",
     "react-native-purchases": "^8.5.0",
-    "react-native-purchases-ui": "^8.5.0",
     "react-native-qrcode-styled": "^0.3.3",
     "react-native-randombytes": "^3.6.1",
     "react-native-reanimated": "3.6.1",

docs/ISSUE_TEMPLATE.md

@@ -2,7 +2,6 @@
 Please answer the following questions for yourself before submitting an issue. **YOU MAY DELETE THE PREREQUISITES SECTION.**
 
 - [ ] I checked to make sure that this issue has not already been filed
-- [ ] I've asked for help in the [OneKey Discord](https://discord.com/invite/onekey) before filing this issue.
 
 ## Summary
 <!--- Concise overview of the issue. -->

packages/kit-bg/src/dbs/local/LocalDbBase.ts

@@ -809,6 +809,23 @@ export abstract class LocalDbBase extends LocalDbBaseContainer {
     });
   }
 
+  async updateWalletsHash(walletsHashMap: { [walletId: string]: string }) {
+    await this.withTransaction(async (tx) => {
+      await this.txUpdateRecords({
+        tx,
+        name: ELocalDBStoreNames.Wallet,
+        ids: Object.keys(walletsHashMap),
+        updater(item) {
+          const newHash = walletsHashMap[item.id];
+          if (!isNil(newHash)) {
+            item.hash = newHash;
+          }
+          return item;
+        },
+      });
+    });
+  }
+
   async updateIndexedAccountOrder({
     indexedAccountId,
     order,
@@ -1199,9 +1216,11 @@ export abstract class LocalDbBase extends LocalDbBaseContainer {
   async buildCreateHDAndHWWalletResult({
     walletId,
     addedHdAccountIndex,
+    isOverrideWallet,
   }: {
     walletId: string;
     addedHdAccountIndex: number;
+    isOverrideWallet?: boolean;
   }) {
     const dbWallet = await this.getWallet({
       walletId,
@@ -1228,6 +1247,7 @@ export abstract class LocalDbBase extends LocalDbBaseContainer {
       wallet: dbWallet,
       indexedAccount: dbIndexedAccount,
       device: dbDevice,
+      isOverrideWallet,
     };
   }
 
@@ -1255,7 +1275,7 @@ export abstract class LocalDbBase extends LocalDbBaseContainer {
             id: walletId,
             name: walletName,
             hash: walletHash || undefined,
-            avatar: avatar && JSON.stringify(avatar), // TODO save object to realmDB?
+            avatar: avatar ? JSON.stringify(avatar) : undefined, // TODO save object to realmDB?
             type: WALLET_TYPE_HD,
             backuped,
             nextIds: {
@@ -1736,6 +1756,13 @@ export abstract class LocalDbBase extends LocalDbBaseContainer {
     const { dbDeviceId, dbWalletId, deviceUUID, rawDeviceId } =
       await this.buildHwWalletId(params);
 
+    const existingWallet = await this.getWalletSafe({
+      walletId: dbWalletId,
+    });
+    const isExistingHiddenWallet = accountUtils.isHwHiddenWallet({
+      wallet: existingWallet,
+    });
+
     let parentWalletId: string | undefined;
     const deviceName = await deviceUtils.buildDeviceName({ device, features });
     let walletName = name || deviceName;
@@ -1881,6 +1908,7 @@ export abstract class LocalDbBase extends LocalDbBaseContainer {
     return this.buildCreateHDAndHWWalletResult({
       walletId: dbWalletId,
       addedHdAccountIndex,
+      isOverrideWallet: existingWallet && !isExistingHiddenWallet,
     });
   }
 
@@ -2273,7 +2301,7 @@ export abstract class LocalDbBase extends LocalDbBaseContainer {
     account,
   }: {
     networkId: string;
-    account: INetworkAccount;
+    account: INetworkAccount; // TODO support accounts array
   }) {
     const accountId = account.id;
     const { indexedAccountId, address, addressDetail, type } = account;
@@ -2373,7 +2401,7 @@ export abstract class LocalDbBase extends LocalDbBaseContainer {
     importedCredential?: ICoreImportedCredentialEncryptHex | undefined;
     // accountNameBuilder for watching, imported, external account
     accountNameBuilder?: (data: { nextAccountId: number }) => string;
-  }): Promise<void> {
+  }): Promise<{ isOverrideAccounts: boolean }> {
     this.validateAccountsFields(accounts);
 
     const wallet = await this.getWallet({ walletId });
@@ -2383,7 +2411,7 @@ export abstract class LocalDbBase extends LocalDbBaseContainer {
       defaultValue: 1,
     });
 
-    await this.withTransaction(async (tx) => {
+    const addResults = await this.withTransaction(async (tx) => {
       const firstAccount: IDBAccount | undefined = accounts?.[0];
       if (
         firstAccount &&
@@ -2535,6 +2563,11 @@ export abstract class LocalDbBase extends LocalDbBaseContainer {
         });
       }
 
+      const isOverrideAccounts = removed > 0 && actualAdded === 0;
+
+      return {
+        isOverrideAccounts,
+      };
       // TODO should add accountId to wallet.accounts or wallet.indexedAccounts?
     });
 
@@ -2555,6 +2588,7 @@ export abstract class LocalDbBase extends LocalDbBaseContainer {
       walletId,
       accounts,
     });
+    return addResults;
   }
 
   async saveTonImportedAccountMnemonic({

packages/kit-bg/src/dbs/simple/base/SimpleDb.ts

@@ -3,6 +3,7 @@ import { SimpleDbEntityAccountValue } from '../entity/SimpleDbEntityAccountValue
 import { SimpleDbEntityAddressBook } from '../entity/SimpleDbEntityAddressBook';
 import { SimpleDbEntityAllNetworks } from '../entity/SimpleDbEntityAllNetworks';
 import { SimpleDbEntityAppCleanup } from '../entity/SimpleDbEntityAppCleanup';
+import { SimpleDbEntityAppStatus } from '../entity/SimpleDbEntityAppStatus';
 import { SimpleDbEntityBabylonSync } from '../entity/SimpleDbEntityBabylonSync';
 import { SimpleDbEntityBrowserBookmarks } from '../entity/SimpleDbEntityBrowserBookmarks';
 import { SimpleDbEntityBrowserClosedTabs } from '../entity/SimpleDbEntityBrowserClosedTabs';
@@ -109,5 +110,7 @@ export class SimpleDb {
 
   babylonSync = new SimpleDbEntityBabylonSync();
 
+  appStatus = new SimpleDbEntityAppStatus();
+
   allNetworks = new SimpleDbEntityAllNetworks();
 }

packages/kit-bg/src/dbs/simple/base/SimpleDbProxy.ts

@@ -7,6 +7,7 @@ import type { SimpleDbEntityAccountValue } from '../entity/SimpleDbEntityAccount
 import type { SimpleDbEntityAddressBook } from '../entity/SimpleDbEntityAddressBook';
 import type { SimpleDbEntityAllNetworks } from '../entity/SimpleDbEntityAllNetworks';
 import type { SimpleDbEntityAppCleanup } from '../entity/SimpleDbEntityAppCleanup';
+import type { SimpleDbEntityAppStatus } from '../entity/SimpleDbEntityAppStatus';
 import type { SimpleDbEntityBabylonSync } from '../entity/SimpleDbEntityBabylonSync';
 import type { SimpleDbEntityBrowserBookmarks } from '../entity/SimpleDbEntityBrowserBookmarks';
 import type { SimpleDbEntityBrowserClosedTabs } from '../entity/SimpleDbEntityBrowserClosedTabs';
@@ -190,6 +191,8 @@ export class SimpleDbProxy
     'babylonSync',
   ) as SimpleDbEntityBabylonSync;
 
+  appStatus = this._createProxyService('appStatus') as SimpleDbEntityAppStatus;
+
   allNetworks = this._createProxyService(
     'allNetworks',
   ) as SimpleDbEntityAllNetworks;

packages/kit-bg/src/dbs/simple/entity/SimpleDbEntityAppStatus.ts

@@ -0,0 +1,11 @@
+import { SimpleDbEntityBase } from '../base/SimpleDbEntityBase';
+
+export interface ISimpleDBAppStatus {
+  hdWalletHashGenerated?: boolean;
+}
+
+export class SimpleDbEntityAppStatus extends SimpleDbEntityBase<ISimpleDBAppStatus> {
+  entityName = 'appStatus';
+
+  override enableCache = true;
+}

packages/kit-bg/src/migrations/v4ToV5Migration/V4MigrationForAccount.ts

@@ -1625,13 +1625,7 @@ export class V4MigrationForAccount extends V4MigrationManagerBase {
                 name: v4wallet.name,
                 mnemonic: await servicePassword.encodeSensitiveText({
                   text: mnemonic,
-                }),
-                walletHashBuilder: () => {
-                  const text = `${mnemonic}--4863FBE1-7B9B-4006-91D0-24212CCCC375--${v4wallet.id}`;
-                  const buff = sha256(bufferUtils.toBuffer(text, 'utf8'));
-                  const walletHash = bufferUtils.bytesToHex(buff);
-                  return walletHash;
-                },
+                })
               });
             v5dbWallet = v5walletSaved;
           }