diff --git a/src/assets/img/icon-important.svg b/src/assets/img/icon-important.svg new file mode 100644 index 000000000..4f113aaf2 --- /dev/null +++ b/src/assets/img/icon-important.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/pages/integrations/amazon/buy-amazon/buy-amazon.ts b/src/pages/integrations/amazon/buy-amazon/buy-amazon.ts index 44a29409f..5befdf1b8 100644 --- a/src/pages/integrations/amazon/buy-amazon/buy-amazon.ts +++ b/src/pages/integrations/amazon/buy-amazon/buy-amazon.ts @@ -311,7 +311,7 @@ export class BuyAmazonPage { this.openSuccessModal(); }); }); - }, 8000, { + }, 15000, { 'leading': true }); @@ -414,11 +414,14 @@ export class BuyAmazonPage { public openSuccessModal(): void { let successComment: string; + let cssClass: string; if (this.amazonGiftCard.status == 'FAILURE') { - successComment = 'Bitcoin purchase completed. Coinbase has queued the transfer to your selected wallet'; + successComment = 'Your purchase could not be completed'; + cssClass = 'danger'; } if (this.amazonGiftCard.status == 'PENDING') { - successComment = 'Your purchase was added to the list of pending' + successComment = 'Your purchase was added to the list of pending'; + cssClass = 'warning'; } if (this.amazonGiftCard.status == 'SUCCESS') { successComment = 'Bought ' + this.amountUnitStr; @@ -427,7 +430,7 @@ export class BuyAmazonPage { successComment = 'Gift card generated and ready to use.'; } let successText = ''; - let modal = this.modalCtrl.create(SuccessModalPage, { successText: successText, successComment: successComment }, { showBackdrop: true, enableBackdropDismiss: false }); + let modal = this.modalCtrl.create(SuccessModalPage, { successText: successText, successComment: successComment, cssClass: cssClass }, { showBackdrop: true, enableBackdropDismiss: false }); modal.present(); modal.onDidDismiss(() => { this.navCtrl.remove(2, 2); 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 45db76188..7933a9b8a 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 @@ -91,7 +91,8 @@ export class BuyMercadoLibrePage { this.wallets = this.profileProvider.getWallets({ onlyComplete: true, network: this.network, - coin: this.coin + coin: this.coin, + m: 1 }); if (_.isEmpty(this.wallets)) { this.showErrorAndBack(null, this.translate.instant('No wallets available')); @@ -301,7 +302,7 @@ export class BuyMercadoLibrePage { this.openSuccessModal(); }); }); - }, 8000, { + }, 15000, { 'leading': true }); @@ -316,7 +317,6 @@ export class BuyMercadoLibrePage { uuid: wallet.id, email: email }; - console.log('[buy-mercado-libre.ts:313]',dataSrc); /* TODO */ this.onGoingProcessProvider.set('loadingTxInfo', true); this.createInvoice(dataSrc).then((data: any) => { let invoice = data.invoice; @@ -402,17 +402,20 @@ export class BuyMercadoLibrePage { public openSuccessModal(): void { let successComment: string; + let cssClass: string; if (this.mlGiftCard.status == 'FAILURE') { successComment = 'Sua compra não pôde ser concluída'; + cssClass = 'danger'; } if (this.mlGiftCard.status == 'PENDING') { successComment = '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'; } let successText = ''; - let modal = this.modalCtrl.create(SuccessModalPage, { successText: successText, successComment: successComment }, { showBackdrop: true, enableBackdropDismiss: false }); + let modal = this.modalCtrl.create(SuccessModalPage, { successText: successText, successComment: successComment, cssClass: cssClass }, { showBackdrop: true, enableBackdropDismiss: false }); modal.present(); modal.onDidDismiss(() => { this.navCtrl.remove(2, 2); diff --git a/src/pages/success/success.html b/src/pages/success/success.html index ca8bde37b..cbc0647fa 100644 --- a/src/pages/success/success.html +++ b/src/pages/success/success.html @@ -1,11 +1,12 @@
-
-
- -
+
+
+ + +
{{successText}}
-
+
{{successComment}}
@@ -13,4 +14,4 @@
OK
-
+
\ No newline at end of file diff --git a/src/pages/success/success.scss b/src/pages/success/success.scss index 97b76274a..6164e645c 100644 --- a/src/pages/success/success.scss +++ b/src/pages/success/success.scss @@ -1,6 +1,5 @@ page-success{ .container { - background-color: #11D1A6; height: 100%; position: relative; .content { @@ -8,7 +7,7 @@ page-success{ display: flex; justify-content: center; align-items: center; - .success { + .body { margin-top: -20vh; text-align: center; &-img { @@ -41,4 +40,13 @@ page-success{ cursor: pointer; } } + .success { + background-color: #11D1A6; + } + .warning { + background-color: color($colors, warning); + } + .danger { + background-color: color($colors, danger); + } } \ No newline at end of file diff --git a/src/pages/success/success.ts b/src/pages/success/success.ts index d77e3f139..11d061c26 100644 --- a/src/pages/success/success.ts +++ b/src/pages/success/success.ts @@ -10,14 +10,16 @@ export class SuccessModalPage { public successText: string; public successComment: string; + public cssClass: string; // success, warning, danger constructor( private viewCtrl: ViewController, private navParams: NavParams, private translate: TranslateService ) { - this.successText = this.navParams.data.successText ? this.navParams.data.successText : this.translate.instant('Payment Sent'); + 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.cssClass = this.navParams.data.cssClass ? this.navParams.data.cssClass : 'success'; } public close(): void { diff --git a/src/pages/txp-details/txp-details.html b/src/pages/txp-details/txp-details.html index 1beaa66d6..0822f167b 100644 --- a/src/pages/txp-details/txp-details.html +++ b/src/pages/txp-details/txp-details.html @@ -171,7 +171,7 @@ {{'Merchant Message'|translate}} - + {{tx.paypro.pr.pd.memo}}