Merge branch 'fix/back-instead-of-close-button' into 'master'

fix(secret): show back button instead of close button See merge request papers/airgap/airgap-vault!74
airgap-it · Jan 14, 2019 · 71e7e18 · 71e7e18
2 parents 2fa73b5 + ec6ba65
commit 71e7e18
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/src/pages/secret-create/secret-create.html b/src/pages/secret-create/secret-create.html
@@ -1,10 +1,4 @@
-<ion-header transparent no-border>
-  <ion-navbar hideBackButton transparent>
-    <ion-buttons end>
-      <button *ngIf="!isRoot()" (click)="close()" ion-button icon-only><ion-icon name="close"></ion-icon></button>
-    </ion-buttons>
-  </ion-navbar>
-</ion-header>
+<ion-header transparent no-border><ion-navbar [hideBackButton]="isRoot()" transparent></ion-navbar></ion-header>
 
 <ion-content padding class="colored-background">
   <h1>{{ 'secret-create.heading' | translate }}</h1>

diff --git a/src/pages/secret-create/secret-create.ts b/src/pages/secret-create/secret-create.ts
@@ -35,8 +35,4 @@ export class SecretCreatePage {
   public goToSocialRecoveryImport() {
     this.navController.push(SocialRecoveryImportPage)
   }
-
-  public close() {
-    this.navController.popToRoot()
-  }
 }