From 6ee85d5a713174c00619c3234173ec5e37ac9a9a Mon Sep 17 00:00:00 2001 From: Gabriel Masclef Date: Tue, 20 Feb 2018 11:55:56 -0300 Subject: [PATCH] Fix: success Modal renamed to finish modal --- src/app/app.module.ts | 6 +++--- .../success.html => finish/finish.html} | 4 ++-- .../success.scss => finish/finish.scss} | 2 +- .../{success/success.ts => finish/finish.ts} | 14 ++++++------- .../amazon/buy-amazon/buy-amazon.ts | 20 +++++++++---------- .../bitpay-card-topup/bitpay-card-topup.ts | 14 ++++++------- .../coinbase/buy-coinbase/buy-coinbase.ts | 12 +++++------ .../coinbase/sell-coinbase/sell-coinbase.ts | 12 +++++------ .../glidera/buy-glidera/buy-glidera.ts | 12 +++++------ .../glidera/sell-glidera/sell-glidera.ts | 12 +++++------ .../buy-mercado-libre/buy-mercado-libre.ts | 18 ++++++++--------- .../shapeshift-confirm/shapeshift-confirm.ts | 10 +++++----- src/pages/paper-wallet/paper-wallet.ts | 12 +++++------ src/pages/send/confirm/confirm.ts | 16 +++++++-------- src/pages/txp-details/txp-details.ts | 10 +++++----- 15 files changed, 87 insertions(+), 87 deletions(-) rename src/pages/{success/success.html => finish/finish.html} (90%) rename src/pages/{success/success.scss => finish/finish.scss} (98%) rename src/pages/{success/success.ts => finish/finish.ts} (54%) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 09d88d113..10d6fe837 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -47,7 +47,7 @@ import { PaperWalletPage } from '../pages/paper-wallet/paper-wallet'; import { PayProPage } from '../pages/paypro/paypro'; import { FeeWarningPage } from '../pages/send/fee-warning/fee-warning'; import { BitcoinCashPage } from '../pages/settings/bitcoin-cash/bitcoin-cash'; -import { SuccessModalPage } from '../pages/success/success'; +import { FinishModalPage } from '../pages/finish/finish'; import { TabsPage } from '../pages/tabs/tabs'; import { TxDetailsPage } from '../pages/tx-details/tx-details'; import { TxpDetailsPage } from '../pages/txp-details/txp-details'; @@ -287,7 +287,7 @@ export function createTranslateLoader(http: HttpClient) { FeePolicyPage, SessionLogPage, SendFeedbackPage, - SuccessModalPage, + FinishModalPage, TourPage, TabsPage, TxpDetailsPage, @@ -415,7 +415,7 @@ export function createTranslateLoader(http: HttpClient) { FeePolicyPage, SessionLogPage, SendFeedbackPage, - SuccessModalPage, + FinishModalPage, TourPage, TabsPage, TxpDetailsPage, diff --git a/src/pages/success/success.html b/src/pages/finish/finish.html similarity index 90% rename from src/pages/success/success.html rename to src/pages/finish/finish.html index cbc0647fa..4df45b06c 100644 --- a/src/pages/success/success.html +++ b/src/pages/finish/finish.html @@ -4,10 +4,10 @@
- {{successText}} + {{finishText}}
- {{successComment}} + {{finishComment}}
diff --git a/src/pages/success/success.scss b/src/pages/finish/finish.scss similarity index 98% rename from src/pages/success/success.scss rename to src/pages/finish/finish.scss index 6164e645c..98155ff28 100644 --- a/src/pages/success/success.scss +++ b/src/pages/finish/finish.scss @@ -1,4 +1,4 @@ -page-success{ +page-finish{ .container { height: 100%; position: relative; diff --git a/src/pages/success/success.ts b/src/pages/finish/finish.ts similarity index 54% rename from src/pages/success/success.ts rename to src/pages/finish/finish.ts index 11d061c26..23ca5a65e 100644 --- a/src/pages/success/success.ts +++ b/src/pages/finish/finish.ts @@ -3,13 +3,13 @@ import { TranslateService } from '@ngx-translate/core'; import { NavParams, ViewController } from 'ionic-angular'; @Component({ - selector: 'page-success', - templateUrl: 'success.html', + selector: 'page-finish', + templateUrl: 'finish.html', }) -export class SuccessModalPage { +export class FinishModalPage { - public successText: string; - public successComment: string; + public finishText: string; + public finishComment: string; public cssClass: string; // success, warning, danger constructor( @@ -17,8 +17,8 @@ export class SuccessModalPage { private navParams: NavParams, private translate: TranslateService ) { - this.successText = (this.navParams.data.successText || this.navParams.data.successText == '') ? this.navParams.data.successText : this.translate.instant('Payment Sent'); - this.successComment = this.navParams.data.successComment ? this.navParams.data.successComment : ''; + this.finishText = (this.navParams.data.finishText || this.navParams.data.finishText == '') ? this.navParams.data.finishText : this.translate.instant('Payment Sent'); + this.finishComment = this.navParams.data.finishComment ? this.navParams.data.finishComment : ''; this.cssClass = this.navParams.data.cssClass ? this.navParams.data.cssClass : 'success'; } diff --git a/src/pages/integrations/amazon/buy-amazon/buy-amazon.ts b/src/pages/integrations/amazon/buy-amazon/buy-amazon.ts index 5befdf1b8..cd1d9ab2c 100644 --- a/src/pages/integrations/amazon/buy-amazon/buy-amazon.ts +++ b/src/pages/integrations/amazon/buy-amazon/buy-amazon.ts @@ -7,7 +7,7 @@ import { Logger } from '../../../../providers/logger/logger'; // Pages import { FeeWarningPage } from '../../../send/fee-warning/fee-warning'; -import { SuccessModalPage } from '../../../success/success'; +import { FinishModalPage } from '../../../finish/finish'; import { AmazonPage } from '../amazon'; // Provider @@ -308,7 +308,7 @@ export class BuyAmazonPage { this.onGoingProcessProvider.set('buyingGiftCard', false); this.logger.debug("Saved new gift card with status: " + newData.status); this.amazonGiftCard = newData; - this.openSuccessModal(); + this.openFinishModal(); }); }); }, 15000, { @@ -412,25 +412,25 @@ export class BuyAmazonPage { }); } - public openSuccessModal(): void { - let successComment: string; + public openFinishModal(): void { + let finishComment: string; let cssClass: string; if (this.amazonGiftCard.status == 'FAILURE') { - successComment = 'Your purchase could not be completed'; + finishComment = 'Your purchase could not be completed'; cssClass = 'danger'; } if (this.amazonGiftCard.status == 'PENDING') { - successComment = 'Your purchase was added to the list of pending'; + finishComment = 'Your purchase was added to the list of pending'; cssClass = 'warning'; } if (this.amazonGiftCard.status == 'SUCCESS') { - successComment = 'Bought ' + this.amountUnitStr; + finishComment = 'Bought ' + this.amountUnitStr; } if (this.amazonGiftCard.status == 'SUCCESS') { - successComment = 'Gift card generated and ready to use.'; + finishComment = 'Gift card generated and ready to use.'; } - let successText = ''; - let modal = this.modalCtrl.create(SuccessModalPage, { successText: successText, successComment: successComment, cssClass: cssClass }, { showBackdrop: true, enableBackdropDismiss: false }); + let finishText = ''; + let modal = this.modalCtrl.create(FinishModalPage, { finishText: finishText, finishComment: finishComment, cssClass: cssClass }, { showBackdrop: true, enableBackdropDismiss: false }); modal.present(); modal.onDidDismiss(() => { this.navCtrl.remove(2, 2); diff --git a/src/pages/integrations/bitpay-card/bitpay-card-topup/bitpay-card-topup.ts b/src/pages/integrations/bitpay-card/bitpay-card-topup/bitpay-card-topup.ts index a2715f362..8169fba32 100644 --- a/src/pages/integrations/bitpay-card/bitpay-card-topup/bitpay-card-topup.ts +++ b/src/pages/integrations/bitpay-card/bitpay-card-topup/bitpay-card-topup.ts @@ -6,7 +6,7 @@ import { Logger } from '../../../../providers/logger/logger'; // Pages import { FeeWarningPage } from '../../../send/fee-warning/fee-warning'; -import { SuccessModalPage } from '../../../success/success'; +import { FinishModalPage } from '../../../finish/finish'; import { BitPayCardPage } from '../bitpay-card'; // Provider @@ -422,16 +422,16 @@ export class BitPayCardTopUpPage { }); } - public openSuccessModal(): void { - let successComment: string; + public openFinishModal(): void { + let finishComment: string; if (this.sendStatus == 'success') { if (this.wallet.credentials.m == 1) - successComment = this.translate.instant('Funds were added to debit card'); + finishComment = this.translate.instant('Funds were added to debit card'); else - successComment = this.translate.instant('Transaction initiated'); + finishComment = this.translate.instant('Transaction initiated'); } - let successText = ''; - let modal = this.modalCtrl.create(SuccessModalPage, { successText: successText, successComment: successComment }, { showBackdrop: true, enableBackdropDismiss: false }); + let finishText = ''; + let modal = this.modalCtrl.create(FinishModalPage, { finishText: finishText, finishComment: finishComment }, { showBackdrop: true, enableBackdropDismiss: false }); modal.present(); modal.onDidDismiss(() => { this.navCtrl.popToRoot({ animate: false }); diff --git a/src/pages/integrations/coinbase/buy-coinbase/buy-coinbase.ts b/src/pages/integrations/coinbase/buy-coinbase/buy-coinbase.ts index 422994132..6a8f2522f 100644 --- a/src/pages/integrations/coinbase/buy-coinbase/buy-coinbase.ts +++ b/src/pages/integrations/coinbase/buy-coinbase/buy-coinbase.ts @@ -13,7 +13,7 @@ import { TxFormatProvider } from '../../../../providers/tx-format/tx-format'; import { WalletProvider } from '../../../../providers/wallet/wallet'; //pages -import { SuccessModalPage } from '../../../success/success'; +import { FinishModalPage } from '../../../finish/finish'; import { CoinbasePage } from '../coinbase'; @Component({ @@ -236,7 +236,7 @@ export class BuyCoinbasePage { this.coinbaseProvider.savePendingTransaction(updatedTx.data, {}, (err: any) => { this.onGoingProcessProvider.set('buyingBitcoin', false); if (err) this.logger.debug(err); - this.openSuccessModal(); + this.openFinishModal(); }); }).catch((err) => { this.onGoingProcessProvider.set('buyingBitcoin', false); @@ -292,10 +292,10 @@ export class BuyCoinbasePage { }); } - public openSuccessModal(): void { - let successText = 'Bought'; - let successComment = 'Bitcoin purchase completed. Coinbase has queued the transfer to your selected wallet'; - let modal = this.modalCtrl.create(SuccessModalPage, { successText: successText, successComment: successComment }, { showBackdrop: true, enableBackdropDismiss: false }); + public openFinishModal(): void { + let finishText = 'Bought'; + let finishComment = 'Bitcoin purchase completed. Coinbase has queued the transfer to your selected wallet'; + let modal = this.modalCtrl.create(FinishModalPage, { finishText: finishText, finishComment: finishComment }, { showBackdrop: true, enableBackdropDismiss: false }); modal.present(); modal.onDidDismiss(() => { this.navCtrl.remove(3, 1); diff --git a/src/pages/integrations/coinbase/sell-coinbase/sell-coinbase.ts b/src/pages/integrations/coinbase/sell-coinbase/sell-coinbase.ts index 28f6d2a21..c534b8c06 100644 --- a/src/pages/integrations/coinbase/sell-coinbase/sell-coinbase.ts +++ b/src/pages/integrations/coinbase/sell-coinbase/sell-coinbase.ts @@ -4,7 +4,7 @@ import * as _ from 'lodash'; import { Logger } from '../../../../providers/logger/logger'; //pages -import { SuccessModalPage } from '../../../success/success'; +import { FinishModalPage } from '../../../finish/finish'; import { CoinbasePage } from '../coinbase'; //providers @@ -217,7 +217,7 @@ export class SellCoinbasePage { ctx.description = this.appProvider.info.nameCase + ' Wallet: ' + this.wallet.name; this.coinbaseProvider.savePendingTransaction(ctx, null, (err: any) => { this.onGoingProcessProvider.set('sellingBitcoin', false); - this.openSuccessModal(); + this.openFinishModal(); if (err) this.logger.debug(this.coinbaseProvider.getErrorsAsString(err.errors)); }); return; @@ -358,10 +358,10 @@ export class SellCoinbasePage { this.processPaymentInfo(); } - public openSuccessModal(): void { - let successText = 'Funds sent to Coinbase Account'; - let successComment = 'The transaction is not yet confirmed, and will show as "Pending" in your Activity. The bitcoin sale will be completed automatically once it is confirmed by Coinbase'; - let modal = this.modalCtrl.create(SuccessModalPage, { successText: successText, successComment: successComment }, { showBackdrop: true, enableBackdropDismiss: false }); + public openFinishModal(): void { + let finishText = 'Funds sent to Coinbase Account'; + let finishComment = 'The transaction is not yet confirmed, and will show as "Pending" in your Activity. The bitcoin sale will be completed automatically once it is confirmed by Coinbase'; + let modal = this.modalCtrl.create(FinishModalPage, { finishText: finishText, finishComment: finishComment }, { showBackdrop: true, enableBackdropDismiss: false }); modal.present(); modal.onDidDismiss(() => { this.navCtrl.remove(3, 1); diff --git a/src/pages/integrations/glidera/buy-glidera/buy-glidera.ts b/src/pages/integrations/glidera/buy-glidera/buy-glidera.ts index 159aa79db..2c4eafba2 100644 --- a/src/pages/integrations/glidera/buy-glidera/buy-glidera.ts +++ b/src/pages/integrations/glidera/buy-glidera/buy-glidera.ts @@ -3,7 +3,7 @@ import { Events, ModalController, NavController, NavParams } from 'ionic-angular import { Logger } from '../../../../providers/logger/logger'; //pages -import { SuccessModalPage } from '../../../success/success'; +import { FinishModalPage } from '../../../finish/finish'; //providers import { GlideraProvider } from '../../../../providers/glidera/glidera'; @@ -165,7 +165,7 @@ export class BuyGlideraPage { this.onGoingProcessProvider.set('buyingBitcoin', false); if (err) return this.showError(err); this.logger.info(data); - this.openSuccessModal(); + this.openFinishModal(); }); }).catch(() => { this.onGoingProcessProvider.set('buyingBitcoin', false); @@ -198,10 +198,10 @@ export class BuyGlideraPage { this.processPaymentInfo(); } - public openSuccessModal(): void { - let successText = 'Bought'; - let successComment = 'A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business day'; - let modal = this.modalCtrl.create(SuccessModalPage, { successText: successText, successComment: successComment }, { showBackdrop: true, enableBackdropDismiss: false }); + public openFinishModal(): void { + let finishText = 'Bought'; + let finishComment = 'A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business day'; + let modal = this.modalCtrl.create(FinishModalPage, { finishText: finishText, finishComment: finishComment }, { showBackdrop: true, enableBackdropDismiss: false }); modal.present(); modal.onDidDismiss(() => { this.navCtrl.remove(3, 1); diff --git a/src/pages/integrations/glidera/sell-glidera/sell-glidera.ts b/src/pages/integrations/glidera/sell-glidera/sell-glidera.ts index 2de814df7..91d853362 100644 --- a/src/pages/integrations/glidera/sell-glidera/sell-glidera.ts +++ b/src/pages/integrations/glidera/sell-glidera/sell-glidera.ts @@ -4,7 +4,7 @@ import * as _ from 'lodash'; import { Logger } from '../../../../providers/logger/logger'; //pages -import { SuccessModalPage } from '../../../success/success'; +import { FinishModalPage } from '../../../finish/finish'; //providers import { ConfigProvider } from '../../../../providers/config/config'; @@ -216,7 +216,7 @@ export class SellGlideraPage { this.onGoingProcessProvider.set('sellingBitcoin', false); if (err) return this.showError(err); this.logger.info(data); - this.openSuccessModal(); + this.openFinishModal(); }); }).catch((err) => { this.onGoingProcessProvider.set('sellingBitcoin', false); @@ -266,10 +266,10 @@ export class SellGlideraPage { }); } - public openSuccessModal(): void { - let successText = 'Funds sent to Glidera Account'; - let successComment = 'The transaction is not yet confirmed, and will show as "Pending" in your Activity. The bitcoin sale will be completed automatically once it is confirmed by Glidera'; - let modal = this.modalCtrl.create(SuccessModalPage, { successText: successText, successComment: successComment }, { showBackdrop: true, enableBackdropDismiss: false }); + public openFinishModal(): void { + let finishText = 'Funds sent to Glidera Account'; + let finishComment = 'The transaction is not yet confirmed, and will show as "Pending" in your Activity. The bitcoin sale will be completed automatically once it is confirmed by Glidera'; + let modal = this.modalCtrl.create(FinishModalPage, { finishText: finishText, finishComment: finishComment }, { showBackdrop: true, enableBackdropDismiss: false }); modal.present(); modal.onDidDismiss(() => { this.navCtrl.remove(3, 1); diff --git a/src/pages/integrations/mercado-libre/buy-mercado-libre/buy-mercado-libre.ts b/src/pages/integrations/mercado-libre/buy-mercado-libre/buy-mercado-libre.ts index 7933a9b8a..62642560c 100644 --- a/src/pages/integrations/mercado-libre/buy-mercado-libre/buy-mercado-libre.ts +++ b/src/pages/integrations/mercado-libre/buy-mercado-libre/buy-mercado-libre.ts @@ -7,7 +7,7 @@ import { Logger } from '../../../../providers/logger/logger'; // Pages import { FeeWarningPage } from '../../../send/fee-warning/fee-warning'; -import { SuccessModalPage } from '../../../success/success'; +import { FinishModalPage } from '../../../finish/finish'; import { MercadoLibrePage } from '../mercado-libre'; // Provider @@ -299,7 +299,7 @@ export class BuyMercadoLibrePage { this.onGoingProcessProvider.set('Comprando Vale-Presente', false); this.logger.debug("Saved new gift card with status: " + newData.status); this.mlGiftCard = newData; - this.openSuccessModal(); + this.openFinishModal(); }); }); }, 15000, { @@ -400,22 +400,22 @@ export class BuyMercadoLibrePage { }); } - public openSuccessModal(): void { - let successComment: string; + public openFinishModal(): void { + let finishComment: string; let cssClass: string; if (this.mlGiftCard.status == 'FAILURE') { - successComment = 'Sua compra não pôde ser concluída'; + finishComment = 'Sua compra não pôde ser concluída'; cssClass = 'danger'; } if (this.mlGiftCard.status == 'PENDING') { - successComment = 'Sua compra foi adicionada à lista de pendentes'; + finishComment = 'Sua compra foi adicionada à lista de pendentes'; cssClass = 'warning'; } if (this.mlGiftCard.status == 'SUCCESS' || this.mlGiftCard.cardStatus == 'active') { - successComment = 'Vale-Presente gerado e pronto para usar'; + finishComment = 'Vale-Presente gerado e pronto para usar'; } - let successText = ''; - let modal = this.modalCtrl.create(SuccessModalPage, { successText: successText, successComment: successComment, cssClass: cssClass }, { showBackdrop: true, enableBackdropDismiss: false }); + let finishText = ''; + let modal = this.modalCtrl.create(FinishModalPage, { finishText: finishText, finishComment: finishComment, cssClass: cssClass }, { showBackdrop: true, enableBackdropDismiss: false }); modal.present(); modal.onDidDismiss(() => { this.navCtrl.remove(2, 2); diff --git a/src/pages/integrations/shapeshift/shapeshift-confirm/shapeshift-confirm.ts b/src/pages/integrations/shapeshift/shapeshift-confirm/shapeshift-confirm.ts index 93b5d6bad..ac1850bac 100644 --- a/src/pages/integrations/shapeshift/shapeshift-confirm/shapeshift-confirm.ts +++ b/src/pages/integrations/shapeshift/shapeshift-confirm/shapeshift-confirm.ts @@ -6,7 +6,7 @@ import * as moment from 'moment'; import { Logger } from '../../../../providers/logger/logger'; // Pages -import { SuccessModalPage } from '../../../success/success'; +import { FinishModalPage } from '../../../finish/finish'; import { ShapeshiftPage } from '../shapeshift'; // Providers @@ -201,7 +201,7 @@ export class ShapeshiftConfirmPage { this.shapeshiftProvider.saveShapeshift(newData, null, (err: any) => { this.logger.debug("Saved shift with status: " + newData.status); - this.openSuccessModal(); + this.openFinishModal(); }); }); } @@ -350,9 +350,9 @@ export class ShapeshiftConfirmPage { }); }; - public openSuccessModal(): void { - let successText = 'Transaction Sent'; - let modal = this.modalCtrl.create(SuccessModalPage, { successText: successText }, { showBackdrop: true, enableBackdropDismiss: false }); + public openFinishModal(): void { + let finishText = 'Transaction Sent'; + let modal = this.modalCtrl.create(FinishModalPage, { finishText: finishText }, { showBackdrop: true, enableBackdropDismiss: false }); modal.present(); modal.onDidDismiss(() => { this.navCtrl.popToRoot({ animate: false }); diff --git a/src/pages/paper-wallet/paper-wallet.ts b/src/pages/paper-wallet/paper-wallet.ts index 6f4e03510..7126646be 100644 --- a/src/pages/paper-wallet/paper-wallet.ts +++ b/src/pages/paper-wallet/paper-wallet.ts @@ -11,7 +11,7 @@ import { OnGoingProcessProvider } from '../../providers/on-going-process/on-goin import { PopupProvider } from '../../providers/popup/popup'; import { ProfileProvider } from '../../providers/profile/profile'; import { WalletProvider } from '../../providers/wallet/wallet'; -import { SuccessModalPage } from '../success/success'; +import { FinishModalPage } from '../finish/finish'; @Component({ selector: 'page-paper-wallet', @@ -163,7 +163,7 @@ export class PaperWalletPage { this._sweepWallet().then((data: any) => { this.onGoingProcessProvider.set('sweepingWallet', false); this.logger.debug('Success sweep. Destination address:' + data.destinationAddress + ' - transaction id: ' + data.txid); - this.openSuccessModal(); + this.openFinishModal(); }).catch((err: any) => { this.logger.error(err); this.popupProvider.ionicAlert(this.translate.instant('Error sweeping wallet:'), err || err.toString()); @@ -183,10 +183,10 @@ export class PaperWalletPage { }); } - public openSuccessModal(): void { - let successComment = this.translate.instant("Check the transaction on your wallet details"); - let successText = this.translate.instant('Sweep Completed'); - let modal = this.modalCtrl.create(SuccessModalPage, { successText: successText, successComment: successComment }, { showBackdrop: true, enableBackdropDismiss: false }); + public openFinishModal(): void { + let finishComment = this.translate.instant("Check the transaction on your wallet details"); + let finishText = this.translate.instant('Sweep Completed'); + let modal = this.modalCtrl.create(FinishModalPage, { finishText: finishText, finishComment: finishComment }, { showBackdrop: true, enableBackdropDismiss: false }); modal.present(); modal.onDidDismiss(() => { this.navCtrl.pop(); diff --git a/src/pages/send/confirm/confirm.ts b/src/pages/send/confirm/confirm.ts index d8154a14d..37d8d6c47 100644 --- a/src/pages/send/confirm/confirm.ts +++ b/src/pages/send/confirm/confirm.ts @@ -6,7 +6,7 @@ import { Logger } from '../../../providers/logger/logger'; // Pages import { PayProPage } from '../../paypro/paypro'; -import { SuccessModalPage } from '../../success/success'; +import { FinishModalPage } from '../../finish/finish'; import { ChooseFeeLevelPage } from '../choose-fee-level/choose-fee-level'; import { FeeWarningPage } from '../fee-warning/fee-warning'; @@ -574,7 +574,7 @@ export class ConfirmPage { this.logger.info('No signing proposal: No private key'); this.walletProvider.onlyPublish(wallet, txp).then(() => { this.onGoingProcessProvider.clear(); - this.openSuccessModal(true); + this.openFinishModal(true); }).catch((err: any) => { this.onGoingProcessProvider.clear(); this.setSendError(err); @@ -588,7 +588,7 @@ export class ConfirmPage { txid: txp.txid }); } - this.openSuccessModal(); + this.openFinishModal(); }).catch((err: any) => { this.setSendError(err); return; @@ -609,14 +609,14 @@ export class ConfirmPage { }); } - public openSuccessModal(onlyPublish?: boolean) { + public openFinishModal(onlyPublish?: boolean) { let params = {}; if (onlyPublish) { - let successText = this.translate.instant('Payment Published'); - let successComment = this.translate.instant('You could sign the transaction later in your wallet details'); - params = { successText: successText, successComment: successComment }; + let finishText = this.translate.instant('Payment Published'); + let finishComment = this.translate.instant('You could sign the transaction later in your wallet details'); + params = { finishText: finishText, finishComment: finishComment }; } - let modal = this.modalCtrl.create(SuccessModalPage, params, { showBackdrop: true, enableBackdropDismiss: false }); + let modal = this.modalCtrl.create(FinishModalPage, params, { showBackdrop: true, enableBackdropDismiss: false }); modal.present(); modal.onDidDismiss(() => { this.navCtrl.popToRoot({ animate: false }).then(() => { diff --git a/src/pages/txp-details/txp-details.ts b/src/pages/txp-details/txp-details.ts index b8769d64b..e04446770 100644 --- a/src/pages/txp-details/txp-details.ts +++ b/src/pages/txp-details/txp-details.ts @@ -14,7 +14,7 @@ import { TxFormatProvider } from '../../providers/tx-format/tx-format'; import { WalletProvider } from '../../providers/wallet/wallet'; //pages -import { SuccessModalPage } from '../success/success'; +import { FinishModalPage } from '../finish/finish'; import * as _ from 'lodash'; @@ -212,7 +212,7 @@ export class TxpDetailsPage { public sign(): void { this.loading = true; this.walletProvider.publishAndSign(this.wallet, this.tx).then((txp: any) => { - this.openSuccessModal(); + this.openFinishModal(); }).catch((err: any) => { this.setError(err, ('Could not send payment')); }); @@ -255,7 +255,7 @@ export class TxpDetailsPage { this.onGoingProcessProvider.set('broadcastingTx', true); this.walletProvider.broadcastTx(this.wallet, this.tx).then((txpb: any) => { this.onGoingProcessProvider.set('broadcastingTx', false); - this.openSuccessModal(); + this.openFinishModal(); }).catch((err: any) => { this.onGoingProcessProvider.set('broadcastingTx', false); this.setError(err, 'Could not broadcast payment'); @@ -307,8 +307,8 @@ export class TxpDetailsPage { this.viewCtrl.dismiss(); } - public openSuccessModal() { - let modal = this.modalCtrl.create(SuccessModalPage, {}, { showBackdrop: true, enableBackdropDismiss: false }); + public openFinishModal() { + let modal = this.modalCtrl.create(FinishModalPage, { finishText: this.successText }, { showBackdrop: true, enableBackdropDismiss: false }); modal.present(); modal.onDidDismiss(() => { this.close();