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

Jump to bottom

Swaps: Update Market price unavailable and Price impact text #2702

Merged
merged 4 commits into from
Jun 7, 2021
Merged

Swaps: Update Market price unavailable and Price impact text #2702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c93f1fb
Update Market price unavailable and Price impact
wachunei May 19, 2021
a3f21af
Merge branch 'develop' into refactor/swaps-price-impact
wachunei May 20, 2021
52e0983
Merge branch 'develop' into refactor/swaps-price-impact
sethkfman Jun 7, 2021
7fd070a
Merge branch 'develop' into refactor/swaps-price-impact
wachunei Jun 7, 2021
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
24 changes: 19 additions & 5 deletions app/components/UI/Swaps/QuotesView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,7 @@ function SwapsQuotesView({
const [isPriceDifferenceModalVisible, togglePriceDifferenceModal, , hidePriceDifferenceModal] = useModalHandler(
false
);
const [isPriceImpactModalVisible, togglePriceImpactModal, , hidePriceImpactModal] = useModalHandler(false);

/* Handlers */
const handleAnimationEnd = useCallback(() => {
Expand Down Expand Up @@ -909,6 +910,7 @@ function SwapsQuotesView({
hideFeeModal();
hideQuotesModal();
hidePriceDifferenceModal();
hidePriceImpactModal();
onCancelEditQuoteTransactions();
}

Expand All @@ -933,7 +935,8 @@ function SwapsQuotesView({
quotesLastFetched,
quoteRefreshSeconds,
remainingTime,
hidePriceDifferenceModal
hidePriceDifferenceModal,
hidePriceImpactModal
]);

/* errorKey effect: hide every modal */
Expand Down Expand Up @@ -1131,15 +1134,20 @@ function SwapsQuotesView({
onPress={handleSlippageAlertPress}
onInfoPress={
selectedQuote.priceSlippage?.calculationError?.length > 0
? undefined
? togglePriceImpactModal
: togglePriceDifferenceModal
}
>
{textStyle =>
selectedQuote.priceSlippage?.calculationError?.length > 0 ? (
<Text style={textStyle} small centered>
{strings('swaps.market_price_unavailable')}
</Text>
<>
<Text style={textStyle} bold centered>
{strings('swaps.market_price_unavailable_title')}
</Text>
<Text style={textStyle} small centered>
{strings('swaps.market_price_unavailable')}
</Text>
</>
) : (
<>
<Text style={textStyle} bold centered>
Expand Down Expand Up @@ -1393,6 +1401,12 @@ function SwapsQuotesView({
title={strings('swaps.price_difference_title')}
body={<Text style={styles.text}>{strings('swaps.price_difference_body')}</Text>}
/>
<InfoModal
isVisible={isPriceImpactModalVisible}
toggleModal={togglePriceImpactModal}
title={strings('swaps.price_impact_title')}
body={<Text style={styles.text}>{strings('swaps.price_impact_body')}</Text>}
/>
<InfoModal
isVisible={isFeeModalVisible}
toggleModal={toggleFeeModal}
Expand Down
5 changes: 4 additions & 1 deletion locales/languages/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1467,10 +1467,13 @@
"more_to_complete": "more to complete this swap.",
"more_gas_to_complete": "more for gas to complete this swap.",
"buy_more_eth": "Buy more ETH.",
"market_price_unavailable": "Market price is unavailable. Make sure you feel comfortable with the returned amount before proceeding.",
"market_price_unavailable_title": "Check your rate before proceeding",
"market_price_unavailable": "Market price is unavailable and price impact is therefore unknown. Please verify that you are comfortable with the amount of tokens you will receive before swapping.",
"price_difference": "Price difference of {{amount}}",
"price_difference_title": "Price difference",
"price_difference_body": "The difference in market prices can be affected by fees taken by intermediaries, size of market, size of trade, or market inefficiencies.",
"price_impact_title": "Price impact",
"price_impact_body": "Price impact is the difference between the current market price and the amount received during transaction execution. Price impact is a function of the size of your trade relative to the size of the liquidity pool.",
"quotes_update_often": "Quotes update often",
"quotes_update_often_text": "Quotes are updated often to reflect current market conditions.",
"about_to_swap": "You are about to swap",
Expand Down