Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: buy crypto UI adjustments #983

Merged
merged 1 commit into from
Nov 20, 2023
Merged

Fix: buy crypto UI adjustments #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 32 additions & 3 deletions src/navigation/services/buy-crypto/screens/BuyCryptoOffers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ export type CryptoOffer = {
showOffer: boolean;
logo: JSX.Element;
expanded: boolean;
buyClicked: boolean;
fiatCurrency: string;
fiatAmount: number;
amountCost?: number;
Expand Down Expand Up @@ -305,6 +306,7 @@ const offersDefault: {
showOffer: true,
logo: <BanxaLogo width={70} height={20} />,
expanded: false,
buyClicked: false,
fiatCurrency: 'USD',
fiatAmount: 0,
fiatMoney: undefined,
Expand All @@ -317,6 +319,7 @@ const offersDefault: {
showOffer: true,
logo: <MoonpayLogo widthIcon={25} heightIcon={25} />,
expanded: false,
buyClicked: false,
fiatCurrency: 'USD',
fiatAmount: 0,
fiatMoney: undefined,
Expand All @@ -329,6 +332,7 @@ const offersDefault: {
showOffer: true,
logo: <RampLogo width={70} height={20} />,
expanded: false,
buyClicked: false,
fiatCurrency: 'USD',
fiatAmount: 0,
fiatMoney: undefined,
Expand All @@ -341,6 +345,7 @@ const offersDefault: {
showOffer: true,
logo: <SardineLogo width={70} height={20} />,
expanded: false,
buyClicked: false,
fiatCurrency: 'USD',
fiatAmount: 0,
fiatMoney: undefined,
Expand All @@ -360,6 +365,7 @@ const offersDefault: {
/>
),
expanded: false,
buyClicked: false,
fiatCurrency: 'USD',
fiatAmount: 0,
fiatMoney: undefined,
Expand Down Expand Up @@ -432,6 +438,7 @@ const BuyCryptoOffers: React.FC = () => {
});

const [offers, setOffers] = useState(cloneDeep(offersDefault));
const [openingBrowser, setOpeningBrowser] = useState(false);
const [finishedBanxa, setFinishedBanxa] = useState(false);
const [finishedMoonpay, setFinishedMoonpay] = useState(false);
const [finishedRamp, setFinishedRamp] = useState(false);
Expand Down Expand Up @@ -1446,6 +1453,7 @@ const BuyCryptoOffers: React.FC = () => {
} catch (err) {
const reason = 'banxaCreateOrder Error';
showBanxaError(err, reason);
setOpeningBrowser(false);
return;
}

Expand All @@ -1456,6 +1464,7 @@ const BuyCryptoOffers: React.FC = () => {
'banxaCreateOrder Error: No checkout_url or id value provided from Banxa';
logger.error(reason);
showBanxaError(undefined, reason);
setOpeningBrowser(false);
return;
}

Expand Down Expand Up @@ -1562,6 +1571,7 @@ const BuyCryptoOffers: React.FC = () => {
} catch (err) {
const reason = 'moonpayGetSignedPaymentUrl Error';
showMoonpayError(err, reason);
setOpeningBrowser(false);
return;
}

Expand Down Expand Up @@ -1653,6 +1663,7 @@ const BuyCryptoOffers: React.FC = () => {
} catch (err) {
const reason = 'rampGetSignedPaymentUrl Error';
showRampError(err, reason);
setOpeningBrowser(false);
return;
}

Expand All @@ -1663,6 +1674,7 @@ const BuyCryptoOffers: React.FC = () => {
const reason =
'rampGetSignedPaymentUrl Error. Could not generate urlWithSignature';
showRampError(err, reason);
setOpeningBrowser(false);
return;
}

Expand Down Expand Up @@ -1711,10 +1723,10 @@ const BuyCryptoOffers: React.FC = () => {
} catch (err) {
const reason = 'sardineGetAuthToken Error';
showSardineError(err, reason);
setOpeningBrowser(false);
return;
}


dispatch(
Analytics.track('Requested Crypto Purchase', {
exchange: 'sardine',
Expand Down Expand Up @@ -1775,6 +1787,7 @@ const BuyCryptoOffers: React.FC = () => {
} catch (err) {
const reason = 'sardineGetSignedPaymentUrl Error';
showSardineError(err, reason);
setOpeningBrowser(false);
return;
}

Expand All @@ -1785,6 +1798,7 @@ const BuyCryptoOffers: React.FC = () => {
const reason =
'sardineGetSignedPaymentUrl Error. Could not generate urlWithSignature';
showSardineError(err, reason);
setOpeningBrowser(false);
return;
}

Expand Down Expand Up @@ -1824,6 +1838,7 @@ const BuyCryptoOffers: React.FC = () => {
if (req && req.error) {
const reason = 'simplexPaymentRequest Error';
showSimplexError(req.error, reason);
setOpeningBrowser(false);
return;
}

Expand Down Expand Up @@ -1886,6 +1901,7 @@ const BuyCryptoOffers: React.FC = () => {
.catch(err => {
const reason = 'simplexPaymentRequest Error';
showSimplexError(err, reason);
setOpeningBrowser(false);
});
};

Expand Down Expand Up @@ -2056,7 +2072,10 @@ const BuyCryptoOffers: React.FC = () => {
</BestOfferTagContainer>
) : null}
<OfferDataCryptoAmount>
{offer.amountReceiving} {coin.toUpperCase()}
{Number(offer.amountReceiving)
.toFixed(8)
.replace(/\.?0+$/, '')}{' '}
{coin.toUpperCase()}
</OfferDataCryptoAmount>
{offer.fiatCurrency !== fiatCurrency ? (
<OfferDataWarningContainer>
Expand All @@ -2083,11 +2102,21 @@ const BuyCryptoOffers: React.FC = () => {
<Button
action={true}
buttonType={'pill'}
disabled={openingBrowser}
onPress={() => {
haptic('impactLight');
offer.buyClicked = true;
setOpeningBrowser(true);
goTo(offer.key);
}}>
{t('Buy')}
{offer.buyClicked ? (
<ActivityIndicator
style={{marginBottom: -5}}
color={White}
/>
) : (
t('Buy')
)}
</Button>
</SummaryCtaContainer>
) : null}
Expand Down
9 changes: 7 additions & 2 deletions src/navigation/tabs/settings/external-services/screens/SardineDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,10 @@ const SardineDetails: React.FC = () => {
paymentRequest.transaction_id = data.withdrawal.txHash;
shouldUpdate = true;
}
if (!paymentRequest.status || data.status != paymentRequest.status) {
if (
data.status &&
(!paymentRequest.status || data.status != paymentRequest.status)
) {
logger.debug(
`Updating status from: ${paymentRequest.status} to: ${data.status}`,
);
Expand Down Expand Up @@ -212,7 +215,9 @@ const SardineDetails: React.FC = () => {
<CryptoAmountContainer>
<CryptoTitle>{t('Approximate receiving amount')}</CryptoTitle>
<CryptoContainer>
<CryptoAmount>{paymentRequest.crypto_amount}</CryptoAmount>
<CryptoAmount>
{paymentRequest.crypto_amount.toFixed(8).replace(/\.?0+$/, '')}
</CryptoAmount>
<CryptoUnit>{paymentRequest.coin}</CryptoUnit>
</CryptoContainer>
</CryptoAmountContainer>
Expand Down