BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7239 from gabrielbazan7/fix/setRoot 

fix redirection to Home view
This commit is contained in:
Javier Donadío 2017-11-22 12:40:24 -03:00 committed by GitHub
parent d1c90816b8 f8e5d49d12
commit 5695bce997
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pages/send/confirm/confirm.ts
View File

@ -5,7 +5,6 @@ import * as _ from 'lodash';
// Pages // Pages
import { SendPage } from '../../send/send'; import { SendPage } from '../../send/send';
import { HomePage } from '../../home/home';
import { PayProPage } from '../../paypro/paypro'; import { PayProPage } from '../../paypro/paypro';
import { ChooseFeeLevelPage } from '../../choose-fee-level/choose-fee-level'; import { ChooseFeeLevelPage } from '../../choose-fee-level/choose-fee-level';
@ -94,7 +93,7 @@ export class ConfirmPage {
this.config = this.configProvider.get(); this.config = this.configProvider.get();
this.configFeeLevel = this.config.wallet.settings.feeLevel ? this.config.wallet.settings.feeLevel : 'normal'; this.configFeeLevel = this.config.wallet.settings.feeLevel ? this.config.wallet.settings.feeLevel : 'normal';
} }
ionViewDidLoad() { ionViewDidLoad() {
console.log('ionViewDidLoad ConfirmPage'); console.log('ionViewDidLoad ConfirmPage');
let addressInfo = this.navParams.data.addressInfo; let addressInfo = this.navParams.data.addressInfo;
@ -106,7 +105,7 @@ export class ConfirmPage {
paypro: this.navParams.data.paypro, paypro: this.navParams.data.paypro,
feeLevel: this.configFeeLevel, feeLevel: this.configFeeLevel,
spendUnconfirmed: this.config.wallet.spendUnconfirmed, spendUnconfirmed: this.config.wallet.spendUnconfirmed,
// Vanity tx info (not in the real tx) // Vanity tx info (not in the real tx)
recipientType: this.navParams.data.recipientType, recipientType: this.navParams.data.recipientType,
name: this.navParams.data.name, name: this.navParams.data.name,
@ -571,7 +570,7 @@ export class ConfirmPage {
public onSuccessConfirm(): void { public onSuccessConfirm(): void {
this.sendStatus = ''; this.sendStatus = '';
this.navCtrl.setRoot(HomePage); this.navCtrl.setRoot(SendPage);
this.navCtrl.popToRoot(); this.navCtrl.popToRoot();
this.navCtrl.parent.select(0); this.navCtrl.parent.select(0);
}; };

6
src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-delete/wallet-delete.ts
View File

@ -6,14 +6,13 @@ import { Validators, FormBuilder, FormGroup } from '@angular/forms';
//providers //providers
import { ProfileProvider } from '../../../../../providers/profile/profile'; import { ProfileProvider } from '../../../../../providers/profile/profile';
import { ConfigProvider } from '../../../../../providers/config/config'; import { ConfigProvider } from '../../../../../providers/config/config';
import { AppProvider } from '../../../../../providers/app/app';
import { PersistenceProvider } from '../../../../../providers/persistence/persistence'; import { PersistenceProvider } from '../../../../../providers/persistence/persistence';
import { PopupProvider } from '../../../../../providers/popup/popup'; import { PopupProvider } from '../../../../../providers/popup/popup';
import { OnGoingProcessProvider } from '../../../../../providers/on-going-process/on-going-process'; import { OnGoingProcessProvider } from '../../../../../providers/on-going-process/on-going-process';
import { PushNotificationsProvider } from '../../../../../providers/push-notifications/push-notifications'; import { PushNotificationsProvider } from '../../../../../providers/push-notifications/push-notifications';
//pages //pages
import { HomePage } from '../../../../home/home'; import { SettingsPage } from '../../../../settings/settings';
@Component({ @Component({
selector: 'page-wallet-delete', selector: 'page-wallet-delete',
@ -29,7 +28,6 @@ export class WalletDeletePage {
private navParams: NavParams, private navParams: NavParams,
private navCtrl: NavController, private navCtrl: NavController,
private configProvider: ConfigProvider, private configProvider: ConfigProvider,
private app: AppProvider,
private logger: Logger, private logger: Logger,
private persistenceProvider: PersistenceProvider, private persistenceProvider: PersistenceProvider,
private formBuilder: FormBuilder, private formBuilder: FormBuilder,
@ -62,7 +60,7 @@ export class WalletDeletePage {
this.profileProvider.deleteWalletClient(this.wallet).then(() => { this.profileProvider.deleteWalletClient(this.wallet).then(() => {
this.onGoingProcessProvider.set('deletingWallet', false); this.onGoingProcessProvider.set('deletingWallet', false);
this.pushNotificationsProvider.unsubscribe(this.wallet); this.pushNotificationsProvider.unsubscribe(this.wallet);
this.navCtrl.setRoot(HomePage); this.navCtrl.setRoot(SettingsPage);
this.navCtrl.popToRoot(); this.navCtrl.popToRoot();
this.navCtrl.parent.select(0); this.navCtrl.parent.select(0);
}).catch((err) => { }).catch((err) => {

4
src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-information/wallet-information.ts
View File

@ -9,7 +9,7 @@ import { ConfigProvider } from '../../../../../providers/config/config';
import { WalletProvider } from '../../../../../providers/wallet/wallet'; import { WalletProvider } from '../../../../../providers/wallet/wallet';
//pages //pages
import { HomePage } from '../../../../../pages/home/home'; import { SettingsPage } from '../../../../../pages/settings/settings';
import { WalletExtendedPrivateKeyPage } from './wallet-extended-private-key/wallet-extended-private-key'; import { WalletExtendedPrivateKeyPage } from './wallet-extended-private-key/wallet-extended-private-key';
import * as _ from 'lodash'; import * as _ from 'lodash';
@ -94,7 +94,7 @@ export class WalletInformationPage {
opts.colorFor[this.wallet.credentials.walletId] = color; opts.colorFor[this.wallet.credentials.walletId] = color;
this.configProvider.set(opts); this.configProvider.set(opts);
this.events.publish('wallet:updated', this.wallet.credentials.walletId); this.events.publish('wallet:updated', this.wallet.credentials.walletId);
this.navCtrl.setRoot(HomePage); this.navCtrl.setRoot(SettingsPage);
this.navCtrl.popToRoot(); this.navCtrl.popToRoot();
this.navCtrl.parent.select(0); this.navCtrl.parent.select(0);
}; };