Merge branch 'develop' of ssh://gitlab.papers.tech:10022/papers/airga…

…p/airgap-vault into feat/rsk-ready
airgap-it · Aug 10, 2023 · 357a561 · 357a561
2 parents f26fd58 + 7710106
commit 357a561
Show file tree

Hide file tree

Showing 4 changed files with 414 additions and 413 deletions.
diff --git a/package.json b/package.json
@@ -36,48 +36,48 @@
     "apply-diagnostic-modules": "node apply-diagnostic-modules.js"
   },
   "resolutions": {
-    "@airgap/aeternity": "0.13.19-beta.13",
-    "@airgap/astar": "0.13.19-beta.13",
-    "@airgap/bitcoin": "0.13.19-beta.13",
-    "@airgap/coinlib-core": "0.13.19-beta.13",
-    "@airgap/coreum": "0.13.19-beta.13",
-    "@airgap/cosmos": "0.13.19-beta.13",
-    "@airgap/cosmos-core": "0.13.19-beta.13",
-    "@airgap/crypto": "0.13.19-beta.13",
-    "@airgap/ethereum": "0.13.19-beta.13",
-    "@airgap/groestlcoin": "0.13.19-beta.13",
-    "@airgap/icp": "0.13.19-beta.13",
-    "@airgap/module-kit": "0.13.19-beta.13",
-    "@airgap/moonbeam": "0.13.19-beta.13",
-    "@airgap/optimism": "0.13.19-beta.13",
-    "@airgap/polkadot": "0.13.19-beta.13",
-    "@airgap/serializer": "0.13.19-beta.13",
-    "@airgap/substrate": "0.13.19-beta.13",
-    "@airgap/tezos": "0.13.19-beta.13"
+    "@airgap/aeternity": "0.13.20-beta.0",
+    "@airgap/astar": "0.13.20-beta.0",
+    "@airgap/bitcoin": "0.13.20-beta.0",
+    "@airgap/coinlib-core": "0.13.20-beta.0",
+    "@airgap/coreum": "0.13.20-beta.0",
+    "@airgap/cosmos": "0.13.20-beta.0",
+    "@airgap/cosmos-core": "0.13.20-beta.0",
+    "@airgap/crypto": "0.13.20-beta.0",
+    "@airgap/ethereum": "0.13.20-beta.0",
+    "@airgap/groestlcoin": "0.13.20-beta.0",
+    "@airgap/icp": "0.13.20-beta.0",
+    "@airgap/module-kit": "0.13.20-beta.0",
+    "@airgap/moonbeam": "0.13.20-beta.0",
+    "@airgap/optimism": "0.13.20-beta.0",
+    "@airgap/polkadot": "0.13.20-beta.0",
+    "@airgap/serializer": "0.13.20-beta.0",
+    "@airgap/substrate": "0.13.20-beta.0",
+    "@airgap/tezos": "0.13.20-beta.0"
   },
   "dependencies": {
-    "@airgap/aeternity": "0.13.19-beta.13",
-    "@airgap/angular-core": "0.0.40-beta.3",
-    "@airgap/angular-ngrx": "0.0.40-beta.3",
-    "@airgap/astar": "0.13.19-beta.13",
-    "@airgap/bitcoin": "0.13.19-beta.13",
-    "@airgap/coinlib-core": "0.13.19-beta.13",
-    "@airgap/coreum": "0.13.19-beta.13",
-    "@airgap/cosmos": "0.13.19-beta.13",
-    "@airgap/cosmos-core": "0.13.19-beta.13",
-    "@airgap/crypto": "0.13.19-beta.13",
-    "@airgap/ethereum": "0.13.19-beta.13",
-    "@airgap/groestlcoin": "0.13.19-beta.13",
-    "@airgap/icp": "0.13.19-beta.13",
-    "@airgap/module-kit": "0.13.19-beta.13",
-    "@airgap/moonbeam": "0.13.19-beta.13",
-    "@airgap/optimism": "0.13.19-beta.13",
-    "@airgap/polkadot": "0.13.19-beta.13",
+    "@airgap/aeternity": "0.13.20-beta.0",
+    "@airgap/angular-core": "0.0.41-beta.0",
+    "@airgap/angular-ngrx": "0.0.41-beta.0",
+    "@airgap/astar": "0.13.20-beta.0",
+    "@airgap/bitcoin": "0.13.20-beta.0",
+    "@airgap/coinlib-core": "0.13.20-beta.0",
+    "@airgap/coreum": "0.13.20-beta.0",
+    "@airgap/cosmos": "0.13.20-beta.0",
+    "@airgap/cosmos-core": "0.13.20-beta.0",
+    "@airgap/crypto": "0.13.20-beta.0",
+    "@airgap/ethereum": "0.13.20-beta.0",
+    "@airgap/groestlcoin": "0.13.20-beta.0",
+    "@airgap/icp": "0.13.20-beta.0",
+    "@airgap/module-kit": "0.13.20-beta.0",
+    "@airgap/moonbeam": "0.13.20-beta.0",
+    "@airgap/optimism": "0.13.20-beta.0",
+    "@airgap/polkadot": "0.13.20-beta.0",
     "@airgap/sapling-wasm": "0.0.7",
-    "@airgap/serializer": "0.13.19-beta.13",
-    "@airgap/substrate": "0.13.19-beta.13",
-    "@airgap/tezos": "0.13.19-beta.13",
-    "@airgap-community/iso-rootstock": "1.0.0-beta.0",
+    "@airgap/serializer": "0.13.20-beta.0",
+    "@airgap/substrate": "0.13.20-beta.0",
+    "@airgap/tezos": "0.13.20-beta.0",
+    "@airgap-community/iso-rootstock": "1.0.0-beta.1",
     "@angular/cdk": "^14.2.7",
     "@angular/common": "16.1.1",
     "@angular/core": "16.1.1",

diff --git a/src/app/components/add-address/add-address.component.ts b/src/app/components/add-address/add-address.component.ts
@@ -39,7 +39,7 @@ export class AddAddressComponent implements OnInit {
     }
 
     this.addressesNotOnContactBook = []
-    this.airGapTxs = this.airGapTxs.map((tx) => ({ ...tx, extra: { names: {} } }))
+    this.airGapTxs = this.airGapTxs?.map((tx) => ({ ...tx, extra: { names: {} } })) ?? []
     this.airGapTxs.forEach((tx) => this.storeAddress(tx))
   }
 

