- Gift card generated and ready to use.
-
-
@@ -22,8 +14,7 @@
@@ -39,9 +30,9 @@
- 
+ class="icon-wallet" />
+
{{wallet ? wallet.name : '...'}}
@@ -70,10 +61,6 @@
-
+
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/integrations/coinbase/buy-coinbase/buy-coinbase.ts b/src/pages/integrations/coinbase/buy-coinbase/buy-coinbase.ts
index 6357a8256..3615d2c97 100644
--- a/src/pages/integrations/coinbase/buy-coinbase/buy-coinbase.ts
+++ b/src/pages/integrations/coinbase/buy-coinbase/buy-coinbase.ts
@@ -1,5 +1,5 @@
import { Component } from '@angular/core';
-import { NavController, NavParams, Events } from 'ionic-angular';
+import { NavController, NavParams, Events, ModalController } from 'ionic-angular';
import { Logger } from '@nsalaun/ng-logger';
import * as _ from 'lodash';
@@ -14,7 +14,7 @@ import { ProfileProvider } from '../../../../providers/profile/profile';
//pages
import { CoinbasePage } from '../coinbase';
-
+import { SuccessModalPage } from '../../../success/success';
@Component({
selector: 'page-buy-coinbase',
@@ -27,7 +27,6 @@ export class BuyCoinbasePage {
private coin: string;
private wallets: any;
- public sendStatus: string;
public paymentMethods: Array;
public selectedPaymentMethodId: any;
public buyPrice: string;
@@ -50,7 +49,8 @@ export class BuyCoinbasePage {
private navParams: NavParams,
private walletProvider: WalletProvider,
private txFormatProvider: TxFormatProvider,
- private profileProvider: ProfileProvider
+ private profileProvider: ProfileProvider,
+ private modalCtrl: ModalController
) {
this.coin = 'btc';
this.isFiat = this.navParams.data.currency != 'BTC' ? true : false;
@@ -78,7 +78,6 @@ export class BuyCoinbasePage {
}
private showErrorAndBack(err: any): void {
- this.sendStatus = '';
this.logger.error(err);
err = err.errors ? err.errors[0].message : err;
this.popupProvider.ionicAlert('Error', err).then(() => {
@@ -87,22 +86,11 @@ export class BuyCoinbasePage {
}
private showError(err: any): void {
- this.sendStatus = '';
this.logger.error(err);
err = err.errors ? err.errors[0].message : err;
this.popupProvider.ionicAlert('Error', err);
}
- private statusChangeHandler(processName: string, isOn: boolean): void {
- let showName = this.onGoingProcessProvider.getShowName(processName);
- this.logger.debug('statusChangeHandler: ', processName, showName, isOn);
- if (processName == 'buyingBitcoin' && !isOn) {
- this.sendStatus = 'success';
- } else if (showName) {
- this.sendStatus = showName;
- }
- }
-
private processPaymentInfo(): void {
this.onGoingProcessProvider.set('connectingCoinbase', true);
this.coinbaseProvider.init((err: any, res: any) => {
@@ -191,11 +179,9 @@ export class BuyCoinbasePage {
if (!ok) return;
this.onGoingProcessProvider.set('buyingBitcoin', true);
- this.statusChangeHandler('buyingBitcoin', true);
this.coinbaseProvider.init((err: any, res: any) => {
if (err) {
this.onGoingProcessProvider.set('buyingBitcoin', false);
- this.statusChangeHandler('buyingBitcoin', false);
this.showError(err);
return;
}
@@ -210,7 +196,6 @@ export class BuyCoinbasePage {
this.coinbaseProvider.buyRequest(accessToken, accountId, dataSrc, (err: any, b: any) => {
if (err) {
this.onGoingProcessProvider.set('buyingBitcoin', false);
- this.statusChangeHandler('buyingBitcoin', false);
this.showError(err);
return;
}
@@ -231,7 +216,6 @@ export class BuyCoinbasePage {
private processBuyTx(tx: any): void {
if (!tx) {
this.onGoingProcessProvider.set('buyingBitcoin', false);
- this.statusChangeHandler('buyingBitcoin', false);
this.showError('Transaction not found');
return;
}
@@ -239,7 +223,6 @@ export class BuyCoinbasePage {
this.coinbaseProvider.getTransaction(this.accessToken, this.accountId, tx.id, (err: any, updatedTx: any) => {
if (err) {
this.onGoingProcessProvider.set('buyingBitcoin', false);
- this.statusChangeHandler('buyingBitcoin', false);
this.showError(err);
return;
}
@@ -251,12 +234,11 @@ export class BuyCoinbasePage {
this.logger.debug('Saving transaction to process later...');
this.coinbaseProvider.savePendingTransaction(updatedTx.data, {}, (err: any) => {
this.onGoingProcessProvider.set('buyingBitcoin', false);
- this.statusChangeHandler('buyingBitcoin', false);
if (err) this.logger.debug(err);
+ this.openSuccessModal();
});
}).catch((err) => {
this.onGoingProcessProvider.set('buyingBitcoin', false);
- this.statusChangeHandler('buyingBitcoin', false);
this.showError(err);
});
});
@@ -266,7 +248,6 @@ export class BuyCoinbasePage {
this.coinbaseProvider.getBuyOrder(this.accessToken, this.accountId, b.data.id, (err: any, buyResp: any) => {
if (err) {
this.onGoingProcessProvider.set('buyingBitcoin', false);
- this.statusChangeHandler('buyingBitcoin', false);
this.showError(err);
return;
}
@@ -310,11 +291,16 @@ export class BuyCoinbasePage {
});
}
- public goBackHome() {
- this.sendStatus = '';
- this.navCtrl.remove(3, 1);
- this.navCtrl.pop();
- this.navCtrl.push(CoinbasePage, { coin: 'btc' });
+ 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 });
+ modal.present();
+ modal.onDidDismiss(() => {
+ this.navCtrl.remove(3, 1);
+ this.navCtrl.pop();
+ this.navCtrl.push(CoinbasePage, { coin: 'btc' });
+ });
}
}
diff --git a/src/pages/integrations/coinbase/sell-coinbase/sell-coinbase.html b/src/pages/integrations/coinbase/sell-coinbase/sell-coinbase.html
index b84838e3e..c5222d1af 100644
--- a/src/pages/integrations/coinbase/sell-coinbase/sell-coinbase.html
+++ b/src/pages/integrations/coinbase/sell-coinbase/sell-coinbase.html
@@ -5,15 +5,6 @@
-
-
- Funds sent to Coinbase Account
-
-
- 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.
-
-
{{amountUnitStr}}
- {{buyRequestInfo.amount.amount}} {{buyRequestInfo.amount.currency}} @ ${{buyPrice.amount}}
- per BTC
+ {{buyRequestInfo.amount.amount}} {{buyRequestInfo.amount.currency}} @ ${{buyPrice.amount}} per BTC
Receive in
-
+ class="icon-wallet" />
+
{{wallet ? wallet.name : '...'}}
@@ -23,22 +14,22 @@
+
Deposit into
@@ -66,17 +57,15 @@
@@ -91,8 +80,8 @@
- {{fee.type}} fee
-
+ {{fee.type}} fee
+
- {{fee.amount.amount}} {{fee.amount.currency}}
@@ -108,10 +97,6 @@
-
+
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/integrations/coinbase/sell-coinbase/sell-coinbase.ts b/src/pages/integrations/coinbase/sell-coinbase/sell-coinbase.ts
index 444cda8a6..19c5c207c 100644
--- a/src/pages/integrations/coinbase/sell-coinbase/sell-coinbase.ts
+++ b/src/pages/integrations/coinbase/sell-coinbase/sell-coinbase.ts
@@ -1,10 +1,11 @@
import { Component } from '@angular/core';
-import { NavController, NavParams, Events } from 'ionic-angular';
+import { NavController, NavParams, Events, ModalController } from 'ionic-angular';
import { Logger } from '@nsalaun/ng-logger';
import * as _ from 'lodash';
//pages
import { CoinbasePage } from '../coinbase';
+import { SuccessModalPage } from '../../../success/success';
//providers
import { AppProvider } from '../../../../providers/app/app';
@@ -28,7 +29,6 @@ export class SellCoinbasePage {
private currency: string;
private wallets: any;
- public sendStatus: string;
public paymentMethods: Array;
public selectedPaymentMethodId: any;
public selectedPriceSensitivity: any;
@@ -54,7 +54,8 @@ export class SellCoinbasePage {
private onGoingProcessProvider: OnGoingProcessProvider,
private walletProvider: WalletProvider,
private txFormatProvider: TxFormatProvider,
- private profileProvider: ProfileProvider
+ private profileProvider: ProfileProvider,
+ private modalCtrl: ModalController
) {
this.coin = 'btc';
this.isFiat = this.navParams.data.currency != 'BTC' ? true : false;
@@ -86,7 +87,6 @@ export class SellCoinbasePage {
}
private showErrorAndBack(err: any): void {
- this.sendStatus = '';
this.logger.error(err);
err = err.errors ? err.errors[0].message : err;
this.popupProvider.ionicAlert('Error', err).then(() => {
@@ -95,13 +95,12 @@ export class SellCoinbasePage {
}
private showError(err: any): void {
- this.sendStatus = '';
this.logger.error(err);
err = err.errors ? err.errors[0].message : err;
this.popupProvider.ionicAlert('Error', err);
}
- private publishAndSign(wallet: any, txp: any, onSendStatusChange: any): Promise {
+ private publishAndSign(wallet: any, txp: any): Promise {
return new Promise((resolve, reject) => {
if (!wallet.canSign() && !wallet.isPrivKeyExternal()) {
let err = 'No signing proposal: No private key'; // TODO: gettextCatalog
@@ -109,7 +108,7 @@ export class SellCoinbasePage {
return reject(err);
}
- this.walletProvider.publishAndSign(wallet, txp, onSendStatusChange).then((txp: any) => {
+ this.walletProvider.publishAndSign(wallet, txp).then((txp: any) => {
return resolve(txp);
}).catch((err: any) => {
return reject(err);
@@ -217,7 +216,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.statusChangeHandler('sellingBitcoin', false);
+ this.openSuccessModal();
if (err) this.logger.debug(this.coinbaseProvider.getErrorsAsString(err.errors));
});
return;
@@ -230,7 +229,6 @@ export class SellCoinbasePage {
this.checkTransaction(count + 1, txp);
} else {
this.onGoingProcessProvider.set('sellingBitcoin', false);
- this.statusChangeHandler('sellingBitcoin', false);
this.showError('No transaction found');
return;
}
@@ -242,16 +240,6 @@ export class SellCoinbasePage {
'leading': true
});
- private statusChangeHandler(processName: string, isOn: boolean): void {
- let showName = this.onGoingProcessProvider.getShowName(processName);
- this.logger.debug('statusChangeHandler: ', processName, showName, isOn);
- if (processName == 'sellingBitcoin' && !isOn) {
- this.sendStatus = 'success';
- } else if (showName) {
- this.sendStatus = showName;
- }
- }
-
public sellRequest(): void {
this.onGoingProcessProvider.set('connectingCoinbase', true);
this.coinbaseProvider.init((err: any, res: any) => {
@@ -291,11 +279,9 @@ export class SellCoinbasePage {
if (!ok) return;
this.onGoingProcessProvider.set('sellingBitcoin', true);
- this.statusChangeHandler('sellingBitcoin', true);
this.coinbaseProvider.init((err: any, res: any) => {
if (err) {
this.onGoingProcessProvider.set('sellingBitcoin', false);
- this.statusChangeHandler('sellingBitcoin', false);
this.showError(this.coinbaseProvider.getErrorsAsString(err.errors));
return;
}
@@ -308,7 +294,6 @@ export class SellCoinbasePage {
this.coinbaseProvider.createAddress(accessToken, accountId, dataSrc, (err: any, data: any) => {
if (err) {
this.onGoingProcessProvider.set('sellingBitcoin', false);
- this.statusChangeHandler('sellingBitcoin', false);
this.showError(this.coinbaseProvider.getErrorsAsString(err.errors));
return;
}
@@ -335,18 +320,16 @@ export class SellCoinbasePage {
this.walletProvider.createTx(this.wallet, txp).then((ctxp: any) => {
this.logger.debug('Transaction created.');
- this.publishAndSign(this.wallet, ctxp, function () { }).then((txSent: any) => {
+ this.publishAndSign(this.wallet, ctxp).then((txSent: any) => {
this.logger.debug('Transaction broadcasted. Wait for Coinbase confirmation...');
this.checkTransaction(1, txSent);
}).catch((err: any) => {
this.onGoingProcessProvider.set('sellingBitcoin', false);
- this.statusChangeHandler('sellingBitcoin', false);
this.showError(err);
return;
});
}).catch((err: any) => {
this.onGoingProcessProvider.set('sellingBitcoin', false);
- this.statusChangeHandler('sellingBitcoin', false);
this.showError(err);
return;
});
@@ -374,11 +357,16 @@ export class SellCoinbasePage {
this.processPaymentInfo();
}
- public goBackHome() {
- this.sendStatus = '';
- this.navCtrl.remove(3, 1);
- this.navCtrl.pop();
- this.navCtrl.push(CoinbasePage, { coin: 'btc' });
+ 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 });
+ modal.present();
+ modal.onDidDismiss(() => {
+ this.navCtrl.remove(3, 1);
+ this.navCtrl.pop();
+ this.navCtrl.push(CoinbasePage, { coin: 'btc' });
+ });
}
}
diff --git a/src/pages/integrations/glidera/buy-glidera/buy-glidera.html b/src/pages/integrations/glidera/buy-glidera/buy-glidera.html
index 55bf6f47d..2d71c915e 100644
--- a/src/pages/integrations/glidera/buy-glidera/buy-glidera.html
+++ b/src/pages/integrations/glidera/buy-glidera/buy-glidera.html
@@ -4,14 +4,6 @@
-
-
- Bought
-
-
- A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business day
-
-
{{amountUnitStr}}
- {{sellRequestInfo.subtotal}} {{sellRequestInfo.currency}} @ ${{sellPrice.amount}} per
- BTC
+ {{sellRequestInfo.subtotal}} {{sellRequestInfo.currency}} @ ${{sellPrice.amount}} per BTC
From
+
+
+
+ {{wallet ? wallet.name : '...'}}
+
+
+
+ {{wallet ? wallet.name : '...'}}
+
Estimated sale value:
- {{sellRequestInfo.total.amount | currency : '' : 2}}
- {{sellRequestInfo.total.currency}}
-
+ {{sellRequestInfo.total.amount | currency : '' : 2}} {{sellRequestInfo.total.currency}}
+
Still sell if price fall until:
- {{(sellRequestInfo.total.amount -
- (selectedPriceSensitivity.data.value / 100) * sellRequestInfo.total.amount) | currency : '' : 2}}
- {{sellRequestInfo.total.currency}}
-
+ {{(sellRequestInfo.total.amount - (selectedPriceSensitivity.data.value / 100) * sellRequestInfo.total.amount) | currency
+ : '' : 2}} {{sellRequestInfo.total.currency}}
+
@@ -32,9 +24,9 @@
-
+ class="icon-wallet" />
+
{{wallet ? wallet.name : '...'}}
@@ -63,10 +55,6 @@
-
+
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/integrations/glidera/buy-glidera/buy-glidera.ts b/src/pages/integrations/glidera/buy-glidera/buy-glidera.ts
index 40520a7d3..32db6e470 100644
--- a/src/pages/integrations/glidera/buy-glidera/buy-glidera.ts
+++ b/src/pages/integrations/glidera/buy-glidera/buy-glidera.ts
@@ -1,7 +1,10 @@
import { Component } from '@angular/core';
-import { NavController, NavParams, Events } from 'ionic-angular';
+import { NavController, NavParams, Events, ModalController } from 'ionic-angular';
import { Logger } from '@nsalaun/ng-logger';
+//pages
+import { SuccessModalPage } from '../../../success/success';
+
//providers
import { PlatformProvider } from '../../../../providers/platform/platform';
import { PopupProvider } from '../../../../providers/popup/popup';
@@ -20,7 +23,6 @@ import * as _ from 'lodash';
export class BuyGlideraPage {
public isCordova: boolean;
- public sendStatus: string;
public token: string;
public isFiat: boolean;
public network: string;
@@ -45,6 +47,7 @@ export class BuyGlideraPage {
private profileProvider: ProfileProvider,
private txFormatProvider: TxFormatProvider,
private walletProvider: WalletProvider,
+ private modalCtrl: ModalController
) {
this.coin = 'btc';
this.isCordova = this.platformProvider.isCordova;
@@ -70,7 +73,6 @@ export class BuyGlideraPage {
}
private showErrorAndBack(err): void {
- this.sendStatus = '';
this.logger.error(err);
err = err.errors ? err.errors[0].message : err || '';
this.popupProvider.ionicAlert('Error', err).then(() => {
@@ -79,22 +81,11 @@ export class BuyGlideraPage {
}
private showError(err): void {
- this.sendStatus = '';
this.logger.error(err);
err = err.errors ? err.errors[0].message : err;
this.popupProvider.ionicAlert('Error', err);
}
- private statusChangeHandler(processName: string, isOn: boolean): void {
- let showName = this.onGoingProcessProvider.getShowName(processName);
- this.logger.debug('statusChangeHandler: ', processName, showName, isOn);
- if (processName == 'buyingBitcoin' && !isOn) {
- this.sendStatus = 'success';
- } else if (showName) {
- this.sendStatus = showName;
- }
- }
-
private processPaymentInfo(): void {
this.onGoingProcessProvider.set('connectingGlidera', true);
this.glideraProvider.init((err, data) => {
@@ -149,18 +140,15 @@ export class BuyGlideraPage {
this.popupProvider.ionicConfirm(null, message, okText, cancelText).then((ok) => {
if (!ok) return;
this.onGoingProcessProvider.set('buyingBitcoin', true);
- this.statusChangeHandler('buyingBitcoin', true);
this.glideraProvider.get2faCode(this.token, (err, tfa) => {
if (err) {
this.onGoingProcessProvider.set('buyingBitcoin', false);
- this.statusChangeHandler('buyingBitcoin', false);
this.showError(err);
return;
}
this.ask2FaCode(tfa.mode, (twoFaCode) => {
if (tfa.mode != 'NONE' && _.isEmpty(twoFaCode)) {
this.onGoingProcessProvider.set('buyingBitcoin', false);
- this.statusChangeHandler('buyingBitcoin', false);
this.showError('No code entered');
return;
}
@@ -175,13 +163,12 @@ export class BuyGlideraPage {
};
this.glideraProvider.buy(this.token, twoFaCode, data, (err, data) => {
this.onGoingProcessProvider.set('buyingBitcoin', false);
- this.statusChangeHandler('buyingBitcoin', false);
if (err) return this.showError(err);
this.logger.info(data);
+ this.openSuccessModal();
});
}).catch(() => {
this.onGoingProcessProvider.set('buyingBitcoin', false);
- this.statusChangeHandler('buyingBitcoin', false);
this.showError(err);
});
});
@@ -211,10 +198,14 @@ export class BuyGlideraPage {
this.processPaymentInfo();
}
- public goBackHome(): void {
- this.sendStatus = '';
- this.navCtrl.remove(3, 1);
- this.navCtrl.pop();
+ 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 });
+ modal.present();
+ modal.onDidDismiss(() => {
+ this.navCtrl.remove(3, 1);
+ this.navCtrl.pop();
+ })
}
-
}
\ No newline at end of file
diff --git a/src/pages/integrations/glidera/sell-glidera/sell-glidera.html b/src/pages/integrations/glidera/sell-glidera/sell-glidera.html
index 90e00aa78..cfd8b907b 100644
--- a/src/pages/integrations/glidera/sell-glidera/sell-glidera.html
+++ b/src/pages/integrations/glidera/sell-glidera/sell-glidera.html
@@ -5,15 +5,6 @@
-
-
- Funds sent to Glidera Account
-
-
- 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.
-
-
Transaction details
@@ -65,10 +56,6 @@
-
+
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/integrations/glidera/sell-glidera/sell-glidera.ts b/src/pages/integrations/glidera/sell-glidera/sell-glidera.ts
index 9af20d7f8..0ac890b80 100644
--- a/src/pages/integrations/glidera/sell-glidera/sell-glidera.ts
+++ b/src/pages/integrations/glidera/sell-glidera/sell-glidera.ts
@@ -1,8 +1,11 @@
import { Component } from '@angular/core';
-import { NavController, NavParams, Events } from 'ionic-angular';
+import { NavController, NavParams, Events, ModalController } from 'ionic-angular';
import { Logger } from '@nsalaun/ng-logger';
import * as _ from 'lodash';
+//pages
+import { SuccessModalPage } from '../../../success/success';
+
//providers
import { PlatformProvider } from '../../../../providers/platform/platform';
import { PopupProvider } from '../../../../providers/popup/popup';
@@ -20,7 +23,6 @@ import { ConfigProvider } from '../../../../providers/config/config';
export class SellGlideraPage {
public isCordova: boolean;
- public sendStatus: string;
public token: string;
public isFiat: boolean;
public network: string;
@@ -45,7 +47,8 @@ export class SellGlideraPage {
private txFormatProvider: TxFormatProvider,
private walletProvider: WalletProvider,
private configProvider: ConfigProvider,
- private events: Events
+ private events: Events,
+ private modalCtrl: ModalController
) {
this.coin = 'btc';
this.isCordova = this.platformProvider.isCordova;
@@ -74,7 +77,6 @@ export class SellGlideraPage {
}
private showErrorAndBack(err: any): void {
- this.sendStatus = '';
this.logger.error(err);
err = err.errors ? err.errors[0].message : err;
this.popupProvider.ionicAlert('Error', err).then(() => {
@@ -83,22 +85,11 @@ export class SellGlideraPage {
}
private showError(err: any): void {
- this.sendStatus = '';
this.logger.error(err);
err = err.errors ? err.errors[0].message : err;
this.popupProvider.ionicAlert('Error', err);
}
- private statusChangeHandler(processName: string, isOn: boolean): void {
- let showName = this.onGoingProcessProvider.getShowName(processName);
- this.logger.debug('statusChangeHandler: ', processName, showName, isOn);
- if (processName == 'sellingBitcoin' && !isOn) {
- this.sendStatus = 'success';
- } else if (showName) {
- this.sendStatus = showName;
- }
- }
-
private processPaymentInfo(): void {
this.onGoingProcessProvider.set('connectingGlidera', true);
this.glideraProvider.init((err, data) => {
@@ -153,18 +144,15 @@ export class SellGlideraPage {
this.popupProvider.ionicConfirm(null, message, okText, cancelText).then((ok) => {
if (!ok) return;
this.onGoingProcessProvider.set('sellingBitcoin', true);
- this.statusChangeHandler('sellingBitcoin', true)
this.glideraProvider.get2faCode(this.token, (err, tfa) => {
if (err) {
this.onGoingProcessProvider.set('sellingBitcoin', false);
- this.statusChangeHandler('sellingBitcoin', false);
this.showError(err);
return;
}
this.ask2FaCode(tfa.mode, (twoFaCode) => {
if (tfa.mode != 'NONE' && _.isEmpty(twoFaCode)) {
this.onGoingProcessProvider.set('sellingBitcoin', false);
- this.statusChangeHandler('sellingBitcoin', false);
this.showError('No code entered');
return;
}
@@ -177,14 +165,12 @@ export class SellGlideraPage {
this.walletProvider.getAddress(this.wallet, false).then((refundAddress) => {
if (!refundAddress) {
this.onGoingProcessProvider.set('sellingBitcoin', false);
- this.statusChangeHandler('sellingBitcoin', false);
this.showError('Could not create address');
return;
}
this.glideraProvider.getSellAddress(this.token, (err, sellAddress) => {
if (!sellAddress || err) {
this.onGoingProcessProvider.set('sellingBitcoin', false);
- this.statusChangeHandler('sellingBitcoin', false);
this.showError(err);
return;
}
@@ -228,13 +214,12 @@ export class SellGlideraPage {
};
this.glideraProvider.sell(this.token, twoFaCode, data, (err, data) => {
this.onGoingProcessProvider.set('sellingBitcoin', false);
- this.statusChangeHandler('sellingBitcoin', false);
if (err) return this.showError(err);
this.logger.info(data);
+ this.openSuccessModal();
});
}).catch((err) => {
this.onGoingProcessProvider.set('sellingBitcoin', false);
- this.statusChangeHandler('sellingBitcoin', false);
this.showError(err);
this.walletProvider.removeTx(this.wallet, publishedTxp).catch((err) => { // TODO in the original code use signedTxp on this function
if (err) this.logger.debug(err);
@@ -242,17 +227,14 @@ export class SellGlideraPage {
});
}).catch((err) => {
this.onGoingProcessProvider.set('sellingBitcoin', false);
- this.statusChangeHandler('sellingBitcoin', false);
this.showError(err);
});
}).catch((err) => {
this.onGoingProcessProvider.set('sellingBitcoin', false);
- this.statusChangeHandler('sellingBitcoin', false);
this.showError(err);
});
}).catch((err) => {
this.onGoingProcessProvider.set('sellingBitcoin', false);
- this.statusChangeHandler('sellingBitcoin', false);
this.showError(err);
});
});
@@ -284,9 +266,15 @@ export class SellGlideraPage {
});
}
- public goBackHome(): void {
- this.sendStatus = '';
- this.navCtrl.remove(3, 1);
- this.navCtrl.pop();
+ 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 });
+ modal.present();
+ modal.onDidDismiss(() => {
+ this.navCtrl.remove(3, 1);
+ this.navCtrl.pop();
+ });
}
+
}
diff --git a/src/pages/integrations/mercado-libre/buy-mercado-libre/buy-mercado-libre.html b/src/pages/integrations/mercado-libre/buy-mercado-libre/buy-mercado-libre.html
index 57c08e087..f76406c60 100644
--- a/src/pages/integrations/mercado-libre/buy-mercado-libre/buy-mercado-libre.html
+++ b/src/pages/integrations/mercado-libre/buy-mercado-libre/buy-mercado-libre.html
@@ -1,7 +1,7 @@
- Buy
+ {{'Buy'|translate}}
@@ -36,19 +36,24 @@
Gift Card
- {{amount | currency:'$ ':2}} {{currencyIsoCode}}
+ {{amount | currency:'$ ':2}}
+ {{currencyIsoCode}}
Network Cost
- {{invoiceFee | currency:'$ ':2}} {{currencyIsoCode}}
+ {{invoiceFee | currency:'$ ':2}}
+ {{currencyIsoCode}}
+
Miner Fee
- {{networkFee | currency:'$ ':2}} {{currencyIsoCode}}
+ {{networkFee | currency:'$ ':2}}
+ {{currencyIsoCode}}
+
@@ -63,22 +68,6 @@
-
-
-
-
-
-
- Sua compra não pôde ser concluída
-
-
- Sua compra foi adicionada à lista de pendentes
-
-
- Comprou {{mlGiftCard.amount}} {{mlGiftCard.currency}}
-
-
+
\ No newline at end of file
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 2855169db..5a15cb450 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,6 +7,7 @@ import * as moment from 'moment';
// Pages
import { FeeWarningPage } from '../../../../pages/send/fee-warning/fee-warning';
import { MercadoLibreCardsPage } from '../../../../pages/integrations/mercado-libre/mercado-libre-cards/mercado-libre-cards';
+import { SuccessModalPage } from '../../../success/success';
// Provider
import { MercadoLibreProvider } from '../../../../providers/mercado-libre/mercado-libre';
@@ -42,7 +43,6 @@ export class BuyMercadoLibrePage {
public invoiceFee: number;
public networkFee: number;
public totalAmount: number;
- public sendStatus: string;
public mlGiftCard: any;
public amountUnitStr: string;
public limitPerDayMessage: string;
@@ -118,7 +118,6 @@ export class BuyMercadoLibrePage {
private showErrorAndBack(title: string, msg: any) {
title = title ? title : 'Error'; // TODO: gettextCatalog
- this.sendStatus = '';
this.logger.error(msg);
msg = (msg && msg.errors) ? msg.errors[0].message : msg;
this.popupProvider.ionicAlert(title, msg).then(() => {
@@ -129,7 +128,6 @@ export class BuyMercadoLibrePage {
private showError = function (title: string, msg: any): Promise {
return new Promise((resolve, reject) => {
title = title || 'Error'; // TODO: gettextCatalog
- this.sendStatus = '';
this.logger.error(msg);
msg = (msg && msg.errors) ? msg.errors[0].message : msg;
this.popupProvider.ionicAlert(title, msg).then(() => {
@@ -138,7 +136,7 @@ export class BuyMercadoLibrePage {
});
}
- private publishAndSign(wallet: any, txp: any, onSendStatusChange: any): Promise {
+ private publishAndSign(wallet: any, txp: any): Promise {
return new Promise((resolve, reject) => {
if (!wallet.canSign() && !wallet.isPrivKeyExternal()) {
let err = 'No signing proposal: No private key'; // TODO: gettextCatalog
@@ -146,7 +144,7 @@ export class BuyMercadoLibrePage {
return reject(err);
}
- this.walletProvider.publishAndSign(wallet, txp, onSendStatusChange).then((txp: any) => {
+ this.walletProvider.publishAndSign(wallet, txp).then((txp: any) => {
return resolve(txp);
}).catch((err: any) => {
return reject(err);
@@ -154,15 +152,6 @@ export class BuyMercadoLibrePage {
});
}
- private statusChangeHandler(processName: string, showName: string, isOn: boolean) {
- this.logger.debug('statusChangeHandler: ', processName, showName, isOn);
- if (processName == 'buyingGiftCard' && !isOn) {
- this.sendStatus = 'success';
- } else if (showName) {
- this.sendStatus = showName;
- }
- }
-
private satToFiat(sat: number): Promise {
return new Promise((resolve, reject) => {
this.txFormatProvider.toFiat(this.coin, sat, this.currencyIsoCode).then((value: string) => {
@@ -274,15 +263,13 @@ export class BuyMercadoLibrePage {
this.mercadoLibreProvider.createGiftCard(dataSrc, (err, giftCard) => {
this.logger.debug("creating gift card " + count);
if (err) {
- this.sendStatus = '';
- this.onGoingProcessProvider.set('Comprando Vale-Presente', false, this.statusChangeHandler);
+ this.onGoingProcessProvider.set('Comprando Vale-Presente', false);
giftCard = giftCard || {};
giftCard['status'] = 'FAILURE';
}
if (giftCard && giftCard.cardStatus && (giftCard.cardStatus != 'active' && giftCard.cardStatus != 'inactive' && giftCard.cardStatus != 'expired')) {
- this.sendStatus = '';
- this.onGoingProcessProvider.set('Comprando Vale-Presente', false, this.statusChangeHandler);
+ this.onGoingProcessProvider.set('Comprando Vale-Presente', false);
giftCard = giftCard || {};
giftCard['status'] = 'FAILURE';
}
@@ -308,9 +295,10 @@ export class BuyMercadoLibrePage {
}
this.mercadoLibreProvider.savePendingGiftCard(newData, null, (err: any) => {
- this.onGoingProcessProvider.set('Comprando Vale-Presente', false, this.statusChangeHandler);
+ this.onGoingProcessProvider.set('Comprando Vale-Presente', false);
this.logger.debug("Saved new gift card with status: " + newData.status);
this.mlGiftCard = newData;
+ this.openSuccessModal();
});
});
}, 8000, {
@@ -385,12 +373,11 @@ export class BuyMercadoLibrePage {
var cancelText = 'Cancel'; // TODO: gettextCatalog
this.popupProvider.ionicConfirm(title, this.message, okText, cancelText).then((ok) => {
if (!ok) {
- this.sendStatus = '';
return;
}
- this.publishAndSign(this.wallet, this.createdTx, function () { }).then((txSent) => {
- this.onGoingProcessProvider.set('Comprando Vale-Presente', true, this.statusChangeHandler);
+ this.publishAndSign(this.wallet, this.createdTx).then((txSent) => {
+ this.onGoingProcessProvider.set('Comprando Vale-Presente', true);
this.checkTransaction(1, this.createdTx.giftData);
}).catch((err: any) => {
this._resetValues();
@@ -405,13 +392,6 @@ export class BuyMercadoLibrePage {
this.initialize(wallet);
}
- public goBackHome(): void {
- this.sendStatus = '';
- this.navCtrl.remove(3, 1);
- this.navCtrl.pop();
- this.navCtrl.push(MercadoLibreCardsPage, { invoiceId: this.invoiceId });
- }
-
public showWallets(): void {
let id = this.wallet ? this.wallet.credentials.walletId : null;
this.events.publish('showWalletsSelectorEvent', this.wallets, id, 'Buy from');
@@ -421,4 +401,25 @@ export class BuyMercadoLibrePage {
});
}
+ public openSuccessModal(): void {
+ let successComment: string;
+ if (this.mlGiftCard.status == 'FAILURE') {
+ successComment = 'Sua compra não pôde ser concluída';
+ }
+ if (this.mlGiftCard.status == 'PENDING') {
+ successComment = 'Sua compra foi adicionada à lista de pendentes';
+ }
+ 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 });
+ modal.present();
+ modal.onDidDismiss(() => {
+ this.navCtrl.remove(3, 1);
+ this.navCtrl.pop();
+ this.navCtrl.push(MercadoLibreCardsPage, { invoiceId: this.invoiceId });
+ });
+ }
+
}
diff --git a/src/pages/integrations/shapeshift/shapeshift-confirm/shapeshift-confirm.html b/src/pages/integrations/shapeshift/shapeshift-confirm/shapeshift-confirm.html
index 5cfd6fd5f..d86107bce 100644
--- a/src/pages/integrations/shapeshift/shapeshift-confirm/shapeshift-confirm.html
+++ b/src/pages/integrations/shapeshift/shapeshift-confirm/shapeshift-confirm.html
@@ -79,10 +79,4 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/integrations/shapeshift/shapeshift-confirm/shapeshift-confirm.ts b/src/pages/integrations/shapeshift/shapeshift-confirm/shapeshift-confirm.ts
index d3241e997..df232ef3e 100644
--- a/src/pages/integrations/shapeshift/shapeshift-confirm/shapeshift-confirm.ts
+++ b/src/pages/integrations/shapeshift/shapeshift-confirm/shapeshift-confirm.ts
@@ -6,6 +6,7 @@ import * as _ from 'lodash';
// Pages
import { ShapeshiftPage } from '../shapeshift';
+import { SuccessModalPage } from '../../../success/success';
// Providers
import { BwcProvider } from '../../../../providers/bwc/bwc';
@@ -19,6 +20,7 @@ import { ProfileProvider } from '../../../../providers/profile/profile';
import { ShapeshiftProvider } from '../../../../providers/shapeshift/shapeshift';
import { TxFormatProvider } from '../../../../providers/tx-format/tx-format';
import { WalletProvider } from '../../../../providers/wallet/wallet';
+import { ModalController } from 'ionic-angular/components/modal/modal-controller';
@Component({
selector: 'page-shapeshift-confirm',
@@ -39,7 +41,6 @@ export class ShapeshiftConfirmPage {
public currencyIsoCode: string;
public isCordova: boolean;
- public sendStatus: string;
public toWallet: any;
public fromWallet: any;
public fiatWithdrawal: number;
@@ -70,7 +71,8 @@ export class ShapeshiftConfirmPage {
private profileProvider: ProfileProvider,
private shapeshiftProvider: ShapeshiftProvider,
private txFormatProvider: TxFormatProvider,
- private walletProvider: WalletProvider
+ private walletProvider: WalletProvider,
+ private modalCtrl: ModalController
) {
this.configWallet = this.configProvider.get().wallet;
this.currencyIsoCode = 'USD'; // Only USD
@@ -124,7 +126,6 @@ export class ShapeshiftConfirmPage {
private showErrorAndBack(title: string, msg: any) {
title = title ? title : 'Error'; // TODO: gettextCatalog
- this.sendStatus = '';
this.logger.error(msg);
msg = (msg && msg.errors) ? msg.errors[0].message : msg;
this.popupProvider.ionicAlert(title, msg).then(() => {
@@ -132,7 +133,7 @@ export class ShapeshiftConfirmPage {
});
};
- private publishAndSign(wallet: any, txp: any, onSendStatusChange: any): Promise {
+ private publishAndSign(wallet: any, txp: any): Promise {
return new Promise((resolve, reject) => {
if (!wallet.canSign() && !wallet.isPrivKeyExternal()) {
let err = 'No signing proposal: No private key'; // TODO: gettextCatalog
@@ -140,7 +141,7 @@ export class ShapeshiftConfirmPage {
return reject(err);
}
- this.walletProvider.publishAndSign(wallet, txp, onSendStatusChange).then((txp: any) => {
+ this.walletProvider.publishAndSign(wallet, txp).then((txp: any) => {
return resolve(txp);
}).catch((err: any) => {
return reject(err);
@@ -148,15 +149,6 @@ export class ShapeshiftConfirmPage {
});
}
- private statusChangeHandler(processName: string, showName: string, isOn: boolean) {
- this.logger.debug('statusChangeHandler: ', processName, showName, isOn);
- if (processName == 'sendingTx' && !isOn) {
- this.sendStatus = 'success';
- } else if (showName) {
- this.sendStatus = showName;
- }
- }
-
private satToFiat(coin: string, sat: number, isoCode: string): Promise {
return new Promise((resolve, reject) => {
this.txFormatProvider.toFiat(coin, sat, isoCode).then((value: any) => {
@@ -196,6 +188,7 @@ export class ShapeshiftConfirmPage {
this.shapeshiftProvider.saveShapeshift(newData, null, (err: any) => {
this.logger.debug("Saved shift with status: " + newData.status);
+ this.openSuccessModal();
});
});
}
@@ -330,13 +323,12 @@ export class ShapeshiftConfirmPage {
let cancelText = 'Cancel'; // TODO: gettextCatalog
this.popupProvider.ionicConfirm(title, '', okText, cancelText).then((ok: any) => {
if (!ok) {
- this.sendStatus = '';
return;
}
- this.onGoingProcessProvider.set('sendingTx', true, this.statusChangeHandler);
- this.publishAndSign(this.fromWallet, this.createdTx, function () { }).then((txSent: any) => {
- this.onGoingProcessProvider.set('sendingTx', false, this.statusChangeHandler);
+ this.onGoingProcessProvider.set('sendingTx', true);
+ this.publishAndSign(this.fromWallet, this.createdTx).then((txSent: any) => {
+ this.onGoingProcessProvider.set('sendingTx', false);
this.txSent = txSent;
this.saveShapeshiftData();
}).catch((err: any) => {
@@ -346,11 +338,15 @@ export class ShapeshiftConfirmPage {
});
};
- public goBackHome() {
- this.sendStatus = '';
- this.navCtrl.remove(3, 1);
- this.navCtrl.pop();
- this.navCtrl.push(ShapeshiftPage);
+ public openSuccessModal(): void {
+ let successText = 'Transaction Sent';
+ let modal = this.modalCtrl.create(SuccessModalPage, { successText: successText }, { showBackdrop: true, enableBackdropDismiss: false });
+ modal.present();
+ modal.onDidDismiss(() => {
+ this.navCtrl.remove(3, 1);
+ this.navCtrl.pop();
+ this.navCtrl.push(ShapeshiftPage);
+ });
}
}
diff --git a/src/pages/send/confirm/confirm.html b/src/pages/send/confirm/confirm.html
index b94abc576..91d20647d 100644
--- a/src/pages/send/confirm/confirm.html
+++ b/src/pages/send/confirm/confirm.html
@@ -19,7 +19,8 @@
Receive in
-
+ class="icon-wallet" />
+
{{wallet ? wallet.name : '...'}}
@@ -31,15 +22,15 @@
+
+ {{wallet ? wallet.name : '...'}}
+
+
+ {{wallet ? wallet.name : '...'}}
+
- Vale-Presente gerado e pronto para usar
-
-
+