From 097aab875cb85186fd6b1fb8ebd7cd26fb4e3c9f Mon Sep 17 00:00:00 2001 From: Isacco Sordo Date: Mon, 17 Jul 2023 16:35:10 +0200 Subject: [PATCH] Fix/name persistence --- .../contact-book-contacts-detail.page.ts | 3 ++- src/app/pages/contact-book-scan/contact-book-scan.page.ts | 3 ++- 2 files changed, 4 insertions(+), 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 index 0b749609..3d595ad9 100644 --- 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 index 31b849b7..d218f9ad 100644 --- 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 { 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)) }) }