+
diff --git a/src/pages/backup/backup-game/backup-game.scss b/src/pages/backup/backup-game/backup-game.scss
index c3cb20f88..e492a7280 100644
--- a/src/pages/backup/backup-game/backup-game.scss
+++ b/src/pages/backup/backup-game/backup-game.scss
@@ -1,42 +1,43 @@
page-backup-game {
- .backup {
- .pages {
- .swiper-pagination {
- display: none;
- }
- .slide-zoom {
- height: 100%;
- }
- .password-required {
- padding: 2rem;
- font-size: 14px;
- color: color($colors, danger);
- }
- .password {
- background-color: color($colors, light);
- padding: 2rem;
- }
- .phrase {
- display: -webkit-box;
- background: color($colors, light);
- border: 2px dashed #d9d9d9;
- border-radius: 3px;
- color: color($colors, secondary);
- text-align: center;
- max-width: 500px;
- min-height: 12rem;
- align-items: center;
- }
- .buttons {
- position: absolute;
- bottom: 0;
- left: 0;
- width: 100%;
- padding-bottom: 5vh;
- .tldr {
- padding: 1rem;
- }
- }
- }
+ text-align: center;
+ .toolbar-background{
+ background-color: transparent;
}
-}
\ No newline at end of file
+ p {
+ line-height: 1.6;
+ font-size: 18px;
+ margin-right: 10px;
+ margin-left: 10px;
+ }
+ .swiper-pagination {
+ display: none;
+ }
+ .slide-zoom {
+ height: 100%;
+ }
+ .password-required {
+ padding: 2rem;
+ font-size: 14px;
+ color: color($colors, danger);
+ }
+ .password {
+ background-color: color($colors, light);
+ padding: 2rem;
+ }
+ .phrase {
+ display: -webkit-box;
+ background: color($colors, light);
+ border: 2px dashed #d9d9d9;
+ border-radius: 3px;
+ color: color($colors, secondary);
+ text-align: center;
+ max-width: 500px;
+ min-height: 12rem;
+ align-items: center;
+ margin: 20px 15px;
+ padding: 15px 0;
+ }
+ .tldr {
+ padding: 1rem;
+ }
+}
diff --git a/src/pages/backup/backup-game/backup-game.ts b/src/pages/backup/backup-game/backup-game.ts
index 91fc836af..7c086fdf4 100644
--- a/src/pages/backup/backup-game/backup-game.ts
+++ b/src/pages/backup/backup-game/backup-game.ts
@@ -1,7 +1,6 @@
import { Component, ViewChild } from '@angular/core';
-import { NavController, Slides, Navbar, AlertController, ModalController, Modal } from 'ionic-angular';
+import { NavController, Slides, Navbar, AlertController } from 'ionic-angular';
import { TabsPage } from '../../tabs/tabs';
-import { BackupConfirmModalPage } from '../backup-confirm-modal/backup-confirm-modal';
import * as _ from 'lodash';
@Component({
@@ -26,9 +25,8 @@ export class BackupGamePage {
private useIdeograms: any;
constructor(
- public navCtrl: NavController,
- public alertCtrl: AlertController,
- public modalCtrl: ModalController
+ public navCtrl: NavController,
+ public alertCtrl: AlertController
) {
// TODO replace for the original wallet object
this.wallet = {
@@ -198,13 +196,18 @@ export class BackupGamePage {
});
alert.present();
} else {
- let self = this;
- const myModal: Modal = self.modalCtrl.create(BackupConfirmModalPage, {}, {
- showBackdrop: true,
- enableBackdropDismiss: false,
- });
-
- myModal.present();
+ let opts = {
+ title: 'Your bitcoin wallet is backed up!',
+ message: 'Be sure to store your recovery phrase in a secure place. If this app is deleted, your money cannot be recovered without it.',
+ buttons: [{
+ text: 'Got it',
+ handler: () => {
+ this.navCtrl.setRoot(TabsPage);
+ this.navCtrl.popToRoot();
+ }
+ }],
+ }
+ this.alertCtrl.create(opts).present();
}
};
diff --git a/src/pages/backup/backup-warning-modal/backup-warning-modal.html b/src/pages/backup/backup-warning-modal/backup-warning-modal.html
deleted file mode 100644
index 122529edb..000000000
--- a/src/pages/backup/backup-warning-modal/backup-warning-modal.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
- Screenshots are not secure
-
-
- If you take a screenshot, your backup may be viewed by other apps. You can make a safe backup with physical paper and a pen.
-
-
-
-
diff --git a/src/pages/backup/backup-warning-modal/backup-warning-modal.scss b/src/pages/backup/backup-warning-modal/backup-warning-modal.scss
deleted file mode 100644
index 655d2f7f5..000000000
--- a/src/pages/backup/backup-warning-modal/backup-warning-modal.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-.warning-modal-header {
- background: color($colors, warning);
- padding: 1rem;
- border-radius: 12px 12px 0 0;
- min-height: 120px;
-}
-.warning-modal-content {
- text-align: center;
- height: 65%;
- overflow-y: scroll;
- padding: 1rem;
- display: flex;
- align-items: center;
- .warning-modal-heading {
- font-weight: bold;
- font-size: 2rem;
- padding-bottom: 1rem;
- }
- .warning-modal-message {
- padding: 1.5rem;
- font-size: 1.6rem;
- }
- button {
- background: none;
- font-size: 1.6rem;
- }
-}
diff --git a/src/pages/backup/backup-warning-modal/backup-warning-modal.ts b/src/pages/backup/backup-warning-modal/backup-warning-modal.ts
deleted file mode 100644
index 3670ee946..000000000
--- a/src/pages/backup/backup-warning-modal/backup-warning-modal.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Component } from '@angular/core';
-import { NavController, ViewController } from 'ionic-angular';
-import { BackupGamePage } from '../backup-game/backup-game';
-
-@Component({
- selector: 'page-backup-warning-modal',
- templateUrl: 'backup-warning-modal.html',
-})
-export class BackupWarningModalPage {
-
- constructor(
- public navCtrl: NavController,
- public viewCtrl: ViewController
- ) {}
-
- close() {
- this.navCtrl.push(BackupGamePage);
- this.viewCtrl.dismiss();
- }
-}
diff --git a/src/pages/backup/backup-warning/backup-warning.html b/src/pages/backup/backup-warning/backup-warning.html
index 908ea532a..887a69427 100644
--- a/src/pages/backup/backup-warning/backup-warning.html
+++ b/src/pages/backup/backup-warning/backup-warning.html
@@ -1,18 +1,13 @@
-
-
-
-
-
+
+
- Are you being watched?
- Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?
-
-
-
+
Are you being watched?
+
Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?
+
+
Anyone with your backup phrase can access or spend your bitcoin.
diff --git a/src/pages/backup/backup-warning/backup-warning.scss b/src/pages/backup/backup-warning/backup-warning.scss
index 5bb8f2338..2bafdfc2f 100644
--- a/src/pages/backup/backup-warning/backup-warning.scss
+++ b/src/pages/backup/backup-warning/backup-warning.scss
@@ -1,9 +1,12 @@
page-backup-warning {
- .buttons {
- padding: 15px;
- width: 100%;
- position: absolute;
- bottom: 0px;
- padding: 15px 15px 4vh 15px;
+ text-align: center;
+ .toolbar-background{
+ background-color: transparent;
}
-}
\ No newline at end of file
+ p {
+ line-height: 1.6;
+ font-size: 18px;
+ margin-right: 10px;
+ margin-left: 10px;
+ }
+}
diff --git a/src/pages/backup/backup-warning/backup-warning.ts b/src/pages/backup/backup-warning/backup-warning.ts
index 70cecd5e8..b250055c5 100644
--- a/src/pages/backup/backup-warning/backup-warning.ts
+++ b/src/pages/backup/backup-warning/backup-warning.ts
@@ -1,6 +1,6 @@
import { Component } from '@angular/core';
-import { ModalController } from 'ionic-angular';
-import { BackupWarningModalPage } from '../backup-warning-modal/backup-warning-modal';
+import { NavController, ModalController, AlertController } from 'ionic-angular';
+import { BackupGamePage } from '../backup-game/backup-game';
@Component({
selector: 'page-backup-warning',
@@ -9,14 +9,25 @@ import { BackupWarningModalPage } from '../backup-warning-modal/backup-warning-m
export class BackupWarningPage {
public currentIndex: number;
- constructor(public modalCtrl: ModalController) {}
+ constructor(
+ public navCtrl: NavController,
+ public alertCtrl: AlertController,
+ public modalCtrl: ModalController
+ ) {}
openWarningModal() {
- const myModal = this.modalCtrl.create(BackupWarningModalPage, {}, {
- showBackdrop: true,
- enableBackdropDismiss: true,
- });
- myModal.present();
+
+ let opts = {
+ title: 'Screenshots are not secure',
+ message: 'If you take a screenshot, your backup may be viewed by other apps. You can make a safe backup with physical paper and a pen',
+ buttons: [{
+ text: 'I understand',
+ handler: () => {
+ this.navCtrl.push(BackupGamePage);
+ }
+ }],
+ }
+ this.alertCtrl.create(opts).present();
}
}
diff --git a/src/pages/onboarding/tour/tour.ts b/src/pages/onboarding/tour/tour.ts
index 1c82885d1..c7c9d3459 100644
--- a/src/pages/onboarding/tour/tour.ts
+++ b/src/pages/onboarding/tour/tour.ts
@@ -49,10 +49,6 @@ export class TourPage {
}
createDefaultWallet() {
- // TODO for testing
- this.navCtrl.push(EmailPage);
- return;
-
let loading = this.loadingCtrl.create({
content: 'Creating Personal Wallet...'
});
diff --git a/src/pages/receive/receive.ts b/src/pages/receive/receive.ts
index 60b297bb1..05843e718 100644
--- a/src/pages/receive/receive.ts
+++ b/src/pages/receive/receive.ts
@@ -1,5 +1,5 @@
import { Component } from '@angular/core';
-import { NavController, NavParams, Events, ActionSheetController, ModalController } from 'ionic-angular';
+import { NavController, Events, ActionSheetController} from 'ionic-angular';
//native
import { SocialSharing } from '@ionic-native/social-sharing';
@@ -7,7 +7,6 @@ import { SocialSharing } from '@ionic-native/social-sharing';
//pages
import { AmountPage } from '../send/amount/amount';
import { CopayersPage } from '../copayers/copayers';
-import { BackupWarningModalPage } from '../backup/backup-warning-modal/backup-warning-modal';
//providers
import { WalletProvider } from '../../providers/wallet/wallet';
import { ProfileProvider } from '../../providers/profile/profile';
@@ -31,15 +30,13 @@ export class ReceivePage {
constructor(
private navCtrl: NavController,
- private navParams: NavParams,
private profileProvider: ProfileProvider,
private walletProvider: WalletProvider,
private popupProvider: PopupProvider,
private platformProvider: PlatformProvider,
private events: Events,
private actionSheetCtrl: ActionSheetController,
- private socialSharing: SocialSharing,
- private modalCtrl: ModalController
+ private socialSharing: SocialSharing
) {
}
@@ -138,11 +135,8 @@ export class ReceivePage {
};
public openBackupNeededModal(): void {
- const myModal = this.modalCtrl.create(BackupWarningModalPage, {}, {
- showBackdrop: true,
- enableBackdropDismiss: true,
- });
- myModal.present();
+ // TODO
+
}
}
- 
-