Api swap (#35)

* Fire success function when wallet other than Badger pays * Updating price API to match Bitcoin.com products * Remove legacy test code
badger-cash · Mar 10, 2020 · a8ce8bd · a8ce8bd
1 parent b8c3653
commit a8ce8bd
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 32 deletions.
diff --git a/src/hoc/BadgerBase/BadgerBase.js b/src/hoc/BadgerBase/BadgerBase.js
@@ -213,16 +213,16 @@ const BadgerBase = (Wrapped: React.AbstractComponent<any>) => {
 				this.setState({ step: 'pending' });
 				console.info('Badger payInvoice begin', paymentRequestUrl);
 				payInvoice({ url: paymentRequestUrl })
-				.then(({ memo }) => {
-					console.info('Badger send success:', memo);
-					successFn && successFn(memo);
-					this.paymentSendSuccess();
-				})
-				.catch((err) => {
-					console.info('Badger send cancel', err);
-					failFn && failFn(err);
-					this.setState({ step: 'fresh' });
-				});
+					.then(({ memo }) => {
+						console.info('Badger send success:', memo);
+						successFn && successFn(memo);
+						this.paymentSendSuccess();
+					})
+					.catch((err) => {
+						console.info('Badger send cancel', err);
+						failFn && failFn(err);
+						this.setState({ step: 'fresh' });
+					});
 				return;
 			}
 
@@ -238,20 +238,20 @@ const BadgerBase = (Wrapped: React.AbstractComponent<any>) => {
 			if (opReturn && opReturn.length) {
 				sendParams.opReturn = opReturn;
 			}
-			
+
 			this.setState({ step: 'pending' });
 			console.info('Badger sendAssets begin', sendParams);
 			sendAssets(sendParams)
-			.then(({txid}) => {
-				console.info('Badger send success:', txid);
-				successFn && successFn(txid);
-				this.paymentSendSuccess();
-			})
-			.catch(err => {
-				console.info('Badger send cancel', err);
-				failFn && failFn(err);
-				this.setState({ step: 'fresh' });
-			});
+				.then(({ txid }) => {
+					console.info('Badger send success:', txid);
+					successFn && successFn(txid);
+					this.paymentSendSuccess();
+				})
+				.catch((err) => {
+					console.info('Badger send cancel', err);
+					failFn && failFn(err);
+					this.setState({ step: 'fresh' });
+				});
 		};
 
 		gotoLoginState = () => {

diff --git a/src/utils/badger-helpers.js b/src/utils/badger-helpers.js
@@ -5,7 +5,7 @@ import BigNumber from 'bignumber.js';
 import { currencySymbolMap, type CurrencyCode } from './currency-helpers';
 
 const buildPriceEndpoint = (currency: CurrencyCode) => {
-	return `https://index-api.bitcoin.com/api/v0/cash/price/${currency}`;
+	return `https://markets.api.bitcoin.com/rates/convertor?c=BCH&q=${currency}`;
 };
 
 const getAddressUnconfirmed = async (address: string): Promise<string[]> => {
@@ -57,15 +57,15 @@ const formatAmount = (amount: ?number, decimals: ?number): string => {
 };
 
 const priceToSatoshis = (BCHRate: number, price: number): number => {
-	const singleDollarValue = new BigNumber(BCHRate).div(100);
+	const singleDollarValue = new BigNumber(BCHRate);
 	const satoshisPerBCH = new BigNumber(100000000);
 	const singleDollarSatoshis = satoshisPerBCH.div(singleDollarValue);
 
 	return +singleDollarSatoshis.times(price).integerValue(BigNumber.ROUND_FLOOR);
 };
 
 const priceToFiat = (BCHRate: number, price: number): number => {
-	const singleDollarValue = new BigNumber(BCHRate).div(100);
+	const singleDollarValue = new BigNumber(BCHRate);
 	return +singleDollarValue.times(price);
 };
 
@@ -75,7 +75,7 @@ const fiatToSatoshis = async (
 ): Promise<number> => {
 	const priceRequest = await fetch(buildPriceEndpoint(currency));
 	const result = await priceRequest.json();
-	const fiatPrice = result.price;
+	const fiatPrice = result[currency].rate;
 	const satoshis = priceToSatoshis(fiatPrice, price);
 	return satoshis;
 };
@@ -86,20 +86,20 @@ const bchToFiat = async (
 ): Promise<number> => {
 	const priceRequest = await fetch(buildPriceEndpoint(currency));
 	const result = await priceRequest.json();
-	const fiatPrice = result.price;
+	const fiatPrice = result[currency].rate;
 
 	const fiatInvoiceTotal = priceToFiat(fiatPrice, price);
 	return fiatInvoiceTotal;
 };
 
-const adjustAmount = (amount: ?number, decimals: number, fromSatoshis: ?boolean): ?number => {
+const adjustAmount = (
+	amount: ?number,
+	decimals: number,
+	fromSatoshis: ?boolean
+): ?number => {
 	decimals = decimals || 0;
 	const shiftBy = !fromSatoshis ? decimals : decimals * -1;
-	return amount
-		? new BigNumber(amount)
-			.shiftedBy(shiftBy)
-			.toString()
-		: null;
+	return amount ? new BigNumber(amount).shiftedBy(shiftBy).toString() : null;
 };
 
 export {