Merge branch 'feat/improved-psbt-signing' into 'develop'

improve psbt signing See merge request papers/airgap/airgap-vault!515
airgap-it · Sep 19, 2024 · ac63c33 · ac63c33
2 parents a878b7d + 0024f94
commit ac63c33
Show file tree

Hide file tree

Showing 7 changed files with 386 additions and 391 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-beta.2",
+    "@airgap/acurast": "0.13.33-beta.2",
+    "@airgap/astar": "0.13.33-beta.2",
+    "@airgap/bitcoin": "0.13.33-beta.2",
+    "@airgap/coinlib-core": "0.13.33-beta.2",
+    "@airgap/coreum": "0.13.33-beta.2",
+    "@airgap/cosmos": "0.13.33-beta.2",
+    "@airgap/cosmos-core": "0.13.33-beta.2",
+    "@airgap/crypto": "0.13.33-beta.2",
+    "@airgap/ethereum": "0.13.33-beta.2",
+    "@airgap/groestlcoin": "0.13.33-beta.2",
+    "@airgap/icp": "0.13.33-beta.2",
+    "@airgap/module-kit": "0.13.33-beta.2",
+    "@airgap/moonbeam": "0.13.33-beta.2",
+    "@airgap/optimism": "0.13.33-beta.2",
+    "@airgap/polkadot": "0.13.33-beta.2",
+    "@airgap/serializer": "0.13.33-beta.2",
+    "@airgap/substrate": "0.13.33-beta.2",
+    "@airgap/tezos": "0.13.33-beta.2"
   },
   "dependencies": {
-    "@airgap/aeternity": "0.13.32",
-    "@airgap/acurast": "0.13.32",
-    "@airgap/angular-core": "0.0.49-beta.0",
-    "@airgap/angular-ngrx": "0.0.49-beta.0",
-    "@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-beta.2",
+    "@airgap/acurast": "0.13.33-beta.2",
+    "@airgap/angular-core": "0.0.49-beta.2",
+    "@airgap/angular-ngrx": "0.0.49-beta.2",
+    "@airgap/astar": "0.13.33-beta.2",
+    "@airgap/bitcoin": "0.13.33-beta.2",
+    "@airgap/coinlib-core": "0.13.33-beta.2",
+    "@airgap/coreum": "0.13.33-beta.2",
+    "@airgap/cosmos": "0.13.33-beta.2",
+    "@airgap/cosmos-core": "0.13.33-beta.2",
+    "@airgap/crypto": "0.13.33-beta.2",
+    "@airgap/ethereum": "0.13.33-beta.2",
+    "@airgap/groestlcoin": "0.13.33-beta.2",
+    "@airgap/icp": "0.13.33-beta.2",
+    "@airgap/module-kit": "0.13.33-beta.2",
+    "@airgap/moonbeam": "0.13.33-beta.2",
+    "@airgap/optimism": "0.13.33-beta.2",
+    "@airgap/polkadot": "0.13.33-beta.2",
     "@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-beta.2",
+    "@airgap/substrate": "0.13.33-beta.2",
+    "@airgap/tezos": "0.13.33-beta.2",
     "@airgap-community/iso-rootstock": "1.0.0",
     "@angular/cdk": "^14.2.7",
     "@angular/common": "16.1.1",

diff --git a/src/app/pages/select-account/select-account.page.html b/src/app/pages/select-account/select-account.page.html
@@ -4,6 +4,5 @@
   [placeholder]="placeholder"
   [wallets]="wallets"
   (walletSetEmitter)="setWallet($event)"
-  [labels]="labels"
   (dismissEmitter)="dismiss()"
 ></airgap-account-selection>
diff --git a/src/app/pages/select-account/select-account.page.ts b/src/app/pages/select-account/select-account.page.ts
@@ -18,7 +18,6 @@ export class SelectAccountPage {
   public placeholder: string
 
   public wallets: AirGapWallet[]
-  public labels: string[]
   public symbolFilter: MainProtocolSymbols | undefined
 
   constructor(
@@ -39,6 +38,7 @@ export class SelectAccountPage {
         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
@@ -49,10 +49,6 @@ export class SelectAccountPage {
       )
 
       this.wallets = flattened(wallets).filter((wallet: AirGapWallet | undefined) => wallet !== undefined)
-      this.labels = secrets.map((secret) => {
-        console.log(secret.label)
-        return secret.label
-      })
     })
   }
 

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": {