diff --git a/src/pages/backup/backup-confirm-modal/backup-confirm-modal.ts b/src/pages/backup/backup-confirm-modal/backup-confirm-modal.ts index f20f1246c..8c6324a66 100644 --- a/src/pages/backup/backup-confirm-modal/backup-confirm-modal.ts +++ b/src/pages/backup/backup-confirm-modal/backup-confirm-modal.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { IonicPage, ViewController, NavParams } from 'ionic-angular'; +import { IonicPage, ViewController } from 'ionic-angular'; @IonicPage() @Component({ @@ -8,7 +8,7 @@ import { IonicPage, ViewController, NavParams } from 'ionic-angular'; }) export class BackupConfirmModalPage { - constructor(public viewCtrl: ViewController, public navParams: NavParams) { + constructor(public viewCtrl: ViewController) { } ionViewDidLoad() { diff --git a/src/pages/backup/backup-game/backup-game.html b/src/pages/backup/backup-game/backup-game.html index 7a4fe7ea0..9c7b9aa1c 100644 --- a/src/pages/backup/backup-game/backup-game.html +++ b/src/pages/backup/backup-game/backup-game.html @@ -1,9 +1,3 @@ - diff --git a/src/pages/backup/backup-game/backup-game.ts b/src/pages/backup/backup-game/backup-game.ts index 42447493e..50fe3ee4b 100644 --- a/src/pages/backup/backup-game/backup-game.ts +++ b/src/pages/backup/backup-game/backup-game.ts @@ -1,5 +1,5 @@ import { Component, ViewChild } from '@angular/core'; -import { IonicPage, NavController, NavParams, Slides, Navbar, AlertController, ModalController } from 'ionic-angular'; +import { IonicPage, NavController, Slides, Navbar, AlertController, ModalController, Modal } from 'ionic-angular'; import * as _ from 'lodash'; @IonicPage() @@ -24,7 +24,7 @@ export class BackupGamePage { private keys: any; private useIdeograms: any; - constructor(public navCtrl: NavController, public navParams: NavParams, public alertCtrl: AlertController, public modalCtrl: ModalController) { + constructor(public navCtrl: NavController, public alertCtrl: AlertController, public modalCtrl: ModalController) { // TODO replace for the original wallet object this.wallet = { name: 'Wallet name', @@ -197,12 +197,19 @@ export class BackupGamePage { }); alert.present(); } else { - const myModal = this.modalCtrl.create('BackupConfirmModalPage', {}, { + let self = this; + const myModal: Modal = self.modalCtrl.create('BackupConfirmModalPage', {}, { showBackdrop: true, enableBackdropDismiss: true, cssClass: "backup-modal-success" }); + myModal.present(); + + myModal.onDidDismiss(() => { + console.log('MODAL DISSMISED'); + self.navCtrl.popToRoot(); // TODO NOT WORKING + }); } }; diff --git a/src/pages/backup/backup-warning-modal/backup-warning-modal.ts b/src/pages/backup/backup-warning-modal/backup-warning-modal.ts index 150306eb8..874e32738 100644 --- a/src/pages/backup/backup-warning-modal/backup-warning-modal.ts +++ b/src/pages/backup/backup-warning-modal/backup-warning-modal.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { IonicPage, NavController, NavParams, ViewController } from 'ionic-angular'; +import { IonicPage, NavController, ViewController } from 'ionic-angular'; @IonicPage() @Component({ @@ -8,7 +8,7 @@ import { IonicPage, NavController, NavParams, ViewController } from 'ionic-angul }) export class BackupWarningModalPage { - constructor(public navCtrl: NavController, public navParams: NavParams, public viewCtrl: ViewController) { + constructor(public navCtrl: NavController, public viewCtrl: ViewController) { } ionViewDidLoad() { diff --git a/src/pages/backup/backup-warning/backup-warning.ts b/src/pages/backup/backup-warning/backup-warning.ts index 3ba9405a1..5c0dd2114 100644 --- a/src/pages/backup/backup-warning/backup-warning.ts +++ b/src/pages/backup/backup-warning/backup-warning.ts @@ -14,11 +14,14 @@ export class BackupWarningPage { } ionViewDidLoad() { - console.log('ionViewDidLoad BackupWarningPage'); } openWarningModal() { - const myModal = this.modalCtrl.create('BackupWarningModalPage', {}, { showBackdrop: true, enableBackdropDismiss: true, cssClass: "backup-modal-warning" }); + const myModal = this.modalCtrl.create('BackupWarningModalPage', {}, { + showBackdrop: true, + enableBackdropDismiss: true, + cssClass: "backup-modal-warning" + }); myModal.present(); }