diff --git a/src/app/pages/tab-scan/tab-scan.page.html b/src/app/pages/tab-scan/tab-scan.page.html
@@ -19,32 +19,30 @@
 
     <ion-progress-bar *ngIf="isMultiQr" style="height: 8px" color="light" [value]="percentageScanned"></ion-progress-bar>
 
-    <ng-container *ngIf="hasCameraPermission | async; let cameraPermission">
-      <ion-row *ngIf="cameraPermission" class="row--height__100 ion-justify-content-center ion-align-items-center">
-        <ion-col class="guides--container content--align__center-center">
-          <img class="guides--container__img" src="./assets/img/qr_code_guides.svg" />
-        </ion-col>
-        <zxing-scanner
-          #scanner
-          [formats]="['QR_CODE']"
-          [timeBetweenScans]="0"
-          [delayBetweenScanSuccess]="0"
-          *ngIf="isBrowser || isElectron"
-          (scanSuccess)="checkScan($event)"
-        ></zxing-scanner>
-      </ion-row>
+    <ion-row *ngIf="hasCameraPermission | async" class="row--height__100 ion-justify-content-center ion-align-items-center">
+      <ion-col class="guides--container content--align__center-center">
+        <img class="guides--container__img" src="./assets/img/qr_code_guides.svg" />
+      </ion-col>
+      <zxing-scanner
+        #scanner
+        [formats]="['QR_CODE']"
+        [timeBetweenScans]="0"
+        [delayBetweenScanSuccess]="0"
+        *ngIf="isBrowser || isElectron"
+        (scanSuccess)="checkScan($event)"
+      ></zxing-scanner>
+    </ion-row>
 
-      <ion-row
-        *ngIf="!cameraPermission"
-        class="row--height__100 ion-justify-content-center ion-align-items-center"
-        (click)="requestPermission()"
-      >
-        <ion-col class="ion-text-center">
-          <img src="../assets/img/permission_onboarding_camera.svg" />
-          <h3 class="ion-padding-horizontal" [innerHTML]="'tab-scan.empty-state_heading' | translate"></h3>
-          <ion-button shape="round" color="primary">{{ 'tab-scan.grant-permission_label' | translate }}</ion-button>
-        </ion-col>
-      </ion-row>
-    </ng-container>
+    <ion-row
+      *ngIf="(hasCameraPermission | async) === false"
+      class="row--height__100 ion-justify-content-center ion-align-items-center"
+      (click)="requestPermission()"
+    >
+      <ion-col class="ion-text-center">
+        <img src="../assets/img/permission_onboarding_camera.svg" />
+        <h3 class="ion-padding-horizontal" [innerHTML]="'tab-scan.empty-state_heading' | translate"></h3>
+        <ion-button shape="round" color="primary">{{ 'tab-scan.grant-permission_label' | translate }}</ion-button>
+      </ion-col>
+    </ion-row>
   </ion-grid>
 </ion-content>