Merge branch 'develop' into 'master'

Develop See merge request papers/airgap/airgap-vault!518
airgap-it · Sep 20, 2024 · a5eba41 · a5eba41
2 parents e30447e + 1441b75
commit a5eba41
Show file tree

Hide file tree

Showing 9 changed files with 417 additions and 402 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,49 +36,49 @@
     "apply-diagnostic-modules": "node apply-diagnostic-modules.js"
   },
   "resolutions": {
-    "@airgap/aeternity": "0.13.32",
-    "@airgap/acurast": "0.13.32",
-    "@airgap/astar": "0.13.32",
-    "@airgap/bitcoin": "0.13.32",
-    "@airgap/coinlib-core": "0.13.32",
-    "@airgap/coreum": "0.13.32",
-    "@airgap/cosmos": "0.13.32",
-    "@airgap/cosmos-core": "0.13.32",
-    "@airgap/crypto": "0.13.32",
-    "@airgap/ethereum": "0.13.32",
-    "@airgap/groestlcoin": "0.13.32",
-    "@airgap/icp": "0.13.32",
-    "@airgap/module-kit": "0.13.32",
-    "@airgap/moonbeam": "0.13.32",
-    "@airgap/optimism": "0.13.32",
-    "@airgap/polkadot": "0.13.32",
-    "@airgap/serializer": "0.13.32",
-    "@airgap/substrate": "0.13.32",
-    "@airgap/tezos": "0.13.32"
+    "@airgap/aeternity": "0.13.33",
+    "@airgap/acurast": "0.13.33",
+    "@airgap/astar": "0.13.33",
+    "@airgap/bitcoin": "0.13.33",
+    "@airgap/coinlib-core": "0.13.33",
+    "@airgap/coreum": "0.13.33",
+    "@airgap/cosmos": "0.13.33",
+    "@airgap/cosmos-core": "0.13.33",
+    "@airgap/crypto": "0.13.33",
+    "@airgap/ethereum": "0.13.33",
+    "@airgap/groestlcoin": "0.13.33",
+    "@airgap/icp": "0.13.33",
+    "@airgap/module-kit": "0.13.33",
+    "@airgap/moonbeam": "0.13.33",
+    "@airgap/optimism": "0.13.33",
+    "@airgap/polkadot": "0.13.33",
+    "@airgap/serializer": "0.13.33",
+    "@airgap/substrate": "0.13.33",
+    "@airgap/tezos": "0.13.33"
   },
   "dependencies": {
-    "@airgap/aeternity": "0.13.32",
-    "@airgap/acurast": "0.13.32",
-    "@airgap/angular-core": "0.0.48",
-    "@airgap/angular-ngrx": "0.0.48",
-    "@airgap/astar": "0.13.32",
-    "@airgap/bitcoin": "0.13.32",
-    "@airgap/coinlib-core": "0.13.32",
-    "@airgap/coreum": "0.13.32",
-    "@airgap/cosmos": "0.13.32",
-    "@airgap/cosmos-core": "0.13.32",
-    "@airgap/crypto": "0.13.32",
-    "@airgap/ethereum": "0.13.32",
-    "@airgap/groestlcoin": "0.13.32",
-    "@airgap/icp": "0.13.32",
-    "@airgap/module-kit": "0.13.32",
-    "@airgap/moonbeam": "0.13.32",
-    "@airgap/optimism": "0.13.32",
-    "@airgap/polkadot": "0.13.32",
+    "@airgap/aeternity": "0.13.33",
+    "@airgap/acurast": "0.13.33",
+    "@airgap/angular-core": "0.0.49",
+    "@airgap/angular-ngrx": "0.0.49",
+    "@airgap/astar": "0.13.33",
+    "@airgap/bitcoin": "0.13.33",
+    "@airgap/coinlib-core": "0.13.33",
+    "@airgap/coreum": "0.13.33",
+    "@airgap/cosmos": "0.13.33",
+    "@airgap/cosmos-core": "0.13.33",
+    "@airgap/crypto": "0.13.33",
+    "@airgap/ethereum": "0.13.33",
+    "@airgap/groestlcoin": "0.13.33",
+    "@airgap/icp": "0.13.33",
+    "@airgap/module-kit": "0.13.33",
+    "@airgap/moonbeam": "0.13.33",
+    "@airgap/optimism": "0.13.33",
+    "@airgap/polkadot": "0.13.33",
     "@airgap/sapling-wasm": "0.0.7",
-    "@airgap/serializer": "0.13.32",
-    "@airgap/substrate": "0.13.32",
-    "@airgap/tezos": "0.13.32",
+    "@airgap/serializer": "0.13.33",
+    "@airgap/substrate": "0.13.33",
+    "@airgap/tezos": "0.13.33",
     "@airgap-community/iso-rootstock": "1.0.0",
     "@angular/cdk": "^14.2.7",
     "@angular/common": "16.1.1",

diff --git a/src/app/pages/account-address/account-address.page.ts b/src/app/pages/account-address/account-address.page.ts
@@ -43,6 +43,12 @@ const specterwallet = {
   qrType: QRType.BC_UR
 }
 
+const nunchukwallet = {
+  icon: 'nunchuk.png',
+  name: 'Nunchuk Wallet',
+  qrType: QRType.BC_UR
+}
+
 const metamask = {
   icon: 'metamask.webp',
   name: 'MetaMask',
@@ -132,7 +138,7 @@ export class AccountAddressPage {
 
       switch (protocolIdentifier) {
         case MainProtocolSymbols.BTC_SEGWIT:
-          this.syncOptions = [airgapwallet, bluewallet, sparrowwallet, specterwallet]
+          this.syncOptions = [airgapwallet, bluewallet, sparrowwallet, specterwallet, nunchukwallet]
           break
         case MainProtocolSymbols.ETH:
         case MainProtocolSymbols.OPTIMISM:

diff --git a/src/app/pages/select-account/select-account.page.ts b/src/app/pages/select-account/select-account.page.ts
@@ -34,21 +34,27 @@ export class SelectAccountPage {
     this.placeholder = this.translateService.instant(`select-account.${type}.placeholder`)
 
     this.secretsService.getSecretsObservable().subscribe(async (secrets: MnemonicSecret[]) => {
-      const wallets: (AirGapWallet | undefined)[][] = await Promise.all(secrets.map((secret) => Promise.all(
-        secret.wallets.map(async (wallet: AirGapWallet) => {
-          return wallet.status === AirGapWalletStatus.ACTIVE && (!this.symbolFilter || (await wallet.protocol.getIdentifier() === this.symbolFilter))
-            ? wallet
-            : undefined
-          })
-      )))
+      const wallets: (AirGapWallet | undefined)[][] = await Promise.all(
+        secrets.map((secret) =>
+          Promise.all(
+            secret.wallets.map(async (wallet: AirGapWallet) => {
+              wallet.label = secret.label
+              return wallet.status === AirGapWalletStatus.ACTIVE &&
+                (!this.symbolFilter || (await wallet.protocol.getIdentifier()) === this.symbolFilter)
+                ? wallet
+                : undefined
+            })
+          )
+        )
+      )
 
       this.wallets = flattened(wallets).filter((wallet: AirGapWallet | undefined) => wallet !== undefined)
     })
   }
 
   public async setWallet(wallet: AirGapWallet) {
     this.modalController
-      .dismiss(this.navParams.get('type') === 'message-signing' ? (await wallet.protocol.getIdentifier()) : wallet) // TODO: change to always return wallet, but it will require a change wherever the "message-signing" is used
+      .dismiss(this.navParams.get('type') === 'message-signing' ? await wallet.protocol.getIdentifier() : wallet) // TODO: change to always return wallet, but it will require a change wherever the "message-signing" is used
       .catch((err) => console.error(err))
   }
 

diff --git a/src/app/services/iac/iac.service.ts b/src/app/services/iac/iac.service.ts
@@ -11,12 +11,7 @@ import {
   UiEventElementsService,
   UiEventService
 } from '@airgap/angular-core'
-import {
-  AirGapWallet,
-  AirGapWalletStatus,
-  MainProtocolSymbols,
-  UnsignedTransaction
-} from '@airgap/coinlib-core'
+import { AirGapWallet, AirGapWalletStatus, MainProtocolSymbols, UnsignedTransaction } from '@airgap/coinlib-core'
 import { Inject, Injectable } from '@angular/core'
 
 import { SignTransactionInfo } from '../../models/sign-transaction-info'
@@ -210,7 +205,10 @@ export class IACService extends BaseIACService {
     }
 
     // ETH: MetaMask requests don't contain the public key information, we need to do the matching based on the sourceFingerprint
-    if (!correctWallet && (signTransactionRequest.protocol === MainProtocolSymbols.ETH || signTransactionRequest.protocol === MainProtocolSymbols.OPTIMISM)) {
+    if (
+      !correctWallet &&
+      (signTransactionRequest.protocol === MainProtocolSymbols.ETH || signTransactionRequest.protocol === MainProtocolSymbols.OPTIMISM)
+    ) {
       const transaction: RawTypedEthereumTransaction = unsignedTransaction.transaction
 
       const fingerprint = transaction.masterFingerprint ?? metadata.sourceFingerprint

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -706,7 +706,7 @@
     "psbt": {
       "title": "Select Account",
       "heading": "Please select an account to sign this PSBT with",
-      "placeholder": "Search by identifier"
+      "placeholder": "Search by label"
     }
   },
   "unsigned-transaction": {

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -706,7 +706,7 @@
     "psbt": {
       "title": "Select Account",
       "heading": "Please select an account to sign this PSBT with",
-      "placeholder": "Search by identifier"
+      "placeholder": "Search by label"
     }
   },
   "unsigned-transaction": {

diff --git a/src/assets/logos/nunchuk.png b/src/assets/logos/nunchuk.png