Fix/name persistence

airgap-it · Jul 17, 2023 · 097aab8 · 097aab8
1 parent 3449648
commit 097aab8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/app/pages/contact-book-contacts-detail/contact-book-contacts-detail.page.ts b/src/app/pages/contact-book-contacts-detail/contact-book-contacts-detail.page.ts
@@ -29,6 +29,7 @@ export class ContactBookContactsDetailPage {
         this.contact.addedFrom = AddType.SIGNING
       } else if (state.addType && state.addType === AddType.QR && state.address && state.address.length > 0) {
         this.contact.address = state.address
+        this.contact.name = state.name
         this.contact.addedFrom = AddType.QR
       } else {
         this.contact.addedFrom = AddType.MANUAL
@@ -101,6 +102,6 @@ export class ContactBookContactsDetailPage {
   }
 
   onClickQRCode() {
-    this.navigationService.route('/contact-book-scan')
+    this.navigationService.routeWithState('/contact-book-scan', { name: this.contact.name })
   }
 }
diff --git a/src/app/pages/contact-book-scan/contact-book-scan.page.ts b/src/app/pages/contact-book-scan/contact-book-scan.page.ts
@@ -44,11 +44,12 @@ export class ContactBookScanPage extends ScanBasePage {
 
   public async checkScan(data: string): Promise<boolean | void> {
     if (data.length > 0) {
+      const name  = await this.navigationService.getState().name ?? ''
       this.ngZone.run(async () => {
         this.resetScannerPage()
         this.stopScan()
         await this.navigationService
-          .routeWithState('/contact-book-contacts-detail', { isNew: true, address: data, addType: AddType.QR })
+          .routeWithState('/contact-book-contacts-detail', { isNew: true, address: data, addType: AddType.QR, name })
           .catch(handleErrorLocal(ErrorCategory.IONIC_NAVIGATION))
       })
     }