chore: rename modal-named arguments/variables related to SendConfirmation

e2e/src/usecases/HandleDeepLinkSend.js

@@ -21,7 +21,9 @@ const launchDeepLink = async ({ url, newInstance = true }) => {
  * @returns {Promise<string>}
  */
 const getCryptoSymbol = async () => {
-  const sendAmountCryptoElement = await element(by.id('SendAmount')).getAttributes()
+  const sendAmountCryptoElement = await element(
+    by.id('SendConfirmationToken/PrimaryValue')
+  ).getAttributes()
   return sendAmountCryptoElement.label.split(' ').at(-1)
 }
 
@@ -41,11 +43,11 @@ export default HandleDeepLinkSend = () => {
       jestExpect(cryptoSymbol).toBe('cUSD')
 
       // Fiat amount should match value passed in deeplink
-      await waitFor(element(by.id('SendAmountFiat')))
+      await waitFor(element(by.id('SendConfirmationToken/SecondaryValue')))
         .toHaveText('$0.01')
         .withTimeout(10 * 1000)
 
-      await waitFor(element(by.id('DisplayName')))
+      await waitFor(element(by.id('SendConfirmationRecipient/PrimaryValue')))
         .toHaveText('TestFaucet')
         .withTimeout(10 * 1000)
 
@@ -87,7 +89,7 @@ export default HandleDeepLinkSend = () => {
       await launchDeepLink({
         url: deepLinks.withoutAddress,
       })
-      await expect(element(by.id('SendAmount'))).not.toBeVisible()
+      await expect(element(by.id('SendConfirmationToken/PrimaryValue'))).not.toBeVisible()
     })
   })
 
@@ -105,11 +107,11 @@ export default HandleDeepLinkSend = () => {
       jestExpect(cryptoSymbol).toBe('cUSD')
 
       // Fiat amount should match value passed in deeplink
-      await waitFor(element(by.id('SendAmountFiat')))
+      await waitFor(element(by.id('SendConfirmationToken/SecondaryValue')))
         .toHaveText('$0.01')
         .withTimeout(10 * 1000)
 
-      await waitFor(element(by.id('DisplayName')))
+      await waitFor(element(by.id('SendConfirmationRecipient/PrimaryValue')))
         .toHaveText('TestFaucet')
         .withTimeout(10 * 1000)
 
@@ -125,7 +127,7 @@ export default HandleDeepLinkSend = () => {
 
     it('Then should error if no address provided', async () => {
       await launchDeepLink({ url: deepLinks.withoutAddress, newInstance: false })
-      await expect(element(by.id('SendAmount'))).not.toBeVisible()
+      await expect(element(by.id('SendConfirmationToken/PrimaryValue'))).not.toBeVisible()
     })
   })
 
@@ -138,11 +140,11 @@ export default HandleDeepLinkSend = () => {
       jestExpect(cryptoSymbol).toBe('cUSD')
 
       // Fiat amount should match value passed in deeplink
-      await waitFor(element(by.id('SendAmountFiat')))
+      await waitFor(element(by.id('SendConfirmationToken/SecondaryValue')))
         .toHaveText('$0.01')
         .withTimeout(10 * 1000)
 
-      await waitFor(element(by.id('DisplayName')))
+      await waitFor(element(by.id('SendConfirmationRecipient/PrimaryValue')))
         .toHaveText('TestFaucet')
         .withTimeout(10 * 1000)
 
@@ -158,7 +160,7 @@ export default HandleDeepLinkSend = () => {
 
     it('Then should error if no address provided', async () => {
       await openDeepLink(deepLinks.withoutAddress)
-      await expect(element(by.id('SendAmount'))).not.toBeVisible()
+      await expect(element(by.id('SendConfirmationToken/PrimaryValue'))).not.toBeVisible()
     })
   })
 

e2e/src/usecases/Send.js

@@ -76,7 +76,7 @@ export default Send = () => {
     })
 
     it('Then should display correct recipient', async () => {
-      await expect(element(by.text(recipientAddressDisplay))).toBeVisible()
+      await expect(element(by.text(DEFAULT_RECIPIENT_ADDRESS))).toBeVisible()
     })
 
     it('Then should be able to edit amount', async () => {
@@ -93,7 +93,7 @@ export default Send = () => {
         timeout: 30_000,
         tap: true,
       })
-      let amount = await element(by.id('SendAmount')).getAttributes()
+      let amount = await element(by.id('SendConfirmationToken/PrimaryValue')).getAttributes()
       jestExpect(amount.text).toEqual('0.01 cEUR')
     })
 
@@ -143,7 +143,7 @@ export default Send = () => {
     })
 
     it('Then should display correct recipient', async () => {
-      await expect(element(by.text(recipientAddressDisplay))).toBeVisible()
+      await expect(element(by.text(DEFAULT_RECIPIENT_ADDRESS))).toBeVisible()
     })
 
     it('Then should be able to send', async () => {

locales/base/translation.json

@@ -2847,10 +2847,13 @@
     "ctaAction_Withdraw": "Withdraw smaller amount"
   },
   "reviewTransaction": {
+    "title": "Review Send",
+    "totalPlusFees": "Total Plus Fees",
     "multipleTokensWithPlusSign": "≈ {{amount1}} {{symbol1}} + {{amount2}} {{symbol2}}"
   },
   "tokenAmount": "{{tokenAmount}} {{tokenSymbol}}",
   "localAmount": "{{localCurrencySymbol}}{{localAmount}}",
+  "localAmount_noFiatPrice": "Price Unavailable",
   "tokenAndLocalAmount": "{{tokenAmount}} {{tokenSymbol}} <0>({{localCurrencySymbol}}{{localAmount}})</0>",
   "tokenAmountApprox": "≈ {{tokenAmount}} {{tokenSymbol}}",
   "localAmountApprox": "≈ {{localCurrencySymbol}}{{localAmount}}",

src/account/utils.ts

@@ -30,3 +30,7 @@ export function getPhoneNumberDetails(
     }
   }
 }
+
+export function formatShortenedAddress(address: string): string {
+  return `${address.slice(0, 6)}...${address.slice(-4)}`
+}

src/components/Avatar.tsx

@@ -2,9 +2,9 @@ import * as React from 'react'
 import { WithTranslation } from 'react-i18next'
 import { StyleSheet, Text, TextStyle, View } from 'react-native'
 import { defaultCountryCodeSelector } from 'src/account/selectors'
+import { formatShortenedAddress } from 'src/account/utils'
 import ContactCircle from 'src/components/ContactCircle'
 import PhoneNumberWithFlag from 'src/components/PhoneNumberWithFlag'
-import { formatShortenedAddress } from 'src/components/ShortenedAddress'
 import { withTranslation } from 'src/i18n'
 import { Recipient, getDisplayName } from 'src/recipients/recipient'
 import { useSelector } from 'src/redux/hooks'