From 45e0b54684348d8322edb2e981397b5d46c3b4d4 Mon Sep 17 00:00:00 2001 From: "runway-github[bot]" <73448015+runway-github[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 12:28:47 -0600 Subject: [PATCH] chore(runway): cherry-pick refactor(ramp): update ramp copy (#11960) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - refactor(ramp): update ramp copy (#10952) ## **Description** This PR contains the changes requested to comply with some regulations ## **Related issues** Fixes: ## **Manual testing steps** 1. Navigate through the changed screens and see the new copy ## **Screenshots/Recordings** | Image | |:-----:| | | | | | | | | | | | | ### **Before** ### **After** ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile Coding Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. [6facd6d](https://github.com/MetaMask/metamask-mobile/commit/6facd6d4a6ea6b80df139fdc203e4b1f3d2374d8) Co-authored-by: Pedro Pablo Aste Kompen --- app/components/UI/ReceiveRequest/index.js | 6 +----- app/components/UI/Swaps/QuotesView.js | 8 ++------ .../Tokens/TokenList/TokenListFooter/index.tsx | 6 ++++-- .../confirmations/SendFlow/Amount/index.js | 18 ++++++++++++++---- .../confirmations/SendFlow/Confirm/index.js | 2 +- .../confirmations/SendFlow/SendTo/index.js | 11 +++++++---- .../ApproveTransactionReview/index.js | 2 +- .../TransactionReviewInformation/index.js | 2 +- locales/languages/en.json | 13 ++++++++++--- 9 files changed, 41 insertions(+), 27 deletions(-) diff --git a/app/components/UI/ReceiveRequest/index.js b/app/components/UI/ReceiveRequest/index.js index 59027ce658d..adeb81bc78c 100644 --- a/app/components/UI/ReceiveRequest/index.js +++ b/app/components/UI/ReceiveRequest/index.js @@ -23,10 +23,7 @@ import GlobalAlert from '../GlobalAlert'; import StyledButton from '../StyledButton'; import ClipboardManager from '../../../core/ClipboardManager'; import { ThemeContext, mockTheme } from '../../../util/theme'; -import { - selectChainId, - selectTicker, -} from '../../../selectors/networkController'; +import { selectChainId } from '../../../selectors/networkController'; import { isNetworkRampSupported } from '../Ramp/utils'; import { createBuyNavigationDetails } from '../Ramp/routes/utils'; import { selectSelectedInternalAccountChecksummedAddress } from '../../../selectors/accountsController'; @@ -271,7 +268,6 @@ ReceiveRequest.contextType = ThemeContext; const mapStateToProps = (state) => ({ chainId: selectChainId(state), - ticker: selectTicker(state), selectedAddress: selectSelectedInternalAccountChecksummedAddress(state), receiveAsset: state.modals.receiveAsset, seedphraseBackedUp: state.user.seedphraseBackedUp, diff --git a/app/components/UI/Swaps/QuotesView.js b/app/components/UI/Swaps/QuotesView.js index ca0b8a17e90..19562a0fe74 100644 --- a/app/components/UI/Swaps/QuotesView.js +++ b/app/components/UI/Swaps/QuotesView.js @@ -1709,16 +1709,12 @@ function SwapsQuotesView({ {(!hasEnoughTokenBalance || !hasEnoughEthBalance) && ( - {`${strings('swaps.you_need')} `} {!hasEnoughTokenBalance && !isSwapsNativeAsset(sourceToken) ? `${renderFromTokenMinimalUnit( missingTokenBalance, sourceToken.decimals, - )} ${ - sourceToken.symbol - // eslint-disable-next-line no-mixed-spaces-and-tabs - } ` + )} ${sourceToken.symbol} ` : `${renderFromWei(missingEthBalance)} ${getTicker(ticker)} `} {!hasEnoughTokenBalance @@ -1727,7 +1723,7 @@ function SwapsQuotesView({ {(isSwapsNativeAsset(sourceToken) || (hasEnoughTokenBalance && !hasEnoughEthBalance)) && ( - {strings('swaps.buy_more', { ticker: getTicker(ticker) })} + {strings('swaps.token_marketplace')} )} diff --git a/app/components/UI/Tokens/TokenList/TokenListFooter/index.tsx b/app/components/UI/Tokens/TokenList/TokenListFooter/index.tsx index c2ea0b42dcc..a20532ee2a0 100644 --- a/app/components/UI/Tokens/TokenList/TokenListFooter/index.tsx +++ b/app/components/UI/Tokens/TokenList/TokenListFooter/index.tsx @@ -88,7 +88,9 @@ export const TokenListFooter = ({ {isBuyableToken && ( - {strings('wallet.add_to_get_started')} + {strings('wallet.token_is_needed_to_continue', { + tokenSymbol: mainToken.symbol, + })}