From 14a2d7e86c7368da348cc18245fba406e9aa432a Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Wed, 15 May 2024 12:08:31 -0700
Subject: [PATCH 001/133] feat(earn): add loading state for deposit when tx is
 submitted (#5415)

### Description

As the title

### Test plan

<img
src="https://github.com/valora-inc/wallet/assets/5062591/94068934-579a-4748-8310-5d82b73c73b5"
width="250" />


### Related issues

- Part of ACT-1178

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/earn/EarnDepositBottomSheet.test.tsx | 21 +++++++++++++++++++++
 src/earn/EarnDepositBottomSheet.tsx      |  7 +++++++
 src/earn/selectors.ts                    |  3 +++
 3 files changed, 31 insertions(+)
 create mode 100644 src/earn/selectors.ts

diff --git a/src/earn/EarnDepositBottomSheet.test.tsx b/src/earn/EarnDepositBottomSheet.test.tsx
index d84d34992f..5ec09fe2ae 100644
--- a/src/earn/EarnDepositBottomSheet.test.tsx
+++ b/src/earn/EarnDepositBottomSheet.test.tsx
@@ -177,4 +177,25 @@ describe('EarnDepositBottomSheet', () => {
     )
     expect(navigate).toHaveBeenCalledWith('WebViewScreen', { uri: 'termsUrl' })
   })
+
+  it('shows loading state and buttons are disabled when deposit is submitted', () => {
+    const store = createMockStore({
+      tokens: { tokenBalances: mockTokenBalances },
+      earn: { depositStatus: 'started' },
+    })
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <EarnDepositBottomSheet
+          forwardedRef={{ current: null }}
+          amount={'100'}
+          tokenId={mockARBTokenId}
+          preparedTransaction={mockPreparedTransaction}
+        />
+      </Provider>
+    )
+
+    expect(getByTestId('EarnDeposit/PrimaryCta')).toBeDisabled()
+    expect(getByTestId('EarnDeposit/SecondaryCta')).toBeDisabled()
+    expect(getByTestId('EarnDeposit/PrimaryCta')).toContainElement(getByTestId('Button/Loading'))
+  })
 })
diff --git a/src/earn/EarnDepositBottomSheet.tsx b/src/earn/EarnDepositBottomSheet.tsx
index 1ca93beb09..42b4a11dbe 100644
--- a/src/earn/EarnDepositBottomSheet.tsx
+++ b/src/earn/EarnDepositBottomSheet.tsx
@@ -10,11 +10,13 @@ import BottomSheet, { BottomSheetRefType } from 'src/components/BottomSheet'
 import Button, { BtnSizes, BtnTypes } from 'src/components/Button'
 import TokenDisplay from 'src/components/TokenDisplay'
 import Touchable from 'src/components/Touchable'
+import { depositStatusSelector } from 'src/earn/selectors'
 import { depositStart } from 'src/earn/slice'
 import InfoIcon from 'src/icons/InfoIcon'
 import Logo from 'src/icons/Logo'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
+import { useSelector } from 'src/redux/hooks'
 import { NETWORK_NAMES } from 'src/shared/conts'
 import { getDynamicConfigParams } from 'src/statsig'
 import { DynamicConfigs } from 'src/statsig/constants'
@@ -43,6 +45,8 @@ export default function EarnDepositBottomSheet({
 }) {
   const { t } = useTranslation()
   const dispatch = useDispatch()
+  const depositStatus = useSelector(depositStatusSelector)
+  const transactionSubmitted = depositStatus === 'started'
 
   const { estimatedFeeAmount, feeCurrency } = getFeeCurrencyAndAmounts(preparedTransaction)
 
@@ -141,6 +145,7 @@ export default function EarnDepositBottomSheet({
             type={BtnTypes.GRAY_WITH_BORDER}
             style={styles.cta}
             onPress={onPressCancel}
+            disabled={transactionSubmitted}
           />
           <Button
             testID="EarnDeposit/PrimaryCta"
@@ -148,6 +153,8 @@ export default function EarnDepositBottomSheet({
             text={t('earnFlow.depositBottomSheet.primaryCta')}
             style={styles.cta}
             onPress={onPressComplete}
+            disabled={transactionSubmitted}
+            showLoading={transactionSubmitted}
           />
         </View>
       </View>
diff --git a/src/earn/selectors.ts b/src/earn/selectors.ts
new file mode 100644
index 0000000000..3875b06e61
--- /dev/null
+++ b/src/earn/selectors.ts
@@ -0,0 +1,3 @@
+import { RootState } from 'src/redux/store'
+
+export const depositStatusSelector = (state: RootState) => state.earn.depositStatus

From 7fde064151f8e1fb06be2b4ed882dc4b6862f9db Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Wed, 15 May 2024 13:49:40 -0700
Subject: [PATCH 002/133] feat(earn): implement deposit submit saga (#5417)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### Description

Submits the deposit transactions, mostly based on the swap and jumpstart
sagas

### Test plan

Unit tests, manually
- tx currently fails because of a gas limit issue, will make a follow up
for this
- loading state is done in #5415



Uploading earn-submit-tx.mp4…




### Related issues

- Part of ACT-1178

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/analytics/Events.tsx     |   4 +
 src/analytics/Properties.tsx |  13 ++
 src/analytics/docs.ts        |   4 +
 src/earn/saga.test.ts        | 305 ++++++++++++++++++++++++++++++++++-
 src/earn/saga.ts             | 173 +++++++++++++++++++-
 src/viem/saga.ts             |   4 +-
 test/values.ts               |  14 ++
 7 files changed, 507 insertions(+), 10 deletions(-)

diff --git a/src/analytics/Events.tsx b/src/analytics/Events.tsx
index 921fa0f560..7b69f1367c 100644
--- a/src/analytics/Events.tsx
+++ b/src/analytics/Events.tsx
@@ -682,5 +682,9 @@ export enum EarnEvents {
   earn_deposit_terms_and_conditions_press = 'earn_deposit_terms_and_conditions_press',
   earn_deposit_complete = 'earn_deposit_complete',
   earn_deposit_cancel = 'earn_deposit_cancel',
+  earn_deposit_submit_start = 'earn_deposit_submit_start',
+  earn_deposit_submit_success = 'earn_deposit_submit_success',
+  earn_deposit_submit_error = 'earn_deposit_submit_error',
+  earn_deposit_submit_cancel = 'earn_deposit_submit_cancel',
   earn_view_pools_press = 'earn_view_pools_press',
 }
diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 50e558ac7e..1c9fa92817 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -1573,6 +1573,13 @@ interface PointsEventsProperties {
   [PointsEvents.points_screen_activity_learn_more_press]: undefined
 }
 
+interface EarnDepositProperties {
+  tokenId: string
+  networkId: NetworkId
+  tokenAmount: string
+  providerId: string
+}
+
 interface EarnEventsProperties {
   [EarnEvents.earn_cta_press]: undefined
   [EarnEvents.earn_add_crypto_action_press]: {
@@ -1582,6 +1589,12 @@ interface EarnEventsProperties {
   [EarnEvents.earn_deposit_terms_and_conditions_press]: undefined
   [EarnEvents.earn_deposit_complete]: undefined
   [EarnEvents.earn_deposit_cancel]: undefined
+  [EarnEvents.earn_deposit_submit_start]: EarnDepositProperties
+  [EarnEvents.earn_deposit_submit_success]: EarnDepositProperties
+  [EarnEvents.earn_deposit_submit_error]: EarnDepositProperties & {
+    error: string
+  }
+  [EarnEvents.earn_deposit_submit_cancel]: EarnDepositProperties
   [EarnEvents.earn_view_pools_press]: undefined
 }
 
diff --git a/src/analytics/docs.ts b/src/analytics/docs.ts
index d684ad0abb..567d5b9bef 100644
--- a/src/analytics/docs.ts
+++ b/src/analytics/docs.ts
@@ -597,6 +597,10 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [EarnEvents.earn_deposit_terms_and_conditions_press]: `When a user taps on the terms and conditions link on the deposit bottom sheet`,
   [EarnEvents.earn_deposit_complete]: `When a user taps on the complete button on the deposit bottom sheet`,
   [EarnEvents.earn_deposit_cancel]: `When a user taps on the cancel button on the deposit bottom sheet`,
+  [EarnEvents.earn_deposit_submit_start]: `When the wallet is about to submit the deposit transaction to the network`,
+  [EarnEvents.earn_deposit_submit_success]: `When the deposit transaction succeeds`,
+  [EarnEvents.earn_deposit_submit_error]: `When the deposit transaction fails`,
+  [EarnEvents.earn_deposit_submit_cancel]: `When the user cancels the deposit after submitting by cancelling PIN input`,
   [EarnEvents.earn_view_pools_press]: `When the user taps on the view pools button from token details`,
 
   // Legacy event docs
diff --git a/src/earn/saga.test.ts b/src/earn/saga.test.ts
index c088b81864..b6a3973733 100644
--- a/src/earn/saga.test.ts
+++ b/src/earn/saga.test.ts
@@ -1,16 +1,315 @@
 import { expectSaga } from 'redux-saga-test-plan'
+import * as matchers from 'redux-saga-test-plan/matchers'
+import { call } from 'redux-saga-test-plan/matchers'
+import { StaticProvider, dynamic, throwError } from 'redux-saga-test-plan/providers'
+import erc20 from 'src/abis/IERC20'
+import { EarnEvents } from 'src/analytics/Events'
+import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import { depositSubmitSaga } from 'src/earn/saga'
-import { depositStart, depositSuccess } from 'src/earn/slice'
+import { depositCancel, depositError, depositStart, depositSuccess } from 'src/earn/slice'
 import { navigateHome } from 'src/navigator/NavigationService'
+import { CANCELLED_PIN_INPUT } from 'src/pincode/authentication'
+import { Network, NetworkId, TokenTransactionTypeV2 } from 'src/transactions/types'
+import { publicClient } from 'src/viem'
+import { SerializableTransactionRequest } from 'src/viem/preparedTransactionSerialization'
+import { sendPreparedTransactions } from 'src/viem/saga'
+import networkConfig from 'src/web3/networkConfig'
+import { createMockStore } from 'test/utils'
+import { mockArbUsdcTokenId, mockTokenBalances, mockUSDCAddress } from 'test/values'
+import { Address, decodeFunctionData } from 'viem'
+
+jest.mock('viem', () => ({
+  ...jest.requireActual('viem'),
+  decodeFunctionData: jest.fn(() => ({
+    functionName: 'approve',
+    args: ['0xspenderAddress', BigInt(1e8)],
+  })),
+}))
+
+jest.mock('src/transactions/types', () => {
+  const originalModule = jest.requireActual('src/transactions/types')
+
+  return {
+    ...originalModule,
+    newTransactionContext: jest.fn((tag, description) => ({
+      id: `id-${tag}-${description}`,
+      tag,
+      description,
+    })),
+  }
+})
 
 describe('depositSubmitSaga', () => {
-  it('navigates home', async () => {
+  const serializableApproveTx: SerializableTransactionRequest = {
+    from: '0xa',
+    to: mockUSDCAddress as Address,
+    value: '100',
+    data: '0x01',
+    gas: '20000',
+  }
+  const serializableDepositTx: SerializableTransactionRequest = {
+    from: '0xa',
+    to: '0xc',
+    value: '100',
+    data: '0x02',
+    gas: '50000',
+  }
+  const mockApproveTxReceipt = {
+    status: 'success',
+    blockNumber: BigInt(1234),
+    transactionHash: '0x1',
+    cumulativeGasUsed: BigInt(3_129_217),
+    effectiveGasPrice: BigInt(5_000_000_000),
+    gasUsed: BigInt(51_578),
+  }
+  const mockDepositTxReceipt = {
+    status: 'success',
+    blockNumber: BigInt(1234),
+    transactionHash: '0x2',
+    cumulativeGasUsed: BigInt(3_899_547),
+    effectiveGasPrice: BigInt(5_000_000_000),
+    gasUsed: BigInt(371_674),
+  }
+  const mockStandbyHandler = jest.fn()
+
+  const sagaProviders: StaticProvider[] = [
+    [
+      matchers.call.fn(decodeFunctionData),
+      { functionName: 'approve', args: ['0xspenderAddress', BigInt(1e8)] },
+    ],
+    [
+      matchers.call.fn(sendPreparedTransactions),
+      dynamic(({ args: [txs, _networkId, standbyHandlers] }) => {
+        if (txs.length === 1) {
+          mockStandbyHandler(standbyHandlers[0]('0x2'))
+          return ['0x2']
+        } else {
+          mockStandbyHandler(standbyHandlers[0]('0x1'))
+          mockStandbyHandler(standbyHandlers[1]('0x2'))
+          return ['0x1', '0x2']
+        }
+      }),
+    ],
+    [
+      call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x1' }),
+      mockApproveTxReceipt,
+    ],
+    [
+      call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x2' }),
+      mockDepositTxReceipt,
+    ],
+  ]
+
+  const expectedAnalyticsProps = {
+    tokenId: mockArbUsdcTokenId,
+    tokenAmount: '100',
+    networkId: NetworkId['arbitrum-sepolia'],
+    providerId: 'aave-v3',
+  }
+
+  const expectedApproveStandbyTx = {
+    __typename: 'TokenApproval',
+    context: {
+      id: 'id-earn/saga-Earn/Approve',
+      tag: 'earn/saga',
+      description: 'Earn/Approve',
+    },
+    networkId: NetworkId['arbitrum-sepolia'],
+    tokenId: mockArbUsdcTokenId,
+    transactionHash: '0x1',
+    type: TokenTransactionTypeV2.Approval,
+    approvedAmount: '100',
+    feeCurrencyId: undefined,
+  }
+
+  const expectedDepositStandbyTx = {
+    __typename: 'TokenExchangeV3',
+    context: {
+      id: 'id-earn/saga-Earn/Deposit',
+      tag: 'earn/saga',
+      description: 'Earn/Deposit',
+    },
+    networkId: NetworkId['arbitrum-sepolia'],
+    inAmount: {
+      value: '100',
+      tokenId: networkConfig.aaveArbUsdcTokenId,
+    },
+    outAmount: {
+      value: '100',
+      tokenId: mockArbUsdcTokenId,
+    },
+    transactionHash: '0x2',
+    type: TokenTransactionTypeV2.SwapTransaction,
+    feeCurrencyId: undefined,
+  }
+
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('sends approve and deposit transactions, navigates home and dispatches the success action', async () => {
     await expectSaga(depositSubmitSaga, {
       type: depositStart.type,
-      payload: { amount: '100', tokenId: 'tokenId', preparedTransactions: [] },
+      payload: {
+        amount: '100',
+        tokenId: mockArbUsdcTokenId,
+        preparedTransactions: [serializableApproveTx, serializableDepositTx],
+      },
     })
+      .withState(createMockStore({ tokens: { tokenBalances: mockTokenBalances } }).getState())
+      .provide(sagaProviders)
       .put(depositSuccess())
+      .call.like({ fn: sendPreparedTransactions })
+      .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x1' })
+      .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x2' })
+      .run()
+    expect(navigateHome).toHaveBeenCalled()
+    expect(decodeFunctionData).toHaveBeenCalledWith({
+      abi: erc20.abi,
+      data: serializableApproveTx.data,
+    })
+    expect(mockStandbyHandler).toHaveBeenCalledTimes(2)
+    expect(mockStandbyHandler).toHaveBeenNthCalledWith(1, expectedApproveStandbyTx)
+    expect(mockStandbyHandler).toHaveBeenNthCalledWith(2, expectedDepositStandbyTx)
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_deposit_submit_start,
+      expectedAnalyticsProps
+    )
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_deposit_submit_success,
+      expectedAnalyticsProps
+    )
+  })
+
+  it('sends only deposit transaction, navigates home and dispatches the success action', async () => {
+    await expectSaga(depositSubmitSaga, {
+      type: depositStart.type,
+      payload: {
+        amount: '100',
+        tokenId: mockArbUsdcTokenId,
+        preparedTransactions: [serializableDepositTx],
+      },
+    })
+      .withState(createMockStore({ tokens: { tokenBalances: mockTokenBalances } }).getState())
+      .provide(sagaProviders)
+      .put(depositSuccess())
+      .call.like({ fn: sendPreparedTransactions })
+      .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x2' })
+      .run()
+    expect(navigateHome).toHaveBeenCalled()
+    expect(decodeFunctionData).not.toHaveBeenCalled()
+    expect(mockStandbyHandler).toHaveBeenCalledTimes(1)
+    expect(mockStandbyHandler).toHaveBeenCalledWith(expectedDepositStandbyTx)
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_deposit_submit_start,
+      expectedAnalyticsProps
+    )
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_deposit_submit_success,
+      expectedAnalyticsProps
+    )
+  })
+
+  it('dispatches cancel action if pin input is cancelled and does not navigate home', async () => {
+    await expectSaga(depositSubmitSaga, {
+      type: depositStart.type,
+      payload: {
+        amount: '100',
+        tokenId: mockArbUsdcTokenId,
+        preparedTransactions: [serializableDepositTx],
+      },
+    })
+      .withState(createMockStore({ tokens: { tokenBalances: mockTokenBalances } }).getState())
+      .provide([
+        // providers run top down so this will take precedence over the one in sagaProviders
+        [matchers.call.fn(sendPreparedTransactions), throwError(CANCELLED_PIN_INPUT as any)],
+        ...sagaProviders,
+      ])
+      .put(depositCancel())
+      .call.like({ fn: sendPreparedTransactions })
+      .not.call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'])
+      .run()
+    expect(navigateHome).not.toHaveBeenCalled()
+    expect(decodeFunctionData).not.toHaveBeenCalled()
+    expect(mockStandbyHandler).not.toHaveBeenCalled()
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_deposit_submit_start,
+      expectedAnalyticsProps
+    )
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_deposit_submit_cancel,
+      expectedAnalyticsProps
+    )
+  })
+
+  it('dispatches error action if transaction submission fails and does not navigate home', async () => {
+    await expectSaga(depositSubmitSaga, {
+      type: depositStart.type,
+      payload: {
+        amount: '100',
+        tokenId: mockArbUsdcTokenId,
+        preparedTransactions: [serializableDepositTx],
+      },
+    })
+      .withState(createMockStore({ tokens: { tokenBalances: mockTokenBalances } }).getState())
+      .provide([
+        [matchers.call.fn(sendPreparedTransactions), throwError(new Error('Transaction failed'))],
+        ...sagaProviders,
+      ])
+      .put(depositError())
+      .call.like({ fn: sendPreparedTransactions })
+      .not.call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'])
+      .run()
+    expect(navigateHome).not.toHaveBeenCalled()
+    expect(decodeFunctionData).not.toHaveBeenCalled()
+    expect(mockStandbyHandler).not.toHaveBeenCalled()
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_deposit_submit_start,
+      expectedAnalyticsProps
+    )
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_deposit_submit_error, {
+      ...expectedAnalyticsProps,
+      error: 'Transaction failed',
+    })
+  })
+
+  it('dispatches error action and navigates home if deposit transaction status is reverted', async () => {
+    await expectSaga(depositSubmitSaga, {
+      type: depositStart.type,
+      payload: {
+        amount: '100',
+        tokenId: mockArbUsdcTokenId,
+        preparedTransactions: [serializableApproveTx, serializableDepositTx],
+      },
+    })
+      .withState(createMockStore({ tokens: { tokenBalances: mockTokenBalances } }).getState())
+      .provide([
+        [
+          call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x2' }),
+          { ...mockDepositTxReceipt, status: 'reverted' },
+        ],
+        ...sagaProviders,
+      ])
+      .put(depositError())
+      .call.like({ fn: sendPreparedTransactions })
+      .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x1' })
+      .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x2' })
       .run()
     expect(navigateHome).toHaveBeenCalled()
+    expect(decodeFunctionData).toHaveBeenCalledWith({
+      abi: erc20.abi,
+      data: serializableApproveTx.data,
+    })
+    expect(mockStandbyHandler).toHaveBeenCalledTimes(2)
+    expect(mockStandbyHandler).toHaveBeenNthCalledWith(1, expectedApproveStandbyTx)
+    expect(mockStandbyHandler).toHaveBeenNthCalledWith(2, expectedDepositStandbyTx)
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_deposit_submit_start,
+      expectedAnalyticsProps
+    )
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_deposit_submit_error, {
+      ...expectedAnalyticsProps,
+      error: 'Deposit transaction reverted: 0x2',
+    })
   })
 })
diff --git a/src/earn/saga.ts b/src/earn/saga.ts
index 0112112306..fbf9a608aa 100644
--- a/src/earn/saga.ts
+++ b/src/earn/saga.ts
@@ -1,14 +1,177 @@
 import { PayloadAction } from '@reduxjs/toolkit'
-import { depositStart, depositSuccess } from 'src/earn/slice'
+import BigNumber from 'bignumber.js'
+import erc20 from 'src/abis/IERC20'
+import { EarnEvents } from 'src/analytics/Events'
+import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
+import { depositCancel, depositError, depositStart, depositSuccess } from 'src/earn/slice'
 import { DepositInfo } from 'src/earn/types'
 import { navigateHome } from 'src/navigator/NavigationService'
+import { CANCELLED_PIN_INPUT } from 'src/pincode/authentication'
+import { vibrateError } from 'src/styles/hapticFeedback'
+import { getTokenInfo } from 'src/tokens/saga'
+import { BaseStandbyTransaction } from 'src/transactions/actions'
+import { TokenTransactionTypeV2, newTransactionContext } from 'src/transactions/types'
+import Logger from 'src/utils/Logger'
+import { ensureError } from 'src/utils/ensureError'
 import { safely } from 'src/utils/safely'
-import { put, takeLeading } from 'typed-redux-saga'
+import { publicClient } from 'src/viem'
+import { getPreparedTransactions } from 'src/viem/preparedTransactionSerialization'
+import { sendPreparedTransactions } from 'src/viem/saga'
+import networkConfig, { networkIdToNetwork } from 'src/web3/networkConfig'
+import { all, call, put, takeLeading } from 'typed-redux-saga'
+import { decodeFunctionData } from 'viem'
+
+const TAG = 'earn/saga'
 
 export function* depositSubmitSaga(action: PayloadAction<DepositInfo>) {
-  // todo(act-1178): submit the tx
-  yield* put(depositSuccess())
-  navigateHome()
+  const { tokenId, preparedTransactions: serializablePreparedTransactions, amount } = action.payload
+
+  const preparedTransactions = getPreparedTransactions(serializablePreparedTransactions)
+
+  const tokenInfo = yield* call(getTokenInfo, tokenId)
+  if (!tokenInfo) {
+    Logger.error(`${TAG}/depositSubmitSaga`, 'Token info not found for token id', tokenId)
+    yield* put(depositError())
+    return
+  }
+
+  const networkId = tokenInfo.networkId
+  const commonAnalyticsProps = {
+    tokenId,
+    networkId,
+    tokenAmount: amount,
+    providerId: 'aave-v3',
+  }
+
+  let submitted = false
+
+  try {
+    Logger.debug(
+      `${TAG}/depositSubmitSaga`,
+      `Starting deposit for token ${tokenId}, total transactions: ${preparedTransactions.length}`
+    )
+
+    const createDepositStandbyTxHandlers = []
+
+    if (preparedTransactions.length > 1 && preparedTransactions[0].data) {
+      const { functionName, args } = decodeFunctionData({
+        abi: erc20.abi,
+        data: preparedTransactions[0].data,
+      })
+      if (functionName === 'approve' && preparedTransactions[0].to === tokenInfo.address && args) {
+        Logger.debug(`${TAG}/depositSubmitSaga`, 'First transaction is an approval transaction')
+        const approvedAmountInSmallestUnit = args[1] as bigint
+        const approvedAmount = new BigNumber(approvedAmountInSmallestUnit.toString())
+          .shiftedBy(-tokenInfo.decimals)
+          .toString()
+
+        const createApprovalStandbyTx = (
+          transactionHash: string,
+          feeCurrencyId?: string
+        ): BaseStandbyTransaction => {
+          return {
+            context: newTransactionContext(TAG, 'Earn/Approve'),
+            __typename: 'TokenApproval',
+            networkId,
+            type: TokenTransactionTypeV2.Approval,
+            transactionHash,
+            tokenId,
+            approvedAmount,
+            feeCurrencyId,
+          }
+        }
+        createDepositStandbyTxHandlers.push(createApprovalStandbyTx)
+      }
+    }
+
+    // this is a placeholder for now, should be updated to a "deposit" transaction type
+    const createDepositStandbyTx = (
+      transactionHash: string,
+      feeCurrencyId?: string
+    ): BaseStandbyTransaction => {
+      return {
+        context: newTransactionContext(TAG, 'Earn/Deposit'),
+        __typename: 'TokenExchangeV3',
+        networkId,
+        type: TokenTransactionTypeV2.SwapTransaction,
+        inAmount: {
+          value: amount,
+          tokenId: networkConfig.aaveArbUsdcTokenId,
+        },
+        outAmount: {
+          value: amount,
+          tokenId,
+        },
+        transactionHash,
+        feeCurrencyId,
+      }
+    }
+    createDepositStandbyTxHandlers.push(createDepositStandbyTx)
+
+    ValoraAnalytics.track(EarnEvents.earn_deposit_submit_start, commonAnalyticsProps)
+
+    const txHashes = yield* call(
+      sendPreparedTransactions,
+      serializablePreparedTransactions,
+      networkId,
+      createDepositStandbyTxHandlers
+    )
+
+    Logger.debug(
+      `${TAG}/depositSubmitSaga`,
+      'Successfully sent deposit transaction(s) to the network',
+      txHashes
+    )
+
+    navigateHome()
+    submitted = true
+
+    // wait for the tx receipts, so that we can track them
+    Logger.debug(`${TAG}/depositSubmitSaga`, 'Waiting for transaction receipts')
+    const txReceipts = yield* all(
+      txHashes.map((txHash) => {
+        return call([publicClient[networkIdToNetwork[networkId]], 'waitForTransactionReceipt'], {
+          hash: txHash,
+        })
+      })
+    )
+    txReceipts.forEach((receipt, index) => {
+      Logger.debug(
+        `${TAG}/depositSubmitSaga`,
+        `Received transaction receipt ${index + 1} of ${txReceipts.length}`,
+        receipt
+      )
+    })
+
+    const depositTxReceipt = txReceipts[txReceipts.length - 1]
+    if (depositTxReceipt.status !== 'success') {
+      throw new Error(`Deposit transaction reverted: ${depositTxReceipt?.transactionHash}`)
+    }
+
+    ValoraAnalytics.track(EarnEvents.earn_deposit_submit_success, commonAnalyticsProps)
+    yield* put(depositSuccess())
+  } catch (err) {
+    if (err === CANCELLED_PIN_INPUT) {
+      Logger.info(`${TAG}/depositSubmitSaga`, 'Transaction cancelled by user')
+      yield* put(depositCancel())
+      ValoraAnalytics.track(EarnEvents.earn_deposit_submit_cancel, commonAnalyticsProps)
+      return
+    }
+
+    const error = ensureError(err)
+    Logger.error(`${TAG}/depositSubmitSaga`, 'Error sending deposit transaction', error)
+    yield* put(depositError())
+    ValoraAnalytics.track(EarnEvents.earn_deposit_submit_error, {
+      ...commonAnalyticsProps,
+      error: error.message,
+    })
+
+    // Only vibrate if we haven't already submitted the transaction
+    // since the user may be doing something else on the app by now
+    if (!submitted) {
+      vibrateError()
+    }
+  }
 }
 
 export function* earnSaga() {
diff --git a/src/viem/saga.ts b/src/viem/saga.ts
index e968672213..e5906843c7 100644
--- a/src/viem/saga.ts
+++ b/src/viem/saga.ts
@@ -1,5 +1,3 @@
-import { TAG } from 'src/send/saga'
-
 import { tokensByIdSelector } from 'src/tokens/selectors'
 import { BaseStandbyTransaction, addStandbyTransaction } from 'src/transactions/actions'
 import { NetworkId } from 'src/transactions/types'
@@ -17,6 +15,8 @@ import { call, put, select } from 'typed-redux-saga'
 import { Hash } from 'viem'
 import { getTransactionCount } from 'viem/actions'
 
+const TAG = 'viem/saga'
+
 /**
  * Sends prepared transactions and adds standby transactions to the store.
  * Returns the hashes of the sent transactions. Throws if the transactions fail
diff --git a/test/values.ts b/test/values.ts
index 8d3986d54a..f9080d828a 100644
--- a/test/values.ts
+++ b/test/values.ts
@@ -139,6 +139,7 @@ export const mockEthTokenId = 'ethereum-sepolia:native'
 export const mockUSDCTokenId = `ethereum-sepolia:${mockUSDCAddress}`
 export const mockARBTokenId = `arbitrum-sepolia:native`
 export const mockOPTokenId = `op-sepolia:native`
+export const mockArbUsdcTokenId = `arbitrum-sepolia:${mockUSDCAddress}`
 
 export const mockQrCodeData2 = {
   address: mockAccount2Invite,
@@ -569,6 +570,19 @@ export const mockTokenBalances: Record<string, StoredTokenBalance> = {
     isNative: true,
     priceFetchedAt: Date.now(),
   },
+  [mockArbUsdcTokenId]: {
+    name: 'USD Coin',
+    networkId: NetworkId['arbitrum-sepolia'],
+    tokenId: mockArbUsdcTokenId,
+    address: mockUSDCAddress,
+    symbol: 'USDC',
+    decimals: 6,
+    imageUrl:
+      'https://raw.githubusercontent.com/valora-inc/address-metadata/main/assets/tokens/ETH.png',
+    balance: '0',
+    priceUsd: '1',
+    priceFetchedAt: Date.now(),
+  },
 }
 
 export const mockCeloTokenBalance: TokenBalance = {

From 71554e2c6877bae1d1f0d7d84808cf0d9e45a538 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Wed, 15 May 2024 14:58:16 -0700
Subject: [PATCH 003/133] feat(earn): get gas padding from dynamic config
 (#5418)

### Description

As the title

### Test plan

Unit tests, manual
Successful tx:
https://sepolia.arbiscan.io/tx/0xe681a97041ad016ecfae008111285db3b14a60a5054abd5912109af2987245d0

https://arbiscan.io/tx/0x3a72d7edf302f4d88ae86dc42bbffd87b95d47ee9b4a1a0723ddee13cd30954f


https://github.com/valora-inc/wallet/assets/5062591/86a99157-d2c8-4c21-9196-640784d1ce9a


### Related issues

- Part of ACT-1178

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/earn/prepareTransactions.test.ts | 13 +++++++++++--
 src/earn/prepareTransactions.ts      | 11 ++++++++++-
 src/statsig/constants.ts             |  1 +
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/earn/prepareTransactions.test.ts b/src/earn/prepareTransactions.test.ts
index dddec0295a..c14e0e7e76 100644
--- a/src/earn/prepareTransactions.test.ts
+++ b/src/earn/prepareTransactions.test.ts
@@ -3,6 +3,8 @@ import { FetchMock } from 'jest-fetch-mock/types'
 import aavePool from 'src/abis/AavePoolV3'
 import erc20 from 'src/abis/IERC20'
 import { prepareSupplyTransactions } from 'src/earn/prepareTransactions'
+import { getDynamicConfigParams } from 'src/statsig'
+import { StatsigDynamicConfigs } from 'src/statsig/types'
 import { TokenBalance } from 'src/tokens/slice'
 import { Network, NetworkId } from 'src/transactions/types'
 import { publicClient } from 'src/viem'
@@ -36,6 +38,7 @@ const mockToken: TokenBalance = {
   networkId: NetworkId['arbitrum-sepolia'],
 }
 
+jest.mock('src/statsig')
 jest.mock('src/viem/prepareTransactions')
 jest.mock('viem', () => ({
   ...jest.requireActual('viem'),
@@ -52,6 +55,12 @@ describe('prepareTransactions', () => {
     }))
     jest.spyOn(publicClient[Network.Arbitrum], 'readContract').mockResolvedValue(BigInt(0))
     jest.mocked(encodeFunctionData).mockReturnValue('0xencodedData')
+    jest.mocked(getDynamicConfigParams).mockImplementation(({ configName, defaultValues }) => {
+      if (configName === StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG) {
+        return { ...defaultValues, depositGasPadding: 100 }
+      }
+      return defaultValues
+    })
   })
 
   describe('prepareSupplyTransactions', () => {
@@ -101,7 +110,7 @@ describe('prepareTransactions', () => {
           from: '0x1234',
           to: '0x5678',
           data: '0xencodedData',
-          gas: BigInt(50000),
+          gas: BigInt(50100),
           _estimatedGasUse: BigInt(49800),
         },
       ]
@@ -164,7 +173,7 @@ describe('prepareTransactions', () => {
           from: '0x1234',
           to: '0x5678',
           data: '0xencodedData',
-          gas: BigInt(50000),
+          gas: BigInt(50100),
           _estimatedGasUse: BigInt(49800),
         },
       ]
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 0e22dfefca..8862a6462f 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -1,6 +1,9 @@
 import BigNumber from 'bignumber.js'
 import aavePool from 'src/abis/AavePoolV3'
 import erc20 from 'src/abis/IERC20'
+import { getDynamicConfigParams } from 'src/statsig'
+import { DynamicConfigs } from 'src/statsig/constants'
+import { StatsigDynamicConfigs } from 'src/statsig/types'
 import { TokenBalance } from 'src/tokens/slice'
 import { fetchWithTimeout } from 'src/utils/fetchWithTimeout'
 import { publicClient } from 'src/viem'
@@ -112,7 +115,13 @@ export async function prepareSupplyTransactions({
     )
   }
 
-  baseTransactions[baseTransactions.length - 1].gas = BigInt(supplySimulatedTx.gasNeeded)
+  const { depositGasPadding } = getDynamicConfigParams(
+    DynamicConfigs[StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG]
+  )
+
+  baseTransactions[baseTransactions.length - 1].gas = BigInt(
+    supplySimulatedTx.gasNeeded + depositGasPadding
+  )
   baseTransactions[baseTransactions.length - 1]._estimatedGasUse = BigInt(supplySimulatedTx.gasUsed)
 
   return prepareTransactions({
diff --git a/src/statsig/constants.ts b/src/statsig/constants.ts
index 608bd1ae32..879926cc75 100644
--- a/src/statsig/constants.ts
+++ b/src/statsig/constants.ts
@@ -141,6 +141,7 @@ export const DynamicConfigs = {
       providerName: 'Aave',
       providerLogoUrl: '',
       providerTermsAndConditionsUrl: '',
+      depositGasPadding: 0,
     },
   },
 } satisfies {

From 8f8fea54b4dcf2304da3fd7b9d06327fa93f7f64 Mon Sep 17 00:00:00 2001
From: Kathy Luo <kathyluo18@gmail.com>
Date: Thu, 16 May 2024 10:24:34 +0200
Subject: [PATCH 004/133] fix(points): enable some activities to only be
 tracked once (#5416)

### Description

As the title, this PR:
1. adds a redux property that tracks the status of "track once"
activities, which is updated after a points event is processed
2. ensure the track event for create-wallet is not fired again after
successfully being processed
3. update tests and migrations

I opted not to hook up the create-wallet activity card status with redux
because it'd be very confusing for the user in case of tracking failure.

### Test plan

n/a

### Related issues

- Fixes RET-1069

### Backwards compatibility

Y

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/home/TabHome.test.tsx |  5 ++-
 src/points/saga.test.ts   | 16 +++++++-
 src/points/saga.ts        | 12 +++++-
 src/points/selectors.ts   |  4 ++
 src/points/slice.test.ts  | 84 +++++++++++++++++++++++++--------------
 src/points/slice.ts       | 20 +++++++---
 src/redux/migrations.ts   |  1 +
 src/redux/store.test.ts   |  5 ++-
 src/redux/store.ts        |  2 +-
 test/RootStateSchema.json | 21 +++++++++-
 test/schemas.ts           | 16 +++++++-
 11 files changed, 143 insertions(+), 43 deletions(-)

diff --git a/src/home/TabHome.test.tsx b/src/home/TabHome.test.tsx
index 03b5295e65..e3a3d81c3f 100644
--- a/src/home/TabHome.test.tsx
+++ b/src/home/TabHome.test.tsx
@@ -127,8 +127,8 @@ describe('TabHome', () => {
     })
 
     // Multiple elements use this text with the scroll aware header
-    expect(tree.queryAllByText('bottomTabsNavigator.home.title')).toBeTruthy()
-    expect(tree.queryByTestId('HomeActionsCarousel')).toBeTruthy()
+    expect(tree.getAllByText('bottomTabsNavigator.home.title')).toBeTruthy()
+    expect(tree.getByTestId('HomeActionsCarousel')).toBeTruthy()
     expect(tree.queryByText('notificationCenterSpotlight.message')).toBeFalsy()
     expect(tree.queryByTestId('HomeTokenBalance')).toBeFalsy()
     expect(tree.queryByTestId('cashInBtn')).toBeFalsy()
@@ -137,6 +137,7 @@ describe('TabHome', () => {
         'HOME/VISIT_HOME',
         'HOME/REFRESH_BALANCES',
         'IDENTITY/IMPORT_CONTACTS',
+        'points/trackPointsEvent',
       ])
     )
   })
diff --git a/src/points/saga.test.ts b/src/points/saga.test.ts
index a92f040538..2cb23b2484 100644
--- a/src/points/saga.test.ts
+++ b/src/points/saga.test.ts
@@ -4,6 +4,7 @@ import { FetchMock } from 'jest-fetch-mock/types'
 import { expectSaga } from 'redux-saga-test-plan'
 import * as matchers from 'redux-saga-test-plan/matchers'
 import { throwError } from 'redux-saga-test-plan/providers'
+import { select } from 'redux-saga/effects'
 import { Actions as AppActions } from 'src/app/actions'
 import * as pointsSaga from 'src/points/saga'
 import {
@@ -16,6 +17,7 @@ import {
   sendPointsEvent,
   watchAppMounted,
 } from 'src/points/saga'
+import { trackOnceActivitiesSelector } from 'src/points/selectors'
 import pointsReducer, {
   PendingPointsEvent,
   getHistoryError,
@@ -392,6 +394,7 @@ describe('sendPointsEvent', () => {
     return expectSaga(sendPointsEvent, mockAction)
       .provide([
         [matchers.call.fn(pointsSaga.fetchTrackPointsEventsEndpoint), mockServerSuccessResponse],
+        [select(trackOnceActivitiesSelector), { 'create-wallet': false }],
       ])
       .put(
         sendPointsEventStarted({
@@ -410,6 +413,7 @@ describe('sendPointsEvent', () => {
     await expectSaga(sendPointsEvent, mockAction)
       .provide([
         [matchers.call.fn(pointsSaga.fetchTrackPointsEventsEndpoint), mockServerErrorResponse],
+        [select(trackOnceActivitiesSelector), { 'create-wallet': false }],
       ])
       .put(
         sendPointsEventStarted({
@@ -429,12 +433,22 @@ describe('sendPointsEvent', () => {
       mockServerErrorMessage
     )
   })
+
+  it('should ignore any track once activities that were already tracked', async () => {
+    const mockAction = trackPointsEvent({ activityId: 'create-wallet' })
+
+    return expectSaga(sendPointsEvent, mockAction)
+      .provide([[select(trackOnceActivitiesSelector), { 'create-wallet': true }]])
+      .not.put(sendPointsEventStarted(expect.anything()))
+      .not.call(fetchTrackPointsEventsEndpoint)
+      .not.put(pointsEventProcessed(expect.anything()))
+      .run()
+  })
 })
 
 describe('sendPendingPointsEvents', () => {
   beforeEach(() => {
     jest.clearAllMocks()
-
     jest.useFakeTimers({ now: new Date(mockTime).getTime() })
   })
 
diff --git a/src/points/saga.ts b/src/points/saga.ts
index 6b62d85f30..f2b2922436 100644
--- a/src/points/saga.ts
+++ b/src/points/saga.ts
@@ -1,7 +1,11 @@
 import { differenceInDays } from 'date-fns'
 import { Actions as AppActions } from 'src/app/actions'
 import { Actions as HomeActions } from 'src/home/actions'
-import { nextPageUrlSelector, pendingPointsEvents } from 'src/points/selectors'
+import {
+  nextPageUrlSelector,
+  pendingPointsEvents,
+  trackOnceActivitiesSelector,
+} from 'src/points/selectors'
 import {
   PointsConfig,
   getHistoryError,
@@ -175,6 +179,12 @@ export async function fetchTrackPointsEventsEndpoint(event: PointsEvent) {
 }
 
 export function* sendPointsEvent({ payload: event }: ReturnType<typeof trackPointsEvent>) {
+  const trackOnceActivities = yield* select(trackOnceActivitiesSelector)
+  if (trackOnceActivities[event.activityId]) {
+    Logger.debug(TAG, `Skipping already tracked activity: ${event.activityId}`)
+    return
+  }
+
   const id = uuidv4()
 
   yield* put(
diff --git a/src/points/selectors.ts b/src/points/selectors.ts
index 318c35188a..c46cc1b618 100644
--- a/src/points/selectors.ts
+++ b/src/points/selectors.ts
@@ -78,3 +78,7 @@ export const pointsBalanceSelector = (state: RootState) => {
 export const pointsBalanceStatusSelector = (state: RootState) => {
   return state.points.pointsBalanceStatus
 }
+
+export const trackOnceActivitiesSelector = (state: RootState) => {
+  return state.points.trackOnceActivities
+}
diff --git a/src/points/slice.test.ts b/src/points/slice.test.ts
index daa305209e..6b4e5ee6e9 100644
--- a/src/points/slice.test.ts
+++ b/src/points/slice.test.ts
@@ -1,36 +1,62 @@
-import { PointsEvent } from 'src/points/types'
-import reducer, { State, pointsEventProcessed, sendPointsEventStarted } from './slice'
+import reducer, {
+  PendingPointsEvent,
+  initialState,
+  pointsEventProcessed,
+  sendPointsEventStarted,
+} from './slice'
+
+const pendingCreateWalletEvent: PendingPointsEvent = {
+  id: 'test-id-1',
+  timestamp: '2024-04-22T11:00:00.000Z',
+  event: { activityId: 'create-wallet' },
+}
+const pendingSwapEvent: PendingPointsEvent = {
+  id: 'test-id-2',
+  timestamp: '2024-04-22T12:00:00.000Z',
+  event: { activityId: 'swap', transactionHash: '0xTEST' },
+}
 
 describe('pending points events', () => {
-  it('should add a pending points event', () => {
-    const id = 'test-id'
-    const timestamp = '2024-04-22T11:00:00.000Z'
-    const event: PointsEvent = { activityId: 'create-wallet' }
-    const pendingPointsEvent = { id, timestamp, event }
-
-    const initialState = { pendingPointsEvents: [] } as unknown as State
-
-    const newState = reducer(initialState, sendPointsEventStarted(pendingPointsEvent))
-
-    expect(newState.pendingPointsEvents).toEqual([pendingPointsEvent])
+  it('should add pending points events', () => {
+    const stateAfterSwapEvent = reducer(
+      {
+        ...initialState,
+        pendingPointsEvents: [],
+        trackOnceActivities: {
+          'create-wallet': false,
+        },
+      },
+      sendPointsEventStarted(pendingSwapEvent)
+    )
+
+    expect(stateAfterSwapEvent.pendingPointsEvents).toEqual([pendingSwapEvent])
+    expect(stateAfterSwapEvent.trackOnceActivities).toEqual({
+      'create-wallet': false,
+    })
+
+    const stateAfterCreateWalletEvent = reducer(
+      stateAfterSwapEvent,
+      sendPointsEventStarted(pendingCreateWalletEvent)
+    )
+
+    expect(stateAfterCreateWalletEvent.pendingPointsEvents).toEqual([
+      pendingSwapEvent,
+      pendingCreateWalletEvent,
+    ])
+    expect(stateAfterCreateWalletEvent.trackOnceActivities).toEqual({
+      'create-wallet': true,
+    })
   })
 
   it('should remove a pending points event by id', () => {
-    const id1 = 'test-id-1'
-    const id2 = 'test-id-2'
-    const timestamp1 = '2024-04-22T11:00:00.000Z'
-    const timestamp2 = '2024-04-22T12:00:00.000Z'
-    const event1: PointsEvent = { activityId: 'create-wallet' }
-    const event2: PointsEvent = { activityId: 'swap', transactionHash: '0xTEST' }
-    const pendingPointsEvent1 = { id: id1, timestamp: timestamp1, event: event1 }
-    const pendingPointsEvent2 = { id: id2, timestamp: timestamp2, event: event2 }
-
-    const initialState = {
-      pendingPointsEvents: [pendingPointsEvent1, pendingPointsEvent2],
-    } as unknown as State
-
-    const newState = reducer(initialState, pointsEventProcessed({ id: id1 }))
-
-    expect(newState.pendingPointsEvents).toEqual([pendingPointsEvent2])
+    const newState = reducer(
+      {
+        ...initialState,
+        pendingPointsEvents: [pendingCreateWalletEvent, pendingSwapEvent],
+      },
+      pointsEventProcessed(pendingCreateWalletEvent)
+    )
+
+    expect(newState.pendingPointsEvents).toEqual([pendingSwapEvent])
   })
 })
diff --git a/src/points/slice.ts b/src/points/slice.ts
index f3e5468605..4c2f643a02 100644
--- a/src/points/slice.ts
+++ b/src/points/slice.ts
@@ -30,7 +30,7 @@ export interface PendingPointsEvent {
   event: PointsEvent
 }
 
-export interface State {
+interface State {
   pointsHistory: ClaimHistory[]
   nextPageUrl: string | null
   getHistoryStatus: 'idle' | 'loading' | 'errorFirstPage' | 'errorNextPage'
@@ -39,9 +39,12 @@ export interface State {
   pendingPointsEvents: PendingPointsEvent[]
   pointsBalanceStatus: 'idle' | 'loading' | 'error' | 'success'
   pointsBalance: string
+  trackOnceActivities: {
+    [key in PointsActivityId]?: boolean
+  }
 }
 
-const initialState: State = {
+export const initialState: State = {
   pointsHistory: [],
   nextPageUrl: null,
   getHistoryStatus: 'idle',
@@ -50,6 +53,9 @@ const initialState: State = {
   pendingPointsEvents: [],
   pointsBalanceStatus: 'idle',
   pointsBalance: '0',
+  trackOnceActivities: {
+    'create-wallet': false,
+  },
 }
 
 const slice = createSlice({
@@ -88,10 +94,12 @@ const slice = createSlice({
     getPointsConfigRetry: (state) => ({
       ...state,
     }),
-    sendPointsEventStarted: (state, action: PayloadAction<PendingPointsEvent>) => ({
-      ...state,
-      pendingPointsEvents: [...state.pendingPointsEvents, action.payload],
-    }),
+    sendPointsEventStarted: (state, action: PayloadAction<PendingPointsEvent>) => {
+      state.pendingPointsEvents = [...state.pendingPointsEvents, action.payload]
+      if (action.payload.event.activityId in state.trackOnceActivities) {
+        state.trackOnceActivities[action.payload.event.activityId] = true
+      }
+    },
     pointsEventProcessed: (state, action: PayloadAction<Pick<PendingPointsEvent, 'id'>>) => ({
       ...state,
       pendingPointsEvents: state.pendingPointsEvents.filter(
diff --git a/src/redux/migrations.ts b/src/redux/migrations.ts
index f56b3964d8..7b2fd5e3db 100644
--- a/src/redux/migrations.ts
+++ b/src/redux/migrations.ts
@@ -1784,4 +1784,5 @@ export const migrations = {
       depositStatus: 'idle',
     },
   }),
+  214: (state: any) => state,
 }
diff --git a/src/redux/store.test.ts b/src/redux/store.test.ts
index 26367145f5..ed56b42ffd 100644
--- a/src/redux/store.test.ts
+++ b/src/redux/store.test.ts
@@ -98,7 +98,7 @@ describe('store state', () => {
       {
         "_persist": {
           "rehydrated": true,
-          "version": 213,
+          "version": 214,
         },
         "account": {
           "acceptedTerms": false,
@@ -298,6 +298,9 @@ describe('store state', () => {
           },
           "pointsConfigStatus": "idle",
           "pointsHistory": [],
+          "trackOnceActivities": {
+            "create-wallet": false,
+          },
         },
         "positions": {
           "positions": [],
diff --git a/src/redux/store.ts b/src/redux/store.ts
index 981024cd69..82aa619b60 100644
--- a/src/redux/store.ts
+++ b/src/redux/store.ts
@@ -21,7 +21,7 @@ const persistConfig: PersistConfig<ReducersRootState> = {
   key: 'root',
   // default is -1, increment as we make migrations
   // See https://github.com/valora-inc/wallet/tree/main/WALLET.md#redux-state-migration
-  version: 213,
+  version: 214,
   keyPrefix: `reduxStore-`, // the redux-persist default is `persist:` which doesn't work with some file systems.
   storage: FSStorage(),
   blacklist: ['networkInfo', 'alert', 'imports', 'keylessBackup', 'jumpstart'],
diff --git a/test/RootStateSchema.json b/test/RootStateSchema.json
index fb0942794f..154391e6c4 100644
--- a/test/RootStateSchema.json
+++ b/test/RootStateSchema.json
@@ -4369,6 +4369,9 @@
                         "$ref": "#/definitions/ClaimHistory"
                     },
                     "type": "array"
+                },
+                "trackOnceActivities": {
+                    "$ref": "#/definitions/{swap?:boolean|undefined;\"create-wallet\"?:boolean|undefined;\"more-coming\"?:boolean|undefined;}"
                 }
             },
             "required": [
@@ -4379,7 +4382,8 @@
                 "pointsBalanceStatus",
                 "pointsConfig",
                 "pointsConfigStatus",
-                "pointsHistory"
+                "pointsHistory",
+                "trackOnceActivities"
             ],
             "type": "object"
         },
@@ -6235,6 +6239,21 @@
             },
             "type": "object"
         },
+        "{swap?:boolean|undefined;\"create-wallet\"?:boolean|undefined;\"more-coming\"?:boolean|undefined;}": {
+            "additionalProperties": false,
+            "properties": {
+                "create-wallet": {
+                    "type": "boolean"
+                },
+                "more-coming": {
+                    "type": "boolean"
+                },
+                "swap": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "{swap?:{pointsAmount:number;}|undefined;\"create-wallet\"?:{pointsAmount:number;}|undefined;\"more-coming\"?:{pointsAmount:number;}|undefined;}": {
             "additionalProperties": false,
             "properties": {
diff --git a/test/schemas.ts b/test/schemas.ts
index 9a7ec911ee..46c9ded7f8 100644
--- a/test/schemas.ts
+++ b/test/schemas.ts
@@ -3309,6 +3309,20 @@ export const v213Schema = {
   },
 }
 
+export const v214Schema = {
+  ...v213Schema,
+  _persist: {
+    ...v213Schema._persist,
+    version: 214,
+  },
+  points: {
+    ...v213Schema.points,
+    trackOnceActivities: {
+      'create-wallet': false,
+    },
+  },
+}
+
 export function getLatestSchema(): Partial<RootState> {
-  return v213Schema as Partial<RootState>
+  return v214Schema as Partial<RootState>
 }

From c49d3f501a0494b3a329973de313a82c404adcd2 Mon Sep 17 00:00:00 2001
From: Kathy Luo <kathyluo18@gmail.com>
Date: Thu, 16 May 2024 11:17:28 +0200
Subject: [PATCH 005/133] fix(points): add required request headers for
 trackPointsEvent call (#5378)

### Description

The missing headers were causing these calls to always fail.

### Test plan

No more errors for /trackPointsEvent

### Related issues

n/a

### Backwards compatibility

Y

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/points/saga.test.ts | 30 ++++++++++++++++++++++++++++--
 src/points/saga.ts      | 12 ++++++++++--
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/points/saga.test.ts b/src/points/saga.test.ts
index 2cb23b2484..548bca7dd3 100644
--- a/src/points/saga.test.ts
+++ b/src/points/saga.test.ts
@@ -4,8 +4,9 @@ import { FetchMock } from 'jest-fetch-mock/types'
 import { expectSaga } from 'redux-saga-test-plan'
 import * as matchers from 'redux-saga-test-plan/matchers'
 import { throwError } from 'redux-saga-test-plan/providers'
-import { select } from 'redux-saga/effects'
+import { call, select } from 'redux-saga/effects'
 import { Actions as AppActions } from 'src/app/actions'
+import { retrieveSignedMessage } from 'src/pincode/authentication'
 import * as pointsSaga from 'src/points/saga'
 import {
   fetchHistory,
@@ -33,10 +34,11 @@ import pointsReducer, {
   sendPointsEventStarted,
   trackPointsEvent,
 } from 'src/points/slice'
-import { ClaimHistory, GetHistoryResponse } from 'src/points/types'
+import { ClaimHistory, GetHistoryResponse, PointsEvent } from 'src/points/types'
 import Logger from 'src/utils/Logger'
 import * as fetchWithTimeout from 'src/utils/fetchWithTimeout'
 import networkConfig from 'src/web3/networkConfig'
+import { walletAddressSelector } from 'src/web3/selectors'
 import { createMockStore } from 'test/utils'
 import { mockAccount } from 'test/values'
 import { v4 as uuidv4 } from 'uuid'
@@ -45,6 +47,7 @@ jest.mock('src/statsig')
 
 jest.mock('uuid')
 jest.mock('src/utils/Logger')
+jest.unmock('src/pincode/authentication')
 
 const MOCK_HISTORY_RESPONSE: GetHistoryResponse = {
   data: [
@@ -567,3 +570,26 @@ describe('watchAppMounted', () => {
     expect(mockSendPendingPointsEvents).toHaveBeenCalledTimes(1)
   })
 })
+
+describe('fetchTrackPointsEventsEndpoint', () => {
+  it('should call fetch with correct params', async () => {
+    const mockEvent: PointsEvent = { activityId: 'create-wallet' }
+    mockFetch.mockResponseOnce(JSON.stringify({ ok: true }))
+
+    await expectSaga(fetchTrackPointsEventsEndpoint, mockEvent)
+      .provide([
+        [select(walletAddressSelector), mockAccount],
+        [call(retrieveSignedMessage), 'someSignedMessage'],
+      ])
+      .run()
+
+    expect(fetchWithTimeoutSpy).toHaveBeenCalledWith(networkConfig.trackPointsEventUrl, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        authorization: `Valora ${mockAccount}:someSignedMessage`,
+      },
+      body: JSON.stringify(mockEvent),
+    })
+  })
+})
diff --git a/src/points/saga.ts b/src/points/saga.ts
index f2b2922436..05f0317c97 100644
--- a/src/points/saga.ts
+++ b/src/points/saga.ts
@@ -1,6 +1,7 @@
 import { differenceInDays } from 'date-fns'
 import { Actions as AppActions } from 'src/app/actions'
 import { Actions as HomeActions } from 'src/home/actions'
+import { retrieveSignedMessage } from 'src/pincode/authentication'
 import {
   nextPageUrlSelector,
   pendingPointsEvents,
@@ -171,9 +172,16 @@ export function* getPointsConfig() {
   }
 }
 
-export async function fetchTrackPointsEventsEndpoint(event: PointsEvent) {
-  return fetchWithTimeout(networkConfig.trackPointsEventUrl, {
+export function* fetchTrackPointsEventsEndpoint(event: PointsEvent) {
+  const address = yield* select(walletAddressSelector)
+  const signedMessage = yield* call(retrieveSignedMessage)
+
+  return yield* call(fetchWithTimeout, networkConfig.trackPointsEventUrl, {
     method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      authorization: `Valora ${address}:${signedMessage}`,
+    },
     body: JSON.stringify(event),
   })
 }

From 848148ea4c5ee15a9f67e3c187bee9fa3ceb3ff5 Mon Sep 17 00:00:00 2001
From: Jean Regisser <jean.regisser@gmail.com>
Date: Thu, 16 May 2024 14:46:56 +0200
Subject: [PATCH 006/133] feat(swap): show app fee details inline (#5419)

### Description

This shows the app fee details directly as a line item.

### Test plan

- Updated tests

| No quote | Valora fee disabled or 0 fee from API | Valora fee > 0 from
API | Valora fee > 0 from API, but no USD price |
|----------|----------|----------|----------|
|
![image](https://github.com/valora-inc/wallet/assets/57791/a7436591-9690-431d-9053-9c9240ca68c3)
|
![image](https://github.com/valora-inc/wallet/assets/57791/a8535de3-37a2-408a-b87a-7036072d1ef4)
|
![image](https://github.com/valora-inc/wallet/assets/57791/f4801a54-8d02-4f56-b8b0-bd240fdf3b94)
|
![image](https://github.com/valora-inc/wallet/assets/57791/37b06389-7a0d-4df3-8c2c-98bce0a6bcb7)
|
|
![image](https://github.com/valora-inc/wallet/assets/57791/79fb8630-f8f7-474b-835c-c9c9e9ffcd81)
|
![image](https://github.com/valora-inc/wallet/assets/57791/6056b8f5-d935-4ec4-a203-07eef1b995f8)
|
![image](https://github.com/valora-inc/wallet/assets/57791/c98b1b00-3b15-4072-96b5-823b944bcd8d)
|
![image](https://github.com/valora-inc/wallet/assets/57791/d6b44206-6663-4ab0-bdd7-302f3d8f4589)
|

Notes:
- copies are not final

### Related issues

- Fixes [RET-1061](https://linear.app/valora/issue/RET-1061)

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 __mocks__/react-i18next.js                    |   4 +-
 locales/base/translation.json                 |   9 ++
 src/analytics/Properties.tsx                  |   1 +
 ...tReminderSummaryNotification.test.tsx.snap |   4 +-
 .../SummaryNotification.test.tsx.snap         |   2 +-
 src/swap/SwapScreen.test.tsx                  |  62 +++++-----
 src/swap/SwapScreen.tsx                       |  50 ++++++--
 src/swap/SwapTransactionDetails.test.tsx      | 114 ++++++++++++++++--
 src/swap/SwapTransactionDetails.tsx           |  74 +++++++++---
 9 files changed, 256 insertions(+), 64 deletions(-)

diff --git a/__mocks__/react-i18next.js b/__mocks__/react-i18next.js
index ea036b7a1c..aacc7a5ca3 100644
--- a/__mocks__/react-i18next.js
+++ b/__mocks__/react-i18next.js
@@ -2,10 +2,10 @@
 const React = require('react')
 const reactI18next = require('react-i18next')
 
-const renderTrans = ({ i18nKey, tOptions, children }) => {
+const renderTrans = ({ i18nKey, tOptions, context, children }) => {
   return (
     <React.Fragment>
-      {translationFunction(i18nKey, tOptions)}
+      {translationFunction(i18nKey, { ...(context && { context }), ...tOptions })}
       {children}
     </React.Fragment>
   )
diff --git a/locales/base/translation.json b/locales/base/translation.json
index 2d3ae7f860..b2db05fe18 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -1817,6 +1817,15 @@
       "networkFeeNoNetwork": "Network Fee",
       "swapFee": "{{appName}} Fee",
       "swapFeeWaived": "Free",
+      "appFee": "{{appName}} Fee",
+      "appFeeValue": "<0></0> <1>(<0></0>)</1>",
+      "appFeeValue_withoutPriceUsd": "<0></0>",
+      "appFeeValue_free": "Free",
+      "appFeeValue_placeholder": "-",
+      "appFeeInfo": "{{appName}} Fee\n\nWe charge a fee to swap tokens on {{appName}}. The fee is {{appFeePercentage}}% of the amount you are exchanging.",
+      "appFeeInfo_free": "{{appName}} Fee\n\nThis swap is free of charge.",
+      "appFeeInfo_placeholder": "{{appName}} Fee\n\nThe fee is calculated based on the quote you receive.",
+      "appFeeInfoDismissButton": "Got it",
       "slippagePercentage": "Slippage Tolerance",
       "networkFeeInfo": "You are swapping on the {{networkName}} Network.\n\nThis estimated network fee is required to conduct a transaction on the {{networkName}} Network. This fee secures your transaction and goes towards keeping the network operational.",
       "networkFeeInfoV1_76": "You are swapping on the {{networkName}} Network.\n\nA network fee is required to conduct a transaction on the {{networkName}} Network. This fee secures your transaction and is paid to network validators.\n\nSince network conditions determine the exact amount, the listed estimate is what we expect the actual fee to be. The fee will not exceed the max fee amount.",
diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 1c9fa92817..1e08c5c997 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -1252,6 +1252,7 @@ export enum SwapShowInfoType {
   ESTIMATED_NETWORK_FEE,
   SLIPPAGE,
   EXCHANGE_RATE,
+  APP_FEE,
 }
 interface SwapEventsProperties {
   [SwapEvents.swap_screen_open]: undefined
diff --git a/src/escrow/__snapshots__/EscrowedPaymentReminderSummaryNotification.test.tsx.snap b/src/escrow/__snapshots__/EscrowedPaymentReminderSummaryNotification.test.tsx.snap
index a564b2f304..849f179680 100644
--- a/src/escrow/__snapshots__/EscrowedPaymentReminderSummaryNotification.test.tsx.snap
+++ b/src/escrow/__snapshots__/EscrowedPaymentReminderSummaryNotification.test.tsx.snap
@@ -84,7 +84,7 @@ exports[`EscrowedPaymentReminderSummaryNotification renders correctly 1`] = `
         }
         testID="undefined/Details"
       >
-        escrowedPaymentReminderSummaryDetails
+        escrowedPaymentReminderSummaryDetails, {"context":"exactly2Items"}
       </Text>
       <View
         style={
@@ -526,7 +526,7 @@ exports[`EscrowedPaymentReminderSummaryNotification when more than 2 requests re
         }
         testID="undefined/Details"
       >
-        escrowedPaymentReminderSummaryDetails
+        escrowedPaymentReminderSummaryDetails, {"context":"exactly2Items"}
       </Text>
       <View
         style={
diff --git a/src/notifications/__snapshots__/SummaryNotification.test.tsx.snap b/src/notifications/__snapshots__/SummaryNotification.test.tsx.snap
index 2459490462..22c48d9677 100644
--- a/src/notifications/__snapshots__/SummaryNotification.test.tsx.snap
+++ b/src/notifications/__snapshots__/SummaryNotification.test.tsx.snap
@@ -77,7 +77,7 @@ exports[`SummaryNotification renders correctly 1`] = `
         }
         testID="undefined/Details"
       >
-        someI18nKey
+        someI18nKey, {"context":"moreThan3Items"}
       </Text>
       <View
         style={
diff --git a/src/swap/SwapScreen.test.tsx b/src/swap/SwapScreen.test.tsx
index 7e2cc7482c..b6064b1829 100644
--- a/src/swap/SwapScreen.test.tsx
+++ b/src/swap/SwapScreen.test.tsx
@@ -1204,8 +1204,10 @@ describe('SwapScreen', () => {
     expect(getByTestId('SwapTransactionDetails/EstimatedNetworkFee')).toHaveTextContent('-')
     expect(transactionDetails).toHaveTextContent('swapScreen.transactionDetails.maxNetworkFee')
     expect(getByTestId('SwapTransactionDetails/MaxNetworkFee')).toHaveTextContent('-')
-    expect(transactionDetails).toHaveTextContent('swapScreen.transactionDetails.swapFee')
-    expect(transactionDetails).toHaveTextContent('swapScreen.transactionDetails.swapFeeWaived')
+    expect(transactionDetails).toHaveTextContent('swapScreen.transactionDetails.appFee')
+    expect(transactionDetails).toHaveTextContent(
+      'swapScreen.transactionDetails.appFeeValue, {"context":"placeholder","appFeePercentage":"0"}'
+    )
     expect(transactionDetails).toHaveTextContent('swapScreen.transactionDetails.slippagePercentage')
     expect(getByTestId('SwapTransactionDetails/Slippage')).toHaveTextContent('0.3%')
 
@@ -1818,7 +1820,7 @@ describe('SwapScreen', () => {
 
   describe('app fee', () => {
     describe('when disabled', () => {
-      it('should show the free swap fee line item and exchange rate without fees when tapping the exchange rate info button', async () => {
+      it('should show the free app fee line item', async () => {
         mockFetch.mockResponse(defaultQuoteResponse)
         const { swapScreen, swapFromContainer, getByText, getByTestId } = renderScreen({})
 
@@ -1846,14 +1848,18 @@ describe('SwapScreen', () => {
         expect(getByTestId('SwapTransactionDetails/ExchangeRate')).toHaveTextContent(
           '1 CELO ≈ 1.23456 cUSD'
         )
-        expect(getByText('swapScreen.transactionDetails.swapFee')).toBeTruthy()
-        expect(getByText('swapScreen.transactionDetails.swapFeeWaived')).toBeTruthy()
+        expect(getByText('swapScreen.transactionDetails.appFee')).toBeTruthy()
+        expect(getByTestId('SwapTransactionDetails/AppFee')).toHaveTextContent(
+          'swapScreen.transactionDetails.appFeeValue, {"context":"free","appFeePercentage":"0"}'
+        )
 
-        fireEvent.press(getByText('swapScreen.transactionDetails.exchangeRate'))
+        fireEvent.press(getByText('swapScreen.transactionDetails.appFee'))
 
-        const exchangeRateInfo =
-          'swapScreen.transactionDetails.exchangeRateInfo, {"context":"","networkName":"Celo Alfajores","slippagePercentage":"0.3"}'
-        expect(getByText(exchangeRateInfo)).toBeTruthy()
+        expect(
+          getByText(
+            'swapScreen.transactionDetails.appFeeInfo, {"networkName":"Celo Alfajores","context":"free","appFeePercentage":"0"}'
+          )
+        ).toBeTruthy()
       })
     })
 
@@ -1868,11 +1874,9 @@ describe('SwapScreen', () => {
         })
       })
 
-      it('should hide the free swap fee line item and show the exchange rate without the app fee when tapping the exchange rate info button, when the quote does not include a positive app fee', async () => {
+      it('should show the free app fee line item, when the quote does not include a positive app fee', async () => {
         mockFetch.mockResponse(defaultQuoteResponse)
-        const { swapScreen, swapFromContainer, getByText, getByTestId, queryByText } = renderScreen(
-          {}
-        )
+        const { swapScreen, swapFromContainer, getByText, getByTestId } = renderScreen({})
 
         selectSwapTokens('CELO', 'cUSD', swapScreen)
         fireEvent.changeText(
@@ -1898,17 +1902,21 @@ describe('SwapScreen', () => {
         expect(getByTestId('SwapTransactionDetails/ExchangeRate')).toHaveTextContent(
           '1 CELO ≈ 1.23456 cUSD'
         )
-        expect(queryByText('swapScreen.transactionDetails.swapFee')).toBeFalsy()
-        expect(queryByText('swapScreen.transactionDetails.swapFeeWaived')).toBeFalsy()
+        expect(getByText('swapScreen.transactionDetails.appFee')).toBeTruthy()
+        expect(getByTestId('SwapTransactionDetails/AppFee')).toHaveTextContent(
+          'swapScreen.transactionDetails.appFeeValue, {"context":"free","appFeePercentage":"0"}'
+        )
 
-        fireEvent.press(getByText('swapScreen.transactionDetails.exchangeRate'))
+        fireEvent.press(getByText('swapScreen.transactionDetails.appFee'))
 
-        const exchangeRateInfo =
-          'swapScreen.transactionDetails.exchangeRateInfo, {"context":"","networkName":"Celo Alfajores","slippagePercentage":"0.3"}'
-        expect(getByText(exchangeRateInfo)).toBeTruthy()
+        expect(
+          getByText(
+            'swapScreen.transactionDetails.appFeeInfo, {"networkName":"Celo Alfajores","context":"free","appFeePercentage":"0"}'
+          )
+        ).toBeTruthy()
       })
 
-      it('should hide the free swap fee line item and show the exchange rate with the app fee when tapping the exchange rate info button, when the quote includes a positive app fee', async () => {
+      it('should show the app fee line item when the quote includes a positive app fee', async () => {
         mockFetch.mockResponse(
           JSON.stringify({
             ...defaultQuote,
@@ -1918,9 +1926,7 @@ describe('SwapScreen', () => {
             },
           })
         )
-        const { swapScreen, swapFromContainer, getByText, getByTestId, queryByText } = renderScreen(
-          {}
-        )
+        const { swapScreen, swapFromContainer, getByText, getByTestId } = renderScreen({})
 
         selectSwapTokens('CELO', 'cUSD', swapScreen)
         fireEvent.changeText(
@@ -1946,14 +1952,16 @@ describe('SwapScreen', () => {
         expect(getByTestId('SwapTransactionDetails/ExchangeRate')).toHaveTextContent(
           '1 CELO ≈ 1.23456 cUSD'
         )
-        expect(queryByText('swapScreen.transactionDetails.swapFee')).toBeFalsy()
-        expect(queryByText('swapScreen.transactionDetails.swapFeeWaived')).toBeFalsy()
+        expect(getByText('swapScreen.transactionDetails.appFee')).toBeTruthy()
+        expect(getByTestId('SwapTransactionDetails/AppFee')).toHaveTextContent(
+          'swapScreen.transactionDetails.appFeeValue, {"appFeePercentage":"2"}~₱0.430.025 CELO'
+        )
 
-        fireEvent.press(getByText('swapScreen.transactionDetails.exchangeRate'))
+        fireEvent.press(getByText('swapScreen.transactionDetails.appFee'))
 
         expect(
           getByText(
-            'swapScreen.transactionDetails.exchangeRateInfo, {"context":"withAppFee","networkName":"Celo Alfajores","slippagePercentage":"0.3","appFeePercentage":"2"}'
+            'swapScreen.transactionDetails.appFeeInfo, {"networkName":"Celo Alfajores","appFeePercentage":"2"}'
           )
         ).toBeTruthy()
       })
diff --git a/src/swap/SwapScreen.tsx b/src/swap/SwapScreen.tsx
index b4b95e010a..1127a61555 100644
--- a/src/swap/SwapScreen.tsx
+++ b/src/swap/SwapScreen.tsx
@@ -231,6 +231,7 @@ export function SwapScreen({ route }: Props) {
   const preparedTransactionsReviewBottomSheetRef = useRef<BottomSheetRefType>(null)
   const exchangeRateInfoBottomSheetRef = useRef<BottomSheetRefType>(null)
   const networkFeeInfoBottomSheetRef = useRef<BottomSheetRefType>(null)
+  const appFeeInfoBottomSheetRef = useRef<BottomSheetRefType>(null)
   const slippageInfoBottomSheetRef = useRef<BottomSheetRefType>(null)
   const fundYourWalletBottomSheetRef = useRef<BottomSheetRefType>(null)
   const tokensWithBalance = useTokensWithTokenBalance()
@@ -634,9 +635,19 @@ export function SwapScreen({ route }: Props) {
     return getNetworkFee(quote, fromToken?.networkId)
   }, [fromToken, quote])
 
-  const appFeePercentage = quote?.appFeePercentageIncludedInPrice
-    ? new BigNumber(quote.appFeePercentageIncludedInPrice)
-    : undefined
+  const appFee = useMemo(() => {
+    if (!quote || !fromToken) {
+      return undefined
+    }
+
+    const percentage = new BigNumber(quote.appFeePercentageIncludedInPrice || 0)
+
+    return {
+      amount: parsedSwapAmount[Field.FROM].multipliedBy(percentage).dividedBy(100),
+      token: fromToken,
+      percentage,
+    }
+  }, [quote, parsedSwapAmount, fromToken])
 
   useEffect(() => {
     if (showPriceImpactWarning || showMissingPriceImpactWarning) {
@@ -735,10 +746,11 @@ export function SwapScreen({ route }: Props) {
             fromToken={fromToken}
             toToken={toToken}
             exchangeRatePrice={quote?.price}
+            exchangeRateInfoBottomSheetRef={exchangeRateInfoBottomSheetRef}
             swapAmount={parsedSwapAmount[Field.FROM]}
             fetchingSwapQuote={quoteUpdatePending}
-            enableAppFee={enableAppFee}
-            exchangeRateInfoBottomSheetRef={exchangeRateInfoBottomSheetRef}
+            appFee={appFee}
+            appFeeInfoBottomSheetRef={appFeeInfoBottomSheetRef}
           />
           {showSwitchedToNetworkWarning && (
             <InLineNotification
@@ -854,10 +866,10 @@ export function SwapScreen({ route }: Props) {
       <BottomSheet
         forwardedRef={exchangeRateInfoBottomSheetRef}
         description={t('swapScreen.transactionDetails.exchangeRateInfo', {
-          context: appFeePercentage?.isGreaterThan(0) ? 'withAppFee' : '',
+          context: appFee?.percentage?.isGreaterThan(0) ? 'withAppFee' : '',
           networkName: NETWORK_NAMES[fromToken?.networkId || networkConfig.defaultNetworkId],
           slippagePercentage: parsedSlippagePercentage,
-          appFeePercentage: appFeePercentage?.toFormat(),
+          appFeePercentage: appFee?.percentage?.toFormat(),
         })}
         testId="ExchangeRateInfoBottomSheet"
       >
@@ -888,6 +900,30 @@ export function SwapScreen({ route }: Props) {
           text={t('swapScreen.transactionDetails.networkFeeInfoDismissButton')}
         />
       </BottomSheet>
+      <BottomSheet
+        forwardedRef={appFeeInfoBottomSheetRef}
+        description={t('swapScreen.transactionDetails.appFeeInfo', {
+          networkName: NETWORK_NAMES[fromToken?.networkId || networkConfig.defaultNetworkId],
+          context:
+            !appFee || fetchingSwapQuote
+              ? 'placeholder'
+              : appFee.percentage.isLessThanOrEqualTo(0)
+                ? 'free'
+                : undefined,
+          appFeePercentage: appFee?.percentage?.toFormat(),
+        })}
+        testId="AppFeeInfoBottomSheet"
+      >
+        <Button
+          type={BtnTypes.SECONDARY}
+          size={BtnSizes.FULL}
+          style={styles.bottomSheetButton}
+          onPress={() => {
+            appFeeInfoBottomSheetRef.current?.close()
+          }}
+          text={t('swapScreen.transactionDetails.appFeeInfoDismissButton')}
+        />
+      </BottomSheet>
       <BottomSheet
         forwardedRef={slippageInfoBottomSheetRef}
         description={t('swapScreen.transactionDetails.slippageToleranceInfo')}
diff --git a/src/swap/SwapTransactionDetails.test.tsx b/src/swap/SwapTransactionDetails.test.tsx
index 96cb4e10d7..e29543ddb9 100644
--- a/src/swap/SwapTransactionDetails.test.tsx
+++ b/src/swap/SwapTransactionDetails.test.tsx
@@ -21,8 +21,8 @@ describe('SwapTransactionDetails', () => {
           networkFeeInfoBottomSheetRef={{ current: null }}
           slippageInfoBottomSheetRef={{ current: null }}
           exchangeRateInfoBottomSheetRef={{ current: null }}
+          appFeeInfoBottomSheetRef={{ current: null }}
           feeTokenId={'someId'}
-          enableAppFee={false}
           slippagePercentage={'0.5'}
           fetchingSwapQuote={false}
           fromToken={{
@@ -53,8 +53,8 @@ describe('SwapTransactionDetails', () => {
           networkFeeInfoBottomSheetRef={{ current: null }}
           slippageInfoBottomSheetRef={{ current: null }}
           exchangeRateInfoBottomSheetRef={{ current: null }}
+          appFeeInfoBottomSheetRef={{ current: null }}
           feeTokenId={'someId'}
-          enableAppFee={false}
           slippagePercentage={'0.5'}
           fetchingSwapQuote={false}
         />
@@ -79,8 +79,8 @@ describe('SwapTransactionDetails', () => {
           networkFeeInfoBottomSheetRef={{ current: null }}
           slippageInfoBottomSheetRef={{ current: null }}
           exchangeRateInfoBottomSheetRef={{ current: null }}
+          appFeeInfoBottomSheetRef={{ current: null }}
           feeTokenId={mockCeloTokenId}
-          enableAppFee={false}
           slippagePercentage={'0.5'}
           fromToken={mockCeloTokenBalance}
           fetchingSwapQuote={false}
@@ -110,7 +110,7 @@ describe('SwapTransactionDetails', () => {
           networkFeeInfoBottomSheetRef={{ current: null }}
           slippageInfoBottomSheetRef={{ current: null }}
           exchangeRateInfoBottomSheetRef={{ current: null }}
-          enableAppFee={false}
+          appFeeInfoBottomSheetRef={{ current: null }}
           feeTokenId={mockCeloTokenId}
           slippagePercentage={'0.5'}
           fromToken={mockCeloTokenBalance}
@@ -125,8 +125,68 @@ describe('SwapTransactionDetails', () => {
     expect(getByTestId('SwapTransactionDetails/Slippage/MoreInfo')).not.toBeDisabled()
   })
 
-  it('should render correctly when app fee is enabled', () => {
-    const { queryByText } = render(
+  it('should render correctly when app fee is >= 0 and token has USD price', () => {
+    const { getByText, getByTestId } = render(
+      <Provider store={createMockStore()}>
+        <SwapTransactionDetails
+          maxNetworkFee={new BigNumber(0.0001)}
+          estimatedNetworkFee={new BigNumber(0.00005)}
+          networkFeeInfoBottomSheetRef={{ current: null }}
+          slippageInfoBottomSheetRef={{ current: null }}
+          exchangeRateInfoBottomSheetRef={{ current: null }}
+          appFeeInfoBottomSheetRef={{ current: null }}
+          appFee={{
+            amount: new BigNumber(0.02),
+            token: mockCeloTokenBalance,
+            percentage: new BigNumber(7.7),
+          }}
+          feeTokenId={mockCeloTokenId}
+          slippagePercentage={'0.5'}
+          fromToken={mockCeloTokenBalance}
+          fetchingSwapQuote={false}
+        />
+      </Provider>
+    )
+
+    expect(getByText('swapScreen.transactionDetails.appFee')).toBeTruthy()
+    // Content is a bit weird to read here because of the way we render translations in tests
+    expect(getByTestId('SwapTransactionDetails/AppFee')).toHaveTextContent(
+      'swapScreen.transactionDetails.appFeeValue, {"appFeePercentage":"7.7"}~₱0.130.02 CELO'
+    )
+  })
+
+  it('should render correctly when app fee is >= 0 and token has no USD price', () => {
+    const { getByText, getByTestId } = render(
+      <Provider store={createMockStore()}>
+        <SwapTransactionDetails
+          maxNetworkFee={new BigNumber(0.0001)}
+          estimatedNetworkFee={new BigNumber(0.00005)}
+          networkFeeInfoBottomSheetRef={{ current: null }}
+          slippageInfoBottomSheetRef={{ current: null }}
+          exchangeRateInfoBottomSheetRef={{ current: null }}
+          appFeeInfoBottomSheetRef={{ current: null }}
+          appFee={{
+            amount: new BigNumber(0.02),
+            token: { ...mockCeloTokenBalance, priceUsd: null },
+            percentage: new BigNumber(7.7),
+          }}
+          feeTokenId={mockCeloTokenId}
+          slippagePercentage={'0.5'}
+          fromToken={mockCeloTokenBalance}
+          fetchingSwapQuote={false}
+        />
+      </Provider>
+    )
+
+    expect(getByText('swapScreen.transactionDetails.appFee')).toBeTruthy()
+    // Content is a bit weird to read here because of the way we render translations in tests
+    expect(getByTestId('SwapTransactionDetails/AppFee')).toHaveTextContent(
+      'swapScreen.transactionDetails.appFeeValue, {"context":"withoutPriceUsd","appFeePercentage":"7.7"}0.02 CELO'
+    )
+  })
+
+  it('should render correctly when app fee is 0', () => {
+    const { getByText, getByTestId } = render(
       <Provider store={createMockStore()}>
         <SwapTransactionDetails
           maxNetworkFee={new BigNumber(0.0001)}
@@ -134,7 +194,12 @@ describe('SwapTransactionDetails', () => {
           networkFeeInfoBottomSheetRef={{ current: null }}
           slippageInfoBottomSheetRef={{ current: null }}
           exchangeRateInfoBottomSheetRef={{ current: null }}
-          enableAppFee={true}
+          appFeeInfoBottomSheetRef={{ current: null }}
+          appFee={{
+            amount: new BigNumber(0),
+            token: mockCeloTokenBalance,
+            percentage: new BigNumber(0),
+          }}
           feeTokenId={mockCeloTokenId}
           slippagePercentage={'0.5'}
           fromToken={mockCeloTokenBalance}
@@ -143,9 +208,36 @@ describe('SwapTransactionDetails', () => {
       </Provider>
     )
 
-    // When app fee is enabled, the free swap fee should not be displayed
-    // it's part of the exchange rate
-    expect(queryByText('swapScreen.transactionDetails.swapFee')).toBeFalsy()
-    expect(queryByText('swapScreen.transactionDetails.swapFeeWaived')).toBeFalsy()
+    expect(getByText('swapScreen.transactionDetails.appFee')).toBeTruthy()
+    // Content is a bit weird to read here because of the way we render translations in tests
+    expect(getByTestId('SwapTransactionDetails/AppFee')).toHaveTextContent(
+      'swapScreen.transactionDetails.appFeeValue, {"context":"free","appFeePercentage":"0"}~₱0.000.00 CELO'
+    )
+  })
+
+  it('should render correctly when app fee is undefined', () => {
+    const { getByText, getByTestId } = render(
+      <Provider store={createMockStore()}>
+        <SwapTransactionDetails
+          maxNetworkFee={new BigNumber(0.0001)}
+          estimatedNetworkFee={new BigNumber(0.00005)}
+          networkFeeInfoBottomSheetRef={{ current: null }}
+          slippageInfoBottomSheetRef={{ current: null }}
+          exchangeRateInfoBottomSheetRef={{ current: null }}
+          appFeeInfoBottomSheetRef={{ current: null }}
+          appFee={undefined}
+          feeTokenId={mockCeloTokenId}
+          slippagePercentage={'0.5'}
+          fromToken={mockCeloTokenBalance}
+          fetchingSwapQuote={false}
+        />
+      </Provider>
+    )
+
+    expect(getByText('swapScreen.transactionDetails.appFee')).toBeTruthy()
+    // Content is a bit weird to read here because of the way we render translations in tests
+    expect(getByTestId('SwapTransactionDetails/AppFee')).toHaveTextContent(
+      'swapScreen.transactionDetails.appFeeValue, {"context":"placeholder","appFeePercentage":"0"}'
+    )
   })
 })
diff --git a/src/swap/SwapTransactionDetails.tsx b/src/swap/SwapTransactionDetails.tsx
index 52c11c9b04..14a7212b8f 100644
--- a/src/swap/SwapTransactionDetails.tsx
+++ b/src/swap/SwapTransactionDetails.tsx
@@ -1,6 +1,6 @@
 import BigNumber from 'bignumber.js'
 import React from 'react'
-import { useTranslation } from 'react-i18next'
+import { Trans, useTranslation } from 'react-i18next'
 import { StyleSheet, Text, View } from 'react-native'
 import { SwapEvents } from 'src/analytics/Events'
 import { SwapShowInfoType } from 'src/analytics/Properties'
@@ -24,10 +24,15 @@ interface Props {
   fromToken?: TokenBalance
   toToken?: TokenBalance
   exchangeRatePrice?: string
+  exchangeRateInfoBottomSheetRef: React.RefObject<BottomSheetRefType>
   swapAmount?: BigNumber
   fetchingSwapQuote: boolean
-  enableAppFee: boolean
-  exchangeRateInfoBottomSheetRef: React.RefObject<BottomSheetRefType>
+  appFee?: {
+    amount: BigNumber
+    token: TokenBalance
+    percentage: BigNumber
+  }
+  appFeeInfoBottomSheetRef: React.RefObject<BottomSheetRefType>
 }
 
 function LabelWithInfo({
@@ -131,10 +136,11 @@ export function SwapTransactionDetails({
   fromToken,
   toToken,
   exchangeRatePrice,
+  exchangeRateInfoBottomSheetRef,
   swapAmount,
   fetchingSwapQuote,
-  enableAppFee,
-  exchangeRateInfoBottomSheetRef,
+  appFee,
+  appFeeInfoBottomSheetRef,
 }: Props) {
   const { t } = useTranslation()
 
@@ -194,15 +200,52 @@ export function SwapTransactionDetails({
         placeholder={placeholder}
         testID={`SwapTransactionDetails/MaxNetworkFee`}
       />
-      {/* When enabled, the fee is part of the exchange rate */}
-      {!enableAppFee && (
-        <View style={styles.row}>
-          <Text style={styles.label}>{t('swapScreen.transactionDetails.swapFee')}</Text>
-          <Text testID={'SwapFee'} style={styles.value}>
-            {t('swapScreen.transactionDetails.swapFeeWaived')}
-          </Text>
-        </View>
-      )}
+      <View style={styles.row}>
+        <LabelWithInfo
+          onPress={() => {
+            ValoraAnalytics.track(SwapEvents.swap_show_info, {
+              type: SwapShowInfoType.APP_FEE,
+            })
+            appFeeInfoBottomSheetRef.current?.snapToIndex(0)
+          }}
+          label={t('swapScreen.transactionDetails.appFee')}
+          testID="SwapTransactionDetails/AppFee/MoreInfo"
+        />
+        <Text testID={'SwapTransactionDetails/AppFee'} style={styles.value}>
+          <Trans
+            i18nKey={'swapScreen.transactionDetails.appFeeValue'}
+            context={
+              !appFee || fetchingSwapQuote
+                ? 'placeholder'
+                : appFee.percentage.isLessThanOrEqualTo(0)
+                  ? 'free'
+                  : !appFee.token.priceUsd
+                    ? 'withoutPriceUsd'
+                    : undefined
+            }
+            tOptions={{ appFeePercentage: appFee?.percentage.toFormat() ?? '0' }}
+          >
+            {appFee && (
+              <TokenDisplay
+                amount={appFee.amount}
+                tokenId={appFee.token.tokenId}
+                showLocalAmount={!!appFee.token.priceUsd}
+                showApprox={!!appFee.token.priceUsd}
+                style={styles.value}
+              />
+            )}
+            {appFee && !!appFee.token.priceUsd && (
+              <Text style={styles.noBold}>
+                <TokenDisplay
+                  amount={appFee.amount}
+                  tokenId={appFee.token.tokenId}
+                  showLocalAmount={false}
+                />
+              </Text>
+            )}
+          </Trans>
+        </Text>
+      </View>
       <View style={styles.row} testID="SwapTransactionDetails/Slippage">
         <LabelWithInfo
           onPress={() => {
@@ -238,6 +281,9 @@ const styles = StyleSheet.create({
     color: colors.gray4,
     fontWeight: '600',
   },
+  noBold: {
+    fontWeight: '400',
+  },
   label: {
     ...typeScale.bodyXSmall,
     color: colors.gray4,

From 7eeac17b0a15dd0e165598e1249cb90afff1875f Mon Sep 17 00:00:00 2001
From: Alex Bakoushin <alex@bakoush.in>
Date: Thu, 16 May 2024 15:12:12 +0200
Subject: [PATCH 007/133] feat(points): points entry point and intro screen
 (#5406)

### Description

* Add points card to the "Discover" screen
* Add an intro screen to the points home page (shown only once)


https://github.com/valora-inc/wallet/assets/2737872/ef769852-a628-4e4c-8ce1-63ffcbb0345b

### Test plan

Updated unit tests

### Related issues

- Fixes RET-1077

### Backwards compatibility

NA

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 .../celo/src/images/points-illustration.png   | Bin 0 -> 603 bytes
 locales/base/translation.json                 |   9 ++
 scripts/sync_branding.sh                      |   2 +-
 src/analytics/Events.tsx                      |   4 +-
 src/analytics/Properties.tsx                  |   4 +-
 src/analytics/docs.ts                         |   4 +-
 src/components/PointsButton.tsx               |  30 ------
 src/dappsExplorer/TabDiscover.tsx             |   2 +
 src/images/Images.ts                          |   1 +
 src/navigator/Headers.tsx                     |   5 -
 src/navigator/Navigator.tsx                   |   2 +
 src/navigator/Screens.tsx                     |   1 +
 src/navigator/types.tsx                       |   1 +
 src/points/PointsDiscoverCard.test.tsx        |  75 ++++++++++++++
 src/points/PointsDiscoverCard.tsx             |  98 ++++++++++++++++++
 src/points/PointsIntro.test.tsx               |  67 ++++++++++++
 src/points/PointsIntro.tsx                    |  87 ++++++++++++++++
 src/points/selectors.ts                       |   4 +
 src/points/slice.test.ts                      |   7 ++
 src/points/slice.ts                           |   7 ++
 src/redux/migrations.test.ts                  |   9 ++
 src/redux/migrations.ts                       |   7 ++
 src/redux/store.test.ts                       |   3 +-
 src/redux/store.ts                            |   2 +-
 test/RootStateSchema.json                     |   5 +
 test/schemas.ts                               |  14 ++-
 26 files changed, 408 insertions(+), 42 deletions(-)
 create mode 100644 branding/celo/src/images/points-illustration.png
 delete mode 100644 src/components/PointsButton.tsx
 create mode 100644 src/points/PointsDiscoverCard.test.tsx
 create mode 100644 src/points/PointsDiscoverCard.tsx
 create mode 100644 src/points/PointsIntro.test.tsx
 create mode 100644 src/points/PointsIntro.tsx

diff --git a/branding/celo/src/images/points-illustration.png b/branding/celo/src/images/points-illustration.png
new file mode 100644
index 0000000000000000000000000000000000000000..c44f4a18bbbc83625436d2d676e8cae4e85db2f4
GIT binary patch
literal 603
zcmeAS@N?(olHy`uVBq!ia0vp^8-REZ2OE&QQL3T}q&N#aB8wRqxP?KOkzv*x37{Zj
zage(c!@6@aFM%AEbVpxD28NCO+<y{TfpQ-_T^vIy7~fuE<Yh46IABosf1cy<Nny_S
q&%JZFBF`Z_!=%x3lo&o?V10Z!OX<>|+a3Ya0)wZkpUXO@geCx<4Z#rr

literal 0
HcmV?d00001

diff --git a/locales/base/translation.json b/locales/base/translation.json
index b2db05fe18..1a2ab7af46 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -2338,6 +2338,15 @@
       "moreComing": {
         "title": "More coming soon!"
       }
+    },
+    "discoverCard": {
+      "title": "{{appName}} Points",
+      "description": "Earn points easily with {{appName}}. Using the app, including swapping, leads to points!"
+    },
+    "intro": {
+      "title": "Earn points effortlessly",
+      "description": "Jump into a new way to earn! Your {{appName}} actions now earn points. Start earning today and unlock awesome benefits.",
+      "cta": "Start your points journey"
     }
   },
   "earnFlow": {
diff --git a/scripts/sync_branding.sh b/scripts/sync_branding.sh
index 835099f9fc..64a01ee726 100755
--- a/scripts/sync_branding.sh
+++ b/scripts/sync_branding.sh
@@ -21,7 +21,7 @@ echo $mobile_root
 cd "$mobile_root"
 
 # Please update the sha when valora branding updates are needed
-valora_branding_sha=f62cc4419260fbab46b886f5b515e6eb2281402a
+valora_branding_sha=d55cad3a094165d124ada4d8c42a6401c5ec7f46
 
 if [[ "$branding" == "valora" ]]; then
   # prevents git from asking credentials
diff --git a/src/analytics/Events.tsx b/src/analytics/Events.tsx
index 7b69f1367c..f82cdce7e9 100644
--- a/src/analytics/Events.tsx
+++ b/src/analytics/Events.tsx
@@ -665,7 +665,9 @@ export enum JumpstartEvents {
 }
 
 export enum PointsEvents {
-  points_screen_open = 'points_screen_open',
+  points_discover_press = 'points_discover_press',
+  points_intro_dismiss = 'points_intro_dismiss',
+  points_intro_back = 'points_intro_back',
   points_screen_back = 'points_screen_back',
   points_screen_card_press = 'points_screen_card_press',
   points_screen_card_cta_press = 'points_screen_card_cta_press',
diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 1e08c5c997..8366943780 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -1558,7 +1558,9 @@ interface JumpstartEventsProperties {
 }
 
 interface PointsEventsProperties {
-  [PointsEvents.points_screen_open]: undefined
+  [PointsEvents.points_discover_press]: undefined
+  [PointsEvents.points_intro_dismiss]: undefined
+  [PointsEvents.points_intro_back]: undefined
   [PointsEvents.points_screen_back]: undefined
   [PointsEvents.points_screen_card_press]: {
     activityId: PointsActivityId
diff --git a/src/analytics/docs.ts b/src/analytics/docs.ts
index 567d5b9bef..4f8fe18b98 100644
--- a/src/analytics/docs.ts
+++ b/src/analytics/docs.ts
@@ -476,7 +476,9 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [RewardsEvents.claimed_reward]: ``,
 
   // Events related to Valora Points program
-  [PointsEvents.points_screen_open]: `when Points home screen is opened`,
+  [PointsEvents.points_discover_press]: `when points card is pressed in the discover tab`,
+  [PointsEvents.points_intro_dismiss]: `when points intro is dismissed`,
+  [PointsEvents.points_intro_back]: `when back button is pressed from points intro screen`,
   [PointsEvents.points_screen_back]: `when back button is pressed from Points home screen`,
   [PointsEvents.points_screen_card_press]: `when an activity card is pressed from Points home screen`,
   [PointsEvents.points_screen_card_cta_press]: `when a CTA is pressed on an activity card bottom sheet from the Points home screen`,
diff --git a/src/components/PointsButton.tsx b/src/components/PointsButton.tsx
deleted file mode 100644
index 35e0d9a348..0000000000
--- a/src/components/PointsButton.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react'
-import { StyleProp, ViewStyle } from 'react-native'
-import { PointsEvents } from 'src/analytics/Events'
-import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
-import AttentionIcon from 'src/icons/Attention'
-import { navigate } from 'src/navigator/NavigationService'
-import { Screens } from 'src/navigator/Screens'
-import { TopBarIconButtonV2 } from 'src/navigator/TopBarIconButtonV2'
-
-interface Props {
-  style?: StyleProp<ViewStyle>
-  size?: number
-  testID?: string
-}
-
-export default function PointsButton({ testID, size, style }: Props) {
-  const onPress = () => {
-    ValoraAnalytics.track(PointsEvents.points_screen_open)
-    navigate(Screens.PointsHome)
-  }
-
-  return (
-    <TopBarIconButtonV2
-      icon={<AttentionIcon size={size} />}
-      testID={testID}
-      onPress={onPress}
-      style={style}
-    />
-  )
-}
diff --git a/src/dappsExplorer/TabDiscover.tsx b/src/dappsExplorer/TabDiscover.tsx
index 5d558323bd..97a77aadb9 100644
--- a/src/dappsExplorer/TabDiscover.tsx
+++ b/src/dappsExplorer/TabDiscover.tsx
@@ -39,6 +39,7 @@ import { currentLanguageSelector } from 'src/i18n/selectors'
 import { Screens } from 'src/navigator/Screens'
 import useScrollAwareHeader from 'src/navigator/ScrollAwareHeader'
 import { StackParamList } from 'src/navigator/types'
+import PointsDiscoverCard from 'src/points/PointsDiscoverCard'
 import { useDispatch, useSelector } from 'src/redux/hooks'
 import { Colors } from 'src/styles/colors'
 import fontStyles, { typeScale } from 'src/styles/fonts'
@@ -235,6 +236,7 @@ function TabDiscover({ navigation }: Props) {
                   </Text>
                 }
                 <DappFeaturedActions onPressShowDappRankings={handleShowDappRankings} />
+                <PointsDiscoverCard />
                 <EarnCardDiscover
                   poolTokenId={networkConfig.aaveArbUsdcTokenId}
                   depositTokenId={networkConfig.arbUsdcTokenId}
diff --git a/src/images/Images.ts b/src/images/Images.ts
index 56661cb760..e1d321f9bd 100644
--- a/src/images/Images.ts
+++ b/src/images/Images.ts
@@ -39,3 +39,4 @@ export const earn1 = require('src/images/earn1.png')
 export const earn2 = require('src/images/earn2.png')
 export const earn3 = require('src/images/earn3.png')
 export const lightningPhone = require('src/images/lightning-phone.png')
+export const pointsIllustration = require('src/images/points-illustration.png')
diff --git a/src/navigator/Headers.tsx b/src/navigator/Headers.tsx
index 87b3852b5f..547b1dd0de 100644
--- a/src/navigator/Headers.tsx
+++ b/src/navigator/Headers.tsx
@@ -8,7 +8,6 @@ import CancelButton from 'src/components/CancelButton'
 import CloseButton from 'src/components/CloseButton'
 import CurrencyDisplay from 'src/components/CurrencyDisplay'
 import LegacyTokenDisplay from 'src/components/LegacyTokenDisplay'
-import PointsButton from 'src/components/PointsButton'
 import QrScanButton from 'src/components/QrScanButton'
 import TokenDisplay from 'src/components/TokenDisplay'
 import NotificationBell from 'src/home/NotificationBell'
@@ -17,8 +16,6 @@ import BackChevronCentered from 'src/icons/BackChevronCentered'
 import { navigateBack } from 'src/navigator/NavigationService'
 import { TopBarIconButton } from 'src/navigator/TopBarButton'
 import DisconnectBanner from 'src/shared/DisconnectBanner'
-import { getFeatureGate } from 'src/statsig'
-import { StatsigFeatureGates } from 'src/statsig/types'
 import colors from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
 import { Spacing } from 'src/styles/styles'
@@ -286,10 +283,8 @@ export function HeaderTitleWithSubtitle({
 export const tabHeader: NativeStackNavigationOptions = {
   ...emptyHeader,
   headerRight: () => {
-    const showPoints = getFeatureGate(StatsigFeatureGates.SHOW_POINTS)
     return (
       <View style={[styles.topElementsContainer, { marginRight: Spacing.Tiny4 }]}>
-        {showPoints && <PointsButton testID={'WalletHome/PointsButton'} />}
         <QrScanButton testID="WalletHome/QRScanButton" />
         <NotificationBell testID="WalletHome/NotificationBell" />
       </View>
diff --git a/src/navigator/Navigator.tsx b/src/navigator/Navigator.tsx
index 96465b1b73..027417b2d0 100644
--- a/src/navigator/Navigator.tsx
+++ b/src/navigator/Navigator.tsx
@@ -99,6 +99,7 @@ import Welcome from 'src/onboarding/welcome/Welcome'
 import PincodeEnter from 'src/pincode/PincodeEnter'
 import PincodeSet from 'src/pincode/PincodeSet'
 import PointsHome from 'src/points/PointsHome'
+import PointsIntro from 'src/points/PointsIntro'
 import { RootState } from 'src/redux/reducers'
 import { store } from 'src/redux/store'
 import SendConfirmation, { sendConfirmationScreenNavOptions } from 'src/send/SendConfirmation'
@@ -578,6 +579,7 @@ const assetScreens = (Navigator: typeof Stack) => (
 const pointsScreens = (Navigator: typeof Stack) => (
   <>
     <Navigator.Screen name={Screens.PointsHome} component={PointsHome} options={noHeader} />
+    <Navigator.Screen name={Screens.PointsIntro} component={PointsIntro} options={noHeader} />
   </>
 )
 const mapStateToProps = (state: RootState) => {
diff --git a/src/navigator/Screens.tsx b/src/navigator/Screens.tsx
index d178dfff6b..8905d8c77f 100644
--- a/src/navigator/Screens.tsx
+++ b/src/navigator/Screens.tsx
@@ -59,6 +59,7 @@ export enum Screens {
   PincodeEnter = 'PincodeEnter',
   PincodeSet = 'PincodeSet',
   PointsHome = 'PointsHome',
+  PointsIntro = 'PointsIntro',
   Profile = 'Profile',
   ProfileMenu = 'ProfileMenu',
   ProtectWallet = 'ProtectWallet',
diff --git a/src/navigator/types.tsx b/src/navigator/types.tsx
index f82de8944c..9ecdfdce01 100644
--- a/src/navigator/types.tsx
+++ b/src/navigator/types.tsx
@@ -201,6 +201,7 @@ export type StackParamList = {
       }
     | undefined
   [Screens.PointsHome]: undefined
+  [Screens.PointsIntro]: undefined
   [Screens.ProtectWallet]: undefined
   [Screens.OnboardingRecoveryPhrase]: undefined
   [Screens.Profile]: undefined
diff --git a/src/points/PointsDiscoverCard.test.tsx b/src/points/PointsDiscoverCard.test.tsx
new file mode 100644
index 0000000000..6b598f2749
--- /dev/null
+++ b/src/points/PointsDiscoverCard.test.tsx
@@ -0,0 +1,75 @@
+import { fireEvent, render } from '@testing-library/react-native'
+import React from 'react'
+import { Provider } from 'react-redux'
+import { PointsEvents } from 'src/analytics/Events'
+import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
+import { navigate } from 'src/navigator/NavigationService'
+import { Screens } from 'src/navigator/Screens'
+import PointsDiscoverCard from 'src/points/PointsDiscoverCard'
+import { RootState } from 'src/redux/store'
+import { getFeatureGate } from 'src/statsig/index'
+import { RecursivePartial, createMockStore } from 'test/utils'
+
+jest.mock('src/analytics/ValoraAnalytics')
+jest.mock('src/statsig')
+
+const renderPointsDiscoverCard = (storeOverrides?: RecursivePartial<RootState>) => {
+  const store = createMockStore(storeOverrides)
+
+  const tree = render(
+    <Provider store={store}>
+      <PointsDiscoverCard />
+    </Provider>
+  )
+
+  return {
+    store,
+    ...tree,
+  }
+}
+
+describe('PointsDiscoverCard', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+
+    jest.mocked(getFeatureGate).mockReturnValue(true)
+  })
+
+  it('renders when feature gate is enabled', () => {
+    const { getByText } = renderPointsDiscoverCard({ points: { pointsBalance: 'BALANCE_AMOUNT' } })
+
+    expect(getByText('points.discoverCard.title')).toBeTruthy()
+    expect(getByText('points.discoverCard.description')).toBeTruthy()
+    expect(getByText('BALANCE_AMOUNT')).toBeTruthy()
+  })
+
+  it('does not render when feature gate is disabled', () => {
+    jest.mocked(getFeatureGate).mockReturnValue(false)
+
+    const { queryByText } = renderPointsDiscoverCard()
+
+    expect(queryByText('points.discoverCard.title')).toBeFalsy()
+    expect(queryByText('points.discoverCard.description')).toBeFalsy()
+  })
+
+  it('tracks analytics event when pressed', () => {
+    const { getByText } = renderPointsDiscoverCard()
+
+    fireEvent.press(getByText('points.discoverCard.title'))
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(PointsEvents.points_discover_press)
+  })
+
+  it('takes to the points intro screen if it has not been dismissed', () => {
+    const { getByText } = renderPointsDiscoverCard()
+
+    fireEvent.press(getByText('points.discoverCard.title'))
+    expect(navigate).toHaveBeenCalledWith(Screens.PointsIntro)
+  })
+
+  it('takes to the points home screen if intro has been dismissed', () => {
+    const { getByText } = renderPointsDiscoverCard({ points: { introHasBeenDismissed: true } })
+
+    fireEvent.press(getByText('points.discoverCard.title'))
+    expect(navigate).toHaveBeenCalledWith(Screens.PointsHome)
+  })
+})
diff --git a/src/points/PointsDiscoverCard.tsx b/src/points/PointsDiscoverCard.tsx
new file mode 100644
index 0000000000..13f5ba946e
--- /dev/null
+++ b/src/points/PointsDiscoverCard.tsx
@@ -0,0 +1,98 @@
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import { StyleSheet, Text, View } from 'react-native'
+import { PointsEvents } from 'src/analytics/Events'
+import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
+import Touchable from 'src/components/Touchable'
+import LogoHeart from 'src/icons/LogoHeart'
+import { navigate } from 'src/navigator/NavigationService'
+import { Screens } from 'src/navigator/Screens'
+import { pointsBalanceSelector, pointsIntroHasBeenDismissedSelector } from 'src/points/selectors'
+import { useSelector } from 'src/redux/hooks'
+import { getFeatureGate } from 'src/statsig'
+import { StatsigFeatureGates } from 'src/statsig/types'
+import { Colors } from 'src/styles/colors'
+import { typeScale } from 'src/styles/fonts'
+import { Spacing } from 'src/styles/styles'
+
+export default function PointsDiscoverCard() {
+  const showPoints = getFeatureGate(StatsigFeatureGates.SHOW_POINTS)
+
+  const { t } = useTranslation()
+  const pointsBalance = useSelector(pointsBalanceSelector)
+  const pointsIntroHasBeenDismissed = useSelector(pointsIntroHasBeenDismissedSelector)
+
+  const handlePress = () => {
+    ValoraAnalytics.track(PointsEvents.points_discover_press)
+    if (pointsIntroHasBeenDismissed) {
+      navigate(Screens.PointsHome)
+    } else {
+      navigate(Screens.PointsIntro)
+    }
+  }
+
+  if (!showPoints) {
+    return null
+  }
+
+  return (
+    <View style={styles.container}>
+      <Touchable
+        style={styles.touchable}
+        borderRadius={Spacing.Smallest8}
+        onPress={handlePress}
+        testID="PointsDiscoverCard"
+      >
+        <>
+          <View style={styles.header}>
+            <Text style={styles.title}>{t('points.discoverCard.title')}</Text>
+            <View style={styles.pill}>
+              <Text style={styles.balance}>{pointsBalance}</Text>
+              <LogoHeart size={Spacing.Regular16} />
+            </View>
+          </View>
+          <Text style={styles.description}>{t('points.discoverCard.description')}</Text>
+        </>
+      </Touchable>
+    </View>
+  )
+}
+
+const styles = StyleSheet.create({
+  container: {
+    marginBottom: Spacing.Thick24,
+  },
+  touchable: {
+    padding: Spacing.Regular16,
+    gap: Spacing.Smallest8,
+    borderColor: Colors.gray2,
+    borderWidth: 1,
+    borderRadius: Spacing.Smallest8,
+  },
+  header: {
+    flexDirection: 'row',
+    alignItems: 'flex-start',
+    justifyContent: 'space-between',
+  },
+  pill: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    paddingHorizontal: Spacing.Small12,
+    paddingVertical: Spacing.Tiny4,
+    gap: Spacing.Tiny4,
+    backgroundColor: Colors.successLight,
+    borderRadius: 100,
+  },
+  title: {
+    ...typeScale.labelSemiBoldMedium,
+    color: Colors.black,
+  },
+  description: {
+    ...typeScale.bodyXSmall,
+    color: Colors.gray4,
+  },
+  balance: {
+    ...typeScale.labelSemiBoldXSmall,
+    color: Colors.successDark,
+  },
+})
diff --git a/src/points/PointsIntro.test.tsx b/src/points/PointsIntro.test.tsx
new file mode 100644
index 0000000000..5de4eabbb7
--- /dev/null
+++ b/src/points/PointsIntro.test.tsx
@@ -0,0 +1,67 @@
+import { fireEvent, render } from '@testing-library/react-native'
+import * as React from 'react'
+import { Provider } from 'react-redux'
+import { PointsEvents } from 'src/analytics/Events'
+import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
+import { Screens } from 'src/navigator/Screens'
+import PointsIntro from 'src/points/PointsIntro'
+import { pointsIntroDismissed } from 'src/points/slice'
+import { waitFor } from 'src/redux/sagas-helpers'
+import { RootState } from 'src/redux/store'
+import MockedNavigator from 'test/MockedNavigator'
+import { RecursivePartial, createMockStore, getMockStackScreenProps } from 'test/utils'
+
+jest.mock('src/analytics/ValoraAnalytics')
+
+const mockScreenProps = () => getMockStackScreenProps(Screens.PointsIntro)
+
+const renderPointsIntro = (storeOverrides?: RecursivePartial<RootState>) => {
+  const store = createMockStore(storeOverrides)
+
+  const tree = render(
+    <Provider store={store}>
+      <MockedNavigator component={PointsIntro} params={mockScreenProps()} />
+    </Provider>
+  )
+
+  return {
+    store,
+    ...tree,
+  }
+}
+
+describe(PointsIntro, () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('renders correctly', () => {
+    const { getByText } = renderPointsIntro()
+
+    expect(getByText('points.intro.title')).toBeTruthy()
+    expect(getByText('points.intro.description')).toBeTruthy()
+  })
+
+  it('updates the redux state on dismiss', () => {
+    const { store, getByText } = renderPointsIntro()
+
+    fireEvent.press(getByText('points.intro.cta'))
+    expect(store.getActions()).toContainEqual(pointsIntroDismissed())
+  })
+
+  it('tracks analytics event on dismiss', () => {
+    const { getByText } = renderPointsIntro()
+
+    fireEvent.press(getByText('points.intro.cta'))
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(PointsEvents.points_intro_dismiss)
+  })
+
+  it('tracks analytics event when navigated back', () => {
+    const { getByTestId } = renderPointsIntro()
+
+    fireEvent.press(getByTestId('BackChevron'))
+    waitFor(() => {
+      expect(ValoraAnalytics.track).toHaveBeenCalledWith(PointsEvents.points_intro_back)
+    })
+  })
+})
diff --git a/src/points/PointsIntro.tsx b/src/points/PointsIntro.tsx
new file mode 100644
index 0000000000..1e7318d6df
--- /dev/null
+++ b/src/points/PointsIntro.tsx
@@ -0,0 +1,87 @@
+import { NativeStackScreenProps } from '@react-navigation/native-stack'
+import React, { useEffect } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Image, StyleSheet, Text, View } from 'react-native'
+import { SafeAreaView } from 'react-native-safe-area-context'
+import { PointsEvents } from 'src/analytics/Events'
+import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
+import BackButton from 'src/components/BackButton'
+import Button, { BtnSizes } from 'src/components/Button'
+import CustomHeader from 'src/components/header/CustomHeader'
+import { pointsIllustration } from 'src/images/Images'
+import { replace } from 'src/navigator/NavigationService'
+import { Screens } from 'src/navigator/Screens'
+import { StackParamList } from 'src/navigator/types'
+import { pointsIntroDismissed } from 'src/points/slice'
+import { useDispatch } from 'src/redux/hooks'
+import { Colors } from 'src/styles/colors'
+import { typeScale } from 'src/styles/fonts'
+import { Spacing } from 'src/styles/styles'
+
+type Props = NativeStackScreenProps<StackParamList, Screens.PointsIntro>
+
+export default function PointsHome({ route, navigation }: Props) {
+  const { t } = useTranslation()
+
+  const dispatch = useDispatch()
+
+  useEffect(() => {
+    const unsubscribe = navigation.addListener('beforeRemove', () => {
+      ValoraAnalytics.track(PointsEvents.points_intro_back)
+    })
+
+    return unsubscribe
+  }, [navigation])
+
+  const onIntroDismiss = () => {
+    ValoraAnalytics.track(PointsEvents.points_intro_dismiss)
+    dispatch(pointsIntroDismissed())
+    replace(Screens.PointsHome)
+  }
+
+  return (
+    <SafeAreaView style={styles.outerContainer}>
+      <CustomHeader style={styles.header} left={<BackButton />} />
+      <View style={styles.container}>
+        <View style={styles.content}>
+          <Image style={styles.image} source={pointsIllustration} />
+          <Text style={styles.title}>{t('points.intro.title')}</Text>
+          <Text style={styles.description}>{t('points.intro.description')}</Text>
+        </View>
+        <Button onPress={onIntroDismiss} text={t('points.intro.cta')} size={BtnSizes.FULL} />
+      </View>
+    </SafeAreaView>
+  )
+}
+
+const styles = StyleSheet.create({
+  outerContainer: {
+    flex: 1,
+  },
+  header: {
+    paddingHorizontal: Spacing.Thick24,
+  },
+  container: {
+    flex: 1,
+    paddingHorizontal: Spacing.Thick24,
+    paddingBottom: Spacing.Thick24,
+  },
+  content: {
+    flex: 1,
+    alignItems: 'center',
+  },
+  image: {
+    marginBottom: Spacing.Regular16,
+  },
+  title: {
+    ...typeScale.titleLarge,
+    color: Colors.black,
+    textAlign: 'center',
+  },
+  description: {
+    ...typeScale.bodySmall,
+    color: Colors.black,
+    marginTop: Spacing.Regular16,
+    textAlign: 'center',
+  },
+})
diff --git a/src/points/selectors.ts b/src/points/selectors.ts
index c46cc1b618..0d32149036 100644
--- a/src/points/selectors.ts
+++ b/src/points/selectors.ts
@@ -82,3 +82,7 @@ export const pointsBalanceStatusSelector = (state: RootState) => {
 export const trackOnceActivitiesSelector = (state: RootState) => {
   return state.points.trackOnceActivities
 }
+
+export const pointsIntroHasBeenDismissedSelector = (state: RootState) => {
+  return state.points.introHasBeenDismissed
+}
diff --git a/src/points/slice.test.ts b/src/points/slice.test.ts
index 6b4e5ee6e9..dc324a3bf8 100644
--- a/src/points/slice.test.ts
+++ b/src/points/slice.test.ts
@@ -2,6 +2,7 @@ import reducer, {
   PendingPointsEvent,
   initialState,
   pointsEventProcessed,
+  pointsIntroDismissed,
   sendPointsEventStarted,
 } from './slice'
 
@@ -59,4 +60,10 @@ describe('pending points events', () => {
 
     expect(newState.pendingPointsEvents).toEqual([pendingSwapEvent])
   })
+
+  it('should set intro has been seen', () => {
+    const newState = reducer(initialState, pointsIntroDismissed())
+
+    expect(newState.introHasBeenDismissed).toEqual(true)
+  })
 })
diff --git a/src/points/slice.ts b/src/points/slice.ts
index 4c2f643a02..bfc31afe8a 100644
--- a/src/points/slice.ts
+++ b/src/points/slice.ts
@@ -42,6 +42,7 @@ interface State {
   trackOnceActivities: {
     [key in PointsActivityId]?: boolean
   }
+  introHasBeenDismissed: boolean
 }
 
 export const initialState: State = {
@@ -56,6 +57,7 @@ export const initialState: State = {
   trackOnceActivities: {
     'create-wallet': false,
   },
+  introHasBeenDismissed: false,
 }
 
 const slice = createSlice({
@@ -119,6 +121,10 @@ const slice = createSlice({
       ...state,
       pointsBalanceStatus: 'error',
     }),
+    pointsIntroDismissed: (state) => ({
+      ...state,
+      introHasBeenDismissed: true,
+    }),
   },
   extraReducers: (builder) => {
     builder.addCase(REHYDRATE, (state, action: RehydrateAction) => ({
@@ -144,6 +150,7 @@ export const {
   getPointsBalanceStarted,
   getPointsBalanceSucceeded,
   getPointsBalanceError,
+  pointsIntroDismissed,
 } = slice.actions
 
 // action handled in saga
diff --git a/src/redux/migrations.test.ts b/src/redux/migrations.test.ts
index 265c8d7bee..67df50e807 100644
--- a/src/redux/migrations.test.ts
+++ b/src/redux/migrations.test.ts
@@ -49,6 +49,7 @@ import {
   v200Schema,
   v201Schema,
   v203Schema,
+  v214Schema,
   v21Schema,
   v28Schema,
   v2Schema,
@@ -1610,4 +1611,12 @@ describe('Redux persist migrations', () => {
     const migratedSchema = migrations[204](oldSchema)
     expect(migratedSchema).toStrictEqual(expectedSchema)
   })
+
+  it('works from 214 to 215', () => {
+    const oldSchema = v214Schema
+    const migratedSchema = migrations[215](oldSchema)
+    const expectedSchema: any = _.cloneDeep(oldSchema)
+    expectedSchema.points.introHasBeenDismissed = false
+    expect(migratedSchema).toStrictEqual(expectedSchema)
+  })
 })
diff --git a/src/redux/migrations.ts b/src/redux/migrations.ts
index 7b2fd5e3db..9791696695 100644
--- a/src/redux/migrations.ts
+++ b/src/redux/migrations.ts
@@ -1785,4 +1785,11 @@ export const migrations = {
     },
   }),
   214: (state: any) => state,
+  215: (state: any) => ({
+    ...state,
+    points: {
+      ...state.points,
+      introHasBeenDismissed: false,
+    },
+  }),
 }
diff --git a/src/redux/store.test.ts b/src/redux/store.test.ts
index ed56b42ffd..fe96890dcc 100644
--- a/src/redux/store.test.ts
+++ b/src/redux/store.test.ts
@@ -98,7 +98,7 @@ describe('store state', () => {
       {
         "_persist": {
           "rehydrated": true,
-          "version": 214,
+          "version": 215,
         },
         "account": {
           "acceptedTerms": false,
@@ -289,6 +289,7 @@ describe('store state', () => {
         },
         "points": {
           "getHistoryStatus": "idle",
+          "introHasBeenDismissed": false,
           "nextPageUrl": null,
           "pendingPointsEvents": [],
           "pointsBalance": "0",
diff --git a/src/redux/store.ts b/src/redux/store.ts
index 82aa619b60..96c2ef914d 100644
--- a/src/redux/store.ts
+++ b/src/redux/store.ts
@@ -21,7 +21,7 @@ const persistConfig: PersistConfig<ReducersRootState> = {
   key: 'root',
   // default is -1, increment as we make migrations
   // See https://github.com/valora-inc/wallet/tree/main/WALLET.md#redux-state-migration
-  version: 214,
+  version: 215,
   keyPrefix: `reduxStore-`, // the redux-persist default is `persist:` which doesn't work with some file systems.
   storage: FSStorage(),
   blacklist: ['networkInfo', 'alert', 'imports', 'keylessBackup', 'jumpstart'],
diff --git a/test/RootStateSchema.json b/test/RootStateSchema.json
index 154391e6c4..a2564b07d4 100644
--- a/test/RootStateSchema.json
+++ b/test/RootStateSchema.json
@@ -2847,6 +2847,7 @@
                 "PincodeEnter",
                 "PincodeSet",
                 "PointsHome",
+                "PointsIntro",
                 "Profile",
                 "ProfileMenu",
                 "ProtectWallet",
@@ -4319,6 +4320,9 @@
                     ],
                     "type": "string"
                 },
+                "introHasBeenDismissed": {
+                    "type": "boolean"
+                },
                 "nextPageUrl": {
                     "type": [
                         "null",
@@ -4376,6 +4380,7 @@
             },
             "required": [
                 "getHistoryStatus",
+                "introHasBeenDismissed",
                 "nextPageUrl",
                 "pendingPointsEvents",
                 "pointsBalance",
diff --git a/test/schemas.ts b/test/schemas.ts
index 46c9ded7f8..26259de142 100644
--- a/test/schemas.ts
+++ b/test/schemas.ts
@@ -3323,6 +3323,18 @@ export const v214Schema = {
   },
 }
 
+export const v215Schema = {
+  ...v214Schema,
+  _persist: {
+    ...v214Schema._persist,
+    version: 215,
+  },
+  points: {
+    ...v214Schema.points,
+    introHasBeenDismissed: false,
+  },
+}
+
 export function getLatestSchema(): Partial<RootState> {
-  return v214Schema as Partial<RootState>
+  return v215Schema as Partial<RootState>
 }

From db7459a63a834e1ad90b541d094981a7b96a64d9 Mon Sep 17 00:00:00 2001
From: Valora Bot <89419329+valora-bot@users.noreply.github.com>
Date: Thu, 16 May 2024 08:03:16 -0700
Subject: [PATCH 008/133] chore: bump app version to 1.85.0  (#5421)

Co-authored-by: runner <runner@Mac-1715867510665.local>
---
 android/app/build.gradle           | 2 +-
 android/gradle.properties          | 2 +-
 ios/celo.xcodeproj/project.pbxproj | 8 ++++----
 package.json                       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index db05d60908..dfeb9b089b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -150,7 +150,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode appVersionCode
-        versionName "1.84.0"
+        versionName "1.85.0"
         multiDexEnabled true
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/android/gradle.properties b/android/gradle.properties
index ca9bc7bf4e..beef6afe01 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -23,7 +23,7 @@ CELO_RELEASE_KEY_ALIAS=celo-key-alias
 
 # Setting this manually based on version number until we have this deploying via Cloud Build
 # Example: v1.5.1 deployment number 1 = 1005001001 (1 005 001 001)
-VERSION_CODE=1021071668
+VERSION_CODE=1021071669
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
diff --git a/ios/celo.xcodeproj/project.pbxproj b/ios/celo.xcodeproj/project.pbxproj
index 31c0401cf2..a69055ddaf 100644
--- a/ios/celo.xcodeproj/project.pbxproj
+++ b/ios/celo.xcodeproj/project.pbxproj
@@ -1205,7 +1205,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 149;
+				CURRENT_PROJECT_VERSION = 150;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
@@ -1225,7 +1225,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 1.84.0;
+				MARKETING_VERSION = 1.85.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
@@ -1257,7 +1257,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 149;
+				CURRENT_PROJECT_VERSION = 150;
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1274,7 +1274,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 1.84.0;
+				MARKETING_VERSION = 1.85.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
diff --git a/package.json b/package.json
index 19735e811a..4a2a2c8cd8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@valora/wallet",
-  "version": "1.84.0",
+  "version": "1.85.0",
   "author": "Valora Inc",
   "license": "Apache-2.0",
   "private": true,

From a76f334447df57a33346d15408eb3f3e7112b145 Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Fri, 17 May 2024 05:27:32 +1200
Subject: [PATCH 009/133] feat: Change button color to black (#5401)

### Description
- Change primary button color to black
- Set opacity at 25% when disabled
- Set opacity of GRAY_WITH_BORDER to 50% when disabled

### Test plan

Updated unit tests, manual tests:

![token-details](https://github.com/valora-inc/wallet/assets/140328381/52e0bb80-1011-45ef-b7e7-361c0de161f6)


https://github.com/valora-inc/wallet/assets/140328381/5fdf0e9c-fef7-4c9b-8608-48354a2ca6c2


https://github.com/valora-inc/wallet/assets/140328381/6afe33f8-7751-42c0-8fce-e13192324e3a


https://github.com/valora-inc/wallet/assets/140328381/2dd9d319-cf81-40c4-b104-bbe1544788cc






### Related issues

- N/A

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [X] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 .../AccountKeyEducation.test.tsx.snap         |  2 +-
 .../__snapshots__/Education.test.tsx.snap     |  6 ++---
 .../__snapshots__/GoldEducation.test.tsx.snap |  2 +-
 .../__snapshots__/Persona.test.tsx.snap       |  6 ++---
 .../__snapshots__/Profile.test.tsx.snap       |  6 ++---
 src/app/MultichainBeta.tsx                    |  2 --
 src/app/__snapshots__/Debug.test.tsx.snap     |  6 ++---
 .../__snapshots__/ErrorScreen.test.tsx.snap   | 12 +++++-----
 .../__snapshots__/BackupPhrase.test.tsx.snap  |  2 +-
 src/components/Button.tsx                     | 23 ++++++++-----------
 .../__snapshots__/Button.test.tsx.snap        |  8 +++----
 .../__snapshots__/FullscreenCTA.test.tsx.snap |  6 ++---
 .../__snapshots__/CashInSuccess.test.tsx.snap | 12 +++++-----
 .../FiatExchangeAmount.test.tsx.snap          | 12 +++++-----
 .../__snapshots__/SimplexScreen.test.tsx.snap | 10 ++++----
 src/points/PointsHome.tsx                     |  1 -
 src/send/EnterAmount.tsx                      |  4 ----
 .../SendConfirmation.test.tsx.snap            |  6 ++---
 .../ValidateRecipientAccount.test.tsx.snap    | 12 +++++-----
 src/tokens/TokenDetails.tsx                   |  1 -
 20 files changed, 63 insertions(+), 76 deletions(-)

diff --git a/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap b/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap
index 3de91fee2a..e53e3d6d0e 100644
--- a/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap
+++ b/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap
@@ -555,7 +555,7 @@ exports[`AccountKeyEducation renders correctly 1`] = `
                 "color": "#2E3338",
                 "fontFamily": "Inter-SemiBold",
                 "fontSize": 16,
-                "lineHeight": 22,
+                "lineHeight": 24,
                 "marginLeft": 0,
                 "marginRight": 0,
               }
diff --git a/src/account/__snapshots__/Education.test.tsx.snap b/src/account/__snapshots__/Education.test.tsx.snap
index 52986d918b..3f6445701d 100644
--- a/src/account/__snapshots__/Education.test.tsx.snap
+++ b/src/account/__snapshots__/Education.test.tsx.snap
@@ -241,12 +241,12 @@ exports[`Education renders correctly 1`] = `
             [
               {
                 "alignItems": "center",
-                "backgroundColor": "#1AB775",
+                "backgroundColor": "#2E3338",
                 "flexDirection": "row",
                 "height": 48,
                 "justifyContent": "center",
                 "minWidth": 120,
-                "opacity": undefined,
+                "opacity": 1,
                 "paddingHorizontal": 24,
                 "paddingVertical": 5,
               },
@@ -264,7 +264,7 @@ exports[`Education renders correctly 1`] = `
                 "color": "#FFFFFF",
                 "fontFamily": "Inter-SemiBold",
                 "fontSize": 16,
-                "lineHeight": 22,
+                "lineHeight": 24,
                 "marginLeft": 0,
                 "marginRight": 0,
               }
diff --git a/src/account/__snapshots__/GoldEducation.test.tsx.snap b/src/account/__snapshots__/GoldEducation.test.tsx.snap
index 2562a85c55..3635d1b2f2 100644
--- a/src/account/__snapshots__/GoldEducation.test.tsx.snap
+++ b/src/account/__snapshots__/GoldEducation.test.tsx.snap
@@ -555,7 +555,7 @@ exports[`renders correctly 1`] = `
                 "color": "#2E3338",
                 "fontFamily": "Inter-SemiBold",
                 "fontSize": 16,
-                "lineHeight": 22,
+                "lineHeight": 24,
                 "marginLeft": 0,
                 "marginRight": 0,
               }
diff --git a/src/account/__snapshots__/Persona.test.tsx.snap b/src/account/__snapshots__/Persona.test.tsx.snap
index 0f14a961ec..c421090c72 100644
--- a/src/account/__snapshots__/Persona.test.tsx.snap
+++ b/src/account/__snapshots__/Persona.test.tsx.snap
@@ -61,12 +61,12 @@ exports[`Persona renders correctly 1`] = `
         [
           {
             "alignItems": "center",
-            "backgroundColor": "#1AB77580",
+            "backgroundColor": "#2E3338",
             "flexDirection": "row",
             "height": 48,
             "justifyContent": "center",
             "minWidth": 120,
-            "opacity": undefined,
+            "opacity": 0.25,
             "paddingHorizontal": 24,
             "paddingVertical": 5,
           },
@@ -82,7 +82,7 @@ exports[`Persona renders correctly 1`] = `
             "color": "#FFFFFF",
             "fontFamily": "Inter-SemiBold",
             "fontSize": 16,
-            "lineHeight": 22,
+            "lineHeight": 24,
             "marginLeft": 0,
             "marginRight": 0,
           }
diff --git a/src/account/__snapshots__/Profile.test.tsx.snap b/src/account/__snapshots__/Profile.test.tsx.snap
index 4ef7e703ef..83ea07df97 100644
--- a/src/account/__snapshots__/Profile.test.tsx.snap
+++ b/src/account/__snapshots__/Profile.test.tsx.snap
@@ -308,12 +308,12 @@ exports[`Profile renders correctly 1`] = `
                 [
                   {
                     "alignItems": "center",
-                    "backgroundColor": "#1AB775",
+                    "backgroundColor": "#2E3338",
                     "flexDirection": "row",
                     "height": 48,
                     "justifyContent": "center",
                     "minWidth": 120,
-                    "opacity": undefined,
+                    "opacity": 1,
                     "paddingHorizontal": 24,
                     "paddingVertical": 5,
                   },
@@ -329,7 +329,7 @@ exports[`Profile renders correctly 1`] = `
                     "color": "#FFFFFF",
                     "fontFamily": "Inter-SemiBold",
                     "fontSize": 16,
-                    "lineHeight": 22,
+                    "lineHeight": 24,
                     "marginLeft": 0,
                     "marginRight": 0,
                   }
diff --git a/src/app/MultichainBeta.tsx b/src/app/MultichainBeta.tsx
index 2f76e466cf..c016a017fb 100644
--- a/src/app/MultichainBeta.tsx
+++ b/src/app/MultichainBeta.tsx
@@ -53,7 +53,6 @@ function MultichainBeta() {
         <View style={styles.ctaContainer}>
           <Button
             style={styles.cta}
-            fontStyle={typeScale.labelSemiBoldMedium}
             touchableStyle={styles.ctaTouchable}
             size={BtnSizes.FULL}
             text={t('multichainBeta.primaryCta')}
@@ -64,7 +63,6 @@ function MultichainBeta() {
           />
           <Button
             style={styles.cta}
-            fontStyle={typeScale.labelSemiBoldMedium}
             touchableStyle={styles.ctaTouchable}
             type={BtnTypes.SECONDARY_WHITE_BG}
             size={BtnSizes.FULL}
diff --git a/src/app/__snapshots__/Debug.test.tsx.snap b/src/app/__snapshots__/Debug.test.tsx.snap
index bc27ad6008..4af253cb1c 100644
--- a/src/app/__snapshots__/Debug.test.tsx.snap
+++ b/src/app/__snapshots__/Debug.test.tsx.snap
@@ -147,12 +147,12 @@ exports[`Debug renders correctly 1`] = `
           [
             {
               "alignItems": "center",
-              "backgroundColor": "#1AB775",
+              "backgroundColor": "#2E3338",
               "flexDirection": "row",
               "height": 48,
               "justifyContent": "center",
               "minWidth": 120,
-              "opacity": undefined,
+              "opacity": 1,
               "paddingHorizontal": 24,
               "paddingVertical": 5,
             },
@@ -167,7 +167,7 @@ exports[`Debug renders correctly 1`] = `
               "color": "#FFFFFF",
               "fontFamily": "Inter-SemiBold",
               "fontSize": 16,
-              "lineHeight": 22,
+              "lineHeight": 24,
               "marginLeft": 0,
               "marginRight": 0,
             }
diff --git a/src/app/__snapshots__/ErrorScreen.test.tsx.snap b/src/app/__snapshots__/ErrorScreen.test.tsx.snap
index 94669a6dda..d09a20982e 100644
--- a/src/app/__snapshots__/ErrorScreen.test.tsx.snap
+++ b/src/app/__snapshots__/ErrorScreen.test.tsx.snap
@@ -143,12 +143,12 @@ exports[`ErrorScreen with errorMessage renders correctly 1`] = `
             [
               {
                 "alignItems": "center",
-                "backgroundColor": "#1AB775",
+                "backgroundColor": "#2E3338",
                 "flexDirection": "row",
                 "height": 48,
                 "justifyContent": "center",
                 "minWidth": 120,
-                "opacity": undefined,
+                "opacity": 1,
                 "paddingHorizontal": 24,
                 "paddingVertical": 5,
               },
@@ -164,7 +164,7 @@ exports[`ErrorScreen with errorMessage renders correctly 1`] = `
                 "color": "#FFFFFF",
                 "fontFamily": "Inter-SemiBold",
                 "fontSize": 16,
-                "lineHeight": 22,
+                "lineHeight": 24,
                 "marginLeft": 0,
                 "marginRight": 0,
               }
@@ -322,12 +322,12 @@ exports[`ErrorScreen without errorMessage renders correctly 1`] = `
             [
               {
                 "alignItems": "center",
-                "backgroundColor": "#1AB775",
+                "backgroundColor": "#2E3338",
                 "flexDirection": "row",
                 "height": 48,
                 "justifyContent": "center",
                 "minWidth": 120,
-                "opacity": undefined,
+                "opacity": 1,
                 "paddingHorizontal": 24,
                 "paddingVertical": 5,
               },
@@ -343,7 +343,7 @@ exports[`ErrorScreen without errorMessage renders correctly 1`] = `
                 "color": "#FFFFFF",
                 "fontFamily": "Inter-SemiBold",
                 "fontSize": 16,
-                "lineHeight": 22,
+                "lineHeight": 24,
                 "marginLeft": 0,
                 "marginRight": 0,
               }
diff --git a/src/backup/__snapshots__/BackupPhrase.test.tsx.snap b/src/backup/__snapshots__/BackupPhrase.test.tsx.snap
index 0a88c0db9d..dde682828d 100644
--- a/src/backup/__snapshots__/BackupPhrase.test.tsx.snap
+++ b/src/backup/__snapshots__/BackupPhrase.test.tsx.snap
@@ -682,7 +682,7 @@ exports[`BackupPhrase renders correctly with backup not completed 1`] = `
               "color": "#666666",
               "fontFamily": "Inter-SemiBold",
               "fontSize": 16,
-              "lineHeight": 22,
+              "lineHeight": 24,
               "marginLeft": 0,
               "marginRight": 0,
             }
diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index c62d50bff0..5c503d215e 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -1,17 +1,9 @@
 import { debounce } from 'lodash'
 import React, { ReactNode, useCallback } from 'react'
-import {
-  ActivityIndicator,
-  StyleProp,
-  StyleSheet,
-  Text,
-  TextStyle,
-  View,
-  ViewStyle,
-} from 'react-native'
+import { ActivityIndicator, StyleProp, StyleSheet, Text, View, ViewStyle } from 'react-native'
 import Touchable from 'src/components/Touchable'
 import colors, { Colors } from 'src/styles/colors'
-import fontStyles from 'src/styles/fonts'
+import { typeScale } from 'src/styles/fonts'
 import { vibrateInformative } from 'src/styles/hapticFeedback'
 
 const BUTTON_TAP_DEBOUNCE_TIME = 300 // milliseconds
@@ -51,7 +43,6 @@ export interface ButtonProps {
   testID?: string
   touchableStyle?: StyleProp<ViewStyle>
   iconMargin?: number
-  fontStyle?: TextStyle
 }
 
 export default React.memo(function Button(props: ButtonProps) {
@@ -70,7 +61,6 @@ export default React.memo(function Button(props: ButtonProps) {
     loadingColor,
     touchableStyle,
     iconMargin = 4,
-    fontStyle = fontStyles.regular600,
   } = props
 
   // Debounce onPress event so that it is called once on trigger and
@@ -117,7 +107,7 @@ export default React.memo(function Button(props: ButtonProps) {
                 maxFontSizeMultiplier={1}
                 accessibilityLabel={accessibilityLabel}
                 style={{
-                  ...fontStyle, // this has to be before color because the legacy font styles default to colors.dark, which will end up overriding the button type based colors
+                  ...styles.fontStyle,
                   color: textColor,
                   marginLeft: icon && iconPositionLeft ? iconMargin : 0,
                   marginRight: icon && !iconPositionLeft ? iconMargin : 0,
@@ -159,6 +149,9 @@ const styles = StyleSheet.create({
     height: 48,
     flexGrow: 1,
   },
+  fontStyle: {
+    ...typeScale.labelSemiBoldMedium,
+  },
 })
 
 function getColors(type: BtnTypes, disabled: boolean | undefined) {
@@ -169,7 +162,8 @@ function getColors(type: BtnTypes, disabled: boolean | undefined) {
   switch (type) {
     case BtnTypes.PRIMARY:
       textColor = colors.white
-      backgroundColor = disabled ? colors.primaryDisabled : colors.primary
+      backgroundColor = colors.black
+      opacity = disabled ? 0.25 : 1.0
       break
     case BtnTypes.SECONDARY:
       textColor = disabled ? colors.gray4 : colors.black
@@ -193,6 +187,7 @@ function getColors(type: BtnTypes, disabled: boolean | undefined) {
       textColor = colors.black
       backgroundColor = colors.gray1
       borderColor = colors.gray2
+      opacity = disabled ? 0.5 : 1.0
       break
   }
 
diff --git a/src/components/__snapshots__/Button.test.tsx.snap b/src/components/__snapshots__/Button.test.tsx.snap
index cb76f1bc58..56a7fb86f4 100644
--- a/src/components/__snapshots__/Button.test.tsx.snap
+++ b/src/components/__snapshots__/Button.test.tsx.snap
@@ -81,7 +81,7 @@ exports[`Button when type is SECONDARY renders 1`] = `
             "color": "#2E3338",
             "fontFamily": "Inter-SemiBold",
             "fontSize": 16,
-            "lineHeight": 22,
+            "lineHeight": 24,
             "marginLeft": 0,
             "marginRight": 0,
           }
@@ -155,12 +155,12 @@ exports[`Button when type not given defaults to primary 1`] = `
         [
           {
             "alignItems": "center",
-            "backgroundColor": "#1AB775",
+            "backgroundColor": "#2E3338",
             "flexDirection": "row",
             "height": 48,
             "justifyContent": "center",
             "minWidth": 120,
-            "opacity": undefined,
+            "opacity": 1,
             "paddingHorizontal": 24,
             "paddingVertical": 5,
           },
@@ -175,7 +175,7 @@ exports[`Button when type not given defaults to primary 1`] = `
             "color": "#FFFFFF",
             "fontFamily": "Inter-SemiBold",
             "fontSize": 16,
-            "lineHeight": 22,
+            "lineHeight": 24,
             "marginLeft": 0,
             "marginRight": 0,
           }
diff --git a/src/components/__snapshots__/FullscreenCTA.test.tsx.snap b/src/components/__snapshots__/FullscreenCTA.test.tsx.snap
index d1b5698860..c19e40406d 100644
--- a/src/components/__snapshots__/FullscreenCTA.test.tsx.snap
+++ b/src/components/__snapshots__/FullscreenCTA.test.tsx.snap
@@ -143,12 +143,12 @@ exports[`FullscreenCTA renders correctly 1`] = `
             [
               {
                 "alignItems": "center",
-                "backgroundColor": "#1AB775",
+                "backgroundColor": "#2E3338",
                 "flexDirection": "row",
                 "height": 48,
                 "justifyContent": "center",
                 "minWidth": 120,
-                "opacity": undefined,
+                "opacity": 1,
                 "paddingHorizontal": 24,
                 "paddingVertical": 5,
               },
@@ -164,7 +164,7 @@ exports[`FullscreenCTA renders correctly 1`] = `
                 "color": "#FFFFFF",
                 "fontFamily": "Inter-SemiBold",
                 "fontSize": 16,
-                "lineHeight": 22,
+                "lineHeight": 24,
                 "marginLeft": 0,
                 "marginRight": 0,
               }
diff --git a/src/fiatExchanges/__snapshots__/CashInSuccess.test.tsx.snap b/src/fiatExchanges/__snapshots__/CashInSuccess.test.tsx.snap
index 07b8507336..43acaf7c73 100644
--- a/src/fiatExchanges/__snapshots__/CashInSuccess.test.tsx.snap
+++ b/src/fiatExchanges/__snapshots__/CashInSuccess.test.tsx.snap
@@ -135,12 +135,12 @@ exports[`CashinInSuccess renders correctly with a provider 1`] = `
             [
               {
                 "alignItems": "center",
-                "backgroundColor": "#1AB775",
+                "backgroundColor": "#2E3338",
                 "flexDirection": "row",
                 "height": 48,
                 "justifyContent": "center",
                 "minWidth": 120,
-                "opacity": undefined,
+                "opacity": 1,
                 "paddingHorizontal": 24,
                 "paddingVertical": 5,
               },
@@ -157,7 +157,7 @@ exports[`CashinInSuccess renders correctly with a provider 1`] = `
                 "color": "#FFFFFF",
                 "fontFamily": "Inter-SemiBold",
                 "fontSize": 16,
-                "lineHeight": 22,
+                "lineHeight": 24,
                 "marginLeft": 0,
                 "marginRight": 0,
               }
@@ -307,12 +307,12 @@ exports[`CashinInSuccess renders correctly without a provider 1`] = `
             [
               {
                 "alignItems": "center",
-                "backgroundColor": "#1AB775",
+                "backgroundColor": "#2E3338",
                 "flexDirection": "row",
                 "height": 48,
                 "justifyContent": "center",
                 "minWidth": 120,
-                "opacity": undefined,
+                "opacity": 1,
                 "paddingHorizontal": 24,
                 "paddingVertical": 5,
               },
@@ -329,7 +329,7 @@ exports[`CashinInSuccess renders correctly without a provider 1`] = `
                 "color": "#FFFFFF",
                 "fontFamily": "Inter-SemiBold",
                 "fontSize": 16,
-                "lineHeight": 22,
+                "lineHeight": 24,
                 "marginLeft": 0,
                 "marginRight": 0,
               }
diff --git a/src/fiatExchanges/__snapshots__/FiatExchangeAmount.test.tsx.snap b/src/fiatExchanges/__snapshots__/FiatExchangeAmount.test.tsx.snap
index d432118199..d5c7c38590 100644
--- a/src/fiatExchanges/__snapshots__/FiatExchangeAmount.test.tsx.snap
+++ b/src/fiatExchanges/__snapshots__/FiatExchangeAmount.test.tsx.snap
@@ -171,12 +171,12 @@ exports[`FiatExchangeAmount cashIn renders correctly with EUR as app currency 1`
           [
             {
               "alignItems": "center",
-              "backgroundColor": "#1AB77580",
+              "backgroundColor": "#2E3338",
               "flexDirection": "row",
               "flexGrow": 1,
               "height": 48,
               "justifyContent": "center",
-              "opacity": undefined,
+              "opacity": 0.25,
               "paddingHorizontal": 24,
               "paddingVertical": 5,
             },
@@ -193,7 +193,7 @@ exports[`FiatExchangeAmount cashIn renders correctly with EUR as app currency 1`
               "color": "#FFFFFF",
               "fontFamily": "Inter-SemiBold",
               "fontSize": 16,
-              "lineHeight": 22,
+              "lineHeight": 24,
               "marginLeft": 0,
               "marginRight": 0,
             }
@@ -394,12 +394,12 @@ exports[`FiatExchangeAmount cashIn renders correctly with USD as app currency 1`
           [
             {
               "alignItems": "center",
-              "backgroundColor": "#1AB77580",
+              "backgroundColor": "#2E3338",
               "flexDirection": "row",
               "flexGrow": 1,
               "height": 48,
               "justifyContent": "center",
-              "opacity": undefined,
+              "opacity": 0.25,
               "paddingHorizontal": 24,
               "paddingVertical": 5,
             },
@@ -416,7 +416,7 @@ exports[`FiatExchangeAmount cashIn renders correctly with USD as app currency 1`
               "color": "#FFFFFF",
               "fontFamily": "Inter-SemiBold",
               "fontSize": 16,
-              "lineHeight": 22,
+              "lineHeight": 24,
               "marginLeft": 0,
               "marginRight": 0,
             }
diff --git a/src/fiatExchanges/__snapshots__/SimplexScreen.test.tsx.snap b/src/fiatExchanges/__snapshots__/SimplexScreen.test.tsx.snap
index 1f63c523fb..267723256f 100644
--- a/src/fiatExchanges/__snapshots__/SimplexScreen.test.tsx.snap
+++ b/src/fiatExchanges/__snapshots__/SimplexScreen.test.tsx.snap
@@ -562,12 +562,12 @@ exports[`SimplexScreen renders correctly 1`] = `
             [
               {
                 "alignItems": "center",
-                "backgroundColor": "#1AB77580",
+                "backgroundColor": "#2E3338",
                 "flexDirection": "row",
                 "flexGrow": 1,
                 "height": 48,
                 "justifyContent": "center",
-                "opacity": undefined,
+                "opacity": 0.25,
                 "paddingHorizontal": 24,
                 "paddingVertical": 5,
               },
@@ -1149,12 +1149,12 @@ exports[`SimplexScreen renders correctly 2`] = `
             [
               {
                 "alignItems": "center",
-                "backgroundColor": "#1AB77580",
+                "backgroundColor": "#2E3338",
                 "flexDirection": "row",
                 "flexGrow": 1,
                 "height": 48,
                 "justifyContent": "center",
-                "opacity": undefined,
+                "opacity": 0.25,
                 "paddingHorizontal": 24,
                 "paddingVertical": 5,
               },
@@ -1169,7 +1169,7 @@ exports[`SimplexScreen renders correctly 2`] = `
                 "color": "#FFFFFF",
                 "fontFamily": "Inter-SemiBold",
                 "fontSize": 16,
-                "lineHeight": 22,
+                "lineHeight": 24,
                 "marginLeft": 0,
                 "marginRight": 0,
               }
diff --git a/src/points/PointsHome.tsx b/src/points/PointsHome.tsx
index 35375325d6..b264532cdf 100644
--- a/src/points/PointsHome.tsx
+++ b/src/points/PointsHome.tsx
@@ -145,7 +145,6 @@ export default function PointsHome({ route, navigation }: Props) {
                 onPress={onPressActivity}
                 text={t('points.activity')}
                 type={BtnTypes.GRAY_WITH_BORDER}
-                fontStyle={typeScale.labelXSmall}
                 size={BtnSizes.FULL}
                 touchableStyle={styles.buttonStyle}
               />
diff --git a/src/send/EnterAmount.tsx b/src/send/EnterAmount.tsx
index c9fdc79804..bf2c072dc8 100644
--- a/src/send/EnterAmount.tsx
+++ b/src/send/EnterAmount.tsx
@@ -98,7 +98,6 @@ export const SendProceed = ({
       text={t('review')}
       style={styles.reviewButton}
       size={BtnSizes.FULL}
-      fontStyle={styles.reviewButtonText}
       disabled={disabled}
       testID="SendEnterAmount/ReviewButton"
     />
@@ -650,9 +649,6 @@ const styles = StyleSheet.create({
   reviewButton: {
     paddingVertical: Spacing.Thick24,
   },
-  reviewButtonText: {
-    ...typeScale.labelSemiBoldMedium,
-  },
   warning: {
     marginBottom: Spacing.Regular16,
     paddingHorizontal: Spacing.Regular16,
diff --git a/src/send/__snapshots__/SendConfirmation.test.tsx.snap b/src/send/__snapshots__/SendConfirmation.test.tsx.snap
index 552c82bef9..43041609ae 100644
--- a/src/send/__snapshots__/SendConfirmation.test.tsx.snap
+++ b/src/send/__snapshots__/SendConfirmation.test.tsx.snap
@@ -711,12 +711,12 @@ exports[`SendConfirmation renders correctly 1`] = `
               [
                 {
                   "alignItems": "center",
-                  "backgroundColor": "#1AB775",
+                  "backgroundColor": "#2E3338",
                   "flexDirection": "row",
                   "flexGrow": 1,
                   "height": 48,
                   "justifyContent": "center",
-                  "opacity": undefined,
+                  "opacity": 1,
                   "paddingHorizontal": 24,
                   "paddingVertical": 5,
                 },
@@ -733,7 +733,7 @@ exports[`SendConfirmation renders correctly 1`] = `
                   "color": "#FFFFFF",
                   "fontFamily": "Inter-SemiBold",
                   "fontSize": 16,
-                  "lineHeight": 22,
+                  "lineHeight": 24,
                   "marginLeft": 0,
                   "marginRight": 0,
                 }
diff --git a/src/send/__snapshots__/ValidateRecipientAccount.test.tsx.snap b/src/send/__snapshots__/ValidateRecipientAccount.test.tsx.snap
index e929b823b3..ec246e110c 100644
--- a/src/send/__snapshots__/ValidateRecipientAccount.test.tsx.snap
+++ b/src/send/__snapshots__/ValidateRecipientAccount.test.tsx.snap
@@ -188,12 +188,12 @@ exports[`ValidateRecipientAccount renders correctly when full validation require
                 [
                   {
                     "alignItems": "center",
-                    "backgroundColor": "#1AB77580",
+                    "backgroundColor": "#2E3338",
                     "flexDirection": "row",
                     "height": 48,
                     "justifyContent": "center",
                     "minWidth": 120,
-                    "opacity": undefined,
+                    "opacity": 0.25,
                     "paddingHorizontal": 24,
                     "paddingVertical": 5,
                   },
@@ -209,7 +209,7 @@ exports[`ValidateRecipientAccount renders correctly when full validation require
                     "color": "#FFFFFF",
                     "fontFamily": "Inter-SemiBold",
                     "fontSize": 16,
-                    "lineHeight": 22,
+                    "lineHeight": 24,
                     "marginLeft": 0,
                     "marginRight": 0,
                   }
@@ -689,12 +689,12 @@ exports[`ValidateRecipientAccount renders correctly when partial validation requ
                 [
                   {
                     "alignItems": "center",
-                    "backgroundColor": "#1AB77580",
+                    "backgroundColor": "#2E3338",
                     "flexDirection": "row",
                     "height": 48,
                     "justifyContent": "center",
                     "minWidth": 120,
-                    "opacity": undefined,
+                    "opacity": 0.25,
                     "paddingHorizontal": 24,
                     "paddingVertical": 5,
                   },
@@ -710,7 +710,7 @@ exports[`ValidateRecipientAccount renders correctly when partial validation requ
                     "color": "#FFFFFF",
                     "fontFamily": "Inter-SemiBold",
                     "fontSize": 16,
-                    "lineHeight": 22,
+                    "lineHeight": 24,
                     "marginLeft": 0,
                     "marginRight": 0,
                   }
diff --git a/src/tokens/TokenDetails.tsx b/src/tokens/TokenDetails.tsx
index 5741d8cdde..0cf63fbdb4 100644
--- a/src/tokens/TokenDetails.tsx
+++ b/src/tokens/TokenDetails.tsx
@@ -289,7 +289,6 @@ function Actions({
           size={BtnSizes.FULL}
           touchableStyle={styles.actionTouchable}
           testID={`TokenDetails/Action/${action.name}`}
-          fontStyle={typeScale.labelMedium}
         />
       ))}
     </View>

From d7d9ae8f43ec88d9e552e5d26579aa2cf3443422 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Thu, 16 May 2024 16:41:35 -0700
Subject: [PATCH 010/133] feat(earn): add function for fetching aave rewards
 (#5422)

### Description

As the title

### Test plan

Unit tests

### Related issues

- Part of ACT-1180

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/abis/AaveIncentivesV3.ts             | 511 +++++++++++++++++++++++
 src/earn/EarnDepositBottomSheet.test.tsx |  18 +-
 src/earn/poolInfo.test.ts                |  35 +-
 src/earn/poolInfo.ts                     |  56 ++-
 src/earn/types.ts                        |   6 +
 src/web3/networkConfig.ts                |   7 +
 test/values.ts                           |  28 +-
 7 files changed, 645 insertions(+), 16 deletions(-)
 create mode 100644 src/abis/AaveIncentivesV3.ts

diff --git a/src/abis/AaveIncentivesV3.ts b/src/abis/AaveIncentivesV3.ts
new file mode 100644
index 0000000000..2e4cd034b2
--- /dev/null
+++ b/src/abis/AaveIncentivesV3.ts
@@ -0,0 +1,511 @@
+// Incentives ABI from https://docs.aave.com/developers/deployed-contracts/v3-mainnet/arbitrum
+const aaveIncentivesV3Abi = [
+  {
+    inputs: [{ internalType: 'address', name: 'emissionManager', type: 'address' }],
+    stateMutability: 'nonpayable',
+    type: 'constructor',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'asset',
+        type: 'address',
+      },
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'reward',
+        type: 'address',
+      },
+      { indexed: true, internalType: 'address', name: 'user', type: 'address' },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'assetIndex',
+        type: 'uint256',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'userIndex',
+        type: 'uint256',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'rewardsAccrued',
+        type: 'uint256',
+      },
+    ],
+    name: 'Accrued',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'asset',
+        type: 'address',
+      },
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'reward',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'oldEmission',
+        type: 'uint256',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'newEmission',
+        type: 'uint256',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'oldDistributionEnd',
+        type: 'uint256',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'newDistributionEnd',
+        type: 'uint256',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'assetIndex',
+        type: 'uint256',
+      },
+    ],
+    name: 'AssetConfigUpdated',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      { indexed: true, internalType: 'address', name: 'user', type: 'address' },
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'claimer',
+        type: 'address',
+      },
+    ],
+    name: 'ClaimerSet',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'reward',
+        type: 'address',
+      },
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'rewardOracle',
+        type: 'address',
+      },
+    ],
+    name: 'RewardOracleUpdated',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      { indexed: true, internalType: 'address', name: 'user', type: 'address' },
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'reward',
+        type: 'address',
+      },
+      { indexed: true, internalType: 'address', name: 'to', type: 'address' },
+      {
+        indexed: false,
+        internalType: 'address',
+        name: 'claimer',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'amount',
+        type: 'uint256',
+      },
+    ],
+    name: 'RewardsClaimed',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'reward',
+        type: 'address',
+      },
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'transferStrategy',
+        type: 'address',
+      },
+    ],
+    name: 'TransferStrategyInstalled',
+    type: 'event',
+  },
+  {
+    inputs: [],
+    name: 'EMISSION_MANAGER',
+    outputs: [{ internalType: 'address', name: '', type: 'address' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'REVISION',
+    outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address[]', name: 'assets', type: 'address[]' },
+      { internalType: 'address', name: 'to', type: 'address' },
+    ],
+    name: 'claimAllRewards',
+    outputs: [
+      { internalType: 'address[]', name: 'rewardsList', type: 'address[]' },
+      { internalType: 'uint256[]', name: 'claimedAmounts', type: 'uint256[]' },
+    ],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address[]', name: 'assets', type: 'address[]' },
+      { internalType: 'address', name: 'user', type: 'address' },
+      { internalType: 'address', name: 'to', type: 'address' },
+    ],
+    name: 'claimAllRewardsOnBehalf',
+    outputs: [
+      { internalType: 'address[]', name: 'rewardsList', type: 'address[]' },
+      { internalType: 'uint256[]', name: 'claimedAmounts', type: 'uint256[]' },
+    ],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [{ internalType: 'address[]', name: 'assets', type: 'address[]' }],
+    name: 'claimAllRewardsToSelf',
+    outputs: [
+      { internalType: 'address[]', name: 'rewardsList', type: 'address[]' },
+      { internalType: 'uint256[]', name: 'claimedAmounts', type: 'uint256[]' },
+    ],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address[]', name: 'assets', type: 'address[]' },
+      { internalType: 'uint256', name: 'amount', type: 'uint256' },
+      { internalType: 'address', name: 'to', type: 'address' },
+      { internalType: 'address', name: 'reward', type: 'address' },
+    ],
+    name: 'claimRewards',
+    outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address[]', name: 'assets', type: 'address[]' },
+      { internalType: 'uint256', name: 'amount', type: 'uint256' },
+      { internalType: 'address', name: 'user', type: 'address' },
+      { internalType: 'address', name: 'to', type: 'address' },
+      { internalType: 'address', name: 'reward', type: 'address' },
+    ],
+    name: 'claimRewardsOnBehalf',
+    outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address[]', name: 'assets', type: 'address[]' },
+      { internalType: 'uint256', name: 'amount', type: 'uint256' },
+      { internalType: 'address', name: 'reward', type: 'address' },
+    ],
+    name: 'claimRewardsToSelf',
+    outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        components: [
+          { internalType: 'uint88', name: 'emissionPerSecond', type: 'uint88' },
+          { internalType: 'uint256', name: 'totalSupply', type: 'uint256' },
+          { internalType: 'uint32', name: 'distributionEnd', type: 'uint32' },
+          { internalType: 'address', name: 'asset', type: 'address' },
+          { internalType: 'address', name: 'reward', type: 'address' },
+          {
+            internalType: 'contract ITransferStrategyBase',
+            name: 'transferStrategy',
+            type: 'address',
+          },
+          {
+            internalType: 'contract IEACAggregatorProxy',
+            name: 'rewardOracle',
+            type: 'address',
+          },
+        ],
+        internalType: 'struct RewardsDataTypes.RewardsConfigInput[]',
+        name: 'config',
+        type: 'tuple[]',
+      },
+    ],
+    name: 'configureAssets',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address[]', name: 'assets', type: 'address[]' },
+      { internalType: 'address', name: 'user', type: 'address' },
+    ],
+    name: 'getAllUserRewards',
+    outputs: [
+      { internalType: 'address[]', name: 'rewardsList', type: 'address[]' },
+      {
+        internalType: 'uint256[]',
+        name: 'unclaimedAmounts',
+        type: 'uint256[]',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [{ internalType: 'address', name: 'asset', type: 'address' }],
+    name: 'getAssetDecimals',
+    outputs: [{ internalType: 'uint8', name: '', type: 'uint8' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address', name: 'asset', type: 'address' },
+      { internalType: 'address', name: 'reward', type: 'address' },
+    ],
+    name: 'getAssetIndex',
+    outputs: [
+      { internalType: 'uint256', name: '', type: 'uint256' },
+      { internalType: 'uint256', name: '', type: 'uint256' },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [{ internalType: 'address', name: 'user', type: 'address' }],
+    name: 'getClaimer',
+    outputs: [{ internalType: 'address', name: '', type: 'address' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address', name: 'asset', type: 'address' },
+      { internalType: 'address', name: 'reward', type: 'address' },
+    ],
+    name: 'getDistributionEnd',
+    outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'getEmissionManager',
+    outputs: [{ internalType: 'address', name: '', type: 'address' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [{ internalType: 'address', name: 'reward', type: 'address' }],
+    name: 'getRewardOracle',
+    outputs: [{ internalType: 'address', name: '', type: 'address' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [{ internalType: 'address', name: 'asset', type: 'address' }],
+    name: 'getRewardsByAsset',
+    outputs: [{ internalType: 'address[]', name: '', type: 'address[]' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address', name: 'asset', type: 'address' },
+      { internalType: 'address', name: 'reward', type: 'address' },
+    ],
+    name: 'getRewardsData',
+    outputs: [
+      { internalType: 'uint256', name: '', type: 'uint256' },
+      { internalType: 'uint256', name: '', type: 'uint256' },
+      { internalType: 'uint256', name: '', type: 'uint256' },
+      { internalType: 'uint256', name: '', type: 'uint256' },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'getRewardsList',
+    outputs: [{ internalType: 'address[]', name: '', type: 'address[]' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [{ internalType: 'address', name: 'reward', type: 'address' }],
+    name: 'getTransferStrategy',
+    outputs: [{ internalType: 'address', name: '', type: 'address' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address', name: 'user', type: 'address' },
+      { internalType: 'address', name: 'reward', type: 'address' },
+    ],
+    name: 'getUserAccruedRewards',
+    outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address', name: 'user', type: 'address' },
+      { internalType: 'address', name: 'asset', type: 'address' },
+      { internalType: 'address', name: 'reward', type: 'address' },
+    ],
+    name: 'getUserAssetIndex',
+    outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address[]', name: 'assets', type: 'address[]' },
+      { internalType: 'address', name: 'user', type: 'address' },
+      { internalType: 'address', name: 'reward', type: 'address' },
+    ],
+    name: 'getUserRewards',
+    outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address', name: 'user', type: 'address' },
+      { internalType: 'uint256', name: 'totalSupply', type: 'uint256' },
+      { internalType: 'uint256', name: 'userBalance', type: 'uint256' },
+    ],
+    name: 'handleAction',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [{ internalType: 'address', name: '', type: 'address' }],
+    name: 'initialize',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address', name: 'user', type: 'address' },
+      { internalType: 'address', name: 'caller', type: 'address' },
+    ],
+    name: 'setClaimer',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address', name: 'asset', type: 'address' },
+      { internalType: 'address', name: 'reward', type: 'address' },
+      { internalType: 'uint32', name: 'newDistributionEnd', type: 'uint32' },
+    ],
+    name: 'setDistributionEnd',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address', name: 'asset', type: 'address' },
+      { internalType: 'address[]', name: 'rewards', type: 'address[]' },
+      {
+        internalType: 'uint88[]',
+        name: 'newEmissionsPerSecond',
+        type: 'uint88[]',
+      },
+    ],
+    name: 'setEmissionPerSecond',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address', name: 'reward', type: 'address' },
+      {
+        internalType: 'contract IEACAggregatorProxy',
+        name: 'rewardOracle',
+        type: 'address',
+      },
+    ],
+    name: 'setRewardOracle',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address', name: 'reward', type: 'address' },
+      {
+        internalType: 'contract ITransferStrategyBase',
+        name: 'transferStrategy',
+        type: 'address',
+      },
+    ],
+    name: 'setTransferStrategy',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+] as const
+
+export default aaveIncentivesV3Abi
diff --git a/src/earn/EarnDepositBottomSheet.test.tsx b/src/earn/EarnDepositBottomSheet.test.tsx
index 5ec09fe2ae..578e246962 100644
--- a/src/earn/EarnDepositBottomSheet.test.tsx
+++ b/src/earn/EarnDepositBottomSheet.test.tsx
@@ -12,7 +12,7 @@ import { StatsigDynamicConfigs } from 'src/statsig/types'
 import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
 import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
 import { createMockStore } from 'test/utils'
-import { mockARBTokenId, mockTokenBalances } from 'test/values'
+import { mockArbEthTokenId, mockTokenBalances } from 'test/values'
 
 jest.mock('src/statsig')
 
@@ -39,7 +39,7 @@ const mockPreparedTransaction: PreparedTransactionsPossible = {
     },
   ],
   feeCurrency: {
-    ...mockTokenBalances[mockARBTokenId],
+    ...mockTokenBalances[mockArbEthTokenId],
     isNative: true,
     balance: new BigNumber(10),
     priceUsd: new BigNumber(1),
@@ -70,7 +70,7 @@ describe('EarnDepositBottomSheet', () => {
         <EarnDepositBottomSheet
           forwardedRef={{ current: null }}
           amount={'100'}
-          tokenId={mockARBTokenId}
+          tokenId={mockArbEthTokenId}
           preparedTransaction={mockPreparedTransaction}
         />
       </Provider>
@@ -104,7 +104,7 @@ describe('EarnDepositBottomSheet', () => {
         <EarnDepositBottomSheet
           forwardedRef={{ current: null }}
           amount={'100'}
-          tokenId={mockARBTokenId}
+          tokenId={mockArbEthTokenId}
           preparedTransaction={mockPreparedTransaction}
         />
       </Provider>
@@ -117,7 +117,7 @@ describe('EarnDepositBottomSheet', () => {
         type: depositStart.type,
         payload: {
           amount: '100',
-          tokenId: mockARBTokenId,
+          tokenId: mockArbEthTokenId,
           preparedTransactions: getSerializablePreparedTransactions(
             mockPreparedTransaction.transactions
           ),
@@ -132,7 +132,7 @@ describe('EarnDepositBottomSheet', () => {
         <EarnDepositBottomSheet
           forwardedRef={{ current: null }}
           amount={'100'}
-          tokenId={mockARBTokenId}
+          tokenId={mockArbEthTokenId}
           preparedTransaction={mockPreparedTransaction}
         />
       </Provider>
@@ -148,7 +148,7 @@ describe('EarnDepositBottomSheet', () => {
         <EarnDepositBottomSheet
           forwardedRef={{ current: null }}
           amount={'100'}
-          tokenId={mockARBTokenId}
+          tokenId={mockArbEthTokenId}
           preparedTransaction={mockPreparedTransaction}
         />
       </Provider>
@@ -165,7 +165,7 @@ describe('EarnDepositBottomSheet', () => {
         <EarnDepositBottomSheet
           forwardedRef={{ current: null }}
           amount={'100'}
-          tokenId={mockARBTokenId}
+          tokenId={mockArbEthTokenId}
           preparedTransaction={mockPreparedTransaction}
         />
       </Provider>
@@ -188,7 +188,7 @@ describe('EarnDepositBottomSheet', () => {
         <EarnDepositBottomSheet
           forwardedRef={{ current: null }}
           amount={'100'}
-          tokenId={mockARBTokenId}
+          tokenId={mockArbEthTokenId}
           preparedTransaction={mockPreparedTransaction}
         />
       </Provider>
diff --git a/src/earn/poolInfo.test.ts b/src/earn/poolInfo.test.ts
index 8a9942de7f..bcbbc11e6c 100644
--- a/src/earn/poolInfo.test.ts
+++ b/src/earn/poolInfo.test.ts
@@ -1,8 +1,10 @@
 import aavePool from 'src/abis/AavePoolV3'
-import { fetchAavePoolInfo } from 'src/earn/poolInfo'
-import { Network } from 'src/transactions/types'
+import { fetchAavePoolInfo, fetchAaveRewards } from 'src/earn/poolInfo'
+import { Network, NetworkId } from 'src/transactions/types'
+import Logger from 'src/utils/Logger'
 import { publicClient } from 'src/viem'
 import networkConfig from 'src/web3/networkConfig'
+import { mockArbArbTokenBalance } from 'test/values'
 
 describe('poolInfo', () => {
   it('fetches poolInfo from contract', async () => {
@@ -25,3 +27,32 @@ describe('poolInfo', () => {
     })
   })
 })
+
+describe('fetchAaveRewards', () => {
+  const mockRewards = [
+    ['0x912CE59144191C1204E64559FE8253a0e49E6548', '0xba5ddd1f9d7f570dc94a51479a000e3bce967196'], // ARB and AAVE
+    [BigInt('2297012079410746'), BigInt('2297012079490746')],
+  ]
+  const warnSpy = jest.spyOn(Logger, 'warn')
+
+  it('fetches rewards from contract', async () => {
+    jest.spyOn(publicClient[Network.Arbitrum], 'readContract').mockResolvedValue(mockRewards)
+    const result = await fetchAaveRewards({
+      walletAddress: '0x1234',
+      assetAddress: '0x1234',
+      contractAddress: networkConfig.arbAaveIncentivesV3ContractAddress,
+      networkId: NetworkId['arbitrum-sepolia'],
+      allTokens: [mockArbArbTokenBalance],
+    })
+    // should get arb, but not aave because we don't have tokenInfo for it.
+    expect(result).toEqual([
+      {
+        amount: '0.002297012079410746',
+        tokenInfo: mockArbArbTokenBalance,
+      },
+    ])
+
+    // should warn that aave wasn't able to be shown
+    expect(warnSpy).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/src/earn/poolInfo.ts b/src/earn/poolInfo.ts
index 0db1002a86..35c3656937 100644
--- a/src/earn/poolInfo.ts
+++ b/src/earn/poolInfo.ts
@@ -1,10 +1,14 @@
 import BigNumber from 'bignumber.js'
+import aaveIncentivesV3Abi from 'src/abis/AaveIncentivesV3'
 import AavePool from 'src/abis/AavePoolV3'
-import { Network } from 'src/transactions/types'
+import { RewardsInfo } from 'src/earn/types'
+import { TokenBalance } from 'src/tokens/slice'
+import { Network, NetworkId } from 'src/transactions/types'
 import Logger from 'src/utils/Logger'
 import { ensureError } from 'src/utils/ensureError'
 import { publicClient } from 'src/viem'
-import { Address } from 'viem'
+import { networkIdToNetwork } from 'src/web3/networkConfig'
+import { Address, formatUnits } from 'viem'
 
 const TAG = 'earn/poolInfo'
 
@@ -43,3 +47,51 @@ export async function fetchAavePoolInfo({
     throw err
   }
 }
+
+export async function fetchAaveRewards({
+  walletAddress,
+  assetAddress,
+  contractAddress,
+  networkId,
+  allTokens,
+}: {
+  walletAddress: Address
+  assetAddress: Address
+  contractAddress: Address
+  networkId: NetworkId
+  allTokens: TokenBalance[]
+}) {
+  try {
+    const network = networkIdToNetwork[networkId]
+    Logger.debug(TAG, 'Fetching Aave reward info', {
+      assetAddress,
+      contractAddress,
+      network,
+    })
+    const [rewardAddresses, rewardAmounts] = await publicClient[network].readContract({
+      abi: aaveIncentivesV3Abi,
+      address: contractAddress,
+      functionName: 'getAllUserRewards',
+      args: [[assetAddress], walletAddress],
+    })
+    const rewards: RewardsInfo[] = []
+    rewardAddresses.forEach((rewardAddress, index) => {
+      const tokenInfo = allTokens.find(
+        (token) => token.address === rewardAddress.toLowerCase() && token.networkId === networkId
+      )
+      if (!tokenInfo) {
+        Logger.warn(TAG, `Token info not found for rewards address ${rewardAddress}`)
+      } else {
+        rewards.push({
+          amount: formatUnits(rewardAmounts[index], tokenInfo.decimals),
+          tokenInfo,
+        })
+      }
+    })
+    return rewards
+  } catch (error) {
+    const err = ensureError(error)
+    Logger.error(TAG, 'Failed to fetch Aave rewards info', err)
+    throw err
+  }
+}
diff --git a/src/earn/types.ts b/src/earn/types.ts
index f19bc12271..7cd3879f49 100644
--- a/src/earn/types.ts
+++ b/src/earn/types.ts
@@ -1,3 +1,4 @@
+import { TokenBalance } from 'src/tokens/slice'
 import { SerializableTransactionRequest } from 'src/viem/preparedTransactionSerialization'
 
 export interface DepositInfo {
@@ -5,3 +6,8 @@ export interface DepositInfo {
   tokenId: string
   preparedTransactions: SerializableTransactionRequest[]
 }
+
+export interface RewardsInfo {
+  amount: string
+  tokenInfo: TokenBalance
+}
diff --git a/src/web3/networkConfig.ts b/src/web3/networkConfig.ts
index d4c2c28b49..3e47891671 100644
--- a/src/web3/networkConfig.ts
+++ b/src/web3/networkConfig.ts
@@ -92,6 +92,7 @@ interface NetworkConfig {
   saveContactsUrl: string
   getPointsConfigUrl: string
   arbAavePoolV3ContractAddress: Address
+  arbAaveIncentivesV3ContractAddress: Address
   aaveArbUsdcTokenId: string
 }
 
@@ -154,6 +155,10 @@ const AAVE_ARB_USDC_TOKEN_ID_MAINNET = `${NetworkId['arbitrum-one']}:0x724dc807b
 const ARB_AAVE_POOL_V3_CONTRACT_ADDRESS_STAGING = '0xBfC91D59fdAA134A4ED45f7B584cAf96D7792Eff'
 const ARB_AAVE_POOL_V3_CONTRACT_ADDRESS_MAINNET = '0x794a61358D6845594F94dc1DB02A252b5b4814aD'
 
+// also called rewards controller
+const ARB_AAVE_INCENTIVES_V3_CONTRACT_ADDRESS_STAGING = '0x3A203B14CF8749a1e3b7314c6c49004B77Ee667A'
+const ARB_AAVE_INCENTIVES_V3_CONTRACT_ADDRESS_MAINNET = '0x929EC64c34a17401F460460D4B9390518E5B473e'
+
 const CLOUD_FUNCTIONS_STAGING = 'https://api.alfajores.valora.xyz'
 const CLOUD_FUNCTIONS_MAINNET = 'https://api.mainnet.valora.xyz'
 
@@ -372,6 +377,7 @@ const networkConfigs: { [testnet: string]: NetworkConfig } = {
     saveContactsUrl: SAVE_CONTACTS_ALFAJORES,
     getPointsConfigUrl: GET_POINTS_CONFIG_ALFAJORES,
     arbAavePoolV3ContractAddress: ARB_AAVE_POOL_V3_CONTRACT_ADDRESS_STAGING,
+    arbAaveIncentivesV3ContractAddress: ARB_AAVE_INCENTIVES_V3_CONTRACT_ADDRESS_STAGING,
     aaveArbUsdcTokenId: AAVE_ARB_USDC_TOKEN_ID_STAGING,
   },
   [Testnets.mainnet]: {
@@ -468,6 +474,7 @@ const networkConfigs: { [testnet: string]: NetworkConfig } = {
     saveContactsUrl: SAVE_CONTACTS_MAINNET,
     getPointsConfigUrl: GET_POINTS_CONFIG_MAINNET,
     arbAavePoolV3ContractAddress: ARB_AAVE_POOL_V3_CONTRACT_ADDRESS_MAINNET,
+    arbAaveIncentivesV3ContractAddress: ARB_AAVE_INCENTIVES_V3_CONTRACT_ADDRESS_MAINNET,
     aaveArbUsdcTokenId: AAVE_ARB_USDC_TOKEN_ID_MAINNET,
   },
 }
diff --git a/test/values.ts b/test/values.ts
index f9080d828a..2b266bd5df 100644
--- a/test/values.ts
+++ b/test/values.ts
@@ -127,6 +127,7 @@ export const mockCrealAddress = '0xE4D517785D091D3c54818832dB6094bcc2744545'.toL
 export const mockWBTCAddress = '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599'.toLowerCase()
 export const mockUSDCAddress = '0x94a9d9ac8a22534e3faca9f4e7f2e2cf85d5e4c8'.toLowerCase()
 export const mockAaveArbUsdcAddress = '0x460b97BD498E1157530AEb3086301d5225b91216'.toLowerCase()
+export const mockArbArbAddress = '0x912CE59144191C1204E64559FE8253a0e49E6548'.toLowerCase()
 
 export const mockCusdTokenId = `celo-alfajores:${mockCusdAddress}`
 export const mockCeurTokenId = `celo-alfajores:${mockCeurAddress}`
@@ -137,9 +138,10 @@ export const mockCrealTokenId = `celo-alfajores:${mockCrealAddress}`
 export const mockWBTCTokenId = `celo-alfajores:${mockWBTCAddress}`
 export const mockEthTokenId = 'ethereum-sepolia:native'
 export const mockUSDCTokenId = `ethereum-sepolia:${mockUSDCAddress}`
-export const mockARBTokenId = `arbitrum-sepolia:native`
+export const mockArbEthTokenId = `arbitrum-sepolia:native`
 export const mockOPTokenId = `op-sepolia:native`
 export const mockArbUsdcTokenId = `arbitrum-sepolia:${mockUSDCAddress}`
+export const mockArbArbTokenId = `arbitrum-sepolia:${mockArbArbAddress}`
 
 export const mockQrCodeData2 = {
   address: mockAccount2Invite,
@@ -542,10 +544,10 @@ export const mockTokenBalances: Record<string, StoredTokenBalance> = {
     priceUsd: '1',
     priceFetchedAt: Date.now(),
   },
-  [mockARBTokenId]: {
+  [mockArbEthTokenId]: {
     name: 'Ethereum',
     networkId: NetworkId['arbitrum-sepolia'],
-    tokenId: mockARBTokenId,
+    tokenId: mockArbEthTokenId,
     address: null,
     symbol: 'ETH',
     decimals: 18,
@@ -583,6 +585,19 @@ export const mockTokenBalances: Record<string, StoredTokenBalance> = {
     priceUsd: '1',
     priceFetchedAt: Date.now(),
   },
+  [mockArbArbTokenId]: {
+    name: 'Arbitrum',
+    networkId: NetworkId['arbitrum-sepolia'],
+    tokenId: mockArbArbTokenId,
+    address: mockArbArbAddress,
+    symbol: 'ARB',
+    decimals: 18,
+    imageUrl:
+      'https://raw.githubusercontent.com/valora-inc/address-metadata/main/assets/tokens/ARB.png',
+    balance: '0',
+    priceUsd: '1.2',
+    priceFetchedAt: Date.now(),
+  },
 }
 
 export const mockCeloTokenBalance: TokenBalance = {
@@ -607,6 +622,13 @@ export const mockEthTokenBalance: NativeTokenBalance = {
   isNative: true,
 }
 
+export const mockArbArbTokenBalance: TokenBalance = {
+  ...mockTokenBalances[mockArbArbTokenId],
+  priceUsd: new BigNumber(1.2),
+  lastKnownPriceUsd: new BigNumber(1.2),
+  balance: new BigNumber(0),
+}
+
 export const mockTokenBalancesWithHistoricalPrices = {
   [mockPoofTokenId]: {
     ...mockTokenBalances[mockPoofTokenId],

From db2a06349bad998255212daecd0345859313b2f6 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Thu, 16 May 2024 22:48:29 -0700
Subject: [PATCH 011/133] feat(earn): fetch rewards on collect screen (#5424)

### Description

Fetches and displays rewards on collect screen. Also hooks up the screen
to the Exit Pool button on discover tab.

### Test plan

Unit tests, manual

Loading -> display rewards (intentionally slowed down to show loading
state)


https://github.com/valora-inc/wallet/assets/5062591/0d4442e0-7648-4aad-9a84-c8917a99fd23


Error state:
<img
src="https://github.com/valora-inc/wallet/assets/5062591/c9fd1f4c-d636-43ef-91ee-4d9736f9099d"
width="250" />


### Related issues

- Part of ACT-1180

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 locales/base/translation.json       |   6 +-
 src/analytics/Events.tsx            |   1 +
 src/analytics/Properties.tsx        |   6 +
 src/analytics/docs.ts               |   1 +
 src/earn/EarnActivePool.test.tsx    |  24 ++++
 src/earn/EarnActivePool.tsx         |  44 ++-----
 src/earn/EarnCollectScreen.test.tsx | 179 ++++++++++++++++++++++++++++
 src/earn/EarnCollectScreen.tsx      | 143 ++++++++++++----------
 src/earn/hooks.ts                   |  77 ++++++++++++
 src/navigator/types.tsx             |   5 +-
 10 files changed, 391 insertions(+), 95 deletions(-)
 create mode 100644 src/earn/EarnCollectScreen.test.tsx
 create mode 100644 src/earn/hooks.ts

diff --git a/locales/base/translation.json b/locales/base/translation.json
index 1a2ab7af46..dc65c473f1 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -2393,9 +2393,11 @@
       "total": "TOTAL",
       "plus": "PLUS",
       "rate": "Rate (est.)",
-      "apy": "~{{apy}}% APY",
+      "apy": "{{apy}}% APY",
       "fee": "Gas Fee",
-      "cta": "Collect Earnings"
+      "cta": "Collect Earnings",
+      "errorTitle": "Something went wrong",
+      "errorDescription": "Unable to fetch deposit details. Please try again."
     }
   }
 }
diff --git a/src/analytics/Events.tsx b/src/analytics/Events.tsx
index f82cdce7e9..f0ab824de8 100644
--- a/src/analytics/Events.tsx
+++ b/src/analytics/Events.tsx
@@ -689,4 +689,5 @@ export enum EarnEvents {
   earn_deposit_submit_error = 'earn_deposit_submit_error',
   earn_deposit_submit_cancel = 'earn_deposit_submit_cancel',
   earn_view_pools_press = 'earn_view_pools_press',
+  earn_exit_pool_press = 'earn_exit_pool_press',
 }
diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 8366943780..8516680c9a 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -1599,6 +1599,12 @@ interface EarnEventsProperties {
   }
   [EarnEvents.earn_deposit_submit_cancel]: EarnDepositProperties
   [EarnEvents.earn_view_pools_press]: undefined
+  [EarnEvents.earn_exit_pool_press]: {
+    poolTokenId: string
+    networkId: NetworkId
+    tokenAmount: string
+    providerId: string
+  }
 }
 
 export type AnalyticsPropertiesList = AppEventsProperties &
diff --git a/src/analytics/docs.ts b/src/analytics/docs.ts
index 4f8fe18b98..74d962d537 100644
--- a/src/analytics/docs.ts
+++ b/src/analytics/docs.ts
@@ -604,6 +604,7 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [EarnEvents.earn_deposit_submit_error]: `When the deposit transaction fails`,
   [EarnEvents.earn_deposit_submit_cancel]: `When the user cancels the deposit after submitting by cancelling PIN input`,
   [EarnEvents.earn_view_pools_press]: `When the user taps on the view pools button from token details`,
+  [EarnEvents.earn_exit_pool_press]: `When the user taps on the exit pool button from the earn card in discover tab`,
 
   // Legacy event docs
   //  The below events had docs, but are no longer produced by the latest app version.
diff --git a/src/earn/EarnActivePool.test.tsx b/src/earn/EarnActivePool.test.tsx
index fb746b1f30..a6670cdc6b 100644
--- a/src/earn/EarnActivePool.test.tsx
+++ b/src/earn/EarnActivePool.test.tsx
@@ -76,4 +76,28 @@ describe('EarnActivePool', () => {
     expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_view_pools_press)
     expect(navigate).toBeCalledWith(Screens.TabDiscover)
   })
+
+  it('should have correct analytics and navigation with exit pool cta', () => {
+    const { getByText } = render(
+      <Provider store={store}>
+        <EarnActivePool
+          cta="ExitAndDeposit"
+          depositTokenId={networkConfig.arbUsdcTokenId}
+          poolTokenId={networkConfig.aaveArbUsdcTokenId}
+        />
+      </Provider>
+    )
+
+    fireEvent.press(getByText('earnFlow.activePools.exitPool'))
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_exit_pool_press, {
+      poolTokenId: networkConfig.aaveArbUsdcTokenId,
+      networkId: NetworkId['arbitrum-sepolia'],
+      tokenAmount: '10.75',
+      providerId: 'aave-v3',
+    })
+    expect(navigate).toBeCalledWith(Screens.EarnCollectScreen, {
+      depositTokenId: networkConfig.arbUsdcTokenId,
+      poolTokenId: networkConfig.aaveArbUsdcTokenId,
+    })
+  })
 })
diff --git a/src/earn/EarnActivePool.tsx b/src/earn/EarnActivePool.tsx
index eb5d6b6b6b..15837ae21f 100644
--- a/src/earn/EarnActivePool.tsx
+++ b/src/earn/EarnActivePool.tsx
@@ -1,5 +1,4 @@
 import React from 'react'
-import { useAsync } from 'react-async-hook'
 import { useTranslation } from 'react-i18next'
 import { StyleSheet, Text, View } from 'react-native'
 import { EarnEvents } from 'src/analytics/Events'
@@ -7,7 +6,7 @@ import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import Button, { BtnSizes, BtnTypes } from 'src/components/Button'
 import SkeletonPlaceholder from 'src/components/SkeletonPlaceholder'
 import TokenDisplay from 'src/components/TokenDisplay'
-import { fetchAavePoolInfo } from 'src/earn/poolInfo'
+import { useAavePoolInfo } from 'src/earn/hooks'
 import UpwardGraph from 'src/icons/UpwardGraph'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -16,8 +15,6 @@ import { typeScale } from 'src/styles/fonts'
 import { Spacing } from 'src/styles/styles'
 import { useTokenInfo } from 'src/tokens/hooks'
 import Logger from 'src/utils/Logger'
-import networkConfig, { networkIdToNetwork } from 'src/web3/networkConfig'
-import { isAddress } from 'viem'
 
 const TAG = 'earn/EarnActivePool'
 
@@ -45,31 +42,8 @@ interface Props {
 
 export default function EarnActivePool({ depositTokenId, poolTokenId, cta }: Props) {
   const { t } = useTranslation()
-  const depositToken = useTokenInfo(depositTokenId)
   const poolToken = useTokenInfo(poolTokenId)
-  const asyncPoolInfo = useAsync(
-    async () => {
-      if (!depositToken || !depositToken.address) {
-        throw new Error(`Token with id ${depositTokenId} not found`)
-      }
-
-      if (!isAddress(depositToken.address)) {
-        throw new Error(`Token with id ${depositTokenId} does not contain a valid address`)
-      }
-
-      return fetchAavePoolInfo({
-        assetAddress: depositToken.address,
-        contractAddress: networkConfig.arbAavePoolV3ContractAddress,
-        network: networkIdToNetwork[depositToken.networkId],
-      })
-    },
-    [],
-    {
-      onError: (error) => {
-        Logger.warn(TAG, error.message)
-      },
-    }
-  )
+  const asyncPoolInfo = useAavePoolInfo({ depositTokenId })
 
   return (
     <View style={styles.card} testID="EarnActivePool">
@@ -114,9 +88,17 @@ export default function EarnActivePool({ depositTokenId, poolTokenId, cta }: Pro
           <View style={styles.buttonContainer}>
             <Button
               onPress={() => {
-                // TODO (act-1180) create earn review withdraw screen
-                // Will navigate to this screen with appropriate props
-                // fire analytics
+                if (!poolToken) {
+                  Logger.warn(TAG, 'No pool token found')
+                  return
+                }
+                ValoraAnalytics.track(EarnEvents.earn_exit_pool_press, {
+                  poolTokenId,
+                  networkId: poolToken.networkId,
+                  tokenAmount: poolToken.balance.toString(),
+                  providerId: 'aave-v3',
+                })
+                navigate(Screens.EarnCollectScreen, { depositTokenId, poolTokenId })
               }}
               text={t('earnFlow.activePools.exitPool')}
               type={BtnTypes.GRAY_WITH_BORDER}
diff --git a/src/earn/EarnCollectScreen.test.tsx b/src/earn/EarnCollectScreen.test.tsx
new file mode 100644
index 0000000000..33528a9d8f
--- /dev/null
+++ b/src/earn/EarnCollectScreen.test.tsx
@@ -0,0 +1,179 @@
+import { render, waitFor } from '@testing-library/react-native'
+import React from 'react'
+import { Provider } from 'react-redux'
+import EarnCollectScreen from 'src/earn/EarnCollectScreen'
+import { fetchAavePoolInfo, fetchAaveRewards } from 'src/earn/poolInfo'
+import { NetworkId } from 'src/transactions/types'
+import networkConfig from 'src/web3/networkConfig'
+import MockedNavigator from 'test/MockedNavigator'
+import { createMockStore } from 'test/utils'
+import {
+  mockAaveArbUsdcAddress,
+  mockArbArbTokenBalance,
+  mockArbArbTokenId,
+  mockArbUsdcTokenId,
+  mockTokenBalances,
+} from 'test/values'
+
+const store = createMockStore({
+  tokens: {
+    tokenBalances: {
+      ...mockTokenBalances,
+      [networkConfig.aaveArbUsdcTokenId]: {
+        networkId: NetworkId['arbitrum-sepolia'],
+        address: mockAaveArbUsdcAddress,
+        tokenId: networkConfig.aaveArbUsdcTokenId,
+        symbol: 'aArbSepUSDC',
+        priceUsd: '1',
+        balance: '10.75',
+        priceFetchedAt: Date.now(),
+      },
+    },
+  },
+})
+
+jest.mock('src/earn/poolInfo')
+
+describe('EarnCollectScreen', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+    jest.mocked(fetchAavePoolInfo).mockResolvedValue({ apy: 0.03 })
+    jest
+      .mocked(fetchAaveRewards)
+      .mockResolvedValue([{ amount: '0.01', tokenInfo: mockArbArbTokenBalance }])
+  })
+
+  it('renders total balance, rewards and apy', async () => {
+    const { getByText, getByTestId, queryByTestId } = render(
+      <Provider store={store}>
+        <MockedNavigator
+          component={EarnCollectScreen}
+          params={{
+            depositTokenId: mockArbUsdcTokenId,
+            poolTokenId: networkConfig.aaveArbUsdcTokenId,
+          }}
+        />
+      </Provider>
+    )
+
+    expect(getByText('earnFlow.collect.title')).toBeTruthy()
+    expect(getByText('earnFlow.collect.total')).toBeTruthy()
+    expect(getByTestId(`EarnCollect/${mockArbUsdcTokenId}/CryptoAmount`)).toHaveTextContent(
+      '10.75 USDC'
+    )
+    expect(getByTestId(`EarnCollect/${mockArbUsdcTokenId}/FiatAmount`)).toHaveTextContent('₱14.30')
+    expect(getByTestId('EarnCollect/RewardsLoading')).toBeTruthy()
+    expect(getByTestId('EarnCollect/ApyLoading')).toBeTruthy()
+    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
+
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/RewardsLoading')).toBeFalsy()
+    })
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/ApyLoading')).toBeFalsy()
+    })
+    expect(getByText('earnFlow.collect.plus')).toBeTruthy()
+    expect(getByTestId(`EarnCollect/${mockArbArbTokenId}/CryptoAmount`)).toHaveTextContent(
+      '0.01 ARB'
+    )
+    expect(getByTestId(`EarnCollect/${mockArbArbTokenId}/FiatAmount`)).toHaveTextContent('₱0.016')
+    expect(getByTestId('EarnCollectScreen/CTA')).toBeEnabled()
+
+    expect(getByText('earnFlow.collect.apy, {"apy":"3.00"}')).toBeTruthy()
+  })
+
+  it('skips rewards section when no rewards', async () => {
+    jest.mocked(fetchAaveRewards).mockResolvedValue([])
+    const { getByText, getByTestId, queryByTestId, queryByText } = render(
+      <Provider store={store}>
+        <MockedNavigator
+          component={EarnCollectScreen}
+          params={{
+            depositTokenId: mockArbUsdcTokenId,
+            poolTokenId: networkConfig.aaveArbUsdcTokenId,
+          }}
+        />
+      </Provider>
+    )
+
+    expect(getByText('earnFlow.collect.title')).toBeTruthy()
+    expect(getByText('earnFlow.collect.total')).toBeTruthy()
+    expect(getByTestId(`EarnCollect/${mockArbUsdcTokenId}/CryptoAmount`)).toHaveTextContent(
+      '10.75 USDC'
+    )
+    expect(getByTestId(`EarnCollect/${mockArbUsdcTokenId}/FiatAmount`)).toHaveTextContent('₱14.30')
+    expect(getByTestId('EarnCollect/RewardsLoading')).toBeTruthy()
+    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
+
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/RewardsLoading')).toBeFalsy()
+    })
+    expect(queryByText('earnFlow.collect.plus')).toBeFalsy()
+    expect(queryByTestId(`EarnCollect/${mockArbArbTokenId}/CryptoAmount`)).toBeFalsy()
+    expect(queryByTestId(`EarnCollect/${mockArbArbTokenId}/FiatAmount`)).toBeFalsy()
+    expect(getByTestId('EarnCollectScreen/CTA')).toBeEnabled()
+  })
+
+  it('shows error and keeps cta disabled if rewards loading fails', async () => {
+    jest.mocked(fetchAaveRewards).mockRejectedValue(new Error('Failed to fetch rewards'))
+    const { getByText, getByTestId, queryByText, queryByTestId } = render(
+      <Provider store={store}>
+        <MockedNavigator
+          component={EarnCollectScreen}
+          params={{
+            depositTokenId: mockArbUsdcTokenId,
+            poolTokenId: networkConfig.aaveArbUsdcTokenId,
+          }}
+        />
+      </Provider>
+    )
+
+    expect(getByText('earnFlow.collect.title')).toBeTruthy()
+    expect(getByText('earnFlow.collect.total')).toBeTruthy()
+    expect(getByTestId('EarnCollect/RewardsLoading')).toBeTruthy()
+    expect(getByTestId('EarnCollect/ApyLoading')).toBeTruthy()
+    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
+
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/RewardsLoading')).toBeFalsy()
+    })
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/ApyLoading')).toBeFalsy()
+    })
+    expect(getByText('earnFlow.collect.errorTitle')).toBeTruthy()
+    expect(queryByText('earnFlow.collect.plus')).toBeFalsy()
+    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
+  })
+
+  it('skips error and enables cta if only apy loading fails', async () => {
+    jest.mocked(fetchAavePoolInfo).mockRejectedValue(new Error('Failed to fetch apy'))
+    const { getByText, getByTestId, queryByTestId, queryByText } = render(
+      <Provider store={store}>
+        <MockedNavigator
+          component={EarnCollectScreen}
+          params={{
+            depositTokenId: mockArbUsdcTokenId,
+            poolTokenId: networkConfig.aaveArbUsdcTokenId,
+          }}
+        />
+      </Provider>
+    )
+
+    expect(getByText('earnFlow.collect.title')).toBeTruthy()
+    expect(getByText('earnFlow.collect.total')).toBeTruthy()
+    expect(getByTestId('EarnCollect/RewardsLoading')).toBeTruthy()
+    expect(getByTestId('EarnCollect/ApyLoading')).toBeTruthy()
+    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
+
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/RewardsLoading')).toBeFalsy()
+    })
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/ApyLoading')).toBeFalsy()
+    })
+    expect(getByText('earnFlow.collect.apy, {"apy":"--"}')).toBeTruthy()
+    expect(getByText('earnFlow.collect.plus')).toBeTruthy()
+    expect(getByTestId('EarnCollectScreen/CTA')).toBeEnabled()
+    expect(queryByText('earnFlow.collect.errorTitle')).toBeFalsy()
+  })
+})
diff --git a/src/earn/EarnCollectScreen.tsx b/src/earn/EarnCollectScreen.tsx
index 58f388e182..5b4eb51cbb 100644
--- a/src/earn/EarnCollectScreen.tsx
+++ b/src/earn/EarnCollectScreen.tsx
@@ -1,69 +1,50 @@
-import React from 'react'
-
+import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import BigNumber from 'bignumber.js'
+import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { SafeAreaView, ScrollView, StyleSheet, Text, View } from 'react-native'
+import SkeletonPlaceholder from 'react-native-skeleton-placeholder'
 import Button, { BtnSizes } from 'src/components/Button'
+import InLineNotification, { NotificationVariant } from 'src/components/InLineNotification'
 import TokenDisplay from 'src/components/TokenDisplay'
 import TokenIcon, { IconSize } from 'src/components/TokenIcon'
+import { useAavePoolInfo, useAaveRewardsInfo } from 'src/earn/hooks'
+import { Screens } from 'src/navigator/Screens'
+import { StackParamList } from 'src/navigator/types'
+import { useSelector } from 'src/redux/hooks'
 import Colors from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
 import { Spacing } from 'src/styles/styles'
 import { useTokenInfo } from 'src/tokens/hooks'
+import { feeCurrenciesSelector } from 'src/tokens/selectors'
 import { TokenBalance } from 'src/tokens/slice'
-import { NetworkId } from 'src/transactions/types'
-import networkConfig from 'src/web3/networkConfig'
 
-export default function EarnCollectScreen() {
-  // TODO: replace with actual token info, pool info, rewards info, pool apy, max fee amount, fee currency
+type Props = NativeStackScreenProps<StackParamList, Screens.EarnCollectScreen>
+
+export default function EarnCollectScreen({ route }: Props) {
+  const { t } = useTranslation()
+  const { depositTokenId, poolTokenId } = route.params
+  const depositToken = useTokenInfo(depositTokenId)
+  const poolToken = useTokenInfo(poolTokenId)
 
-  const tokenInfo = useTokenInfo(networkConfig.arbUsdcTokenId)
-  const poolTokenInfo = useTokenInfo(networkConfig.aaveArbUsdcTokenId)
-  const rewardTokenInfo = useTokenInfo(`${NetworkId['arbitrum-sepolia']}:native`)
-  const feeCurrency = useTokenInfo(`${NetworkId['arbitrum-sepolia']}:native`)
-  if (!tokenInfo || !rewardTokenInfo || !feeCurrency || !poolTokenInfo) {
-    return null
+  if (!depositToken || !poolToken) {
+    // should never happen
+    throw new Error('Deposit / pool token not found')
   }
 
-  const dummyRewardsInfo = [{ amount: new BigNumber(0.00003), tokenInfo: rewardTokenInfo }]
-  const poolApy = 3.47
+  const asyncRewardsInfo = useAaveRewardsInfo({ poolTokenId })
+
+  // TODO(ACT-1180): prepare a tx and handle these
+  const feeCurrencies = useSelector((state) => feeCurrenciesSelector(state, depositToken.networkId))
   const maxFeeAmount = new BigNumber(0.0001)
   const onPress = () => {
     // Todo handle prepared transactions
   }
 
-  // TODO: Add loading state
-  return (
-    <EarnCollectComponent
-      tokenInfo={tokenInfo}
-      poolTokenInfo={poolTokenInfo}
-      rewardsInfo={dummyRewardsInfo}
-      poolApy={poolApy}
-      maxFeeAmount={maxFeeAmount}
-      feeCurrency={feeCurrency}
-      onPress={onPress}
-    />
-  )
-}
+  // skipping apy fetch error because that isn't blocking collecting rewards
+  const error = asyncRewardsInfo.error
+  const ctaDisabled = asyncRewardsInfo.loading || asyncRewardsInfo.error
 
-function EarnCollectComponent({
-  tokenInfo,
-  poolTokenInfo,
-  poolApy,
-  rewardsInfo,
-  maxFeeAmount,
-  feeCurrency,
-  onPress,
-}: {
-  tokenInfo: TokenBalance
-  poolTokenInfo: TokenBalance
-  poolApy: number
-  maxFeeAmount: BigNumber
-  feeCurrency: TokenBalance
-  onPress: () => void
-  rewardsInfo: { amount: BigNumber; tokenInfo: TokenBalance }[]
-}) {
-  const { t } = useTranslation()
   return (
     <SafeAreaView style={styles.container}>
       <ScrollView contentContainerStyle={styles.contentContainer}>
@@ -71,10 +52,15 @@ function EarnCollectComponent({
         <View style={styles.collectInfoContainer}>
           <CollectItem
             title={t('earnFlow.collect.total')}
-            tokenInfo={tokenInfo}
-            rewardAmount={poolTokenInfo.balance}
+            tokenInfo={depositToken}
+            rewardAmount={poolToken.balance}
           />
-          {rewardsInfo.map((info, index) => (
+          {asyncRewardsInfo.loading && (
+            <SkeletonPlaceholder backgroundColor={Colors.gray2} testID="EarnCollect/RewardsLoading">
+              <View style={styles.rewardsLoading} />
+            </SkeletonPlaceholder>
+          )}
+          {asyncRewardsInfo.result?.map((info, index) => (
             <CollectItem
               title={t('earnFlow.collect.plus')}
               key={index}
@@ -83,16 +69,26 @@ function EarnCollectComponent({
             />
           ))}
           <View style={styles.separator} />
-          <Rate tokenInfo={poolTokenInfo} poolApy={poolApy} />
-          <GasFee maxFeeAmount={maxFeeAmount} feeCurrency={feeCurrency} />
+          <Rate depositToken={depositToken} />
+          <GasFee maxFeeAmount={maxFeeAmount} feeCurrency={feeCurrencies[0]} />
         </View>
+        {error && (
+          <InLineNotification
+            variant={NotificationVariant.Error}
+            title={t('earnFlow.collect.errorTitle')}
+            description={t('earnFlow.collect.errorDescription')}
+            style={styles.error}
+          />
+        )}
       </ScrollView>
+
       <Button
         style={styles.button}
         size={BtnSizes.FULL}
         text={t('earnFlow.collect.cta')}
         onPress={onPress}
         testID="EarnCollectScreen/CTA"
+        disabled={!!ctaDisabled}
       />
     </SafeAreaView>
   )
@@ -104,7 +100,7 @@ function CollectItem({
   title,
 }: {
   tokenInfo: TokenBalance
-  rewardAmount: BigNumber
+  rewardAmount: BigNumber.Value
   title: string
 }) {
   return (
@@ -120,12 +116,14 @@ function CollectItem({
             tokenId={tokenInfo.tokenId}
             amount={rewardAmount}
             showLocalAmount={false}
+            testID={`EarnCollect/${tokenInfo.tokenId}/CryptoAmount`}
           />
           <TokenDisplay
             style={styles.fiatText}
             tokenId={tokenInfo.tokenId}
             amount={rewardAmount}
             showLocalAmount={true}
+            testID={`EarnCollect/${tokenInfo.tokenId}/FiatAmount`}
           />
         </View>
       </View>
@@ -133,20 +131,33 @@ function CollectItem({
   )
 }
 
-function Rate({ tokenInfo, poolApy }: { tokenInfo: TokenBalance; poolApy: number }) {
+function Rate({ depositToken }: { depositToken: TokenBalance }) {
   const { t } = useTranslation()
+  const asyncPoolInfo = useAavePoolInfo({ depositTokenId: depositToken.tokenId })
   return (
     <View>
       <Text style={styles.rateText}>{t('earnFlow.collect.rate')}</Text>
       <View style={styles.row}>
-        <TokenIcon token={tokenInfo} size={IconSize.SMALL} />
-        <View style={styles.apyContainer}>
+        <TokenIcon token={depositToken} size={IconSize.SMALL} />
+        {asyncPoolInfo.result && (
           <Text style={styles.apyText}>
-            {t('earnFlow.activePools.apy', {
-              apy: poolApy,
+            {t('earnFlow.collect.apy', {
+              apy: (asyncPoolInfo.result.apy * 100).toFixed(2),
             })}
           </Text>
-        </View>
+        )}
+        {asyncPoolInfo.loading && (
+          <SkeletonPlaceholder
+            backgroundColor={Colors.gray2}
+            highlightColor={Colors.white}
+            testID="EarnCollect/ApyLoading"
+          >
+            <View style={styles.apyLoading} />
+          </SkeletonPlaceholder>
+        )}
+        {asyncPoolInfo.error && (
+          <Text style={styles.apyText}>{t('earnFlow.collect.apy', { apy: '--' })}</Text>
+        )}
       </View>
     </View>
   )
@@ -217,18 +228,20 @@ const styles = StyleSheet.create({
     color: Colors.black,
     marginBottom: Spacing.Smallest8,
   },
+  rewardsLoading: {
+    height: 72,
+    borderRadius: 16,
+    marginBottom: Spacing.Regular16,
+  },
   separator: {
     marginBottom: Spacing.Regular16,
     borderBottomWidth: 1,
     borderBottomColor: Colors.gray2,
   },
-  apyContainer: {
-    flexDirection: 'row',
-    alignItems: 'center',
-  },
   rateText: {
     ...typeScale.bodySmall,
     color: Colors.gray4,
+    marginBottom: Spacing.Tiny4,
   },
   iconContainer: {
     flexDirection: 'row',
@@ -237,6 +250,11 @@ const styles = StyleSheet.create({
   apyText: {
     ...typeScale.labelSemiBoldSmall,
   },
+  apyLoading: {
+    width: 64,
+    borderRadius: 100,
+    ...typeScale.labelSemiBoldSmall,
+  },
   gasFeeFiat: {
     ...typeScale.bodyXSmall,
     color: Colors.gray4,
@@ -244,4 +262,7 @@ const styles = StyleSheet.create({
   button: {
     padding: Spacing.Thick24,
   },
+  error: {
+    marginTop: Spacing.Regular16,
+  },
 })
diff --git a/src/earn/hooks.ts b/src/earn/hooks.ts
new file mode 100644
index 0000000000..596e5ecd53
--- /dev/null
+++ b/src/earn/hooks.ts
@@ -0,0 +1,77 @@
+import { useAsync } from 'react-async-hook'
+import { fetchAavePoolInfo, fetchAaveRewards } from 'src/earn/poolInfo'
+import { useSelector } from 'src/redux/hooks'
+import { useTokenInfo, useTokensList } from 'src/tokens/hooks'
+import Logger from 'src/utils/Logger'
+import networkConfig, { networkIdToNetwork } from 'src/web3/networkConfig'
+import { walletAddressSelector } from 'src/web3/selectors'
+import { isAddress } from 'viem'
+
+const TAG = 'earn/hooks'
+
+export function useAavePoolInfo({ depositTokenId }: { depositTokenId: string }) {
+  const depositToken = useTokenInfo(depositTokenId)
+  const asyncPoolInfo = useAsync(
+    async () => {
+      if (!depositToken || !depositToken.address) {
+        throw new Error(`Token with id ${depositTokenId} not found`)
+      }
+
+      if (!isAddress(depositToken.address)) {
+        throw new Error(`Token with id ${depositTokenId} does not contain a valid address`)
+      }
+
+      return fetchAavePoolInfo({
+        assetAddress: depositToken.address,
+        contractAddress: networkConfig.arbAavePoolV3ContractAddress,
+        network: networkIdToNetwork[depositToken.networkId],
+      })
+    },
+    [],
+    {
+      onError: (error) => {
+        Logger.warn(`${TAG}/useAavePoolInfo`, error.message)
+      },
+    }
+  )
+
+  return asyncPoolInfo
+}
+
+export function useAaveRewardsInfo({ poolTokenId }: { poolTokenId: string }) {
+  const poolTokenInfo = useTokenInfo(poolTokenId)
+  const walletAddress = useSelector(walletAddressSelector)
+  const allTokens = useTokensList()
+
+  return useAsync(
+    async () => {
+      if (!poolTokenInfo || !poolTokenInfo.address) {
+        throw new Error(`Token with id ${networkConfig.aaveArbUsdcTokenId} not found`)
+      }
+
+      if (!isAddress(poolTokenInfo.address)) {
+        throw new Error(
+          `Token with id ${networkConfig.arbUsdcTokenId} does not contain a valid address`
+        )
+      }
+
+      if (!walletAddress || !isAddress(walletAddress)) {
+        throw new Error(`Invalid wallet address: ${walletAddress}`)
+      }
+
+      return fetchAaveRewards({
+        walletAddress,
+        assetAddress: poolTokenInfo.address,
+        contractAddress: networkConfig.arbAaveIncentivesV3ContractAddress,
+        networkId: poolTokenInfo.networkId,
+        allTokens,
+      })
+    },
+    [],
+    {
+      onError: (error) => {
+        Logger.warn(`${TAG}/useAaveRewardsInfo`, error.message)
+      },
+    }
+  )
+}
diff --git a/src/navigator/types.tsx b/src/navigator/types.tsx
index 9ecdfdce01..21707f348f 100644
--- a/src/navigator/types.tsx
+++ b/src/navigator/types.tsx
@@ -81,7 +81,10 @@ export type StackParamList = {
     rewardId: string
   }
   [Screens.Debug]: undefined
-  [Screens.EarnCollectScreen]: undefined
+  [Screens.EarnCollectScreen]: {
+    depositTokenId: string
+    poolTokenId: string
+  }
   [Screens.ErrorScreen]: {
     errorMessage?: string
   }

From 99d3822a4d80b80ae6237440db1de0dfaa04b80b Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Fri, 17 May 2024 13:35:34 -0700
Subject: [PATCH 012/133] feat(earn): add function for preparing withdraw
 transactions (#5426)

### Description

As the title

### Test plan

Unit tests, manually by invoking this function

### Related issues

- Part of ACT-1180

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/earn/prepareTransactions.test.ts | 108 ++++++++++++++++++++++++++-
 src/earn/prepareTransactions.ts      |  61 +++++++++++++++
 2 files changed, 168 insertions(+), 1 deletion(-)

diff --git a/src/earn/prepareTransactions.test.ts b/src/earn/prepareTransactions.test.ts
index c14e0e7e76..1faae04052 100644
--- a/src/earn/prepareTransactions.test.ts
+++ b/src/earn/prepareTransactions.test.ts
@@ -1,14 +1,20 @@
 import BigNumber from 'bignumber.js'
 import { FetchMock } from 'jest-fetch-mock/types'
+import aaveIncentivesV3Abi from 'src/abis/AaveIncentivesV3'
 import aavePool from 'src/abis/AavePoolV3'
 import erc20 from 'src/abis/IERC20'
-import { prepareSupplyTransactions } from 'src/earn/prepareTransactions'
+import {
+  prepareSupplyTransactions,
+  prepareWithdrawAndClaimTransactions,
+} from 'src/earn/prepareTransactions'
 import { getDynamicConfigParams } from 'src/statsig'
 import { StatsigDynamicConfigs } from 'src/statsig/types'
 import { TokenBalance } from 'src/tokens/slice'
 import { Network, NetworkId } from 'src/transactions/types'
 import { publicClient } from 'src/viem'
 import { prepareTransactions } from 'src/viem/prepareTransactions'
+import networkConfig from 'src/web3/networkConfig'
+import { mockArbArbAddress, mockArbArbTokenBalance } from 'test/values'
 import { Address, encodeFunctionData } from 'viem'
 
 const mockFeeCurrency: TokenBalance = {
@@ -278,4 +284,104 @@ describe('prepareTransactions', () => {
       ).rejects.toThrow('Expected 2 simulated transactions, got 1')
     })
   })
+
+  describe('prepareWithdrawAndClaimTransactions', () => {
+    it('prepares withdraw and claim transactions', async () => {
+      const rewards = [
+        {
+          amount: '0.002',
+          tokenInfo: mockArbArbTokenBalance,
+        },
+        {
+          amount: '0.003',
+          tokenInfo: mockToken,
+        },
+      ]
+      const result = await prepareWithdrawAndClaimTransactions({
+        amount: '5',
+        token: mockToken,
+        walletAddress: '0x1234',
+        feeCurrencies: [mockFeeCurrency],
+        rewards,
+        poolTokenAddress: '0x5678',
+      })
+
+      const expectedTransactions = [
+        {
+          from: '0x1234',
+          to: networkConfig.arbAavePoolV3ContractAddress,
+          data: '0xencodedData',
+        },
+        {
+          from: '0x1234',
+          to: networkConfig.arbAaveIncentivesV3ContractAddress,
+          data: '0xencodedData',
+        },
+        {
+          from: '0x1234',
+          to: networkConfig.arbAaveIncentivesV3ContractAddress,
+          data: '0xencodedData',
+        },
+      ]
+      expect(result).toEqual({
+        type: 'possible',
+        feeCurrency: mockFeeCurrency,
+        transactions: expectedTransactions,
+      })
+      expect(encodeFunctionData).toHaveBeenCalledTimes(3)
+      expect(encodeFunctionData).toHaveBeenCalledWith({
+        abi: aavePool,
+        functionName: 'withdraw',
+        args: [mockTokenAddress, BigInt(5e6), '0x1234'],
+      })
+      expect(encodeFunctionData).toHaveBeenCalledWith({
+        abi: aaveIncentivesV3Abi,
+        functionName: 'claimRewardsToSelf',
+        args: [['0x5678'], BigInt(2e15), mockArbArbAddress],
+      })
+      expect(encodeFunctionData).toHaveBeenCalledWith({
+        abi: aaveIncentivesV3Abi,
+        functionName: 'claimRewardsToSelf',
+        args: [['0x5678'], BigInt(3000), mockTokenAddress],
+      })
+      expect(prepareTransactions).toHaveBeenCalledWith({
+        baseTransactions: expectedTransactions,
+        feeCurrencies: [mockFeeCurrency],
+      })
+    })
+
+    it('prepares only withdraw transaction if no rewards', async () => {
+      const result = await prepareWithdrawAndClaimTransactions({
+        amount: '5',
+        token: mockToken,
+        walletAddress: '0x1234',
+        feeCurrencies: [mockFeeCurrency],
+        rewards: [],
+        poolTokenAddress: '0x5678',
+      })
+
+      const expectedTransactions = [
+        {
+          from: '0x1234',
+          to: networkConfig.arbAavePoolV3ContractAddress,
+          data: '0xencodedData',
+        },
+      ]
+      expect(result).toEqual({
+        type: 'possible',
+        feeCurrency: mockFeeCurrency,
+        transactions: expectedTransactions,
+      })
+      expect(encodeFunctionData).toHaveBeenCalledTimes(1)
+      expect(encodeFunctionData).toHaveBeenCalledWith({
+        abi: aavePool,
+        functionName: 'withdraw',
+        args: [mockTokenAddress, BigInt(5e6), '0x1234'],
+      })
+      expect(prepareTransactions).toHaveBeenCalledWith({
+        baseTransactions: expectedTransactions,
+        feeCurrencies: [mockFeeCurrency],
+      })
+    })
+  })
 })
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 8862a6462f..ca168303d7 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -1,6 +1,8 @@
 import BigNumber from 'bignumber.js'
+import aaveIncentivesV3Abi from 'src/abis/AaveIncentivesV3'
 import aavePool from 'src/abis/AavePoolV3'
 import erc20 from 'src/abis/IERC20'
+import { RewardsInfo } from 'src/earn/types'
 import { getDynamicConfigParams } from 'src/statsig'
 import { DynamicConfigs } from 'src/statsig/constants'
 import { StatsigDynamicConfigs } from 'src/statsig/types'
@@ -131,3 +133,62 @@ export async function prepareSupplyTransactions({
     spendTokenAmount: new BigNumber(amount),
   })
 }
+
+export async function prepareWithdrawAndClaimTransactions({
+  amount,
+  token,
+  walletAddress,
+  feeCurrencies,
+  rewards,
+  poolTokenAddress,
+}: {
+  amount: string
+  token: TokenBalance
+  poolTokenAddress: Address
+  walletAddress: Address
+  feeCurrencies: TokenBalance[]
+  rewards: RewardsInfo[]
+}) {
+  const baseTransactions: TransactionRequest[] = []
+
+  if (!token.address || !isAddress(token.address)) {
+    // should never happen
+    throw new Error(`Cannot use a token without address. Token id: ${token.tokenId}`)
+  }
+
+  const amountToWithdraw = parseUnits(amount, token.decimals)
+
+  baseTransactions.push({
+    from: walletAddress,
+    to: networkConfig.arbAavePoolV3ContractAddress,
+    data: encodeFunctionData({
+      abi: aavePool,
+      functionName: 'withdraw',
+      args: [token.address, amountToWithdraw, walletAddress],
+    }),
+  })
+
+  rewards.forEach(({ amount, tokenInfo }) => {
+    const amountToClaim = parseUnits(amount, tokenInfo.decimals)
+
+    if (!tokenInfo.address || !isAddress(tokenInfo.address)) {
+      // should never happen
+      throw new Error(`Cannot use a token without address. Token id: ${token.tokenId}`)
+    }
+
+    baseTransactions.push({
+      from: walletAddress,
+      to: networkConfig.arbAaveIncentivesV3ContractAddress,
+      data: encodeFunctionData({
+        abi: aaveIncentivesV3Abi,
+        functionName: 'claimRewardsToSelf',
+        args: [[poolTokenAddress], amountToClaim, tokenInfo.address],
+      }),
+    })
+  })
+
+  return prepareTransactions({
+    feeCurrencies,
+    baseTransactions,
+  })
+}

From 2666d6cef6bbb8af6cce6075efe6cca07ad67ba7 Mon Sep 17 00:00:00 2001
From: valora-bot-crowdin
 <80050969+valora-bot-crowdin@users.noreply.github.com>
Date: Fri, 17 May 2024 13:47:40 -0700
Subject: [PATCH 013/133] chore(l10n): update translations from Crowdin (#5420)

Co-authored-by: Valora Bot <89419329+valora-bot@users.noreply.github.com>
---
 locales/de/translation.json     | 24 ++++++++++++++++++++++--
 locales/en-US/translation.json  | 26 +++++++++++++++++++++++---
 locales/es-419/translation.json | 24 ++++++++++++++++++++++--
 locales/fr-FR/translation.json  | 24 ++++++++++++++++++++++--
 locales/it-IT/translation.json  | 24 ++++++++++++++++++++++--
 locales/pl-PL/translation.json  | 24 ++++++++++++++++++++++--
 locales/pt-BR/translation.json  | 24 ++++++++++++++++++++++--
 locales/ru-RU/translation.json  | 24 ++++++++++++++++++++++--
 locales/th-TH/translation.json  | 24 ++++++++++++++++++++++--
 locales/tr-TR/translation.json  | 24 ++++++++++++++++++++++--
 locales/uk-UA/translation.json  | 24 ++++++++++++++++++++++--
 locales/vi-VN/translation.json  | 24 ++++++++++++++++++++++--
 locales/zh-CN/translation.json  | 24 ++++++++++++++++++++++--
 13 files changed, 287 insertions(+), 27 deletions(-)

diff --git a/locales/de/translation.json b/locales/de/translation.json
index bac77d09ea..f48eab3f39 100644
--- a/locales/de/translation.json
+++ b/locales/de/translation.json
@@ -1815,6 +1815,15 @@
       "networkFeeNoNetwork": "Netzwerkgebühr",
       "swapFee": "{{appName}}-Gebühr",
       "swapFeeWaived": "Kostenlos",
+      "appFee": "{{appName}}-Gebühr",
+      "appFeeValue": "<0></0> <1>(<0></0>)</1>",
+      "appFeeValue_withoutPriceUsd": "<0></0>",
+      "appFeeValue_free": "Kostenlos",
+      "appFeeValue_placeholder": "-",
+      "appFeeInfo": "{{appName}} Gebühr\n\nWir erheben eine Gebühr für den Tausch von Token auf {{appName}}. Die Gebühr beträgt {{appFeePercentage}}% des Betrags, den du tauschst.",
+      "appFeeInfo_free": "{{appName}} Gebühr\n\nDieser Tausch ist kostenlos.",
+      "appFeeInfo_placeholder": "{{appName}} Gebühr\n\nDie Gebühr wird auf der Grundlage des Angebots berechnet, das du erhältst.",
+      "appFeeInfoDismissButton": "Verstanden",
       "slippagePercentage": "Slippage-Toleranz",
       "networkFeeInfo": "Du tauschst über das {{networkName}}-Netzwerk.\n\nUm eine Transaktion über das {{networkName}}-Netzwerk durchzuführen, musst du diese geschätzte Netzwerkgebühr bezahlen. Diese Gebühr sichert deine Transaktion und trägt dazu bei, das Netzwerk aufrechtzuerhalten.",
       "networkFeeInfoV1_76": "Du tauschst über das {{networkName}} Netzwerk.\n\nUm eine Transaktion über das {{networkName}} Netzwerk durchzuführen, ist eine Netzwerkgebühr erforderlich. Diese Gebühr sichert deine Transaktion ab und wird an die Netzwerk-Validierer gezahlt.\n\nDa der genaue Betrag von den Netzwerkbedingungen abhängt, ist die angegebene Gebühr der erwartete Betrag. Die Gebühr wird den maximalen Betrag nicht überschreiten.",
@@ -2327,6 +2336,15 @@
       "moreComing": {
         "title": "Mehr dazu demnächst!"
       }
+    },
+    "discoverCard": {
+      "title": "{{appName}} Punkte",
+      "description": "Sammle ganz einfach Punkte mit {{appName}}. Die Nutzung der App, einschließlich des Tauschens, führt zu Punkten!"
+    },
+    "intro": {
+      "title": "Mühelos Punkte sammeln",
+      "description": "Erlebe eine neue Art zu verdienen! Für deine {{appName}} Aktionen gibt es jetzt Punkte. Fang noch heute an zu verdienen und schalte tolle Vorteile frei.",
+      "cta": "Beginne deine Punkte-Reise"
     }
   },
   "earnFlow": {
@@ -2373,9 +2391,11 @@
       "total": "GESAMT",
       "plus": "PLUS",
       "rate": "Rate (geschätzt)",
-      "apy": "~{{apy}}% APY",
+      "apy": "{{apy}}% APY",
       "fee": "Gasgebühr",
-      "cta": "Verdienste sammeln"
+      "cta": "Verdienste sammeln",
+      "errorTitle": "Etwas ist schief gelaufen",
+      "errorDescription": "Die Einzahlungsdetails können nicht abgerufen werden. Bitte versuche es erneut."
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/en-US/translation.json b/locales/en-US/translation.json
index b8bd28d775..5e592f02e8 100644
--- a/locales/en-US/translation.json
+++ b/locales/en-US/translation.json
@@ -256,7 +256,7 @@
     }
   ],
   "consumerIncentivesTitle": "Get started with Supercharge",
-  "consumerIncentivesSummary": "Supercharge is here! Get {{percent}}% annual rewards on your highest stablecoin balance (cUSD, cEUR, or cREAL). Available for a limited time. Here's how it works:",
+  "consumerIncentivesSummary": "But more rewards are headed your way. Until May 28, get {{percent}}% annual rewards on your highest stablecoin balance (cUSD, cEUR, or cREAL). Here's how it works:",
   "earnWeekly": {
     "header": "Connect your phone number",
     "text": "Tap Connect Number if you haven't connected it yet."
@@ -1815,6 +1815,15 @@
       "networkFeeNoNetwork": "Network Fee",
       "swapFee": "{{appName}} Fee",
       "swapFeeWaived": "Free",
+      "appFee": "{{appName}} Fee",
+      "appFeeValue": "<0></0> <1>(<0></0>)</1>",
+      "appFeeValue_withoutPriceUsd": "<0></0>",
+      "appFeeValue_free": "Free",
+      "appFeeValue_placeholder": "-",
+      "appFeeInfo": "{{appName}} Fee\n\nWe charge a fee to swap tokens on {{appName}}. The fee is {{appFeePercentage}}% of the amount you are exchanging.",
+      "appFeeInfo_free": "{{appName}} Fee\n\nThis swap is free of charge.",
+      "appFeeInfo_placeholder": "{{appName}} Fee\n\nThe fee is calculated based on the quote you receive.",
+      "appFeeInfoDismissButton": "Got it",
       "slippagePercentage": "Slippage Tolerance",
       "networkFeeInfo": "You are swapping on the {{networkName}} Network.\n\nThis estimated network fee is required to conduct a transaction on the {{networkName}} Network. This fee secures your transaction and goes towards keeping the network operational.",
       "networkFeeInfoV1_76": "You are swapping on the {{networkName}} Network.\n\nA network fee is required to conduct a transaction on the {{networkName}} Network. This fee secures your transaction and is paid to network validators.\n\nSince network conditions determine the exact amount, the listed estimate is what we expect the actual fee to be. The fee will not exceed the max fee amount.",
@@ -2327,6 +2336,15 @@
       "moreComing": {
         "title": "More coming soon!"
       }
+    },
+    "discoverCard": {
+      "title": "{{appName}} Points",
+      "description": "Earn points easily with {{appName}}. Using the app, including swapping, leads to points!"
+    },
+    "intro": {
+      "title": "Earn points effortlessly",
+      "description": "Jump into a new way to earn! Your {{appName}} actions now earn points. Start earning today and unlock awesome benefits.",
+      "cta": "Start your points journey"
     }
   },
   "earnFlow": {
@@ -2373,9 +2391,11 @@
       "total": "TOTAL",
       "plus": "PLUS",
       "rate": "Rate (est.)",
-      "apy": "~{{apy}}% APY",
+      "apy": "{{apy}}% APY",
       "fee": "Gas Fee",
-      "cta": "Collect Earnings"
+      "cta": "Collect Earnings",
+      "errorTitle": "Something went wrong",
+      "errorDescription": "Unable to fetch deposit details. Please try again."
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/es-419/translation.json b/locales/es-419/translation.json
index 94bd06c311..922091636b 100644
--- a/locales/es-419/translation.json
+++ b/locales/es-419/translation.json
@@ -1815,6 +1815,15 @@
       "networkFeeNoNetwork": "Tarifa de red",
       "swapFee": "Tarifa de {{appName}}",
       "swapFeeWaived": "Gratis",
+      "appFee": "Tarifa de {{appName}}",
+      "appFeeValue": "<0></0> <1>(<0></0>)</1>",
+      "appFeeValue_withoutPriceUsd": "<0></0>",
+      "appFeeValue_free": "Gratis",
+      "appFeeValue_placeholder": "-",
+      "appFeeInfo": "{{appName}} Comisión\n\nCobramos una comisión por intercambiar fichas en {{appName}}. La comisión es {{appFeePercentage}}% de la cantidad que intercambies.",
+      "appFeeInfo_free": "{{appName}} Tarifa\n\nEste intercambio es gratuito.",
+      "appFeeInfo_placeholder": "{{appName}} Tarifa\n\nLa tarifa se calcula en función del presupuesto que recibas.",
+      "appFeeInfoDismissButton": "Entendido",
       "slippagePercentage": "Tolerancia al slippage",
       "networkFeeInfo": "Estás intercambiando en la red {{networkName}}.\n\nSe requiere esta tarifa de red estimada para realizar una transacción en la red {{networkName}}. Esta tarifa asegura tu transacción y se destina a mantener la red.",
       "networkFeeInfoV1_76": "Estás intercambiando en la Red {{networkName}}.\n\nSe requiere una tarifa de red para realizar una transacción en la Red {{networkName}}. Esta tarifa asegura tu transacción y se paga a los validadores de la red.\n\nDado que las condiciones de la red determinan el monto exacto, la estimación indicada es lo que esperamos que sea la tarifa real. La tarifa no superará el monto máximo.",
@@ -2327,6 +2336,15 @@
       "moreComing": {
         "title": "¡Pronto más!"
       }
+    },
+    "discoverCard": {
+      "title": "{{appName}} Puntos",
+      "description": "Gana puntos fácilmente con {{appName}}. Utilizar la aplicación, incluidos los intercambios, ¡conlleva puntos!"
+    },
+    "intro": {
+      "title": "Gana puntos sin esfuerzo",
+      "description": "¡Entra en una nueva forma de ganar! Tus acciones en {{appName}} ahora ganan puntos. Empieza a ganar hoy y desbloquea increíbles ventajas.",
+      "cta": "Comienza tu viaje por los puntos"
     }
   },
   "earnFlow": {
@@ -2373,9 +2391,11 @@
       "total": "TOTAL",
       "plus": "MÁS",
       "rate": "Tasa (est.)",
-      "apy": "~{{apy}}% APY",
+      "apy": "{{apy}}% APY",
       "fee": "Tasa del gas",
-      "cta": "Recaudar ingresos"
+      "cta": "Recaudar ingresos",
+      "errorTitle": "Algo salió mal",
+      "errorDescription": "No se han podido obtener los datos del depósito. Vuelve a intentarlo."
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/fr-FR/translation.json b/locales/fr-FR/translation.json
index fad991377a..59f686dc33 100644
--- a/locales/fr-FR/translation.json
+++ b/locales/fr-FR/translation.json
@@ -1815,6 +1815,15 @@
       "networkFeeNoNetwork": "Frais de réseau",
       "swapFee": "Frais de {{appName}}",
       "swapFeeWaived": "Gratuit",
+      "appFee": "Frais de {{appName}}",
+      "appFeeValue": "<0></0> <1>(<0></0>)</1>",
+      "appFeeValue_withoutPriceUsd": "<0></0>",
+      "appFeeValue_free": "Gratuit",
+      "appFeeValue_placeholder": "-",
+      "appFeeInfo": "{{appName}} Frais\n\nNous facturons des frais pour échanger des jetons sur {{appName}}. Ces frais s'élèvent à {{appFeePercentage}}% du montant que tu échanges.",
+      "appFeeInfo_free": "{{appName}} Frais\n\nCet échange est gratuit.",
+      "appFeeInfo_placeholder": "{{appName}} Frais\n\nLes frais sont calculés en fonction du devis que tu reçois.",
+      "appFeeInfoDismissButton": "J'ai compris",
       "slippagePercentage": "Tolérance de glissement",
       "networkFeeInfo": "Vous échangez sur le réseau {{networkName}} .\n\nCes frais de réseau estimés sont nécessaires pour effectuer une transaction sur le réseau {{networkName}}. Ces frais sécurisent votre transaction et permettent le bon fonctionnement du réseau.",
       "networkFeeInfoV1_76": "Vous êtes en train d'échanger sur le réseau {{networkName}}.\n\nUne taxe de réseau est demandée pour effectuer une transaction sur le réseau {{networkName}}. Ces frais sécurisent votre transaction et sont reversés aux validateurs du réseau.\n\nDans la mesure où les conditions du réseau déterminent le montant exact, le montant indiqué correspond à une estimation des frais réels. Les frais ne dépasseront pas le montant maximum.",
@@ -2327,6 +2336,15 @@
       "moreComing": {
         "title": "Plus d'informations bientôt !"
       }
+    },
+    "discoverCard": {
+      "title": "{{appName}} Points",
+      "description": "Gagne facilement des points avec {{appName}}. L'utilisation de l'application, y compris l'échange, permet de gagner des points !"
+    },
+    "intro": {
+      "title": "Gagne des points sans effort",
+      "description": "Saute dans une nouvelle façon de gagner de l'argent ! Tes actions sur {{appName}} te permettent désormais de gagner des points. Commence à gagner des points dès aujourd'hui et débloque des avantages impressionnants.",
+      "cta": "Commence ton voyage de points"
     }
   },
   "earnFlow": {
@@ -2373,9 +2391,11 @@
       "total": "TOTAL",
       "plus": "PLUS",
       "rate": "Taux (est.)",
-      "apy": "~{{apy}}% APY",
+      "apy": "{{apy}}% APY",
       "fee": "Frais de gaz",
-      "cta": "Collecter les gains"
+      "cta": "Collecter les gains",
+      "errorTitle": "Une erreur s'est produite",
+      "errorDescription": "Impossible de récupérer les détails du dépôt. Essaie à nouveau."
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/it-IT/translation.json b/locales/it-IT/translation.json
index 22b5b42b95..4034ad7c68 100644
--- a/locales/it-IT/translation.json
+++ b/locales/it-IT/translation.json
@@ -1815,6 +1815,15 @@
       "networkFeeNoNetwork": "Commissione di rete",
       "swapFee": "Commissione di {{appName}}",
       "swapFeeWaived": "Gratuito",
+      "appFee": "Commissione di {{appName}}",
+      "appFeeValue": "<0></0> <1>(<0></0>)</1>",
+      "appFeeValue_withoutPriceUsd": "<0></0>",
+      "appFeeValue_free": "Gratuito",
+      "appFeeValue_placeholder": "-",
+      "appFeeInfo": "{{appName}} Commissione\n\nApplichiamo una commissione per lo scambio di token su {{appName}}. La commissione è pari al {{appFeePercentage}}% dell'importo che stai scambiando.",
+      "appFeeInfo_free": "{{appName}} Costo\n\nQuesto scambio è gratuito.",
+      "appFeeInfo_placeholder": "{{appName}} Tariffa\n\nLa tariffa viene calcolata in base al preventivo ricevuto.",
+      "appFeeInfoDismissButton": "Ho capito",
       "slippagePercentage": "Tolleranza slippage",
       "networkFeeInfo": "Stai effettuando uno scambio sulla rete {{networkName}}.\n\nQuesta commissione di rete stimata è necessaria per eseguire una transazione sulla rete {{networkName}}. Questa commissione protegge la tua transazione e serve a mantenere operativa la rete.",
       "networkFeeInfoV1_76": "Stai effettuando uno scambio sulla Rete {{networkName}}.\n\nPer effettuare una transazione sulla Rete {{networkName}} è richiesta una commissione di rete. Questa commissione garantisce la sicurezza della transazione e viene pagata ai validatori della rete.\n\nPoiché le condizioni della rete determinano l'importo esatto, la stima indicata è la somma che ci aspettiamo corrisponda alla commissione effettiva. La commissione non supererà l'importo massimo previsto.",
@@ -2327,6 +2336,15 @@
       "moreComing": {
         "title": "Prossimamente ne arriveranno altri!"
       }
+    },
+    "discoverCard": {
+      "title": "{{appName}} Punti",
+      "description": "Guadagna punti facilmente con {{appName}}. L'utilizzo dell'app, compreso lo scambio, porta a guadagnare punti!"
+    },
+    "intro": {
+      "title": "Accumula punti senza fatica",
+      "description": "Scopri un nuovo modo di guadagnare! Le tue azioni su {{appName}} ora fanno guadagnare punti. Inizia a guadagnare oggi stesso e sblocca fantastici vantaggi.",
+      "cta": "Inizia il tuo viaggio a punti"
     }
   },
   "earnFlow": {
@@ -2373,9 +2391,11 @@
       "total": "TOTALE",
       "plus": "PIÙ",
       "rate": "Tasso (est.)",
-      "apy": "~{{apy}}% APY",
+      "apy": "{{apy}}% APY",
       "fee": "Tassa sul gas",
-      "cta": "Raccogli i guadagni"
+      "cta": "Raccogli i guadagni",
+      "errorTitle": "Si è verificato un errore",
+      "errorDescription": "Impossibile recuperare i dettagli del deposito. Riprova."
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/pl-PL/translation.json b/locales/pl-PL/translation.json
index e023e05af9..f0df865c45 100644
--- a/locales/pl-PL/translation.json
+++ b/locales/pl-PL/translation.json
@@ -1819,6 +1819,15 @@
       "networkFeeNoNetwork": "Opłata sieciowa",
       "swapFee": "Opłata w aplikacji {{appName}}",
       "swapFeeWaived": "Bezpłatnie",
+      "appFee": "Opłata w aplikacji {{appName}}",
+      "appFeeValue": "<0></0> <1>(<0></0>)</1>",
+      "appFeeValue_withoutPriceUsd": "<0></0>",
+      "appFeeValue_free": "Bezpłatnie",
+      "appFeeValue_placeholder": "-",
+      "appFeeInfo": "{{appName}} Opłata\n\nPobieramy opłatę za wymianę tokenów na {{appName}}. Opłata wynosi {{appFeePercentage}}% kwoty, którą wymieniasz.",
+      "appFeeInfo_free": "{{appName}} Opłata\n\nTa wymiana jest bezpłatna.",
+      "appFeeInfo_placeholder": "{{appName}} Opłata\n\nOpłata jest obliczana na podstawie otrzymanej wyceny.",
+      "appFeeInfoDismissButton": "Rozumiem",
       "slippagePercentage": "Tolerancja poślizgu",
       "networkFeeInfo": "Dokonujesz wymiany w sieci {{networkName}}.\n\nTa szacunkowa opłata sieciowa jest wymagana do przeprowadzenia transakcji w sieci {{networkName}}. Opłata ta zabezpiecza Twoją transakcję i przeznaczana jest na utrzymanie działania sieci.",
       "networkFeeInfoV1_76": "Dokonujesz wymiany w sieci {{networkName}}.\n\nDo przeprowadzenia transakcji w sieci {{networkName}} wymagana jest opłata sieciowa. Zabezpiecza ona Twoją transakcję i jest wypłacana weryfikatorom sieci.\n\nWarunki sieciowe określają dokładną kwotę, dlatego podane szacunki przedstawiają oczekiwaną przez nas opłatę. Nie przekroczy ona maksymalnej kwoty opłaty.",
@@ -2331,6 +2340,15 @@
       "moreComing": {
         "title": "Więcej już wkrótce!"
       }
+    },
+    "discoverCard": {
+      "title": "{{appName}} Punkty",
+      "description": "Łatwo zdobywaj punkty dzięki {{appName}}. Korzystanie z aplikacji, w tym wymiana, prowadzi do zdobywania punktów!"
+    },
+    "intro": {
+      "title": "Zdobywaj punkty bez wysiłku",
+      "description": "Poznaj nowy sposób zarabiania! Twoje działania na {{appName}} przynoszą teraz punkty. Zacznij zarabiać już dziś i odblokuj niesamowite korzyści.",
+      "cta": "Rozpocznij swoją podróż po punkty"
     }
   },
   "earnFlow": {
@@ -2377,9 +2395,11 @@
       "total": "RAZEM",
       "plus": "PLUS",
       "rate": "Stawka (szacunkowa)",
-      "apy": "~{{apy}}% APY",
+      "apy": "{{apy}}% RRSO",
       "fee": "Opłata za gaz",
-      "cta": "Zbieraj zarobki"
+      "cta": "Zbieraj zarobki",
+      "errorTitle": "Coś poszło nie tak",
+      "errorDescription": "Nie można pobrać szczegółów wpłaty. Spróbuj ponownie."
     }
   },
   "celoDollarAmount_0": "<0></0> Celo Dolar",
diff --git a/locales/pt-BR/translation.json b/locales/pt-BR/translation.json
index 6fa7c660ac..546918c35d 100644
--- a/locales/pt-BR/translation.json
+++ b/locales/pt-BR/translation.json
@@ -1815,6 +1815,15 @@
       "networkFeeNoNetwork": "Taxa de rede",
       "swapFee": "Taxa da {{appName}}",
       "swapFeeWaived": "Grátis",
+      "appFee": "Taxa da {{appName}}",
+      "appFeeValue": "<0></0> <1>(<0></0>)</1>",
+      "appFeeValue_withoutPriceUsd": "<0></0>",
+      "appFeeValue_free": "Grátis",
+      "appFeeValue_placeholder": "-",
+      "appFeeInfo": "{{appName}} Taxa\n\nCobramos uma taxa para você trocar tokens em {{appName}}. A taxa é {{appFeePercentage}}% do valor que você está trocando.",
+      "appFeeInfo_free": "{{appName}} Tarifa\n\nEssa troca é gratuita.",
+      "appFeeInfo_placeholder": "{{appName}} Taxa\n\nA taxa é calculada com base na cotação que você receber.",
+      "appFeeInfoDismissButton": "Entendi",
       "slippagePercentage": "Tolerância do slippage",
       "networkFeeInfo": "Você está trocando na rede {{networkName}}.\n\nEsta taxa de rede estimada é necessária para realizar uma transação na rede {{networkName}}. Essa taxa protege a sua transação e visa manter a rede operacional.",
       "networkFeeInfoV1_76": "Você está trocando na rede {{networkName}}.\n\nUma taxa de rede é necessária para realizar uma transação na rede {{networkName}}. Essa taxa protege sua transação e é paga aos validadores da rede.\n\nComo as condições da rede determinam a quantia exata, a estimativa listada é o que esperamos que seja a taxa real. A taxa não excederá a quantia máxima da taxa.",
@@ -2327,6 +2336,15 @@
       "moreComing": {
         "title": "Em breve, você receberá mais informações!"
       }
+    },
+    "discoverCard": {
+      "title": "{{appName}} Pontos",
+      "description": "Ganhe pontos facilmente com o {{appName}}. Ao usar o aplicativo, incluindo a troca, você ganha pontos!"
+    },
+    "intro": {
+      "title": "Ganhe pontos sem esforço",
+      "description": "Você está em uma nova forma de ganhar! Agora você ganha pontos com as ações do {{appName}} . Comece a ganhar pontos hoje mesmo e desbloqueie benefícios incríveis.",
+      "cta": "Comece sua jornada de pontos"
     }
   },
   "earnFlow": {
@@ -2373,9 +2391,11 @@
       "total": "TOTAL",
       "plus": "MAIS",
       "rate": "Taxa (est.)",
-      "apy": "~{{apy}}% APY",
+      "apy": "{{apy}}% APY",
       "fee": "Taxa de gás",
-      "cta": "Coleta de ganhos"
+      "cta": "Coleta de ganhos",
+      "errorTitle": "Algo deu errado",
+      "errorDescription": "Não foi possível obter os detalhes do depósito. Por favor, tente novamente."
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/ru-RU/translation.json b/locales/ru-RU/translation.json
index bcec64d6fd..cee8c306db 100644
--- a/locales/ru-RU/translation.json
+++ b/locales/ru-RU/translation.json
@@ -1819,6 +1819,15 @@
       "networkFeeNoNetwork": "Комиссия сообщества",
       "swapFee": "Комиссия {{appName}}",
       "swapFeeWaived": "Бесплатно",
+      "appFee": "Комиссия {{appName}}",
+      "appFeeValue": "<0></0> <1>(<0></0>)</1>",
+      "appFeeValue_withoutPriceUsd": "<0></0>",
+      "appFeeValue_free": "Бесплатно",
+      "appFeeValue_placeholder": "-",
+      "appFeeInfo": "{{appName}} Комиссия\n\nМы взимаем комиссию за обмен токенов на сайте {{appName}}. Комиссия составляет {{appFeePercentage}}% от суммы, которую ты обмениваешь.",
+      "appFeeInfo_free": "{{appName}} Плата\n\nЭтот своп бесплатный.",
+      "appFeeInfo_placeholder": "{{appName}} Гонорар\n\nГонорар рассчитывается на основе полученной тобой цитаты.",
+      "appFeeInfoDismissButton": "Понятно",
       "slippagePercentage": "Допустимое проскальзывание",
       "networkFeeInfo": "Вы выполняете обмен в сеть {{networkName}}.\n\nЭта примерная комиссия сеть необходима для выполнения транзакции в {{networkName}}. Она обеспечивает безопасность транзакции и работоспособность сеть.",
       "networkFeeInfoV1_76": "Вы совершаете обмен в сеть {{networkName}}.\n\nЭта примерная комиссия сеть необходима для выполнения транзакции в {{networkName}}. Она обеспечивает безопасность транзакции и выплачивается валидаторам сеть.\n\nТочная сумма определяется условиями сеть, и мы полагаем, что реальная комиссия будет равняться указанной приблизительной сумме. Размер комиссии не превысит максимальную сумму.",
@@ -2331,6 +2340,15 @@
       "moreComing": {
         "title": "Скоро будет больше!"
       }
+    },
+    "discoverCard": {
+      "title": "{{appName}} Очки",
+      "description": "Зарабатывай очки легко с помощью {{appName}}. Использование приложения, включая обмен, приводит к начислению очков!"
+    },
+    "intro": {
+      "title": "Зарабатывай очки без особых усилий",
+      "description": "Переходи на новый способ заработка! За твои действия на сайте {{appName}} теперь начисляются баллы. Начни зарабатывать уже сегодня и открой для себя потрясающие преимущества.",
+      "cta": "Начни свое путешествие по очкам"
     }
   },
   "earnFlow": {
@@ -2377,9 +2395,11 @@
       "total": "ВСЕ",
       "plus": "ПЛЮС",
       "rate": "Ставка (эст.)",
-      "apy": "~{{apy}}% APY",
+      "apy": "{{apy}}% APY",
       "fee": "Плата за газ",
-      "cta": "Собирайте заработок"
+      "cta": "Собирайте заработок",
+      "errorTitle": "Что-то пошло не так",
+      "errorDescription": "Невозможно получить данные о депозите. Пожалуйста, попробуй еще раз."
     }
   },
   "celoDollarAmount_0": "<0></0> Celo Dollar",
diff --git a/locales/th-TH/translation.json b/locales/th-TH/translation.json
index 4350681f2a..02ead11a9d 100644
--- a/locales/th-TH/translation.json
+++ b/locales/th-TH/translation.json
@@ -1813,6 +1813,15 @@
       "networkFeeNoNetwork": "ค่าธรรมเนียมเครือข่าย",
       "swapFee": "ค่าธรรมเนียม {{appName}}",
       "swapFeeWaived": "ฟรี",
+      "appFee": "ค่าธรรมเนียม {{appName}}",
+      "appFeeValue": "<0></0> <1>(<0></0>)</1>",
+      "appFeeValue_withoutPriceUsd": "<0></0>",
+      "appFeeValue_free": "ฟรี",
+      "appFeeValue_placeholder": "-",
+      "appFeeInfo": "{{appName}} Fee\n\nWe charge a fee to swap tokens on {{appName}}. The fee is {{appFeePercentage}}% of the amount you are exchanging.",
+      "appFeeInfo_free": "{{appName}} Fee\n\nThis swap is free of charge.",
+      "appFeeInfo_placeholder": "{{appName}} Fee\n\nThe fee is calculated based on the quote you receive.",
+      "appFeeInfoDismissButton": "เข้าใจแล้ว",
       "slippagePercentage": "การยอมรับราคาคลาดเคลื่อน",
       "networkFeeInfo": "คุณกำลังสว็อปบนเครือข่าย {{networkName}}\n\nการดำเนินการธุรกรรมบนเครือข่าย {{networkName}} จำเป็นต้องมีค่าธรรมเนียมเครือข่ายโดยประมาณนี้ ค่าธรรมเนียมนี้จะช่วยดูแลธุรกรรมของคุณให้ปลอดภัยและสนับสนุนการดำเนินงานของเครือข่าย",
       "networkFeeInfoV1_76": "คุณกำลังสว็อปบนเครือข่าย {{networkName}}\n\nการทำธุรกรรมบนเครือข่าย {{networkName}} มีค่าธรรมเนียมเครือข่าย ค่าธรรมเนียมดังกล่าวเป็นการรักษาความปลอดภัยให้กับธุรกรรมของคุณโดยจะชำระให้กับผู้ตรวจสอบเครือข่าย\n\nเนื่องจากเงื่อนไขของเครือข่ายมีการกำหนดจำนวนเงินที่แน่นอน เราจึงคาดว่ารายการค่าธรรมเนียมประมาณการนี้เป็นค่าธรรมเนียมที่แท้จริง ค่าธรรมเนียมจะไม่เกินกว่าจำนวนค่าธรรมเนียมสูงสุด",
@@ -2325,6 +2334,15 @@
       "moreComing": {
         "title": "More coming soon!"
       }
+    },
+    "discoverCard": {
+      "title": "{{appName}} Points",
+      "description": "Earn points easily with {{appName}}. Using the app, including swapping, leads to points!"
+    },
+    "intro": {
+      "title": "Earn points effortlessly",
+      "description": "Jump into a new way to earn! Your {{appName}} actions now earn points. Start earning today and unlock awesome benefits.",
+      "cta": "Start your points journey"
     }
   },
   "earnFlow": {
@@ -2371,9 +2389,11 @@
       "total": "TOTAL",
       "plus": "PLUS",
       "rate": "Rate (est.)",
-      "apy": "~{{apy}}% APY",
+      "apy": "{{apy}}% APY",
       "fee": "Gas Fee",
-      "cta": "Collect Earnings"
+      "cta": "Collect Earnings",
+      "errorTitle": "มีบางอย่างผิดปกติ",
+      "errorDescription": "Unable to fetch deposit details. Please try again."
     }
   },
   "celoDollarAmount_0": "&amp;lt;0&amp;gt;&amp;lt;/0&amp;gt; Celo ดอลลาร์"
diff --git a/locales/tr-TR/translation.json b/locales/tr-TR/translation.json
index 7e3fe481df..276d65fe98 100644
--- a/locales/tr-TR/translation.json
+++ b/locales/tr-TR/translation.json
@@ -1815,6 +1815,15 @@
       "networkFeeNoNetwork": "Ağ Ücreti",
       "swapFee": "{{appName}} Ücreti",
       "swapFeeWaived": "Ücretsiz",
+      "appFee": "{{appName}} Ücreti",
+      "appFeeValue": "<0></0> <1>(<0></0>)</1>",
+      "appFeeValue_withoutPriceUsd": "<0></0>",
+      "appFeeValue_free": "Ücretsiz",
+      "appFeeValue_placeholder": "-",
+      "appFeeInfo": "{{appName}} Ücret\n\nJetonları {{appName}}adresinde takas etmek için bir ücret alıyoruz. Ücret, takas ettiğiniz miktarın {{appFeePercentage}}%'sidir.",
+      "appFeeInfo_free": "{{appName}} Ücret\n\nBu takas ücretsizdir.",
+      "appFeeInfo_placeholder": "{{appName}} Ücret\n\nÜcret, aldığınız teklife göre hesaplanır.",
+      "appFeeInfoDismissButton": "Anladım",
       "slippagePercentage": "Slipaj Toleransı",
       "networkFeeInfo": "{{networkName}} Ağında swap işlemi yapıyorsunuz.\n\nBu tahmini ağ ücreti, {{networkName}} Ağında bir işlem gerçekleştirmek için gereklidir. Bu ücret işleminizi güvence altına alır ve ağın çalışır durumda kalmasını sağlar.",
       "networkFeeInfoV1_76": "{{networkName}} Ağında takas yapıyorsunuz.\n\n{{networkName}} Ağında işlem gerçekleştirmek için bir ağ ücreti gereklidir. Bu ücret işleminizi güvence altına alır ve ağ doğrulayıcılarına ödenir.\n\nAğ koşulları kesin tutarı belirlediğinden, listelenen tahmin, gerçek ücretin ne olmasını beklediğimizdir. Ücret, maksimum ücret tutarını aşmayacaktır.",
@@ -2327,6 +2336,15 @@
       "moreComing": {
         "title": "Daha fazlası yakında!"
       }
+    },
+    "discoverCard": {
+      "title": "{{appName}} Puanlar",
+      "description": "{{appName}}ile kolayca puan kazanın. Takas da dahil olmak üzere uygulamayı kullanmak puan kazandırır!"
+    },
+    "intro": {
+      "title": "Zahmetsizce puan kazanın",
+      "description": "Kazanmak için yeni bir yola girin! {{appName}} eylemleriniz artık puan kazandırıyor. Bugün kazanmaya başlayın ve harika avantajların kilidini açın.",
+      "cta": "Puan yolculuğunuza başlayın"
     }
   },
   "earnFlow": {
@@ -2373,9 +2391,11 @@
       "total": "TOPLAM",
       "plus": "ARTI",
       "rate": "Oran (tahmini)",
-      "apy": "~{{apy}}% APY",
+      "apy": "{{apy}}% APY",
       "fee": "Gaz Ücreti",
-      "cta": "Kazançları Toplayın"
+      "cta": "Kazançları Toplayın",
+      "errorTitle": "Bir şeyler ters gitti",
+      "errorDescription": "Para yatırma detayları alınamıyor. Lütfen tekrar deneyin."
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/uk-UA/translation.json b/locales/uk-UA/translation.json
index f5547cbfda..f2fe7889f0 100644
--- a/locales/uk-UA/translation.json
+++ b/locales/uk-UA/translation.json
@@ -1819,6 +1819,15 @@
       "networkFeeNoNetwork": "Комісія за мережу",
       "swapFee": "Комісія {{appName}}",
       "swapFeeWaived": "Безплатно",
+      "appFee": "Комісія {{appName}}",
+      "appFeeValue": "<0></0> <1>(<0></0>)</1>",
+      "appFeeValue_withoutPriceUsd": "<0></0>",
+      "appFeeValue_free": "Безплатно",
+      "appFeeValue_placeholder": "-",
+      "appFeeInfo": "{{appName}} Комісія\n\nМи стягуємо комісію за обмін токенів на {{appName}}. Комісія становить {{appFeePercentage}}% від суми, яку ви обмінюєте.",
+      "appFeeInfo_free": "{{appName}} Вартість\n\nЦей обмін безкоштовний.",
+      "appFeeInfo_placeholder": "{{appName}} Комісія\n\nКомісія розраховується на основі отриманої вами пропозиції.",
+      "appFeeInfoDismissButton": "Зрозуміло",
       "slippagePercentage": "Допуск прослизання",
       "networkFeeInfo": "Ви обмінюєтеся активами в мережі {{networkName}}.\n\nОрієнтовна комісія мережі потрібна, щоб виконати транзакцію в мережі {{networkName}}. Комісія допомагає убезпечити транзакцію і спрямована на підтримку роботи мережі.",
       "networkFeeInfoV1_76": "Ви обмінюєтеся активами в мережі {{networkName}}.\n\nКомісія мережі потрібна, щоб виконати транзакцію в мережі {{networkName}}. Комісія допомагає убезпечити транзакцію і сплачується валідаторам мережі.\n\nОскільки за умовами мережі визначається точна сума, орієнтовне допущене значення — очікувана сума фактичної комісії. Комісія не перевищуватиме максимальну суму.",
@@ -2331,6 +2340,15 @@
       "moreComing": {
         "title": "Скоро буде більше!"
       }
+    },
+    "discoverCard": {
+      "title": "{{appName}} Бали",
+      "description": "Легко заробляйте бали з {{appName}}. Використання додатку, включаючи обмін, приносить бали!"
+    },
+    "intro": {
+      "title": "Заробляйте бали без зайвих зусиль",
+      "description": "Переходьте до нового способу заробітку! Ваші дії на сайті {{appName}} тепер приносять бали. Почніть заробляти вже сьогодні та отримайте чудові переваги.",
+      "cta": "Розпочніть свою подорож балами"
     }
   },
   "earnFlow": {
@@ -2377,9 +2395,11 @@
       "total": "ВСЬОГО",
       "plus": "ПЛЮС",
       "rate": "Ставка (ест.)",
-      "apy": "~{{apy}}% APY",
+      "apy": "{{apy}}% APY",
       "fee": "Плата за газ",
-      "cta": "Збирайте заробіток"
+      "cta": "Збирайте заробіток",
+      "errorTitle": "Щось пішло не так",
+      "errorDescription": "Не вдається отримати інформацію про депозит. Спробуйте ще раз."
     }
   },
   "celoDollarAmount_0": "<0></0> Celo Dollar",
diff --git a/locales/vi-VN/translation.json b/locales/vi-VN/translation.json
index cd864a1315..f7270cb968 100644
--- a/locales/vi-VN/translation.json
+++ b/locales/vi-VN/translation.json
@@ -1813,6 +1813,15 @@
       "networkFeeNoNetwork": "Phí mạng lưới",
       "swapFee": "Phí {{appName}}",
       "swapFeeWaived": "Miễn phí",
+      "appFee": "Phí {{appName}}",
+      "appFeeValue": "<0></0> <1>(<0></0>)</1>",
+      "appFeeValue_withoutPriceUsd": "<0></0>",
+      "appFeeValue_free": "Miễn phí",
+      "appFeeValue_placeholder": "-",
+      "appFeeInfo": "{{appName}} Fee\n\nWe charge a fee to swap tokens on {{appName}}. The fee is {{appFeePercentage}}% of the amount you are exchanging.",
+      "appFeeInfo_free": "{{appName}} Fee\n\nThis swap is free of charge.",
+      "appFeeInfo_placeholder": "{{appName}} Fee\n\nThe fee is calculated based on the quote you receive.",
+      "appFeeInfoDismissButton": "Đã hiểu",
       "slippagePercentage": "Tỷ lệ trượt giá chấp nhận",
       "networkFeeInfo": "Bạn đang trao đổi trên Mạng {{networkName}}.\n\nĐể thực hiện giao dịch trên Mạng {{networkName}}, bạn bắt buộc phải trả khoản phí mạng lưới ước tính này. Khoản phí này sẽ đảm bảo cho giao dịch của bạn và được sử dụng để duy trì hoạt động của mạng.",
       "networkFeeInfoV1_76": "Bạn đang trao đổi trên Mạng {{networkName}}.\n\nĐể thực hiện giao dịch trên Mạng {{networkName}}, bạn bắt buộc phải trả khoản phí mạng này. Khoản phí này sẽ đảm bảo cho giao dịch của bạn và được sử dụng để thanh toán cho các trình xác thực mạng.\n\nDo phí giao dịch chính xác phụ thuộc vào tình trạng mạng, nên mức phí ước tính được nêu tại đây là số tiền chúng tôi dự đoán. Khoản phí này sẽ không vượt quá mức phí tối đa.",
@@ -2325,6 +2334,15 @@
       "moreComing": {
         "title": "More coming soon!"
       }
+    },
+    "discoverCard": {
+      "title": "{{appName}} Points",
+      "description": "Earn points easily with {{appName}}. Using the app, including swapping, leads to points!"
+    },
+    "intro": {
+      "title": "Earn points effortlessly",
+      "description": "Jump into a new way to earn! Your {{appName}} actions now earn points. Start earning today and unlock awesome benefits.",
+      "cta": "Start your points journey"
     }
   },
   "earnFlow": {
@@ -2371,9 +2389,11 @@
       "total": "TOTAL",
       "plus": "PLUS",
       "rate": "Rate (est.)",
-      "apy": "~{{apy}}% APY",
+      "apy": "{{apy}}% APY",
       "fee": "Gas Fee",
-      "cta": "Collect Earnings"
+      "cta": "Collect Earnings",
+      "errorTitle": "Đã xảy ra lỗi",
+      "errorDescription": "Unable to fetch deposit details. Please try again."
     }
   },
   "celoDollarAmount_0": "&amp;lt;0&amp;gt;&amp;lt;/0&amp;gt; Đô la Celo"
diff --git a/locales/zh-CN/translation.json b/locales/zh-CN/translation.json
index 4cd9d09876..11ae38a72a 100644
--- a/locales/zh-CN/translation.json
+++ b/locales/zh-CN/translation.json
@@ -1813,6 +1813,15 @@
       "networkFeeNoNetwork": "网络费用",
       "swapFee": "{{appName}} 费用",
       "swapFeeWaived": "免费",
+      "appFee": "{{appName}} 费用",
+      "appFeeValue": "<0></0> <1>(<0></0>)</1>",
+      "appFeeValue_withoutPriceUsd": "<0></0>",
+      "appFeeValue_free": "免费",
+      "appFeeValue_placeholder": "-",
+      "appFeeInfo": "{{appName}} 费用\n\n我们对在 {{appName}}上交换代币收取一定费用。费用为您兑换金额的 {{appFeePercentage}}%。",
+      "appFeeInfo_free": "{{appName}} 费用\n\n本次交换是免费的。",
+      "appFeeInfo_placeholder": "{{appName}} 费用\n\n费用根据您收到的报价计算。",
+      "appFeeInfoDismissButton": "知道了",
       "slippagePercentage": "滑点调整",
       "networkFeeInfo": "您正在 {{networkName}} 网络上进行交换。\n\n在 {{networkName}} 网络上进行交易需要支付该预估网络费用。该费用可确保您的交易安全，并用于维持网络正常运行。",
       "networkFeeInfoV1_76": "您正在 {{networkName}} 网络上进行交换。\n\n在 {{networkName}} 网络上进行交易需要支付网络费用。该费用可确保您的交易安全，并支付给网络验证机构。\n\n由于网络条件决定了确切的金额，因此列出的估算费用是我们预计的实际费用。该费用不会超过最大费用金额。",
@@ -2325,6 +2334,15 @@
       "moreComing": {
         "title": "更多内容即将推出！"
       }
+    },
+    "discoverCard": {
+      "title": "{{appName}} 积分",
+      "description": "通过 {{appName}}轻松赚取积分。使用应用程序（包括交换）可获得积分！"
+    },
+    "intro": {
+      "title": "轻松赚取积分",
+      "description": "跳转到新的赚钱方式！您的 {{appName}} 行动现在可以赚取积分。今天就开始赚取积分，享受超值优惠。",
+      "cta": "开始您的积分之旅"
     }
   },
   "earnFlow": {
@@ -2371,9 +2389,11 @@
       "total": "总计",
       "plus": "加",
       "rate": "比率（估计值）",
-      "apy": "~{{apy}}% APY",
+      "apy": "{{apy}}年利率",
       "fee": "燃气费",
-      "cta": "收取收益"
+      "cta": "收取收益",
+      "errorTitle": "出错了",
+      "errorDescription": "无法获取存款详情。请重试。"
     }
   },
   "celoDollarAmount_0": "&amp;lt;0&amp;gt;&amp;lt;/0&amp;gt; Celo 美元"

From 64fd9eb7a5479e6fae2698d4100bfa3421708f48 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 17 May 2024 14:20:07 -0700
Subject: [PATCH 014/133] feat: earn transaction feed items (#5414)

### Description

Adds the `EarnFeedItem.tsx`, types and associated GraphQL queries to
populate the transaction feed.

#### Screenshots

| iOS transaction Feed | iOS Details |
| ----- | ----- |
|
![](https://github.com/valora-inc/wallet/assets/26950305/52a3099b-5ff1-4c65-bafd-eccc1c44cabe
"iOS Feed") |
![](https://github.com/valora-inc/wallet/assets/26950305/9a7d6598-c3e8-4ee5-9007-95b68afc318c
"iOS Details") |

### Test plan

- [x] Tested locally on iOS
- [x] Tested locally on Android
- [x] Unit tests added

### Related issues

- Fixes ACT-1182

### Backwards compatibility

Yes
### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 locales/base/translation.json                 |   8 +
 src/analytics/Events.tsx                      |   1 +
 src/analytics/Properties.tsx                  |   3 +
 src/analytics/docs.ts                         |   1 +
 src/icons/UpwardGraph.tsx                     |   5 +-
 src/transactions/feed/EarnFeedItem.test.tsx   | 206 ++++++++++++++++++
 src/transactions/feed/EarnFeedItem.tsx        | 175 +++++++++++++++
 .../feed/TransactionDetailsScreen.tsx         |  12 +-
 src/transactions/feed/TransactionFeed.tsx     |   5 +
 .../feed/TransactionFeedItemImage.tsx         |  12 +
 src/transactions/feed/queryHelper.ts          | 122 +++++++++++
 src/transactions/types.ts                     |  53 ++++-
 test/RootStateSchema.json                     | 176 +++++++++++++++
 13 files changed, 775 insertions(+), 4 deletions(-)
 create mode 100644 src/transactions/feed/EarnFeedItem.test.tsx
 create mode 100644 src/transactions/feed/EarnFeedItem.tsx

diff --git a/locales/base/translation.json b/locales/base/translation.json
index dc65c473f1..1f39197e80 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -2398,6 +2398,14 @@
       "cta": "Collect Earnings",
       "errorTitle": "Something went wrong",
       "errorDescription": "Unable to fetch deposit details. Please try again."
+    },
+    "transactionFeed": {
+      "earnClaimTitle": "Collected",
+      "earnClaimSubtitle": "from {{providerName}} Pool",
+      "earnDepositTitle": "Deposited",
+      "earnDepositSubtitle": "to {{providerName}} Pool",
+      "earnWithdrawTitle": "Withdrew",
+      "earnWithdrawSubtitle": "from {{providerName}} Pool"
     }
   }
 }
diff --git a/src/analytics/Events.tsx b/src/analytics/Events.tsx
index f0ab824de8..b60501ed91 100644
--- a/src/analytics/Events.tsx
+++ b/src/analytics/Events.tsx
@@ -690,4 +690,5 @@ export enum EarnEvents {
   earn_deposit_submit_cancel = 'earn_deposit_submit_cancel',
   earn_view_pools_press = 'earn_view_pools_press',
   earn_exit_pool_press = 'earn_exit_pool_press',
+  earn_feed_item_select = 'earn_feed_item_select',
 }
diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 8516680c9a..8a9eb6ce47 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -1605,6 +1605,9 @@ interface EarnEventsProperties {
     tokenAmount: string
     providerId: string
   }
+  [EarnEvents.earn_feed_item_select]: {
+    origin: 'EarnDeposit' | 'EarnWithdraw' | 'EarnClaimReward'
+  }
 }
 
 export type AnalyticsPropertiesList = AppEventsProperties &
diff --git a/src/analytics/docs.ts b/src/analytics/docs.ts
index 74d962d537..56edf804a4 100644
--- a/src/analytics/docs.ts
+++ b/src/analytics/docs.ts
@@ -605,6 +605,7 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [EarnEvents.earn_deposit_submit_cancel]: `When the user cancels the deposit after submitting by cancelling PIN input`,
   [EarnEvents.earn_view_pools_press]: `When the user taps on the view pools button from token details`,
   [EarnEvents.earn_exit_pool_press]: `When the user taps on the exit pool button from the earn card in discover tab`,
+  [EarnEvents.earn_feed_item_select]: `When the users taps on an earn transaction feed item`,
 
   // Legacy event docs
   //  The below events had docs, but are no longer produced by the latest app version.
diff --git a/src/icons/UpwardGraph.tsx b/src/icons/UpwardGraph.tsx
index 675ad46d6b..6845d4ce22 100644
--- a/src/icons/UpwardGraph.tsx
+++ b/src/icons/UpwardGraph.tsx
@@ -5,11 +5,12 @@ import colors from 'src/styles/colors'
 interface Props {
   color?: string
   testID?: string
+  size?: number
 }
 
-function UpwardGraph({ color = colors.primary, testID = 'UpwardGraph' }: Props) {
+function UpwardGraph({ color = colors.primary, testID = 'UpwardGraph', size = 16 }: Props) {
   return (
-    <Svg width={16} height={16} viewBox="0 0 16 16" fill="none" testID={testID}>
+    <Svg width={size} height={size} viewBox="0 0 16 16" fill="none" testID={testID}>
       <Path
         d="M6.09245 7.91311L2.846 11.1596L2.70687 11.0204L6.44624 7.27601L8.49245 9.32222L8.846 9.67577L9.19955 9.32222L12.1276 6.39422L12.4811 6.04066L12.1276 5.68711L11.6071 5.16666H13.5V7.05956L12.9796 6.53911L12.6263 6.18584L12.2727 6.53883L8.84628 9.95984L6.79955 7.91311L6.446 7.55956L6.09245 7.91311Z"
         fill={color}
diff --git a/src/transactions/feed/EarnFeedItem.test.tsx b/src/transactions/feed/EarnFeedItem.test.tsx
new file mode 100644
index 0000000000..9af669a3c2
--- /dev/null
+++ b/src/transactions/feed/EarnFeedItem.test.tsx
@@ -0,0 +1,206 @@
+import { fireEvent, render, within } from '@testing-library/react-native'
+import React from 'react'
+import { Provider } from 'react-redux'
+import { EarnEvents } from 'src/analytics/Events'
+import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
+import { navigate } from 'src/navigator/NavigationService'
+import { Screens } from 'src/navigator/Screens'
+import EarnFeedItem from 'src/transactions/feed/EarnFeedItem'
+import { NetworkId, TransactionStatus } from 'src/transactions/types'
+import networkConfig from 'src/web3/networkConfig'
+import { createMockStore } from 'test/utils'
+import { mockAaveArbUsdcAddress, mockArbArbTokenId } from 'test/values'
+
+const store = createMockStore({
+  tokens: {
+    tokenBalances: {
+      [networkConfig.arbUsdcTokenId]: {
+        tokenId: networkConfig.arbUsdcTokenId,
+        symbol: 'USDC',
+        priceUsd: '1',
+        priceFetchedAt: Date.now(),
+        networkId: NetworkId['arbitrum-sepolia'],
+      },
+      [mockArbArbTokenId]: {
+        tokenId: mockArbArbTokenId,
+        symbol: 'ARB',
+        priceUsd: '0.9898',
+        priceFetchedAt: Date.now(),
+        networkId: NetworkId['arbitrum-sepolia'],
+      },
+      [networkConfig.aaveArbUsdcTokenId]: {
+        networkId: NetworkId['arbitrum-sepolia'],
+        address: mockAaveArbUsdcAddress,
+        tokenId: networkConfig.aaveArbUsdcTokenId,
+        symbol: 'aArbSepUSDC',
+        priceUsd: '1',
+        priceFetchedAt: Date.now(),
+      },
+    },
+  },
+})
+
+describe.each([
+  {
+    type: 'EarnWithdraw',
+    transaction: {
+      __typename: 'EarnWithdraw',
+      inAmount: {
+        localAmount: null,
+        tokenAddress: '0xdef',
+        tokenId: networkConfig.arbUsdcTokenId,
+        value: '1',
+      },
+      outAmount: {
+        localAmount: null,
+        tokenAddress: mockAaveArbUsdcAddress,
+        tokenId: networkConfig.aaveArbUsdcTokenId,
+        value: '0.996614',
+      },
+      block: '211276583',
+      fees: [
+        {
+          amount: {
+            localAmount: null,
+            tokenAddress: null,
+            tokenId: mockArbArbTokenId,
+            value: '0.00000229122',
+          },
+          type: 'SECURITY_FEE',
+        },
+      ],
+      networkId: NetworkId['arbitrum-sepolia'],
+      providerId: 'aave-v3',
+      timestamp: Date.now(),
+      transactionHash: '0xHASH0',
+      type: 'EARN_WITHDRAW',
+      status: TransactionStatus.Complete,
+    },
+    expectedTitle: 'earnFlow.transactionFeed.earnWithdrawTitle',
+    expectedSubTitle: 'earnFlow.transactionFeed.earnWithdrawSubtitle, {"providerName":"Aave"}',
+    expectedTotal: '+1.00 USDC',
+    expectedTotalLocal: '₱1.33',
+  },
+  {
+    type: 'EarnDeposit',
+    transaction: {
+      __typename: 'EarnDeposit',
+      inAmount: {
+        localAmount: null,
+        tokenAddress: mockAaveArbUsdcAddress,
+        tokenId: networkConfig.aaveArbUsdcTokenId,
+        value: '10',
+      },
+      outAmount: {
+        localAmount: null,
+        tokenAddress: '0xdef',
+        tokenId: networkConfig.arbUsdcTokenId,
+        value: '10',
+      },
+      block: '210927567',
+      fees: [
+        {
+          amount: {
+            localAmount: null,
+            tokenAddress: null,
+            tokenId: mockArbArbTokenId,
+            value: '0.00000284243',
+          },
+          type: 'SECURITY_FEE',
+        },
+      ],
+      networkId: NetworkId['arbitrum-sepolia'],
+      providerId: 'aave-v3',
+      timestamp: Date.now(),
+      transactionHash: '0xHASH1',
+      type: 'EARN_DEPOSIT',
+      status: TransactionStatus.Complete,
+    },
+    expectedTitle: 'earnFlow.transactionFeed.earnDepositTitle',
+    expectedSubTitle: 'earnFlow.transactionFeed.earnDepositSubtitle, {"providerName":"Aave"}',
+    expectedTotal: '-10.00 USDC',
+    expectedTotalLocal: '₱13.30',
+  },
+  {
+    type: 'EarnClaimReward',
+    transaction: {
+      __typename: 'EarnClaimReward',
+      amount: {
+        localAmount: null,
+        tokenAddress: '0xhij',
+        tokenId: mockArbArbTokenId,
+        value: '1.5',
+      },
+      block: '211278852',
+      fees: [
+        {
+          amount: {
+            localAmount: null,
+            tokenAddress: null,
+            tokenId: mockArbArbTokenId,
+            value: '0.00000146037',
+          },
+          type: 'SECURITY_FEE',
+        },
+      ],
+      networkId: NetworkId['arbitrum-sepolia'],
+      providerId: 'aave-v3',
+      timestamp: Date.now(),
+      transactionHash: '0xHASH2',
+      type: 'EARN_CLAIM_REWARD',
+      status: TransactionStatus.Complete,
+    } as any,
+    expectedTitle: 'earnFlow.transactionFeed.earnClaimTitle',
+    expectedSubTitle: 'earnFlow.transactionFeed.earnClaimSubtitle, {"providerName":"Aave"}',
+    expectedTotal: '+1.50 ARB',
+    expectedTotalLocal: '₱1.97',
+  },
+])(
+  `$type`,
+  ({ type, transaction, expectedTitle, expectedSubTitle, expectedTotal, expectedTotalLocal }) => {
+    beforeEach(() => {
+      jest.clearAllMocks()
+    })
+
+    it('Should render correctly', () => {
+      const { getByText, getByTestId } = render(
+        <Provider store={store}>
+          <EarnFeedItem transaction={transaction} />
+        </Provider>
+      )
+
+      expect(getByText(expectedTitle)).toBeTruthy()
+      expect(getByText(expectedSubTitle)).toBeTruthy()
+      expect(
+        within(getByTestId(`EarnFeedItem/${type}-amount-crypto`)).getByText(expectedTotal)
+      ).toBeTruthy()
+      expect(
+        within(getByTestId(`EarnFeedItem/${type}-amount-local`)).getByText(expectedTotalLocal)
+      ).toBeTruthy()
+    })
+
+    it('Should navigate correctly on tap', () => {
+      const { getByTestId } = render(
+        <Provider store={store}>
+          <EarnFeedItem transaction={transaction} />
+        </Provider>
+      )
+
+      fireEvent.press(getByTestId(`EarnFeedItem/${transaction.transactionHash}`))
+      expect(navigate).toHaveBeenCalledWith(Screens.TransactionDetailsScreen, { transaction })
+    })
+
+    it('Should fire analytic event on tap', () => {
+      const { getByTestId } = render(
+        <Provider store={store}>
+          <EarnFeedItem transaction={transaction} />
+        </Provider>
+      )
+
+      fireEvent.press(getByTestId(`EarnFeedItem/${transaction.transactionHash}`))
+      expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_feed_item_select, {
+        origin: type,
+      })
+    })
+  }
+)
diff --git a/src/transactions/feed/EarnFeedItem.tsx b/src/transactions/feed/EarnFeedItem.tsx
new file mode 100644
index 0000000000..b4b4681f1e
--- /dev/null
+++ b/src/transactions/feed/EarnFeedItem.tsx
@@ -0,0 +1,175 @@
+import BigNumber from 'bignumber.js'
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import { StyleSheet, Text, View } from 'react-native'
+import { EarnEvents } from 'src/analytics/Events'
+import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
+import TokenDisplay from 'src/components/TokenDisplay'
+import Touchable from 'src/components/Touchable'
+import { navigate } from 'src/navigator/NavigationService'
+import { Screens } from 'src/navigator/Screens'
+import { getDynamicConfigParams } from 'src/statsig'
+import { DynamicConfigs } from 'src/statsig/constants'
+import { StatsigDynamicConfigs } from 'src/statsig/types'
+import { Colors } from 'src/styles/colors'
+import { typeScale } from 'src/styles/fonts'
+import { Spacing } from 'src/styles/styles'
+import variables from 'src/styles/variables'
+import TransactionFeedItemImage from 'src/transactions/feed/TransactionFeedItemImage'
+import { EarnClaimReward, EarnDeposit, EarnWithdraw } from 'src/transactions/types'
+
+interface DescriptionProps {
+  transaction: EarnWithdraw | EarnDeposit | EarnClaimReward
+}
+
+function Description({ transaction }: DescriptionProps) {
+  const { t } = useTranslation()
+  const { providerName } = getDynamicConfigParams(
+    DynamicConfigs[StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG]
+  )
+  let title
+  let subtitle
+
+  switch (transaction.__typename) {
+    case 'EarnDeposit':
+      title = t('earnFlow.transactionFeed.earnDepositTitle')
+      subtitle = t('earnFlow.transactionFeed.earnDepositSubtitle', { providerName })
+      break
+    case 'EarnWithdraw':
+      title = t('earnFlow.transactionFeed.earnWithdrawTitle')
+      subtitle = t('earnFlow.transactionFeed.earnWithdrawSubtitle', { providerName })
+      break
+    case 'EarnClaimReward':
+      title = t('earnFlow.transactionFeed.earnClaimTitle')
+      subtitle = t('earnFlow.transactionFeed.earnClaimSubtitle', { providerName })
+      break
+  }
+
+  return (
+    <View style={styles.contentContainer}>
+      <Text style={styles.title} testID={'EarnFeedItem/title'} numberOfLines={1}>
+        {title}
+      </Text>
+      <Text style={styles.subtitle} testID={'EarnFeedItem/subtitle'} numberOfLines={1}>
+        {subtitle}
+      </Text>
+    </View>
+  )
+}
+
+interface AmountDisplayProps {
+  transaction: EarnWithdraw | EarnDeposit | EarnClaimReward
+  isLocal: boolean
+}
+
+function AmountDisplay({ transaction, isLocal }: AmountDisplayProps) {
+  let amountValue
+  let tokenId
+
+  switch (transaction.__typename) {
+    case 'EarnDeposit':
+      amountValue = new BigNumber(-transaction.inAmount.value)
+      tokenId = transaction.outAmount.tokenId
+      break
+    case 'EarnWithdraw':
+      amountValue = new BigNumber(transaction.outAmount.value)
+      tokenId = transaction.inAmount.tokenId
+      break
+    case 'EarnClaimReward':
+      amountValue = new BigNumber(transaction.amount.value)
+      tokenId = transaction.amount.tokenId
+      break
+  }
+
+  const textStyle = isLocal
+    ? styles.amountSubtitle
+    : [styles.amountTitle, transaction.__typename !== 'EarnDeposit' && { color: Colors.primary }]
+
+  return (
+    <TokenDisplay
+      amount={amountValue}
+      tokenId={tokenId}
+      showLocalAmount={isLocal}
+      showSymbol={true}
+      showExplicitPositiveSign={!isLocal}
+      hideSign={!!isLocal}
+      style={textStyle}
+      testID={`EarnFeedItem/${transaction.__typename}-amount-${isLocal ? 'local' : 'crypto'}`}
+    />
+  )
+}
+
+interface AmountProps {
+  transaction: EarnWithdraw | EarnDeposit | EarnClaimReward
+}
+
+function Amount({ transaction }: AmountProps) {
+  return (
+    <View style={styles.amountContainer}>
+      <AmountDisplay transaction={transaction} isLocal={false} />
+      <AmountDisplay transaction={transaction} isLocal={true} />
+    </View>
+  )
+}
+
+interface Props {
+  transaction: EarnWithdraw | EarnDeposit | EarnClaimReward
+}
+
+export default function EarnFeedItem({ transaction }: Props) {
+  return (
+    <Touchable
+      testID={`EarnFeedItem/${transaction.transactionHash}`}
+      onPress={() => {
+        ValoraAnalytics.track(EarnEvents.earn_feed_item_select, { origin: transaction.__typename })
+        navigate(Screens.TransactionDetailsScreen, { transaction })
+      }}
+    >
+      <View style={styles.container}>
+        <TransactionFeedItemImage
+          status={transaction.status}
+          transactionType={transaction.__typename}
+          networkId={transaction.networkId}
+        />
+        <Description transaction={transaction} />
+        <Amount transaction={transaction} />
+      </View>
+    </Touchable>
+  )
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flexDirection: 'row',
+    paddingVertical: Spacing.Small12,
+    paddingHorizontal: variables.contentPadding,
+    alignItems: 'center',
+  },
+  contentContainer: {
+    flex: 1,
+    paddingHorizontal: variables.contentPadding,
+  },
+  title: {
+    ...typeScale.labelMedium,
+    color: Colors.black,
+  },
+  subtitle: {
+    ...typeScale.bodySmall,
+    color: Colors.gray4,
+  },
+  amountContainer: {
+    maxWidth: '50%',
+  },
+  amountTitle: {
+    ...typeScale.labelMedium,
+    color: Colors.black,
+    flexWrap: 'wrap',
+    textAlign: 'right',
+  },
+  amountSubtitle: {
+    ...typeScale.bodySmall,
+    color: Colors.gray4,
+    flexWrap: 'wrap',
+    textAlign: 'right',
+  },
+})
diff --git a/src/transactions/feed/TransactionDetailsScreen.tsx b/src/transactions/feed/TransactionDetailsScreen.tsx
index f137709667..4e46a18df3 100644
--- a/src/transactions/feed/TransactionDetailsScreen.tsx
+++ b/src/transactions/feed/TransactionDetailsScreen.tsx
@@ -67,6 +67,12 @@ function useHeaderTitle(transaction: TokenTransaction) {
       return t('swapScreen.title')
     case TokenTransactionTypeV2.Approval:
       return t('transactionFeed.approvalTransactionTitle')
+    case TokenTransactionTypeV2.EarnWithdraw:
+      return t('earnFlow.transactionFeed.earnWithdrawTitle')
+    case TokenTransactionTypeV2.EarnClaimReward:
+      return t('earnFlow.transactionFeed.earnClaimTitle')
+    case TokenTransactionTypeV2.EarnDeposit:
+      return t('earnFlow.transactionFeed.earnDepositTitle')
   }
 }
 
@@ -100,12 +106,16 @@ function TransactionDetailsScreen({ route }: Props) {
       } else {
         content = <TransferReceivedContent transfer={receivedTransfer} />
       }
-
       break
     case TokenTransactionTypeV2.SwapTransaction:
       content = <SwapContent exchange={transaction as TokenExchange} />
       retryHandler = () => navigate(Screens.SwapScreenWithBack)
       break
+    case TokenTransactionTypeV2.EarnClaimReward:
+    case TokenTransactionTypeV2.EarnWithdraw:
+    case TokenTransactionTypeV2.EarnDeposit:
+      content = null //TODO (act-1198): details for Earn
+      break
     case TokenTransactionTypeV2.Approval:
       content = <TokenApprovalDetails transaction={transaction as TokenApproval} />
       break
diff --git a/src/transactions/feed/TransactionFeed.tsx b/src/transactions/feed/TransactionFeed.tsx
index f19ea93052..5d6cd3dacf 100644
--- a/src/transactions/feed/TransactionFeed.tsx
+++ b/src/transactions/feed/TransactionFeed.tsx
@@ -8,6 +8,7 @@ import { StatsigFeatureGates } from 'src/statsig/types'
 import colors from 'src/styles/colors'
 import { Spacing } from 'src/styles/styles'
 import NoActivity from 'src/transactions/NoActivity'
+import EarnFeedItem from 'src/transactions/feed/EarnFeedItem'
 import NftFeedItem from 'src/transactions/feed/NftFeedItem'
 import SwapFeedItem from 'src/transactions/feed/SwapFeedItem'
 import TokenApprovalFeedItem from 'src/transactions/feed/TokenApprovalFeedItem'
@@ -78,6 +79,10 @@ function TransactionFeed() {
         return <NftFeedItem key={tx.transactionHash} transaction={tx} />
       case 'TokenApproval':
         return <TokenApprovalFeedItem key={tx.transactionHash} transaction={tx} />
+      case 'EarnDeposit':
+      case 'EarnWithdraw':
+      case 'EarnClaimReward':
+        return <EarnFeedItem key={tx.transactionHash} transaction={tx} />
     }
   }
 
diff --git a/src/transactions/feed/TransactionFeedItemImage.tsx b/src/transactions/feed/TransactionFeedItemImage.tsx
index b5d968475d..f583e9bec5 100644
--- a/src/transactions/feed/TransactionFeedItemImage.tsx
+++ b/src/transactions/feed/TransactionFeedItemImage.tsx
@@ -7,6 +7,7 @@ import CircledIcon from 'src/icons/CircledIcon'
 import GreenLoadingSpinner from 'src/icons/GreenLoadingSpinner'
 import MagicWand from 'src/icons/MagicWand'
 import SwapIcon from 'src/icons/SwapIcon'
+import UpwardGraph from 'src/icons/UpwardGraph'
 import { Recipient } from 'src/recipients/recipient'
 import Colors from 'src/styles/colors'
 import { NetworkId, TransactionStatus } from 'src/transactions/types'
@@ -26,6 +27,9 @@ type Props = { networkId: NetworkId; status: TransactionStatus } & (
   | {
       transactionType: 'TokenApproval'
     }
+  | {
+      transactionType: 'EarnDeposit' | 'EarnWithdraw' | 'EarnClaimReward'
+    }
 )
 
 function TransactionFeedItemBaseImage(props: Props) {
@@ -64,6 +68,14 @@ function TransactionFeedItemBaseImage(props: Props) {
     return <ContactCircle recipient={props.recipient} size={AVATAR_SIZE} />
   }
 
+  if (['EarnWithdraw', 'EarnDeposit', 'EarnClaimReward'].includes(transactionType)) {
+    return (
+      <CircledIcon backgroundColor={Colors.successLight} radius={AVATAR_SIZE}>
+        <UpwardGraph size={30} color={Colors.successDark} />
+      </CircledIcon>
+    )
+  }
+
   // Should never happen
   Logger.error(
     'TransactionFeedItemImage',
diff --git a/src/transactions/feed/queryHelper.ts b/src/transactions/feed/queryHelper.ts
index 9995b1d588..68a524b9de 100644
--- a/src/transactions/feed/queryHelper.ts
+++ b/src/transactions/feed/queryHelper.ts
@@ -384,6 +384,9 @@ export const TRANSACTIONS_QUERY = gql`
         ...TokenTransferItemV3
         ...NftTransferItemV3
         ...TokenExchangeItemV3
+        ...EarnDepositItem
+        ...EarnWithdrawItem
+        ...EarnClaimRewardItem
         ...TokenApprovalItem
       }
     }
@@ -505,6 +508,125 @@ export const TRANSACTIONS_QUERY = gql`
     }
   }
 
+  fragment EarnDepositItem on EarnDeposit {
+    __typename
+    type
+    transactionHash
+    status
+    providerId
+    timestamp
+    block
+    inAmount {
+      value
+      tokenAddress
+      tokenId
+      localAmount {
+        value
+        currencyCode
+        exchangeRate
+      }
+    }
+    outAmount {
+      value
+      tokenAddress
+      tokenId
+      localAmount {
+        value
+        currencyCode
+        exchangeRate
+      }
+    }
+    fees {
+      type
+      amount {
+        value
+        tokenAddress
+        tokenId
+        localAmount {
+          value
+          currencyCode
+          exchangeRate
+        }
+      }
+    }
+  }
+
+  fragment EarnWithdrawItem on EarnWithdraw {
+    __typename
+    type
+    transactionHash
+    status
+    providerId
+    timestamp
+    block
+    inAmount {
+      value
+      tokenAddress
+      tokenId
+      localAmount {
+        value
+        currencyCode
+        exchangeRate
+      }
+    }
+    outAmount {
+      value
+      tokenAddress
+      tokenId
+      localAmount {
+        value
+        currencyCode
+        exchangeRate
+      }
+    }
+    fees {
+      type
+      amount {
+        value
+        tokenAddress
+        tokenId
+        localAmount {
+          value
+          currencyCode
+          exchangeRate
+        }
+      }
+    }
+  }
+
+  fragment EarnClaimRewardItem on EarnClaimReward {
+    __typename
+    type
+    transactionHash
+    status
+    providerId
+    timestamp
+    block
+    amount {
+      value
+      tokenAddress
+      tokenId
+      localAmount {
+        value
+        currencyCode
+        exchangeRate
+      }
+    }
+    fees {
+      type
+      amount {
+        value
+        tokenAddress
+        tokenId
+        localAmount {
+          value
+          currencyCode
+          exchangeRate
+        }
+      }
+    }
+  }
+
   fragment TokenApprovalItem on TokenApproval {
     __typename
     type
diff --git a/src/transactions/types.ts b/src/transactions/types.ts
index 1771f710ce..d78139ed3b 100644
--- a/src/transactions/types.ts
+++ b/src/transactions/types.ts
@@ -106,7 +106,14 @@ export enum TransactionStatus {
   Failed = 'Failed',
 }
 
-export type TokenTransaction = TokenTransfer | TokenExchange | NftTransfer | TokenApproval
+export type TokenTransaction =
+  | TokenTransfer
+  | TokenExchange
+  | NftTransfer
+  | TokenApproval
+  | EarnDeposit
+  | EarnWithdraw
+  | EarnClaimReward
 
 export interface TokenAmount {
   value: BigNumber.Value
@@ -131,6 +138,9 @@ export enum TokenTransactionTypeV2 {
   NftSent = 'NFT_SENT',
   SwapTransaction = 'SWAP_TRANSACTION',
   Approval = 'APPROVAL',
+  EarnDeposit = 'EARN_DEPOSIT',
+  EarnWithdraw = 'EARN_WITHDRAW',
+  EarnClaimReward = 'EARN_CLAIM_REWARD',
 }
 
 // Can we optional the fields `transactionHash` and `block`?
@@ -210,3 +220,44 @@ export interface TokenApproval {
   fees: Fee[]
   status: TransactionStatus
 }
+
+export interface EarnDeposit {
+  __typename: 'EarnDeposit'
+  networkId: NetworkId
+  type: TokenTransactionTypeV2
+  transactionHash: string
+  timestamp: number
+  block: string
+  fees: Fee[]
+  providerId: string
+  inAmount: TokenAmount
+  outAmount: TokenAmount
+  status: TransactionStatus
+}
+
+export interface EarnWithdraw {
+  __typename: 'EarnWithdraw'
+  networkId: NetworkId
+  type: TokenTransactionTypeV2
+  transactionHash: string
+  timestamp: number
+  block: string
+  fees: Fee[]
+  providerId: string
+  inAmount: TokenAmount
+  outAmount: TokenAmount
+  status: TransactionStatus
+}
+
+export interface EarnClaimReward {
+  __typename: 'EarnClaimReward'
+  networkId: NetworkId
+  amount: TokenAmount
+  type: TokenTransactionTypeV2
+  transactionHash: string
+  timestamp: number
+  block: string
+  fees: Fee[]
+  providerId: string
+  status: TransactionStatus
+}
diff --git a/test/RootStateSchema.json b/test/RootStateSchema.json
index a2564b07d4..d2d8ebd463 100644
--- a/test/RootStateSchema.json
+++ b/test/RootStateSchema.json
@@ -1185,6 +1185,170 @@
             },
             "type": "object"
         },
+        "EarnClaimReward": {
+            "additionalProperties": false,
+            "properties": {
+                "__typename": {
+                    "const": "EarnClaimReward",
+                    "type": "string"
+                },
+                "amount": {
+                    "$ref": "#/definitions/TokenAmount"
+                },
+                "block": {
+                    "type": "string"
+                },
+                "fees": {
+                    "items": {
+                        "$ref": "#/definitions/Fee"
+                    },
+                    "type": "array"
+                },
+                "networkId": {
+                    "$ref": "#/definitions/NetworkId"
+                },
+                "providerId": {
+                    "type": "string"
+                },
+                "status": {
+                    "$ref": "#/definitions/TransactionStatus"
+                },
+                "timestamp": {
+                    "type": "number"
+                },
+                "transactionHash": {
+                    "type": "string"
+                },
+                "type": {
+                    "$ref": "#/definitions/TokenTransactionTypeV2"
+                }
+            },
+            "required": [
+                "__typename",
+                "amount",
+                "block",
+                "fees",
+                "networkId",
+                "providerId",
+                "status",
+                "timestamp",
+                "transactionHash",
+                "type"
+            ],
+            "type": "object"
+        },
+        "EarnDeposit": {
+            "additionalProperties": false,
+            "properties": {
+                "__typename": {
+                    "const": "EarnDeposit",
+                    "type": "string"
+                },
+                "block": {
+                    "type": "string"
+                },
+                "fees": {
+                    "items": {
+                        "$ref": "#/definitions/Fee"
+                    },
+                    "type": "array"
+                },
+                "inAmount": {
+                    "$ref": "#/definitions/TokenAmount"
+                },
+                "networkId": {
+                    "$ref": "#/definitions/NetworkId"
+                },
+                "outAmount": {
+                    "$ref": "#/definitions/TokenAmount"
+                },
+                "providerId": {
+                    "type": "string"
+                },
+                "status": {
+                    "$ref": "#/definitions/TransactionStatus"
+                },
+                "timestamp": {
+                    "type": "number"
+                },
+                "transactionHash": {
+                    "type": "string"
+                },
+                "type": {
+                    "$ref": "#/definitions/TokenTransactionTypeV2"
+                }
+            },
+            "required": [
+                "__typename",
+                "block",
+                "fees",
+                "inAmount",
+                "networkId",
+                "outAmount",
+                "providerId",
+                "status",
+                "timestamp",
+                "transactionHash",
+                "type"
+            ],
+            "type": "object"
+        },
+        "EarnWithdraw": {
+            "additionalProperties": false,
+            "properties": {
+                "__typename": {
+                    "const": "EarnWithdraw",
+                    "type": "string"
+                },
+                "block": {
+                    "type": "string"
+                },
+                "fees": {
+                    "items": {
+                        "$ref": "#/definitions/Fee"
+                    },
+                    "type": "array"
+                },
+                "inAmount": {
+                    "$ref": "#/definitions/TokenAmount"
+                },
+                "networkId": {
+                    "$ref": "#/definitions/NetworkId"
+                },
+                "outAmount": {
+                    "$ref": "#/definitions/TokenAmount"
+                },
+                "providerId": {
+                    "type": "string"
+                },
+                "status": {
+                    "$ref": "#/definitions/TransactionStatus"
+                },
+                "timestamp": {
+                    "type": "number"
+                },
+                "transactionHash": {
+                    "type": "string"
+                },
+                "type": {
+                    "$ref": "#/definitions/TokenTransactionTypeV2"
+                }
+            },
+            "required": [
+                "__typename",
+                "block",
+                "fees",
+                "inAmount",
+                "networkId",
+                "outAmount",
+                "providerId",
+                "status",
+                "timestamp",
+                "transactionHash",
+                "type"
+            ],
+            "type": "object"
+        },
         "ErrorDisplayType": {
             "enum": [
                 0,
@@ -5200,12 +5364,24 @@
                 },
                 {
                     "$ref": "#/definitions/NftTransfer"
+                },
+                {
+                    "$ref": "#/definitions/EarnDeposit"
+                },
+                {
+                    "$ref": "#/definitions/EarnWithdraw"
+                },
+                {
+                    "$ref": "#/definitions/EarnClaimReward"
                 }
             ]
         },
         "TokenTransactionTypeV2": {
             "enum": [
                 "APPROVAL",
+                "EARN_CLAIM_REWARD",
+                "EARN_DEPOSIT",
+                "EARN_WITHDRAW",
                 "EXCHANGE",
                 "INVITE_RECEIVED",
                 "INVITE_SENT",

From f7fc23a9ef82f89faa322c665d621e52b86ac6c1 Mon Sep 17 00:00:00 2001
From: valora-bot-crowdin
 <80050969+valora-bot-crowdin@users.noreply.github.com>
Date: Fri, 17 May 2024 17:05:41 -0700
Subject: [PATCH 015/133] chore(l10n): update translations from Crowdin (#5431)

---
 locales/de/translation.json     | 8 ++++++++
 locales/en-US/translation.json  | 8 ++++++++
 locales/es-419/translation.json | 8 ++++++++
 locales/fr-FR/translation.json  | 8 ++++++++
 locales/it-IT/translation.json  | 8 ++++++++
 locales/pl-PL/translation.json  | 8 ++++++++
 locales/pt-BR/translation.json  | 8 ++++++++
 locales/ru-RU/translation.json  | 8 ++++++++
 locales/th-TH/translation.json  | 8 ++++++++
 locales/tr-TR/translation.json  | 8 ++++++++
 locales/uk-UA/translation.json  | 8 ++++++++
 locales/vi-VN/translation.json  | 8 ++++++++
 locales/zh-CN/translation.json  | 8 ++++++++
 13 files changed, 104 insertions(+)

diff --git a/locales/de/translation.json b/locales/de/translation.json
index f48eab3f39..aace9e3cc4 100644
--- a/locales/de/translation.json
+++ b/locales/de/translation.json
@@ -2396,6 +2396,14 @@
       "cta": "Verdienste sammeln",
       "errorTitle": "Etwas ist schief gelaufen",
       "errorDescription": "Die Einzahlungsdetails können nicht abgerufen werden. Bitte versuche es erneut."
+    },
+    "transactionFeed": {
+      "earnClaimTitle": "Gesammelt",
+      "earnClaimSubtitle": "von {{providerName}} Pool",
+      "earnDepositTitle": "Hinterlegt",
+      "earnDepositSubtitle": "zu {{providerName}} Pool",
+      "earnWithdrawTitle": "Zurückgezogen",
+      "earnWithdrawSubtitle": "von {{providerName}} Pool"
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/en-US/translation.json b/locales/en-US/translation.json
index 5e592f02e8..c96e46c598 100644
--- a/locales/en-US/translation.json
+++ b/locales/en-US/translation.json
@@ -2396,6 +2396,14 @@
       "cta": "Collect Earnings",
       "errorTitle": "Something went wrong",
       "errorDescription": "Unable to fetch deposit details. Please try again."
+    },
+    "transactionFeed": {
+      "earnClaimTitle": "Collected",
+      "earnClaimSubtitle": "from {{providerName}} Pool",
+      "earnDepositTitle": "Deposited",
+      "earnDepositSubtitle": "to {{providerName}} Pool",
+      "earnWithdrawTitle": "Withdrew",
+      "earnWithdrawSubtitle": "from {{providerName}} Pool"
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/es-419/translation.json b/locales/es-419/translation.json
index 922091636b..cd4d50d730 100644
--- a/locales/es-419/translation.json
+++ b/locales/es-419/translation.json
@@ -2396,6 +2396,14 @@
       "cta": "Recaudar ingresos",
       "errorTitle": "Algo salió mal",
       "errorDescription": "No se han podido obtener los datos del depósito. Vuelve a intentarlo."
+    },
+    "transactionFeed": {
+      "earnClaimTitle": "Recopilado",
+      "earnClaimSubtitle": "de {{providerName}} Pool",
+      "earnDepositTitle": "Depositado",
+      "earnDepositSubtitle": "a {{providerName}} Piscina",
+      "earnWithdrawTitle": "Retirada",
+      "earnWithdrawSubtitle": "de {{providerName}} Pool"
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/fr-FR/translation.json b/locales/fr-FR/translation.json
index 59f686dc33..bd099caf36 100644
--- a/locales/fr-FR/translation.json
+++ b/locales/fr-FR/translation.json
@@ -2396,6 +2396,14 @@
       "cta": "Collecter les gains",
       "errorTitle": "Une erreur s'est produite",
       "errorDescription": "Impossible de récupérer les détails du dépôt. Essaie à nouveau."
+    },
+    "transactionFeed": {
+      "earnClaimTitle": "Recueilli",
+      "earnClaimSubtitle": "de {{providerName}} Pool",
+      "earnDepositTitle": "Déposé",
+      "earnDepositSubtitle": "à {{providerName}} Pool",
+      "earnWithdrawTitle": "Retire-toi",
+      "earnWithdrawSubtitle": "de {{providerName}} Pool"
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/it-IT/translation.json b/locales/it-IT/translation.json
index 4034ad7c68..bd508b48d9 100644
--- a/locales/it-IT/translation.json
+++ b/locales/it-IT/translation.json
@@ -2396,6 +2396,14 @@
       "cta": "Raccogli i guadagni",
       "errorTitle": "Si è verificato un errore",
       "errorDescription": "Impossibile recuperare i dettagli del deposito. Riprova."
+    },
+    "transactionFeed": {
+      "earnClaimTitle": "Raccolta",
+      "earnClaimSubtitle": "da {{providerName}} Pool",
+      "earnDepositTitle": "Depositato",
+      "earnDepositSubtitle": "a {{providerName}} Pool",
+      "earnWithdrawTitle": "Ritirata",
+      "earnWithdrawSubtitle": "da {{providerName}} Pool"
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/pl-PL/translation.json b/locales/pl-PL/translation.json
index f0df865c45..2f031e3566 100644
--- a/locales/pl-PL/translation.json
+++ b/locales/pl-PL/translation.json
@@ -2400,6 +2400,14 @@
       "cta": "Zbieraj zarobki",
       "errorTitle": "Coś poszło nie tak",
       "errorDescription": "Nie można pobrać szczegółów wpłaty. Spróbuj ponownie."
+    },
+    "transactionFeed": {
+      "earnClaimTitle": "Zebrane",
+      "earnClaimSubtitle": "z {{providerName}} Pool",
+      "earnDepositTitle": "Wpłacono",
+      "earnDepositSubtitle": "na {{providerName}} Pool",
+      "earnWithdrawTitle": "Wycofany",
+      "earnWithdrawSubtitle": "z {{providerName}} Pool"
     }
   },
   "celoDollarAmount_0": "<0></0> Celo Dolar",
diff --git a/locales/pt-BR/translation.json b/locales/pt-BR/translation.json
index 546918c35d..4374ca455a 100644
--- a/locales/pt-BR/translation.json
+++ b/locales/pt-BR/translation.json
@@ -2396,6 +2396,14 @@
       "cta": "Coleta de ganhos",
       "errorTitle": "Algo deu errado",
       "errorDescription": "Não foi possível obter os detalhes do depósito. Por favor, tente novamente."
+    },
+    "transactionFeed": {
+      "earnClaimTitle": "Coletânea",
+      "earnClaimSubtitle": "do site {{providerName}} Pool",
+      "earnDepositTitle": "Depositado",
+      "earnDepositSubtitle": "para {{providerName}} Pool",
+      "earnWithdrawTitle": "Retirada",
+      "earnWithdrawSubtitle": "do site {{providerName}} Pool"
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/ru-RU/translation.json b/locales/ru-RU/translation.json
index cee8c306db..9496813fbd 100644
--- a/locales/ru-RU/translation.json
+++ b/locales/ru-RU/translation.json
@@ -2400,6 +2400,14 @@
       "cta": "Собирайте заработок",
       "errorTitle": "Что-то пошло не так",
       "errorDescription": "Невозможно получить данные о депозите. Пожалуйста, попробуй еще раз."
+    },
+    "transactionFeed": {
+      "earnClaimTitle": "Собрано",
+      "earnClaimSubtitle": "с сайта {{providerName}} Pool",
+      "earnDepositTitle": "Депозит",
+      "earnDepositSubtitle": "на {{providerName}} Pool",
+      "earnWithdrawTitle": "Отказаться от",
+      "earnWithdrawSubtitle": "с сайта {{providerName}} Pool"
     }
   },
   "celoDollarAmount_0": "<0></0> Celo Dollar",
diff --git a/locales/th-TH/translation.json b/locales/th-TH/translation.json
index 02ead11a9d..1fa7ead0fd 100644
--- a/locales/th-TH/translation.json
+++ b/locales/th-TH/translation.json
@@ -2394,6 +2394,14 @@
       "cta": "Collect Earnings",
       "errorTitle": "มีบางอย่างผิดปกติ",
       "errorDescription": "Unable to fetch deposit details. Please try again."
+    },
+    "transactionFeed": {
+      "earnClaimTitle": "Collected",
+      "earnClaimSubtitle": "from {{providerName}} Pool",
+      "earnDepositTitle": "Deposited",
+      "earnDepositSubtitle": "to {{providerName}} Pool",
+      "earnWithdrawTitle": "Withdrew",
+      "earnWithdrawSubtitle": "from {{providerName}} Pool"
     }
   },
   "celoDollarAmount_0": "&amp;lt;0&amp;gt;&amp;lt;/0&amp;gt; Celo ดอลลาร์"
diff --git a/locales/tr-TR/translation.json b/locales/tr-TR/translation.json
index 276d65fe98..28c678f4b6 100644
--- a/locales/tr-TR/translation.json
+++ b/locales/tr-TR/translation.json
@@ -2396,6 +2396,14 @@
       "cta": "Kazançları Toplayın",
       "errorTitle": "Bir şeyler ters gitti",
       "errorDescription": "Para yatırma detayları alınamıyor. Lütfen tekrar deneyin."
+    },
+    "transactionFeed": {
+      "earnClaimTitle": "Toplanmış",
+      "earnClaimSubtitle": "{{providerName}} Pool'dan",
+      "earnDepositTitle": "Yatırılan",
+      "earnDepositSubtitle": "{{providerName}} Havuzuna",
+      "earnWithdrawTitle": "Geri çekildi",
+      "earnWithdrawSubtitle": "{{providerName}} Pool'dan"
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/uk-UA/translation.json b/locales/uk-UA/translation.json
index f2fe7889f0..d5f8f8b299 100644
--- a/locales/uk-UA/translation.json
+++ b/locales/uk-UA/translation.json
@@ -2400,6 +2400,14 @@
       "cta": "Збирайте заробіток",
       "errorTitle": "Щось пішло не так",
       "errorDescription": "Не вдається отримати інформацію про депозит. Спробуйте ще раз."
+    },
+    "transactionFeed": {
+      "earnClaimTitle": "Зібрано",
+      "earnClaimSubtitle": "від {{providerName}} Пул",
+      "earnDepositTitle": "Депоновано",
+      "earnDepositSubtitle": "на {{providerName}} Пул",
+      "earnWithdrawTitle": "Вийшов з гри.",
+      "earnWithdrawSubtitle": "від {{providerName}} Пул"
     }
   },
   "celoDollarAmount_0": "<0></0> Celo Dollar",
diff --git a/locales/vi-VN/translation.json b/locales/vi-VN/translation.json
index f7270cb968..fb9f4bc620 100644
--- a/locales/vi-VN/translation.json
+++ b/locales/vi-VN/translation.json
@@ -2394,6 +2394,14 @@
       "cta": "Collect Earnings",
       "errorTitle": "Đã xảy ra lỗi",
       "errorDescription": "Unable to fetch deposit details. Please try again."
+    },
+    "transactionFeed": {
+      "earnClaimTitle": "Collected",
+      "earnClaimSubtitle": "from {{providerName}} Pool",
+      "earnDepositTitle": "Deposited",
+      "earnDepositSubtitle": "to {{providerName}} Pool",
+      "earnWithdrawTitle": "Withdrew",
+      "earnWithdrawSubtitle": "from {{providerName}} Pool"
     }
   },
   "celoDollarAmount_0": "&amp;lt;0&amp;gt;&amp;lt;/0&amp;gt; Đô la Celo"
diff --git a/locales/zh-CN/translation.json b/locales/zh-CN/translation.json
index 11ae38a72a..d02c1941b1 100644
--- a/locales/zh-CN/translation.json
+++ b/locales/zh-CN/translation.json
@@ -2394,6 +2394,14 @@
       "cta": "收取收益",
       "errorTitle": "出错了",
       "errorDescription": "无法获取存款详情。请重试。"
+    },
+    "transactionFeed": {
+      "earnClaimTitle": "收藏",
+      "earnClaimSubtitle": "来自 {{providerName}} Pool",
+      "earnDepositTitle": "存入",
+      "earnDepositSubtitle": "至 {{providerName}} 池",
+      "earnWithdrawTitle": "撤回",
+      "earnWithdrawSubtitle": "来自 {{providerName}} Pool"
     }
   },
   "celoDollarAmount_0": "&amp;lt;0&amp;gt;&amp;lt;/0&amp;gt; Celo 美元"

From ede24ec8be3b0e35f43c2c4dd687f46ea8b5a18e Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Fri, 17 May 2024 19:28:56 -0700
Subject: [PATCH 016/133] feat(earn): prepare transactions on the collect
 screen and display gas (#5428)

### Description

Updates hook to prepare txs after rewards info is fetched and then use
prepared txs to display gas fee on the collect screen

### Test plan

Unit tests, manual



https://github.com/valora-inc/wallet/assets/5062591/52291d53-72c4-4a46-a964-f273cfc7698d



### Related issues

- Part of ACT-1180

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/earn/EarnCollectScreen.test.tsx | 153 ++++++++++++++++++++++++++--
 src/earn/EarnCollectScreen.tsx      |  77 +++++++++++---
 src/earn/hooks.ts                   |  62 +++++++++--
 src/send/SendEnterAmount.test.tsx   |  13 +--
 test/utils.ts                       |  14 +++
 5 files changed, 277 insertions(+), 42 deletions(-)

diff --git a/src/earn/EarnCollectScreen.test.tsx b/src/earn/EarnCollectScreen.test.tsx
index 33528a9d8f..efe7ced5e3 100644
--- a/src/earn/EarnCollectScreen.test.tsx
+++ b/src/earn/EarnCollectScreen.test.tsx
@@ -1,16 +1,21 @@
 import { render, waitFor } from '@testing-library/react-native'
+import BigNumber from 'bignumber.js'
 import React from 'react'
 import { Provider } from 'react-redux'
 import EarnCollectScreen from 'src/earn/EarnCollectScreen'
 import { fetchAavePoolInfo, fetchAaveRewards } from 'src/earn/poolInfo'
+import { prepareWithdrawAndClaimTransactions } from 'src/earn/prepareTransactions'
 import { NetworkId } from 'src/transactions/types'
+import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
 import networkConfig from 'src/web3/networkConfig'
 import MockedNavigator from 'test/MockedNavigator'
-import { createMockStore } from 'test/utils'
+import { createMockStore, mockStoreBalancesToTokenBalances } from 'test/utils'
 import {
   mockAaveArbUsdcAddress,
+  mockAccount,
   mockArbArbTokenBalance,
   mockArbArbTokenId,
+  mockArbEthTokenId,
   mockArbUsdcTokenId,
   mockTokenBalances,
 } from 'test/values'
@@ -33,17 +38,49 @@ const store = createMockStore({
 })
 
 jest.mock('src/earn/poolInfo')
+jest.mock('src/earn/prepareTransactions')
+
+const mockPreparedTransaction: PreparedTransactionsPossible = {
+  type: 'possible' as const,
+  transactions: [
+    {
+      from: '0xfrom',
+      to: '0xto',
+      data: '0xdata',
+      gas: BigInt(5e16),
+      _baseFeePerGas: BigInt(1),
+      maxFeePerGas: BigInt(1),
+      maxPriorityFeePerGas: undefined,
+    },
+    {
+      from: '0xfrom',
+      to: '0xto',
+      data: '0xdata',
+      gas: BigInt(1e16),
+      _baseFeePerGas: BigInt(1),
+      maxFeePerGas: BigInt(1),
+      maxPriorityFeePerGas: undefined,
+    },
+  ],
+  feeCurrency: {
+    ...mockTokenBalances[mockArbEthTokenId],
+    balance: new BigNumber(10),
+    priceUsd: new BigNumber(1),
+    lastKnownPriceUsd: new BigNumber(1),
+  },
+}
+
+const mockRewards = [{ amount: '0.01', tokenInfo: mockArbArbTokenBalance }]
 
 describe('EarnCollectScreen', () => {
   beforeEach(() => {
     jest.clearAllMocks()
     jest.mocked(fetchAavePoolInfo).mockResolvedValue({ apy: 0.03 })
-    jest
-      .mocked(fetchAaveRewards)
-      .mockResolvedValue([{ amount: '0.01', tokenInfo: mockArbArbTokenBalance }])
+    jest.mocked(fetchAaveRewards).mockResolvedValue(mockRewards)
+    jest.mocked(prepareWithdrawAndClaimTransactions).mockResolvedValue(mockPreparedTransaction)
   })
 
-  it('renders total balance, rewards and apy', async () => {
+  it('renders total balance, rewards, apy and gas after fetching rewards and preparing tx', async () => {
     const { getByText, getByTestId, queryByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
@@ -64,6 +101,7 @@ describe('EarnCollectScreen', () => {
     expect(getByTestId(`EarnCollect/${mockArbUsdcTokenId}/FiatAmount`)).toHaveTextContent('₱14.30')
     expect(getByTestId('EarnCollect/RewardsLoading')).toBeTruthy()
     expect(getByTestId('EarnCollect/ApyLoading')).toBeTruthy()
+    expect(getByTestId('EarnCollect/GasLoading')).toBeTruthy()
     expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
 
     await waitFor(() => {
@@ -77,9 +115,22 @@ describe('EarnCollectScreen', () => {
       '0.01 ARB'
     )
     expect(getByTestId(`EarnCollect/${mockArbArbTokenId}/FiatAmount`)).toHaveTextContent('₱0.016')
-    expect(getByTestId('EarnCollectScreen/CTA')).toBeEnabled()
-
     expect(getByText('earnFlow.collect.apy, {"apy":"3.00"}')).toBeTruthy()
+
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/GasLoading')).toBeFalsy()
+    })
+    expect(getByTestId('EarnCollect/GasFeeCryptoAmount')).toHaveTextContent('0.06 ETH')
+    expect(getByTestId('EarnCollect/GasFeeFiatAmount')).toHaveTextContent('₱119.70')
+    expect(getByTestId('EarnCollectScreen/CTA')).toBeEnabled()
+    expect(prepareWithdrawAndClaimTransactions).toHaveBeenCalledWith({
+      amount: '10.75',
+      feeCurrencies: mockStoreBalancesToTokenBalances([mockTokenBalances[mockArbEthTokenId]]),
+      poolTokenAddress: mockAaveArbUsdcAddress,
+      rewards: mockRewards,
+      token: mockStoreBalancesToTokenBalances([mockTokenBalances[mockArbUsdcTokenId]])[0],
+      walletAddress: mockAccount.toLowerCase(),
+    })
   })
 
   it('skips rewards section when no rewards', async () => {
@@ -112,6 +163,11 @@ describe('EarnCollectScreen', () => {
     expect(queryByTestId(`EarnCollect/${mockArbArbTokenId}/CryptoAmount`)).toBeFalsy()
     expect(queryByTestId(`EarnCollect/${mockArbArbTokenId}/FiatAmount`)).toBeFalsy()
     expect(getByTestId('EarnCollectScreen/CTA')).toBeEnabled()
+
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/GasLoading')).toBeFalsy()
+    })
+    expect(getByTestId('EarnCollectScreen/CTA')).toBeEnabled()
   })
 
   it('shows error and keeps cta disabled if rewards loading fails', async () => {
@@ -132,6 +188,7 @@ describe('EarnCollectScreen', () => {
     expect(getByText('earnFlow.collect.total')).toBeTruthy()
     expect(getByTestId('EarnCollect/RewardsLoading')).toBeTruthy()
     expect(getByTestId('EarnCollect/ApyLoading')).toBeTruthy()
+    expect(getByTestId('EarnCollect/GasLoading')).toBeTruthy()
     expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
 
     await waitFor(() => {
@@ -140,9 +197,50 @@ describe('EarnCollectScreen', () => {
     await waitFor(() => {
       expect(queryByTestId('EarnCollect/ApyLoading')).toBeFalsy()
     })
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/GasLoading')).toBeFalsy()
+    })
     expect(getByText('earnFlow.collect.errorTitle')).toBeTruthy()
     expect(queryByText('earnFlow.collect.plus')).toBeFalsy()
     expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
+    expect(prepareWithdrawAndClaimTransactions).not.toHaveBeenCalled()
+  })
+
+  it('shows error and keeps cta disabled if prepare tx fails', async () => {
+    jest
+      .mocked(prepareWithdrawAndClaimTransactions)
+      .mockRejectedValue(new Error('Failed to prepare'))
+    const { getByText, getByTestId, queryByTestId } = render(
+      <Provider store={store}>
+        <MockedNavigator
+          component={EarnCollectScreen}
+          params={{
+            depositTokenId: mockArbUsdcTokenId,
+            poolTokenId: networkConfig.aaveArbUsdcTokenId,
+          }}
+        />
+      </Provider>
+    )
+
+    expect(getByText('earnFlow.collect.title')).toBeTruthy()
+    expect(getByText('earnFlow.collect.total')).toBeTruthy()
+    expect(getByTestId('EarnCollect/RewardsLoading')).toBeTruthy()
+    expect(getByTestId('EarnCollect/ApyLoading')).toBeTruthy()
+    expect(getByTestId('EarnCollect/GasLoading')).toBeTruthy()
+    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
+
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/RewardsLoading')).toBeFalsy()
+    })
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/ApyLoading')).toBeFalsy()
+    })
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/GasLoading')).toBeFalsy()
+    })
+    expect(getByText('earnFlow.collect.errorTitle')).toBeTruthy()
+    expect(getByTestId('EarnCollect/GasError')).toBeTruthy()
+    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
   })
 
   it('skips error and enables cta if only apy loading fails', async () => {
@@ -163,6 +261,7 @@ describe('EarnCollectScreen', () => {
     expect(getByText('earnFlow.collect.total')).toBeTruthy()
     expect(getByTestId('EarnCollect/RewardsLoading')).toBeTruthy()
     expect(getByTestId('EarnCollect/ApyLoading')).toBeTruthy()
+    expect(getByTestId('EarnCollect/GasLoading')).toBeTruthy()
     expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
 
     await waitFor(() => {
@@ -171,9 +270,49 @@ describe('EarnCollectScreen', () => {
     await waitFor(() => {
       expect(queryByTestId('EarnCollect/ApyLoading')).toBeFalsy()
     })
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/GasLoading')).toBeFalsy()
+    })
     expect(getByText('earnFlow.collect.apy, {"apy":"--"}')).toBeTruthy()
     expect(getByText('earnFlow.collect.plus')).toBeTruthy()
     expect(getByTestId('EarnCollectScreen/CTA')).toBeEnabled()
     expect(queryByText('earnFlow.collect.errorTitle')).toBeFalsy()
   })
+
+  it('disables cta if not enough balance for gas', async () => {
+    jest.mocked(prepareWithdrawAndClaimTransactions).mockResolvedValue({
+      type: 'not-enough-balance-for-gas',
+      feeCurrencies: [mockPreparedTransaction.feeCurrency],
+    })
+    const { getByText, getByTestId, queryByTestId } = render(
+      <Provider store={store}>
+        <MockedNavigator
+          component={EarnCollectScreen}
+          params={{
+            depositTokenId: mockArbUsdcTokenId,
+            poolTokenId: networkConfig.aaveArbUsdcTokenId,
+          }}
+        />
+      </Provider>
+    )
+
+    expect(getByText('earnFlow.collect.title')).toBeTruthy()
+    expect(getByText('earnFlow.collect.total')).toBeTruthy()
+    expect(getByTestId('EarnCollect/RewardsLoading')).toBeTruthy()
+    expect(getByTestId('EarnCollect/ApyLoading')).toBeTruthy()
+    expect(getByTestId('EarnCollect/GasLoading')).toBeTruthy()
+    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
+
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/RewardsLoading')).toBeFalsy()
+    })
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/ApyLoading')).toBeFalsy()
+    })
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/GasLoading')).toBeFalsy()
+    })
+    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
+    expect(getByTestId('EarnCollect/GasError')).toBeTruthy()
+  })
 })
diff --git a/src/earn/EarnCollectScreen.tsx b/src/earn/EarnCollectScreen.tsx
index 5b4eb51cbb..81015f0318 100644
--- a/src/earn/EarnCollectScreen.tsx
+++ b/src/earn/EarnCollectScreen.tsx
@@ -8,7 +8,7 @@ import Button, { BtnSizes } from 'src/components/Button'
 import InLineNotification, { NotificationVariant } from 'src/components/InLineNotification'
 import TokenDisplay from 'src/components/TokenDisplay'
 import TokenIcon, { IconSize } from 'src/components/TokenIcon'
-import { useAavePoolInfo, useAaveRewardsInfo } from 'src/earn/hooks'
+import { useAavePoolInfo, useAaveRewardsInfoAndPrepareTransactions } from 'src/earn/hooks'
 import { Screens } from 'src/navigator/Screens'
 import { StackParamList } from 'src/navigator/types'
 import { useSelector } from 'src/redux/hooks'
@@ -18,6 +18,7 @@ import { Spacing } from 'src/styles/styles'
 import { useTokenInfo } from 'src/tokens/hooks'
 import { feeCurrenciesSelector } from 'src/tokens/selectors'
 import { TokenBalance } from 'src/tokens/slice'
+import { getFeeCurrencyAndAmounts } from 'src/viem/prepareTransactions'
 
 type Props = NativeStackScreenProps<StackParamList, Screens.EarnCollectScreen>
 
@@ -32,18 +33,32 @@ export default function EarnCollectScreen({ route }: Props) {
     throw new Error('Deposit / pool token not found')
   }
 
-  const asyncRewardsInfo = useAaveRewardsInfo({ poolTokenId })
-
-  // TODO(ACT-1180): prepare a tx and handle these
   const feeCurrencies = useSelector((state) => feeCurrenciesSelector(state, depositToken.networkId))
-  const maxFeeAmount = new BigNumber(0.0001)
+  const { asyncRewardsInfo, asyncPreparedTransactions } = useAaveRewardsInfoAndPrepareTransactions({
+    poolTokenId,
+    depositTokenId,
+    feeCurrencies,
+  })
   const onPress = () => {
-    // Todo handle prepared transactions
+    // TODO(ACT-1180): submit the tx
   }
 
   // skipping apy fetch error because that isn't blocking collecting rewards
-  const error = asyncRewardsInfo.error
-  const ctaDisabled = asyncRewardsInfo.loading || asyncRewardsInfo.error
+  const error = asyncRewardsInfo.error || asyncPreparedTransactions.error
+  const ctaDisabled =
+    asyncRewardsInfo.loading ||
+    asyncRewardsInfo.error ||
+    asyncPreparedTransactions.loading ||
+    asyncPreparedTransactions.error ||
+    asyncPreparedTransactions.result?.type !== 'possible'
+
+  const { maxFeeAmount, feeCurrency } = getFeeCurrencyAndAmounts(asyncPreparedTransactions.result)
+  let feeSection = <GasFeeLoading />
+  if (maxFeeAmount && feeCurrency) {
+    feeSection = <GasFee maxFeeAmount={maxFeeAmount} feeCurrency={feeCurrency} />
+  } else if (!asyncPreparedTransactions.loading) {
+    feeSection = <GasFeeError />
+  }
 
   return (
     <SafeAreaView style={styles.container}>
@@ -70,7 +85,10 @@ export default function EarnCollectScreen({ route }: Props) {
           ))}
           <View style={styles.separator} />
           <Rate depositToken={depositToken} />
-          <GasFee maxFeeAmount={maxFeeAmount} feeCurrency={feeCurrencies[0]} />
+          <View>
+            <Text style={styles.rateText}>{t('earnFlow.collect.fee')}</Text>
+            {feeSection}
+          </View>
         </View>
         {error && (
           <InLineNotification
@@ -163,6 +181,28 @@ function Rate({ depositToken }: { depositToken: TokenBalance }) {
   )
 }
 
+function GasFeeError() {
+  return (
+    <View testID="EarnCollect/GasError">
+      <Text style={styles.apyText}> -- </Text>
+      <Text style={styles.gasFeeFiat}> -- </Text>
+    </View>
+  )
+}
+
+function GasFeeLoading() {
+  return (
+    <View testID="EarnCollect/GasLoading">
+      <SkeletonPlaceholder backgroundColor={Colors.gray2} highlightColor={Colors.white}>
+        <View style={styles.gasFeeCryptoLoading} />
+      </SkeletonPlaceholder>
+      <SkeletonPlaceholder backgroundColor={Colors.gray2} highlightColor={Colors.white}>
+        <View style={styles.gasFeeFiatLoading} />
+      </SkeletonPlaceholder>
+    </View>
+  )
+}
+
 function GasFee({
   maxFeeAmount,
   feeCurrency,
@@ -170,24 +210,23 @@ function GasFee({
   maxFeeAmount: BigNumber
   feeCurrency: TokenBalance
 }) {
-  const { t } = useTranslation()
-
   return (
-    <View>
-      <Text style={styles.rateText}>{t('earnFlow.collect.fee')}</Text>
+    <>
       <TokenDisplay
         style={styles.apyText}
         tokenId={feeCurrency.tokenId}
         amount={maxFeeAmount}
         showLocalAmount={false}
+        testID="EarnCollect/GasFeeCryptoAmount"
       />
       <TokenDisplay
         style={styles.gasFeeFiat}
         tokenId={feeCurrency.tokenId}
         amount={maxFeeAmount}
         showLocalAmount={true}
+        testID="EarnCollect/GasFeeFiatAmount"
       />
-    </View>
+    </>
   )
 }
 
@@ -265,4 +304,14 @@ const styles = StyleSheet.create({
   error: {
     marginTop: Spacing.Regular16,
   },
+  gasFeeCryptoLoading: {
+    width: 80,
+    borderRadius: 100,
+    ...typeScale.labelSemiBoldSmall,
+  },
+  gasFeeFiatLoading: {
+    width: 64,
+    borderRadius: 100,
+    ...typeScale.bodyXSmall,
+  },
 })
diff --git a/src/earn/hooks.ts b/src/earn/hooks.ts
index 596e5ecd53..5275eee275 100644
--- a/src/earn/hooks.ts
+++ b/src/earn/hooks.ts
@@ -1,7 +1,9 @@
 import { useAsync } from 'react-async-hook'
 import { fetchAavePoolInfo, fetchAaveRewards } from 'src/earn/poolInfo'
+import { prepareWithdrawAndClaimTransactions } from 'src/earn/prepareTransactions'
 import { useSelector } from 'src/redux/hooks'
 import { useTokenInfo, useTokensList } from 'src/tokens/hooks'
+import { TokenBalance } from 'src/tokens/slice'
 import Logger from 'src/utils/Logger'
 import networkConfig, { networkIdToNetwork } from 'src/web3/networkConfig'
 import { walletAddressSelector } from 'src/web3/selectors'
@@ -38,21 +40,28 @@ export function useAavePoolInfo({ depositTokenId }: { depositTokenId: string })
   return asyncPoolInfo
 }
 
-export function useAaveRewardsInfo({ poolTokenId }: { poolTokenId: string }) {
+export function useAaveRewardsInfoAndPrepareTransactions({
+  poolTokenId,
+  depositTokenId,
+  feeCurrencies,
+}: {
+  poolTokenId: string
+  depositTokenId: string
+  feeCurrencies: TokenBalance[]
+}) {
   const poolTokenInfo = useTokenInfo(poolTokenId)
+  const depositTokenInfo = useTokenInfo(depositTokenId)
   const walletAddress = useSelector(walletAddressSelector)
   const allTokens = useTokensList()
 
-  return useAsync(
+  const asyncRewardsInfo = useAsync(
     async () => {
-      if (!poolTokenInfo || !poolTokenInfo.address) {
-        throw new Error(`Token with id ${networkConfig.aaveArbUsdcTokenId} not found`)
+      if (!poolTokenInfo) {
+        throw new Error(`Token with id ${poolTokenId} not found`)
       }
 
-      if (!isAddress(poolTokenInfo.address)) {
-        throw new Error(
-          `Token with id ${networkConfig.arbUsdcTokenId} does not contain a valid address`
-        )
+      if (!poolTokenInfo.address || !isAddress(poolTokenInfo.address)) {
+        throw new Error(`Token with id ${poolTokenId} does not contain a valid address`)
       }
 
       if (!walletAddress || !isAddress(walletAddress)) {
@@ -70,8 +79,43 @@ export function useAaveRewardsInfo({ poolTokenId }: { poolTokenId: string }) {
     [],
     {
       onError: (error) => {
-        Logger.warn(`${TAG}/useAaveRewardsInfo`, error.message)
+        Logger.warn(`${TAG}/useAaveRewardsInfoAndPrepareTransactions`, error)
       },
     }
   )
+
+  const asyncPreparedTransactions = useAsync(
+    async () => {
+      if (!asyncRewardsInfo.result) {
+        return
+      }
+
+      if (
+        !walletAddress ||
+        !isAddress(walletAddress) ||
+        !poolTokenInfo?.address ||
+        !isAddress(poolTokenInfo.address) ||
+        !depositTokenInfo
+      ) {
+        // should never happen
+        throw new Error('Invalid wallet or pool token address')
+      }
+
+      return prepareWithdrawAndClaimTransactions({
+        amount: poolTokenInfo.balance.toString(),
+        token: depositTokenInfo,
+        walletAddress,
+        feeCurrencies,
+        rewards: asyncRewardsInfo.result,
+        poolTokenAddress: poolTokenInfo.address,
+      })
+    },
+    [asyncRewardsInfo.result],
+    {
+      onError: (error) => {
+        Logger.warn(`${TAG}/useAaveRewardsInfoAndPrepareTransactions`, error)
+      },
+    }
+  )
+  return { asyncRewardsInfo, asyncPreparedTransactions }
 }
diff --git a/src/send/SendEnterAmount.test.tsx b/src/send/SendEnterAmount.test.tsx
index 762837e4b2..8d8c87daed 100644
--- a/src/send/SendEnterAmount.test.tsx
+++ b/src/send/SendEnterAmount.test.tsx
@@ -11,10 +11,9 @@ import { RecipientType } from 'src/recipients/recipient'
 import SendEnterAmount from 'src/send/SendEnterAmount'
 import { usePrepareSendTransactions } from 'src/send/usePrepareSendTransactions'
 import { getDynamicConfigParams } from 'src/statsig'
-import { StoredTokenBalance, TokenBalance } from 'src/tokens/slice'
 import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
 import MockedNavigator from 'test/MockedNavigator'
-import { createMockStore } from 'test/utils'
+import { createMockStore, mockStoreBalancesToTokenBalances } from 'test/utils'
 import {
   mockAccount,
   mockCeloAddress,
@@ -55,16 +54,6 @@ const mockPrepareTransactionsResultPossible: PreparedTransactionsPossible = {
   feeCurrency: mockCeloTokenBalance,
 }
 
-const mockStoreBalancesToTokenBalances = (storeBalances: StoredTokenBalance[]): TokenBalance[] => {
-  return storeBalances.map(
-    (token): TokenBalance => ({
-      ...token,
-      balance: new BigNumber(token.balance ?? 0),
-      priceUsd: new BigNumber(token.priceUsd ?? 0),
-      lastKnownPriceUsd: token.priceUsd ? new BigNumber(token.priceUsd) : null,
-    })
-  )
-}
 const tokenBalances = {
   [mockCeloTokenId]: { ...mockTokenBalances[mockCeloTokenId], balance: '10' },
   [mockCusdTokenId]: { ...mockTokenBalances[mockCusdTokenId], balance: '10' },
diff --git a/test/utils.ts b/test/utils.ts
index ea571870b4..86eeb7271c 100644
--- a/test/utils.ts
+++ b/test/utils.ts
@@ -6,6 +6,7 @@ import configureMockStore from 'redux-mock-store'
 import i18n from 'src/i18n'
 import { StackParamList } from 'src/navigator/types'
 import { RootState } from 'src/redux/reducers'
+import { StoredTokenBalance, TokenBalance } from 'src/tokens/slice'
 import { getLatestSchema } from 'test/schemas'
 import {
   mockAddressToE164Number,
@@ -156,3 +157,16 @@ export function getElementText(instance: ReactTestInstance | string): string {
     })
     .join('')
 }
+
+export const mockStoreBalancesToTokenBalances = (
+  storeBalances: StoredTokenBalance[]
+): TokenBalance[] => {
+  return storeBalances.map(
+    (token): TokenBalance => ({
+      ...token,
+      balance: new BigNumber(token.balance ?? 0),
+      priceUsd: new BigNumber(token.priceUsd ?? 0),
+      lastKnownPriceUsd: token.priceUsd ? new BigNumber(token.priceUsd) : null,
+    })
+  )
+}

From e8472fd5e9c984af00e6d8b952e6c609a5a3383c Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Fri, 17 May 2024 22:15:36 -0700
Subject: [PATCH 017/133] feat(earn): redux setup for withdraw (#5429)

### Description

Also changed from started -> loading to be consistent with other slices

### Test plan

Unit tests

### Related issues

- Part of ACT-1180

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/earn/EarnDepositBottomSheet.test.tsx |  2 +-
 src/earn/EarnDepositBottomSheet.tsx      |  2 +-
 src/earn/saga.test.ts                    | 29 +++++++++++++++--
 src/earn/saga.ts                         | 18 +++++++++--
 src/earn/slice.test.ts                   | 40 ++++++++++++++++++++++--
 src/earn/slice.ts                        | 34 +++++++++++++++++---
 src/earn/types.ts                        | 10 ++++++
 src/redux/migrations.ts                  |  7 +++++
 src/redux/store.test.ts                  |  3 +-
 src/redux/store.ts                       |  2 +-
 test/RootStateSchema.json                | 23 +++++++++-----
 test/schemas.ts                          | 14 ++++++++-
 12 files changed, 161 insertions(+), 23 deletions(-)

diff --git a/src/earn/EarnDepositBottomSheet.test.tsx b/src/earn/EarnDepositBottomSheet.test.tsx
index 578e246962..55e7937fae 100644
--- a/src/earn/EarnDepositBottomSheet.test.tsx
+++ b/src/earn/EarnDepositBottomSheet.test.tsx
@@ -181,7 +181,7 @@ describe('EarnDepositBottomSheet', () => {
   it('shows loading state and buttons are disabled when deposit is submitted', () => {
     const store = createMockStore({
       tokens: { tokenBalances: mockTokenBalances },
-      earn: { depositStatus: 'started' },
+      earn: { depositStatus: 'loading' },
     })
     const { getByTestId } = render(
       <Provider store={store}>
diff --git a/src/earn/EarnDepositBottomSheet.tsx b/src/earn/EarnDepositBottomSheet.tsx
index 42b4a11dbe..2bb0b9c9d3 100644
--- a/src/earn/EarnDepositBottomSheet.tsx
+++ b/src/earn/EarnDepositBottomSheet.tsx
@@ -46,7 +46,7 @@ export default function EarnDepositBottomSheet({
   const { t } = useTranslation()
   const dispatch = useDispatch()
   const depositStatus = useSelector(depositStatusSelector)
-  const transactionSubmitted = depositStatus === 'started'
+  const transactionSubmitted = depositStatus === 'loading'
 
   const { estimatedFeeAmount, feeCurrency } = getFeeCurrencyAndAmounts(preparedTransaction)
 
diff --git a/src/earn/saga.test.ts b/src/earn/saga.test.ts
index b6a3973733..4ccdc9bed2 100644
--- a/src/earn/saga.test.ts
+++ b/src/earn/saga.test.ts
@@ -5,8 +5,15 @@ import { StaticProvider, dynamic, throwError } from 'redux-saga-test-plan/provid
 import erc20 from 'src/abis/IERC20'
 import { EarnEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
-import { depositSubmitSaga } from 'src/earn/saga'
-import { depositCancel, depositError, depositStart, depositSuccess } from 'src/earn/slice'
+import { depositSubmitSaga, withdrawSubmitSaga } from 'src/earn/saga'
+import {
+  depositCancel,
+  depositError,
+  depositStart,
+  depositSuccess,
+  withdrawStart,
+  withdrawSuccess,
+} from 'src/earn/slice'
 import { navigateHome } from 'src/navigator/NavigationService'
 import { CANCELLED_PIN_INPUT } from 'src/pincode/authentication'
 import { Network, NetworkId, TokenTransactionTypeV2 } from 'src/transactions/types'
@@ -313,3 +320,21 @@ describe('depositSubmitSaga', () => {
     })
   })
 })
+
+describe('withdrawSubmitSaga', () => {
+  it('navigates home and fires success event', async () => {
+    await expectSaga(withdrawSubmitSaga, {
+      type: withdrawStart.type,
+      payload: {
+        amount: '100',
+        tokenId: mockArbUsdcTokenId,
+        preparedTransactions: [],
+        rewards: [],
+      },
+    })
+      .put(withdrawSuccess())
+      .run()
+
+    expect(navigateHome).toHaveBeenCalled()
+  })
+})
diff --git a/src/earn/saga.ts b/src/earn/saga.ts
index fbf9a608aa..ffe7d066b0 100644
--- a/src/earn/saga.ts
+++ b/src/earn/saga.ts
@@ -3,8 +3,15 @@ import BigNumber from 'bignumber.js'
 import erc20 from 'src/abis/IERC20'
 import { EarnEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
-import { depositCancel, depositError, depositStart, depositSuccess } from 'src/earn/slice'
-import { DepositInfo } from 'src/earn/types'
+import {
+  depositCancel,
+  depositError,
+  depositStart,
+  depositSuccess,
+  withdrawStart,
+  withdrawSuccess,
+} from 'src/earn/slice'
+import { DepositInfo, WithdrawInfo } from 'src/earn/types'
 import { navigateHome } from 'src/navigator/NavigationService'
 import { CANCELLED_PIN_INPUT } from 'src/pincode/authentication'
 import { vibrateError } from 'src/styles/hapticFeedback'
@@ -174,6 +181,13 @@ export function* depositSubmitSaga(action: PayloadAction<DepositInfo>) {
   }
 }
 
+export function* withdrawSubmitSaga(action: PayloadAction<WithdrawInfo>) {
+  // TODO: submit the tx
+  navigateHome()
+  yield* put(withdrawSuccess())
+}
+
 export function* earnSaga() {
   yield* takeLeading(depositStart.type, safely(depositSubmitSaga))
+  yield* takeLeading(withdrawStart.type, safely(withdrawSubmitSaga))
 }
diff --git a/src/earn/slice.test.ts b/src/earn/slice.test.ts
index 08affa5951..4d035884af 100644
--- a/src/earn/slice.test.ts
+++ b/src/earn/slice.test.ts
@@ -1,4 +1,13 @@
-import reducer, { depositCancel, depositError, depositStart, depositSuccess } from './slice'
+import reducer, {
+  depositCancel,
+  depositError,
+  depositStart,
+  depositSuccess,
+  withdrawCancel,
+  withdrawError,
+  withdrawStart,
+  withdrawSuccess,
+} from './slice'
 
 describe('Earn Slice', () => {
   it('should handle deposit start', () => {
@@ -7,7 +16,7 @@ describe('Earn Slice', () => {
       depositStart({ amount: '100', tokenId: 'tokenId', preparedTransactions: [] })
     )
 
-    expect(updatedState).toHaveProperty('depositStatus', 'started')
+    expect(updatedState).toHaveProperty('depositStatus', 'loading')
   })
 
   it('should handle deposit success', () => {
@@ -27,4 +36,31 @@ describe('Earn Slice', () => {
 
     expect(updatedState).toHaveProperty('depositStatus', 'idle')
   })
+
+  it('should handle withdraw start', () => {
+    const updatedState = reducer(
+      undefined,
+      withdrawStart({ amount: '100', tokenId: 'tokenId', preparedTransactions: [], rewards: [] })
+    )
+
+    expect(updatedState).toHaveProperty('withdrawStatus', 'loading')
+  })
+
+  it('should handle withdraw success', () => {
+    const updatedState = reducer(undefined, withdrawSuccess())
+
+    expect(updatedState).toHaveProperty('withdrawStatus', 'success')
+  })
+
+  it('should handle withdraw error', () => {
+    const updatedState = reducer(undefined, withdrawError())
+
+    expect(updatedState).toHaveProperty('withdrawStatus', 'error')
+  })
+
+  it('should handle withdraw cancel', () => {
+    const updatedState = reducer(undefined, withdrawCancel())
+
+    expect(updatedState).toHaveProperty('withdrawStatus', 'idle')
+  })
 })
diff --git a/src/earn/slice.ts b/src/earn/slice.ts
index 1fd944e968..dc80d9d12a 100644
--- a/src/earn/slice.ts
+++ b/src/earn/slice.ts
@@ -1,14 +1,18 @@
 import { PayloadAction, createSlice } from '@reduxjs/toolkit'
 import { REHYDRATE, RehydrateAction } from 'redux-persist'
-import { DepositInfo } from 'src/earn/types'
+import { DepositInfo, WithdrawInfo } from 'src/earn/types'
 import { getRehydratePayload } from 'src/redux/persist-helper'
 
+type Status = 'idle' | 'loading' | 'success' | 'error'
+
 interface State {
-  depositStatus: 'idle' | 'started' | 'success' | 'error'
+  depositStatus: Status
+  withdrawStatus: Status
 }
 
 const initialState: State = {
   depositStatus: 'idle',
+  withdrawStatus: 'idle',
 }
 
 export const slice = createSlice({
@@ -16,7 +20,7 @@ export const slice = createSlice({
   initialState,
   reducers: {
     depositStart: (state, action: PayloadAction<DepositInfo>) => {
-      state.depositStatus = 'started'
+      state.depositStatus = 'loading'
     },
     depositSuccess: (state) => {
       state.depositStatus = 'success'
@@ -27,16 +31,38 @@ export const slice = createSlice({
     depositCancel: (state) => {
       state.depositStatus = 'idle'
     },
+    withdrawStart: (state, action: PayloadAction<WithdrawInfo>) => {
+      state.withdrawStatus = 'loading'
+    },
+    withdrawSuccess: (state) => {
+      state.withdrawStatus = 'success'
+    },
+    withdrawError: (state) => {
+      state.withdrawStatus = 'error'
+    },
+    withdrawCancel: (state) => {
+      state.withdrawStatus = 'idle'
+    },
   },
   extraReducers: (builder) => {
     builder.addCase(REHYDRATE, (state, action: RehydrateAction) => ({
       ...state,
       ...getRehydratePayload(action, 'earn'),
       depositStatus: 'idle',
+      withdrawStatus: 'idle',
     }))
   },
 })
 
-export const { depositStart, depositSuccess, depositError, depositCancel } = slice.actions
+export const {
+  depositStart,
+  depositSuccess,
+  depositError,
+  depositCancel,
+  withdrawStart,
+  withdrawSuccess,
+  withdrawError,
+  withdrawCancel,
+} = slice.actions
 
 export default slice.reducer
diff --git a/src/earn/types.ts b/src/earn/types.ts
index 7cd3879f49..f42a66932a 100644
--- a/src/earn/types.ts
+++ b/src/earn/types.ts
@@ -11,3 +11,13 @@ export interface RewardsInfo {
   amount: string
   tokenInfo: TokenBalance
 }
+
+export interface WithdrawInfo {
+  amount: string
+  tokenId: string
+  preparedTransactions: SerializableTransactionRequest[]
+  rewards: {
+    amount: string
+    tokenId: string
+  }[]
+}
diff --git a/src/redux/migrations.ts b/src/redux/migrations.ts
index 9791696695..9be1f1eb98 100644
--- a/src/redux/migrations.ts
+++ b/src/redux/migrations.ts
@@ -1792,4 +1792,11 @@ export const migrations = {
       introHasBeenDismissed: false,
     },
   }),
+  216: (state: any) => ({
+    ...state,
+    earn: {
+      depositStatus: 'idle',
+      withdrawStatus: 'idle',
+    },
+  }),
 }
diff --git a/src/redux/store.test.ts b/src/redux/store.test.ts
index fe96890dcc..25f650c7ab 100644
--- a/src/redux/store.test.ts
+++ b/src/redux/store.test.ts
@@ -98,7 +98,7 @@ describe('store state', () => {
       {
         "_persist": {
           "rehydrated": true,
-          "version": 215,
+          "version": 216,
         },
         "account": {
           "acceptedTerms": false,
@@ -189,6 +189,7 @@ describe('store state', () => {
         },
         "earn": {
           "depositStatus": "idle",
+          "withdrawStatus": "idle",
         },
         "escrow": {
           "isReclaiming": false,
diff --git a/src/redux/store.ts b/src/redux/store.ts
index 96c2ef914d..21b464f1dc 100644
--- a/src/redux/store.ts
+++ b/src/redux/store.ts
@@ -21,7 +21,7 @@ const persistConfig: PersistConfig<ReducersRootState> = {
   key: 'root',
   // default is -1, increment as we make migrations
   // See https://github.com/valora-inc/wallet/tree/main/WALLET.md#redux-state-migration
-  version: 215,
+  version: 216,
   keyPrefix: `reduxStore-`, // the redux-persist default is `persist:` which doesn't work with some file systems.
   storage: FSStorage(),
   blacklist: ['networkInfo', 'alert', 'imports', 'keylessBackup', 'jumpstart'],
diff --git a/test/RootStateSchema.json b/test/RootStateSchema.json
index d2d8ebd463..e498c16509 100644
--- a/test/RootStateSchema.json
+++ b/test/RootStateSchema.json
@@ -4560,17 +4560,15 @@
             "additionalProperties": false,
             "properties": {
                 "depositStatus": {
-                    "enum": [
-                        "error",
-                        "idle",
-                        "started",
-                        "success"
-                    ],
-                    "type": "string"
+                    "$ref": "#/definitions/Status_1"
+                },
+                "withdrawStatus": {
+                    "$ref": "#/definitions/Status_1"
                 }
             },
             "required": [
-                "depositStatus"
+                "depositStatus",
+                "withdrawStatus"
             ],
             "type": "object"
         },
@@ -4953,6 +4951,15 @@
             ],
             "type": "string"
         },
+        "Status_1": {
+            "enum": [
+                "error",
+                "idle",
+                "loading",
+                "success"
+            ],
+            "type": "string"
+        },
         "StoredTokenBalance": {
             "additionalProperties": false,
             "properties": {
diff --git a/test/schemas.ts b/test/schemas.ts
index 26259de142..1402fd7928 100644
--- a/test/schemas.ts
+++ b/test/schemas.ts
@@ -3335,6 +3335,18 @@ export const v215Schema = {
   },
 }
 
+export const v216Schema = {
+  ...v215Schema,
+  _persist: {
+    ...v215Schema._persist,
+    version: 216,
+  },
+  earn: {
+    depositStatus: 'idle',
+    withdrawStatus: 'idle',
+  },
+}
+
 export function getLatestSchema(): Partial<RootState> {
-  return v215Schema as Partial<RootState>
+  return v216Schema as Partial<RootState>
 }

From da2b95c428926e0488c44bb11a1894aad67e0354 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Fri, 17 May 2024 23:07:37 -0700
Subject: [PATCH 018/133] feat(earn): dispatch withdraw start on pressing
 collect (#5430)

### Description

Dispatches the redux action on pressing the collect earnings button and
fires analytics event

### Test plan

Unit tests

### Related issues

- Part of ACT-1180

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/analytics/Events.tsx            |  1 +
 src/analytics/Properties.tsx        |  8 +++
 src/analytics/docs.ts               |  1 +
 src/earn/EarnCollectScreen.test.tsx | 95 ++++++++++++++++++++++++-----
 src/earn/EarnCollectScreen.tsx      | 39 +++++++++++-
 src/earn/selectors.ts               |  2 +
 src/earn/types.ts                   | 10 +--
 7 files changed, 135 insertions(+), 21 deletions(-)

diff --git a/src/analytics/Events.tsx b/src/analytics/Events.tsx
index b60501ed91..042bfbaf9e 100644
--- a/src/analytics/Events.tsx
+++ b/src/analytics/Events.tsx
@@ -691,4 +691,5 @@ export enum EarnEvents {
   earn_view_pools_press = 'earn_view_pools_press',
   earn_exit_pool_press = 'earn_exit_pool_press',
   earn_feed_item_select = 'earn_feed_item_select',
+  earn_collect_earnings_press = 'earn_collect_earnings_press',
 }
diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 8a9eb6ce47..23d149db14 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -60,6 +60,7 @@ import {
   RewardsScreenOrigin,
 } from 'src/consumerIncentives/analyticsEventsTracker'
 import { DappSection } from 'src/dapps/types'
+import { SerializableRewardsInfo } from 'src/earn/types'
 import { ProviderSelectionAnalyticsData } from 'src/fiatExchanges/types'
 import { CICOFlow, FiatExchangeFlow, PaymentMethod } from 'src/fiatExchanges/utils'
 import { HomeActionName, NotificationBannerCTATypes, NotificationType } from 'src/home/types'
@@ -1608,6 +1609,13 @@ interface EarnEventsProperties {
   [EarnEvents.earn_feed_item_select]: {
     origin: 'EarnDeposit' | 'EarnWithdraw' | 'EarnClaimReward'
   }
+  [EarnEvents.earn_collect_earnings_press]: {
+    tokenId: string
+    amount: string
+    networkId: NetworkId
+    providerId: string
+    rewards: SerializableRewardsInfo[]
+  }
 }
 
 export type AnalyticsPropertiesList = AppEventsProperties &
diff --git a/src/analytics/docs.ts b/src/analytics/docs.ts
index 56edf804a4..757950046f 100644
--- a/src/analytics/docs.ts
+++ b/src/analytics/docs.ts
@@ -606,6 +606,7 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [EarnEvents.earn_view_pools_press]: `When the user taps on the view pools button from token details`,
   [EarnEvents.earn_exit_pool_press]: `When the user taps on the exit pool button from the earn card in discover tab`,
   [EarnEvents.earn_feed_item_select]: `When the users taps on an earn transaction feed item`,
+  [EarnEvents.earn_collect_earnings_press]: `When the user taps on the collect earnings button in the collect screen`,
 
   // Legacy event docs
   //  The below events had docs, but are no longer produced by the latest app version.
diff --git a/src/earn/EarnCollectScreen.test.tsx b/src/earn/EarnCollectScreen.test.tsx
index efe7ced5e3..c19e74bca2 100644
--- a/src/earn/EarnCollectScreen.test.tsx
+++ b/src/earn/EarnCollectScreen.test.tsx
@@ -1,12 +1,16 @@
-import { render, waitFor } from '@testing-library/react-native'
+import { fireEvent, render, waitFor } from '@testing-library/react-native'
 import BigNumber from 'bignumber.js'
 import React from 'react'
 import { Provider } from 'react-redux'
+import { EarnEvents } from 'src/analytics/Events'
+import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import EarnCollectScreen from 'src/earn/EarnCollectScreen'
 import { fetchAavePoolInfo, fetchAaveRewards } from 'src/earn/poolInfo'
 import { prepareWithdrawAndClaimTransactions } from 'src/earn/prepareTransactions'
+import { withdrawStart } from 'src/earn/slice'
 import { NetworkId } from 'src/transactions/types'
 import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
+import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
 import networkConfig from 'src/web3/networkConfig'
 import MockedNavigator from 'test/MockedNavigator'
 import { createMockStore, mockStoreBalancesToTokenBalances } from 'test/utils'
@@ -20,22 +24,22 @@ import {
   mockTokenBalances,
 } from 'test/values'
 
-const store = createMockStore({
-  tokens: {
-    tokenBalances: {
-      ...mockTokenBalances,
-      [networkConfig.aaveArbUsdcTokenId]: {
-        networkId: NetworkId['arbitrum-sepolia'],
-        address: mockAaveArbUsdcAddress,
-        tokenId: networkConfig.aaveArbUsdcTokenId,
-        symbol: 'aArbSepUSDC',
-        priceUsd: '1',
-        balance: '10.75',
-        priceFetchedAt: Date.now(),
-      },
+const mockStoreTokens = {
+  tokenBalances: {
+    ...mockTokenBalances,
+    [networkConfig.aaveArbUsdcTokenId]: {
+      networkId: NetworkId['arbitrum-sepolia'],
+      address: mockAaveArbUsdcAddress,
+      tokenId: networkConfig.aaveArbUsdcTokenId,
+      symbol: 'aArbSepUSDC',
+      priceUsd: '1',
+      balance: '10.75',
+      priceFetchedAt: Date.now(),
     },
   },
-})
+}
+
+const store = createMockStore({ tokens: mockStoreTokens })
 
 jest.mock('src/earn/poolInfo')
 jest.mock('src/earn/prepareTransactions')
@@ -78,6 +82,7 @@ describe('EarnCollectScreen', () => {
     jest.mocked(fetchAavePoolInfo).mockResolvedValue({ apy: 0.03 })
     jest.mocked(fetchAaveRewards).mockResolvedValue(mockRewards)
     jest.mocked(prepareWithdrawAndClaimTransactions).mockResolvedValue(mockPreparedTransaction)
+    store.clearActions()
   })
 
   it('renders total balance, rewards, apy and gas after fetching rewards and preparing tx', async () => {
@@ -315,4 +320,64 @@ describe('EarnCollectScreen', () => {
     expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
     expect(getByTestId('EarnCollect/GasError')).toBeTruthy()
   })
+
+  it('pressing cta dispatches withdraw action and fires analytics event', async () => {
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <MockedNavigator
+          component={EarnCollectScreen}
+          params={{
+            depositTokenId: mockArbUsdcTokenId,
+            poolTokenId: networkConfig.aaveArbUsdcTokenId,
+          }}
+        />
+      </Provider>
+    )
+
+    await waitFor(() => {
+      expect(getByTestId('EarnCollectScreen/CTA')).toBeEnabled()
+    })
+
+    fireEvent.press(getByTestId('EarnCollectScreen/CTA'))
+
+    expect(store.getActions()).toEqual([
+      {
+        type: withdrawStart.type,
+        payload: {
+          amount: '10.75',
+          tokenId: mockArbUsdcTokenId,
+          preparedTransactions: getSerializablePreparedTransactions(
+            mockPreparedTransaction.transactions
+          ),
+          rewards: [{ amount: '0.01', tokenId: mockArbArbTokenId }],
+        },
+      },
+    ])
+
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_collect_earnings_press, {
+      tokenId: mockArbUsdcTokenId,
+      amount: '10.75',
+      networkId: NetworkId['arbitrum-sepolia'],
+      providerId: 'aave-v3',
+      rewards: [{ amount: '0.01', tokenId: mockArbArbTokenId }],
+    })
+  })
+
+  it('disables cta and shows loading spinner when withdraw is submitted', async () => {
+    const store = createMockStore({ tokens: mockStoreTokens, earn: { withdrawStatus: 'loading' } })
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <MockedNavigator
+          component={EarnCollectScreen}
+          params={{
+            depositTokenId: mockArbUsdcTokenId,
+            poolTokenId: networkConfig.aaveArbUsdcTokenId,
+          }}
+        />
+      </Provider>
+    )
+
+    expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
+    expect(getByTestId('EarnCollectScreen/CTA')).toContainElement(getByTestId('Button/Loading'))
+  })
 })
diff --git a/src/earn/EarnCollectScreen.tsx b/src/earn/EarnCollectScreen.tsx
index 81015f0318..801da7a4e6 100644
--- a/src/earn/EarnCollectScreen.tsx
+++ b/src/earn/EarnCollectScreen.tsx
@@ -4,14 +4,18 @@ import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { SafeAreaView, ScrollView, StyleSheet, Text, View } from 'react-native'
 import SkeletonPlaceholder from 'react-native-skeleton-placeholder'
+import { EarnEvents } from 'src/analytics/Events'
+import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import Button, { BtnSizes } from 'src/components/Button'
 import InLineNotification, { NotificationVariant } from 'src/components/InLineNotification'
 import TokenDisplay from 'src/components/TokenDisplay'
 import TokenIcon, { IconSize } from 'src/components/TokenIcon'
 import { useAavePoolInfo, useAaveRewardsInfoAndPrepareTransactions } from 'src/earn/hooks'
+import { withdrawStatusSelector } from 'src/earn/selectors'
+import { withdrawStart } from 'src/earn/slice'
 import { Screens } from 'src/navigator/Screens'
 import { StackParamList } from 'src/navigator/types'
-import { useSelector } from 'src/redux/hooks'
+import { useDispatch, useSelector } from 'src/redux/hooks'
 import Colors from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
 import { Spacing } from 'src/styles/styles'
@@ -19,14 +23,17 @@ import { useTokenInfo } from 'src/tokens/hooks'
 import { feeCurrenciesSelector } from 'src/tokens/selectors'
 import { TokenBalance } from 'src/tokens/slice'
 import { getFeeCurrencyAndAmounts } from 'src/viem/prepareTransactions'
+import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
 
 type Props = NativeStackScreenProps<StackParamList, Screens.EarnCollectScreen>
 
 export default function EarnCollectScreen({ route }: Props) {
   const { t } = useTranslation()
+  const dispatch = useDispatch()
   const { depositTokenId, poolTokenId } = route.params
   const depositToken = useTokenInfo(depositTokenId)
   const poolToken = useTokenInfo(poolTokenId)
+  const withdrawStatus = useSelector(withdrawStatusSelector)
 
   if (!depositToken || !poolToken) {
     // should never happen
@@ -40,7 +47,34 @@ export default function EarnCollectScreen({ route }: Props) {
     feeCurrencies,
   })
   const onPress = () => {
-    // TODO(ACT-1180): submit the tx
+    if (!asyncRewardsInfo.result || asyncPreparedTransactions.result?.type !== 'possible') {
+      // should never happen because button is disabled if withdraw is not possible
+      throw new Error('Cannot be called without possible prepared transactions')
+    }
+
+    const serializedRewards = asyncRewardsInfo.result.map((info) => ({
+      amount: info.amount.toString(),
+      tokenId: info.tokenInfo.tokenId,
+    }))
+
+    dispatch(
+      withdrawStart({
+        amount: poolToken.balance.toString(),
+        tokenId: depositTokenId,
+        preparedTransactions: getSerializablePreparedTransactions(
+          asyncPreparedTransactions.result.transactions
+        ),
+        rewards: serializedRewards,
+      })
+    )
+
+    ValoraAnalytics.track(EarnEvents.earn_collect_earnings_press, {
+      tokenId: depositTokenId,
+      amount: poolToken.balance.toString(),
+      networkId: depositToken.networkId,
+      providerId: 'aave-v3',
+      rewards: serializedRewards,
+    })
   }
 
   // skipping apy fetch error because that isn't blocking collecting rewards
@@ -107,6 +141,7 @@ export default function EarnCollectScreen({ route }: Props) {
         onPress={onPress}
         testID="EarnCollectScreen/CTA"
         disabled={!!ctaDisabled}
+        showLoading={withdrawStatus === 'loading'}
       />
     </SafeAreaView>
   )
diff --git a/src/earn/selectors.ts b/src/earn/selectors.ts
index 3875b06e61..db3f9efa81 100644
--- a/src/earn/selectors.ts
+++ b/src/earn/selectors.ts
@@ -1,3 +1,5 @@
 import { RootState } from 'src/redux/store'
 
 export const depositStatusSelector = (state: RootState) => state.earn.depositStatus
+
+export const withdrawStatusSelector = (state: RootState) => state.earn.withdrawStatus
diff --git a/src/earn/types.ts b/src/earn/types.ts
index f42a66932a..c5f7060f38 100644
--- a/src/earn/types.ts
+++ b/src/earn/types.ts
@@ -12,12 +12,14 @@ export interface RewardsInfo {
   tokenInfo: TokenBalance
 }
 
+export interface SerializableRewardsInfo {
+  amount: string
+  tokenId: string
+}
+
 export interface WithdrawInfo {
   amount: string
   tokenId: string
   preparedTransactions: SerializableTransactionRequest[]
-  rewards: {
-    amount: string
-    tokenId: string
-  }[]
+  rewards: SerializableRewardsInfo[]
 }

From c55cd0ac26f892bdc6da3fd26ab46b326b63aab9 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 20 May 2024 09:38:03 -0700
Subject: [PATCH 019/133] feat(earn): earn transaction details content (#5425)

### Description

Adds transaction details content for `EarnDeposit`, `EarnClaimReward`
and `EarnWithdraw`.

#### Screenshots

| iOS Deposit | iOS Claim | iOS Withdraw |
| ----- | ----- | ----- |
|
![](https://github.com/valora-inc/wallet/assets/26950305/27692908-edb1-4bcf-a876-ffff1d0c50bf
"iOS Deposit") |
![](https://github.com/valora-inc/wallet/assets/26950305/136518ee-bf17-40ad-8fc7-1abf3fae9506
"iOS Claim") |
![](https://github.com/valora-inc/wallet/assets/26950305/517de616-6017-46e4-9ab8-31556241c87e
"iOS Withdraw") |

### Test plan

- [x] Tested locally on iOS
- [x] Tested locally on Android
- [x] Unit tests updated

### Related issues

- Fixes ACT-1198

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 locales/base/translation.json                 |  12 ++
 src/transactions/feed/EarnFeedItem.test.tsx   | 106 ++---------
 .../feed/TransactionDetailsScreen.test.tsx    | 115 +++++++++++-
 .../feed/TransactionDetailsScreen.tsx         |  14 +-
 .../feed/detailContent/EarnContent.tsx        | 171 ++++++++++++++++++
 test/values.ts                                | 100 ++++++++++
 6 files changed, 421 insertions(+), 97 deletions(-)
 create mode 100644 src/transactions/feed/detailContent/EarnContent.tsx

diff --git a/locales/base/translation.json b/locales/base/translation.json
index 1f39197e80..f6f2beec0f 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -2406,6 +2406,18 @@
       "earnDepositSubtitle": "to {{providerName}} Pool",
       "earnWithdrawTitle": "Withdrew",
       "earnWithdrawSubtitle": "from {{providerName}} Pool"
+    },
+    "transactionDetails": {
+      "descriptionLabel": "Details",
+      "earnClaimTitle": "Collected",
+      "earnClaimSubtitle": "Collected {{tokenSymbol}} from {{providerName}} Pool",
+      "earnClaimDetails": "Amount Collected",
+      "earnDepositTitle": "Deposited",
+      "earnDepositSubtitle": "Deposited {{tokenSymbol}} to {{providerName}} Pool",
+      "earnDepositDetails": "Amount Deposited",
+      "earnWithdrawTitle": "Withdrew",
+      "earnWithdrawSubtitle": "Withdrew {{tokenSymbol}} from {{providerName}} Pool",
+      "earnWithdrawDetails": "Amount Withdrawn"
     }
   }
 }
diff --git a/src/transactions/feed/EarnFeedItem.test.tsx b/src/transactions/feed/EarnFeedItem.test.tsx
index 9af669a3c2..7632e4dff6 100644
--- a/src/transactions/feed/EarnFeedItem.test.tsx
+++ b/src/transactions/feed/EarnFeedItem.test.tsx
@@ -6,10 +6,16 @@ import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import EarnFeedItem from 'src/transactions/feed/EarnFeedItem'
-import { NetworkId, TransactionStatus } from 'src/transactions/types'
+import { NetworkId } from 'src/transactions/types'
 import networkConfig from 'src/web3/networkConfig'
 import { createMockStore } from 'test/utils'
-import { mockAaveArbUsdcAddress, mockArbArbTokenId } from 'test/values'
+import {
+  mockAaveArbUsdcAddress,
+  mockArbArbTokenId,
+  mockEarnClaimRewardTransaction,
+  mockEarnDepositTransaction,
+  mockEarnWithdrawTransaction,
+} from 'test/values'
 
 const store = createMockStore({
   tokens: {
@@ -43,39 +49,7 @@ const store = createMockStore({
 describe.each([
   {
     type: 'EarnWithdraw',
-    transaction: {
-      __typename: 'EarnWithdraw',
-      inAmount: {
-        localAmount: null,
-        tokenAddress: '0xdef',
-        tokenId: networkConfig.arbUsdcTokenId,
-        value: '1',
-      },
-      outAmount: {
-        localAmount: null,
-        tokenAddress: mockAaveArbUsdcAddress,
-        tokenId: networkConfig.aaveArbUsdcTokenId,
-        value: '0.996614',
-      },
-      block: '211276583',
-      fees: [
-        {
-          amount: {
-            localAmount: null,
-            tokenAddress: null,
-            tokenId: mockArbArbTokenId,
-            value: '0.00000229122',
-          },
-          type: 'SECURITY_FEE',
-        },
-      ],
-      networkId: NetworkId['arbitrum-sepolia'],
-      providerId: 'aave-v3',
-      timestamp: Date.now(),
-      transactionHash: '0xHASH0',
-      type: 'EARN_WITHDRAW',
-      status: TransactionStatus.Complete,
-    },
+    transaction: mockEarnWithdrawTransaction,
     expectedTitle: 'earnFlow.transactionFeed.earnWithdrawTitle',
     expectedSubTitle: 'earnFlow.transactionFeed.earnWithdrawSubtitle, {"providerName":"Aave"}',
     expectedTotal: '+1.00 USDC',
@@ -83,39 +57,7 @@ describe.each([
   },
   {
     type: 'EarnDeposit',
-    transaction: {
-      __typename: 'EarnDeposit',
-      inAmount: {
-        localAmount: null,
-        tokenAddress: mockAaveArbUsdcAddress,
-        tokenId: networkConfig.aaveArbUsdcTokenId,
-        value: '10',
-      },
-      outAmount: {
-        localAmount: null,
-        tokenAddress: '0xdef',
-        tokenId: networkConfig.arbUsdcTokenId,
-        value: '10',
-      },
-      block: '210927567',
-      fees: [
-        {
-          amount: {
-            localAmount: null,
-            tokenAddress: null,
-            tokenId: mockArbArbTokenId,
-            value: '0.00000284243',
-          },
-          type: 'SECURITY_FEE',
-        },
-      ],
-      networkId: NetworkId['arbitrum-sepolia'],
-      providerId: 'aave-v3',
-      timestamp: Date.now(),
-      transactionHash: '0xHASH1',
-      type: 'EARN_DEPOSIT',
-      status: TransactionStatus.Complete,
-    },
+    transaction: mockEarnDepositTransaction,
     expectedTitle: 'earnFlow.transactionFeed.earnDepositTitle',
     expectedSubTitle: 'earnFlow.transactionFeed.earnDepositSubtitle, {"providerName":"Aave"}',
     expectedTotal: '-10.00 USDC',
@@ -123,33 +65,7 @@ describe.each([
   },
   {
     type: 'EarnClaimReward',
-    transaction: {
-      __typename: 'EarnClaimReward',
-      amount: {
-        localAmount: null,
-        tokenAddress: '0xhij',
-        tokenId: mockArbArbTokenId,
-        value: '1.5',
-      },
-      block: '211278852',
-      fees: [
-        {
-          amount: {
-            localAmount: null,
-            tokenAddress: null,
-            tokenId: mockArbArbTokenId,
-            value: '0.00000146037',
-          },
-          type: 'SECURITY_FEE',
-        },
-      ],
-      networkId: NetworkId['arbitrum-sepolia'],
-      providerId: 'aave-v3',
-      timestamp: Date.now(),
-      transactionHash: '0xHASH2',
-      type: 'EARN_CLAIM_REWARD',
-      status: TransactionStatus.Complete,
-    } as any,
+    transaction: mockEarnClaimRewardTransaction,
     expectedTitle: 'earnFlow.transactionFeed.earnClaimTitle',
     expectedSubTitle: 'earnFlow.transactionFeed.earnClaimSubtitle, {"providerName":"Aave"}',
     expectedTotal: '+1.50 ARB',
diff --git a/src/transactions/feed/TransactionDetailsScreen.test.tsx b/src/transactions/feed/TransactionDetailsScreen.test.tsx
index 09bc7587af..6e0eb67fad 100644
--- a/src/transactions/feed/TransactionDetailsScreen.test.tsx
+++ b/src/transactions/feed/TransactionDetailsScreen.test.tsx
@@ -6,8 +6,13 @@ import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { RootState } from 'src/redux/reducers'
+import { getDynamicConfigParams } from 'src/statsig'
+import { StatsigDynamicConfigs } from 'src/statsig/types'
 import TransactionDetailsScreen from 'src/transactions/feed/TransactionDetailsScreen'
 import {
+  EarnClaimReward,
+  EarnDeposit,
+  EarnWithdraw,
   Fee,
   FeeType,
   NetworkId,
@@ -39,6 +44,9 @@ import {
   mockCusdTokenId,
   mockDisplayNumber2,
   mockE164Number2,
+  mockEarnClaimRewardTransaction,
+  mockEarnDepositTransaction,
+  mockEarnWithdrawTransaction,
 } from 'test/values'
 
 jest.mock('src/analytics/ValoraAnalytics')
@@ -176,6 +184,33 @@ describe('TransactionDetailsScreen', () => {
     }
   }
 
+  function earnClaimTransaction({
+    status = TransactionStatus.Complete,
+  }: Partial<EarnClaimReward>): EarnClaimReward {
+    return {
+      ...mockEarnClaimRewardTransaction,
+      status,
+    }
+  }
+
+  function earnDepositTransaction({
+    status = TransactionStatus.Complete,
+  }: Partial<EarnDeposit>): EarnDeposit {
+    return {
+      ...mockEarnDepositTransaction,
+      status,
+    }
+  }
+
+  function earnWithdrawTransaction({
+    status = TransactionStatus.Complete,
+  }: Partial<EarnWithdraw>): EarnWithdraw {
+    return {
+      ...mockEarnWithdrawTransaction,
+      status,
+    }
+  }
+
   it('renders correctly for sends', async () => {
     const { getByTestId, getByText } = renderScreen({
       transaction: tokenTransfer({
@@ -338,7 +373,85 @@ describe('TransactionDetailsScreen', () => {
     expect(getByText('transactionDetailsActions.checkPendingTransactionStatus')).toBeTruthy()
   })
 
-  it(`renders the correct details for ${TokenTransactionTypeV2.Approval} transacton`, () => {
+  describe('Earn', () => {
+    beforeEach(() => {
+      jest.clearAllMocks()
+      jest.mocked(getDynamicConfigParams).mockImplementation(({ configName, defaultValues }) => {
+        switch (configName) {
+          case StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG:
+            return {
+              providerName: 'Aave',
+              providerLogoUrl: 'logoUrl',
+              providerTermsAndConditionsUrl: 'termsUrl',
+            }
+          default:
+            return defaultValues
+        }
+      })
+    })
+
+    it(`renders check status action for pending ${TokenTransactionTypeV2.EarnClaimReward} transaction`, () => {
+      const { getByText } = renderScreen({
+        transaction: earnClaimTransaction({
+          status: TransactionStatus.Pending,
+        }),
+      })
+
+      expect(getByText('transactionDetailsActions.checkPendingTransactionStatus')).toBeTruthy()
+    })
+
+    it(`renders check status action for pending ${TokenTransactionTypeV2.EarnDeposit} transaction`, () => {
+      const { getByText } = renderScreen({
+        transaction: earnDepositTransaction({
+          status: TransactionStatus.Pending,
+        }),
+      })
+
+      expect(getByText('transactionDetailsActions.checkPendingTransactionStatus')).toBeTruthy()
+    })
+
+    it(`renders check status action for pending ${TokenTransactionTypeV2.EarnWithdraw} transaction`, () => {
+      const { getByText } = renderScreen({
+        transaction: earnWithdrawTransaction({
+          status: TransactionStatus.Pending,
+        }),
+      })
+
+      expect(getByText('transactionDetailsActions.checkPendingTransactionStatus')).toBeTruthy()
+    })
+
+    it(`renders details action for complete ${TokenTransactionTypeV2.EarnClaimReward} transaction`, () => {
+      const { getByText } = renderScreen({
+        transaction: earnClaimTransaction({
+          status: TransactionStatus.Complete,
+        }),
+      })
+
+      expect(getByText('transactionDetailsActions.showCompletedTransactionDetails')).toBeTruthy()
+    })
+
+    it(`renders details action for complete ${TokenTransactionTypeV2.EarnDeposit} transaction`, () => {
+      const { getByText } = renderScreen({
+        transaction: earnDepositTransaction({
+          status: TransactionStatus.Complete,
+        }),
+      })
+
+      expect(getByText('transactionDetailsActions.showCompletedTransactionDetails')).toBeTruthy()
+    })
+
+    it(`renders details action for complete ${TokenTransactionTypeV2.EarnWithdraw} transaction`, () => {
+      const { getByText } = renderScreen({
+        transaction: earnWithdrawTransaction({
+          status: TransactionStatus.Complete,
+        }),
+      })
+
+      expect(getByText('transactionDetailsActions.showCompletedTransactionDetails')).toBeTruthy()
+    })
+  })
+
+  it(`renders the correct details for ${TokenTransactionTypeV2.Approval} transaction`, () => {
     const { getByText, getByTestId } = renderScreen({
       transaction: approvalTransaction({
         status: TransactionStatus.Complete,
diff --git a/src/transactions/feed/TransactionDetailsScreen.tsx b/src/transactions/feed/TransactionDetailsScreen.tsx
index 4e46a18df3..4ce20197cd 100644
--- a/src/transactions/feed/TransactionDetailsScreen.tsx
+++ b/src/transactions/feed/TransactionDetailsScreen.tsx
@@ -9,9 +9,17 @@ import { coinbasePaySendersSelector, rewardsSendersSelector } from 'src/recipien
 import { useSelector } from 'src/redux/hooks'
 import { useTokenInfo } from 'src/tokens/hooks'
 import TransactionDetails from 'src/transactions/feed/TransactionDetails'
+import {
+  EarnClaimContent,
+  EarnDepositContent,
+  EarnWithdrawContent,
+} from 'src/transactions/feed/detailContent/EarnContent'
 import TokenApprovalDetails from 'src/transactions/feed/detailContent/TokenApprovalDetails'
 import TransferSentContent from 'src/transactions/feed/detailContent/TransferSentContent'
 import {
+  EarnClaimReward,
+  EarnDeposit,
+  EarnWithdraw,
   TokenApproval,
   TokenExchange,
   TokenTransaction,
@@ -112,9 +120,13 @@ function TransactionDetailsScreen({ route }: Props) {
       retryHandler = () => navigate(Screens.SwapScreenWithBack)
       break
     case TokenTransactionTypeV2.EarnClaimReward:
+      content = <EarnClaimContent transaction={transaction as EarnClaimReward} />
+      break
     case TokenTransactionTypeV2.EarnWithdraw:
+      content = <EarnWithdrawContent transaction={transaction as EarnWithdraw} />
+      break
     case TokenTransactionTypeV2.EarnDeposit:
-      content = null //TODO (act-1198): details for Earn
+      content = <EarnDepositContent transaction={transaction as EarnDeposit} />
       break
     case TokenTransactionTypeV2.Approval:
       content = <TokenApprovalDetails transaction={transaction as TokenApproval} />
diff --git a/src/transactions/feed/detailContent/EarnContent.tsx b/src/transactions/feed/detailContent/EarnContent.tsx
new file mode 100644
index 0000000000..57860e573e
--- /dev/null
+++ b/src/transactions/feed/detailContent/EarnContent.tsx
@@ -0,0 +1,171 @@
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import { StyleSheet, Text, View } from 'react-native'
+import RowDivider from 'src/components/RowDivider'
+import TokenDisplay from 'src/components/TokenDisplay'
+import { getDynamicConfigParams } from 'src/statsig'
+import { DynamicConfigs } from 'src/statsig/constants'
+import { StatsigDynamicConfigs } from 'src/statsig/types'
+import Colors from 'src/styles/colors'
+import { typeScale } from 'src/styles/fonts'
+import { useTokenInfo } from 'src/tokens/hooks'
+import NetworkFeeRowItem from 'src/transactions/feed/detailContent/NetworkFeeRowItem'
+import { EarnClaimReward, EarnDeposit, EarnWithdraw } from 'src/transactions/types'
+
+interface EarnClaimRewardProps {
+  transaction: EarnClaimReward
+}
+
+export function EarnClaimContent({ transaction }: EarnClaimRewardProps) {
+  const { t } = useTranslation()
+  const { providerName } = getDynamicConfigParams(
+    DynamicConfigs[StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG]
+  )
+  const tokenInfo = useTokenInfo(transaction.amount.tokenId)
+  const tokenSymbol = tokenInfo?.symbol ?? ''
+
+  return (
+    <>
+      <Text style={styles.detailsTitle}>{t('earnFlow.transactionDetails.descriptionLabel')}</Text>
+      <Text style={styles.detailsSubtitle}>
+        {t('earnFlow.transactionDetails.earnClaimSubtitle', { providerName, tokenSymbol })}
+      </Text>
+      <RowDivider />
+      <View>
+        <View style={styles.row}>
+          <Text style={styles.amountTitle} testID={'EarnFeedItem/title'}>
+            {t('earnFlow.transactionDetails.earnClaimDetails')}
+          </Text>
+          <TokenDisplay
+            amount={transaction.amount.value}
+            tokenId={transaction.amount.tokenId}
+            showSymbol={true}
+            showLocalAmount={false}
+            style={styles.amountTitle}
+          />
+        </View>
+        <TokenDisplay
+          amount={transaction.amount.value}
+          tokenId={transaction.amount.tokenId}
+          style={styles.amountSubtitle}
+        />
+      </View>
+      <RowDivider />
+      <NetworkFeeRowItem fees={transaction.fees} transactionStatus={transaction.status} />
+    </>
+  )
+}
+
+interface EarnDepositProps {
+  transaction: EarnDeposit
+}
+
+export function EarnDepositContent({ transaction }: EarnDepositProps) {
+  const { t } = useTranslation()
+  const { providerName } = getDynamicConfigParams(
+    DynamicConfigs[StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG]
+  )
+  const tokenInfo = useTokenInfo(transaction.outAmount.tokenId)
+  const tokenSymbol = tokenInfo?.symbol ?? ''
+
+  return (
+    <>
+      <Text style={styles.detailsTitle}>{t('earnFlow.transactionDetails.descriptionLabel')}</Text>
+      <Text style={styles.detailsSubtitle}>
+        {t('earnFlow.transactionDetails.earnDepositSubtitle', { providerName, tokenSymbol })}
+      </Text>
+      <RowDivider />
+      <View>
+        <View style={styles.row}>
+          <Text style={styles.amountTitle} testID={'EarnDepositDetails/title'}>
+            {t('earnFlow.transactionDetails.earnDepositDetails')}
+          </Text>
+          <TokenDisplay
+            amount={transaction.outAmount.value}
+            tokenId={transaction.outAmount.tokenId}
+            showSymbol={true}
+            showLocalAmount={false}
+            style={styles.amountTitle}
+          />
+        </View>
+        <TokenDisplay
+          amount={transaction.outAmount.value}
+          tokenId={transaction.outAmount.tokenId}
+          style={styles.amountSubtitle}
+        />
+      </View>
+      <RowDivider />
+      <NetworkFeeRowItem fees={transaction.fees} transactionStatus={transaction.status} />
+    </>
+  )
+}
+
+interface EarnWithdrawProps {
+  transaction: EarnWithdraw
+}
+
+export function EarnWithdrawContent({ transaction }: EarnWithdrawProps) {
+  const { t } = useTranslation()
+  const { providerName } = getDynamicConfigParams(
+    DynamicConfigs[StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG]
+  )
+  const tokenInfo = useTokenInfo(transaction.inAmount.tokenId)
+  const tokenSymbol = tokenInfo?.symbol ?? ''
+
+  return (
+    <>
+      <Text style={styles.detailsTitle}>{t('earnFlow.transactionDetails.descriptionLabel')}</Text>
+      <Text style={styles.detailsSubtitle}>
+        {t('earnFlow.transactionDetails.earnWithdrawSubtitle', { providerName, tokenSymbol })}
+      </Text>
+      <RowDivider />
+      <View>
+        <View style={styles.row}>
+          <Text style={styles.amountTitle} testID={'EarnWithdrawDetails/title'}>
+            {t('earnFlow.transactionDetails.earnWithdrawDetails')}
+          </Text>
+          <TokenDisplay
+            amount={transaction.inAmount.value}
+            tokenId={transaction.inAmount.tokenId}
+            showSymbol={true}
+            showLocalAmount={false}
+            style={styles.amountTitle}
+          />
+        </View>
+        <TokenDisplay
+          amount={transaction.inAmount.value}
+          tokenId={transaction.inAmount.tokenId}
+          style={styles.amountSubtitle}
+        />
+      </View>
+      <RowDivider />
+      <NetworkFeeRowItem fees={transaction.fees} transactionStatus={transaction.status} />
+    </>
+  )
+}
+
+const styles = StyleSheet.create({
+  detailsTitle: {
+    ...typeScale.labelSmall,
+    color: Colors.black,
+  },
+  detailsSubtitle: {
+    ...typeScale.bodyMedium,
+    color: Colors.black,
+  },
+  row: {
+    flex: 1,
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    flexWrap: 'wrap',
+  },
+  amountTitle: {
+    ...typeScale.labelSemiBoldMedium,
+    color: Colors.black,
+  },
+  amountSubtitle: {
+    ...typeScale.bodySmall,
+    color: Colors.gray4,
+    marginLeft: 'auto',
+  },
+})
diff --git a/test/values.ts b/test/values.ts
index 2b266bd5df..1eb1a51335 100644
--- a/test/values.ts
+++ b/test/values.ts
@@ -51,6 +51,9 @@ import {
 import { TransactionDataInput } from 'src/send/types'
 import { NativeTokenBalance, StoredTokenBalance, TokenBalance } from 'src/tokens/slice'
 import {
+  EarnClaimReward,
+  EarnDeposit,
+  EarnWithdraw,
   NetworkId,
   TokenApproval,
   TokenTransactionTypeV2,
@@ -58,6 +61,7 @@ import {
 } from 'src/transactions/types'
 import { CiCoCurrency, Currency } from 'src/utils/currencies'
 import { ONE_DAY_IN_MILLIS } from 'src/utils/time'
+import networkConfig from 'src/web3/networkConfig'
 
 export const nullAddress = '0x0'
 
@@ -1664,6 +1668,102 @@ export const mockApprovalTransaction: TokenApproval = {
   status: TransactionStatus.Complete,
 }
 
+export const mockEarnClaimRewardTransaction: EarnClaimReward = {
+  type: TokenTransactionTypeV2.EarnClaimReward,
+  __typename: 'EarnClaimReward',
+  amount: {
+    localAmount: undefined,
+    tokenAddress: mockArbArbAddress,
+    tokenId: mockArbArbTokenId,
+    value: '1.5',
+  },
+  block: '211278852',
+  fees: [
+    {
+      amount: {
+        localAmount: undefined,
+        tokenAddress: mockArbArbAddress,
+        tokenId: mockArbArbTokenId,
+        value: '0.00000146037',
+      },
+      type: 'SECURITY_FEE',
+    },
+  ],
+  networkId: NetworkId['arbitrum-sepolia'],
+  providerId: 'aave-v3',
+  timestamp: Date.now(),
+  transactionHash: '0xHASH2',
+  status: TransactionStatus.Complete,
+}
+
+export const mockEarnDepositTransaction: EarnDeposit = {
+  __typename: 'EarnDeposit',
+  inAmount: {
+    localAmount: undefined,
+    tokenAddress: mockAaveArbUsdcAddress,
+    tokenId: networkConfig.aaveArbUsdcTokenId,
+    value: '10',
+  },
+  outAmount: {
+    localAmount: undefined,
+    tokenAddress: '0xdef',
+    tokenId: networkConfig.arbUsdcTokenId,
+    value: '10',
+  },
+  block: '210927567',
+  fees: [
+    {
+      amount: {
+        localAmount: undefined,
+        tokenAddress: mockArbArbAddress,
+        tokenId: mockArbArbTokenId,
+        value: '0.00000284243',
+      },
+      type: 'SECURITY_FEE',
+    },
+  ],
+  networkId: NetworkId['arbitrum-sepolia'],
+  providerId: 'aave-v3',
+  timestamp: Date.now(),
+  transactionHash: '0xHASH1',
+  status: TransactionStatus.Complete,
+  type: TokenTransactionTypeV2.EarnDeposit,
+}
+
+export const mockEarnWithdrawTransaction: EarnWithdraw = {
+  __typename: 'EarnWithdraw',
+  inAmount: {
+    localAmount: undefined,
+    tokenAddress: '0xdef',
+    tokenId: networkConfig.arbUsdcTokenId,
+    value: '1',
+  },
+  outAmount: {
+    localAmount: undefined,
+    tokenAddress: mockAaveArbUsdcAddress,
+    tokenId: networkConfig.aaveArbUsdcTokenId,
+    value: '0.996614',
+  },
+  block: '211276583',
+  fees: [
+    {
+      amount: {
+        localAmount: undefined,
+        tokenAddress: mockArbArbAddress,
+        tokenId: mockArbArbTokenId,
+        value: '0.00000229122',
+      },
+      type: 'SECURITY_FEE',
+    },
+  ],
+  networkId: NetworkId['arbitrum-sepolia'],
+  providerId: 'aave-v3',
+  timestamp: Date.now(),
+  transactionHash: '0xHASH0',
+  type: TokenTransactionTypeV2.EarnWithdraw,
+  status: TransactionStatus.Complete,
+}
+
 export const mockExpectedCleverTapInboxMessage = {
   wzrkParams: { wzrk_id: '0_0' },
   id: '1704393845',

From 6c3366db6434b2c75d03c028eeb994b795537c8f Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Tue, 21 May 2024 06:06:02 +1200
Subject: [PATCH 020/133] feat(buttons): Change onboarding buttons to new
 design (#5423)

### Description

Update the onboarding buttons

### Test plan

unit/e2e tests pass

Manual Tests:
![Simulator Screenshot - iPhone 14 Pro - 2024-05-16 at 12 33
56](https://github.com/valora-inc/wallet/assets/140328381/f616523d-e24b-46f3-bff1-650b51c7f0ad)
![Simulator Screenshot - iPhone 14 Pro - 2024-05-16 at 12 34
02](https://github.com/valora-inc/wallet/assets/140328381/fea7646c-cda6-470d-b5b4-3f30b6bb1842)
![Simulator Screenshot - iPhone 14 Pro - 2024-05-16 at 12 34
25](https://github.com/valora-inc/wallet/assets/140328381/2ab26ff4-89dd-4a58-a8bc-6f2cd0bebc1b)



### Related issues

- N/A

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [X] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/components/Button.tsx                       | 17 ++++++-----------
 src/import/ImportWallet.tsx                     |  2 +-
 src/keylessBackup/KeylessBackupProgress.tsx     |  4 ++--
 src/onboarding/registration/EnableBiometry.tsx  |  2 +-
 .../registration/OnboardingRecoveryPhrase.tsx   |  2 +-
 src/onboarding/registration/RegulatoryTerms.tsx |  2 +-
 src/onboarding/welcome/Welcome.tsx              |  4 ++--
 src/verify/VerificationStartScreen.tsx          |  2 +-
 8 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index 5c503d215e..1a79353d23 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -16,9 +16,8 @@ export enum BtnTypes {
   PRIMARY = 'Primary',
   SECONDARY = 'Secondary',
   SECONDARY_WHITE_BG = 'SecondaryWhiteBg',
-  ONBOARDING = 'Onboarding',
-  ONBOARDING_SECONDARY = 'OnboardingSecondary',
   GRAY_WITH_BORDER = 'GrayWithBorder',
+  ONBOARDING_SECONDARY = 'OnboardingSecondary',
 }
 
 export enum BtnSizes {
@@ -173,22 +172,18 @@ function getColors(type: BtnTypes, disabled: boolean | undefined) {
       textColor = colors.gray3
       backgroundColor = colors.white
       break
-    case BtnTypes.ONBOARDING:
-      textColor = colors.white
-      backgroundColor = colors.successDark
+    case BtnTypes.GRAY_WITH_BORDER:
+      textColor = colors.black
+      backgroundColor = colors.gray1
+      borderColor = colors.gray2
       opacity = disabled ? 0.5 : 1.0
       break
+    /** @deprecated TODO(ACT-1200): Remove and replace with GRAY_WITHBORDER*/
     case BtnTypes.ONBOARDING_SECONDARY:
       textColor = colors.successDark
       backgroundColor = colors.white
       opacity = disabled ? 0.5 : 1.0
       break
-    case BtnTypes.GRAY_WITH_BORDER:
-      textColor = colors.black
-      backgroundColor = colors.gray1
-      borderColor = colors.gray2
-      opacity = disabled ? 0.5 : 1.0
-      break
   }
 
   return { textColor, backgroundColor, opacity, borderColor }
diff --git a/src/import/ImportWallet.tsx b/src/import/ImportWallet.tsx
index c135b32dfb..698a07b1ea 100644
--- a/src/import/ImportWallet.tsx
+++ b/src/import/ImportWallet.tsx
@@ -221,7 +221,7 @@ function ImportWallet({ navigation, route }: Props) {
                   onPress={onPressRestore}
                   text={t('restore')}
                   size={BtnSizes.FULL}
-                  type={BtnTypes.ONBOARDING}
+                  type={BtnTypes.PRIMARY}
                   disabled={
                     isImportingWallet || !isValidBackupPhrase(backupPhrase) || !appConnected
                   }
diff --git a/src/keylessBackup/KeylessBackupProgress.tsx b/src/keylessBackup/KeylessBackupProgress.tsx
index 19d3e8bd99..5ebcbc3313 100644
--- a/src/keylessBackup/KeylessBackupProgress.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.tsx
@@ -315,7 +315,7 @@ function Setup() {
             onPress={onPressLater}
             text={t('keylessBackupStatus.setup.failed.later')}
             size={BtnSizes.FULL}
-            type={BtnTypes.ONBOARDING}
+            type={BtnTypes.PRIMARY}
             style={styles.button}
             touchableStyle={styles.buttonTouchable}
           />
@@ -324,7 +324,7 @@ function Setup() {
             onPress={onPressManual}
             text={t('keylessBackupStatus.setup.failed.manual')}
             size={BtnSizes.FULL}
-            type={BtnTypes.ONBOARDING_SECONDARY}
+            type={BtnTypes.GRAY_WITH_BORDER}
             style={styles.button}
             touchableStyle={styles.buttonTouchable}
           />
diff --git a/src/onboarding/registration/EnableBiometry.tsx b/src/onboarding/registration/EnableBiometry.tsx
index 64c0218413..878ff0c02e 100644
--- a/src/onboarding/registration/EnableBiometry.tsx
+++ b/src/onboarding/registration/EnableBiometry.tsx
@@ -129,7 +129,7 @@ export default function EnableBiometry({ navigation }: Props) {
             biometryType: t(`biometryType.${supportedBiometryType}`),
           })}
           size={BtnSizes.FULL}
-          type={BtnTypes.ONBOARDING}
+          type={BtnTypes.PRIMARY}
           testID="EnableBiometryButton"
           icon={
             supportedBiometryType && (
diff --git a/src/onboarding/registration/OnboardingRecoveryPhrase.tsx b/src/onboarding/registration/OnboardingRecoveryPhrase.tsx
index dd681c95f0..4f52998cf1 100644
--- a/src/onboarding/registration/OnboardingRecoveryPhrase.tsx
+++ b/src/onboarding/registration/OnboardingRecoveryPhrase.tsx
@@ -108,7 +108,7 @@ function OnboardingRecoveryPhrase({ navigation }: Props) {
             onPress={onPressContinue}
             text={t('recoveryPhrase.continue')}
             size={BtnSizes.FULL}
-            type={BtnTypes.ONBOARDING}
+            type={BtnTypes.PRIMARY}
             testID={'protectWalletBottomSheetContinue'}
           />
         </View>
diff --git a/src/onboarding/registration/RegulatoryTerms.tsx b/src/onboarding/registration/RegulatoryTerms.tsx
index cdd19472ba..a9dbd38426 100644
--- a/src/onboarding/registration/RegulatoryTerms.tsx
+++ b/src/onboarding/registration/RegulatoryTerms.tsx
@@ -181,7 +181,7 @@ export class RegulatoryTerms extends React.Component<Props> {
           {(insets) => (
             <Button
               style={[styles.button, insets && insets.bottom <= MARGIN && { marginBottom: MARGIN }]}
-              type={BtnTypes.ONBOARDING}
+              type={BtnTypes.PRIMARY}
               size={BtnSizes.FULL}
               text={t('accept')}
               onPress={this.onPressAccept}
diff --git a/src/onboarding/welcome/Welcome.tsx b/src/onboarding/welcome/Welcome.tsx
index 7c8c255ee6..ecf654dea8 100644
--- a/src/onboarding/welcome/Welcome.tsx
+++ b/src/onboarding/welcome/Welcome.tsx
@@ -116,7 +116,7 @@ export default function Welcome() {
           onPress={onPressCreateAccount}
           text={t('welcome.getStarted')}
           size={BtnSizes.FULL}
-          type={BtnTypes.ONBOARDING}
+          type={BtnTypes.PRIMARY}
           style={styles.createAccountButton}
           testID={'CreateAccountButton'}
           disabled={buttonsDisabled}
@@ -125,7 +125,7 @@ export default function Welcome() {
           onPress={onPressRestoreAccount}
           text={t('welcome.hasWallet')}
           size={BtnSizes.FULL}
-          type={BtnTypes.ONBOARDING_SECONDARY}
+          type={BtnTypes.GRAY_WITH_BORDER}
           testID={'RestoreAccountButton'}
           disabled={buttonsDisabled}
         />
diff --git a/src/verify/VerificationStartScreen.tsx b/src/verify/VerificationStartScreen.tsx
index d9bd865dea..885917f11e 100644
--- a/src/verify/VerificationStartScreen.tsx
+++ b/src/verify/VerificationStartScreen.tsx
@@ -232,7 +232,7 @@ function VerificationStartScreen({
         <Button
           text={t('phoneVerificationScreen.startButtonLabel')}
           onPress={onPressStart}
-          type={BtnTypes.ONBOARDING}
+          type={BtnTypes.PRIMARY}
           size={BtnSizes.FULL}
           showLoading={!signedMessageCreated}
           style={styles.startButton}

From a7efc6d71b78333a92af03702cb2e6d981cb8028 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Mon, 20 May 2024 12:44:22 -0700
Subject: [PATCH 021/133] feat(earn): implement withdraw saga (#5433)

### Description

Submits the withdraw and claim tx. Uses swap and transfer as types for
the pending tx, which will be updated in a followup

### Test plan

Unit tests, manual

Successful withdraw tx:
https://arbiscan.io/tx/0x1a478de2f1c87c47af5e1a86c8eef82b34c2f8563c9a4cdd1cc5c4022c3c436c
Successful reward tx:
https://arbiscan.io/tx/0x57294a12d68d58378b6e4fa07209dfa2ccfa94dd0d60279fbcb8a9ef6e123883

### Related issues

- Fixes ACT-1180

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/analytics/Events.tsx            |   4 +
 src/analytics/Properties.tsx        |  20 +-
 src/analytics/docs.ts               |   4 +
 src/earn/EarnCollectScreen.test.tsx |   2 +-
 src/earn/EarnCollectScreen.tsx      |   2 +-
 src/earn/saga.test.ts               | 306 ++++++++++++++++++++++++++--
 src/earn/saga.ts                    | 153 +++++++++++++-
 7 files changed, 458 insertions(+), 33 deletions(-)

diff --git a/src/analytics/Events.tsx b/src/analytics/Events.tsx
index 042bfbaf9e..75ece9210f 100644
--- a/src/analytics/Events.tsx
+++ b/src/analytics/Events.tsx
@@ -692,4 +692,8 @@ export enum EarnEvents {
   earn_exit_pool_press = 'earn_exit_pool_press',
   earn_feed_item_select = 'earn_feed_item_select',
   earn_collect_earnings_press = 'earn_collect_earnings_press',
+  earn_withdraw_submit_start = 'earn_withdraw_submit_start',
+  earn_withdraw_submit_success = 'earn_withdraw_submit_success',
+  earn_withdraw_submit_error = 'earn_withdraw_submit_error',
+  earn_withdraw_submit_cancel = 'earn_withdraw_submit_cancel',
 }
diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 23d149db14..6cf714ddf6 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -1584,6 +1584,14 @@ interface EarnDepositProperties {
   providerId: string
 }
 
+interface EarnWithdrawProperties {
+  tokenId: string
+  tokenAmount: string
+  networkId: NetworkId
+  providerId: string
+  rewards: SerializableRewardsInfo[]
+}
+
 interface EarnEventsProperties {
   [EarnEvents.earn_cta_press]: undefined
   [EarnEvents.earn_add_crypto_action_press]: {
@@ -1609,13 +1617,13 @@ interface EarnEventsProperties {
   [EarnEvents.earn_feed_item_select]: {
     origin: 'EarnDeposit' | 'EarnWithdraw' | 'EarnClaimReward'
   }
-  [EarnEvents.earn_collect_earnings_press]: {
-    tokenId: string
-    amount: string
-    networkId: NetworkId
-    providerId: string
-    rewards: SerializableRewardsInfo[]
+  [EarnEvents.earn_collect_earnings_press]: EarnWithdrawProperties
+  [EarnEvents.earn_withdraw_submit_start]: EarnWithdrawProperties
+  [EarnEvents.earn_withdraw_submit_success]: EarnWithdrawProperties
+  [EarnEvents.earn_withdraw_submit_error]: EarnWithdrawProperties & {
+    error: string
   }
+  [EarnEvents.earn_withdraw_submit_cancel]: EarnWithdrawProperties
 }
 
 export type AnalyticsPropertiesList = AppEventsProperties &
diff --git a/src/analytics/docs.ts b/src/analytics/docs.ts
index 757950046f..1bdfd7f616 100644
--- a/src/analytics/docs.ts
+++ b/src/analytics/docs.ts
@@ -607,6 +607,10 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [EarnEvents.earn_exit_pool_press]: `When the user taps on the exit pool button from the earn card in discover tab`,
   [EarnEvents.earn_feed_item_select]: `When the users taps on an earn transaction feed item`,
   [EarnEvents.earn_collect_earnings_press]: `When the user taps on the collect earnings button in the collect screen`,
+  [EarnEvents.earn_withdraw_submit_start]: `When the wallet is about to submit the withdraw and claim transactions to the network`,
+  [EarnEvents.earn_withdraw_submit_success]: `When the withdraw and claim transactions succeed`,
+  [EarnEvents.earn_withdraw_submit_error]: `When the withdraw and claim transactions fail`,
+  [EarnEvents.earn_withdraw_submit_cancel]: `When the user cancels the withdraw and claim transactions after submitting by cancelling PIN input`,
 
   // Legacy event docs
   //  The below events had docs, but are no longer produced by the latest app version.
diff --git a/src/earn/EarnCollectScreen.test.tsx b/src/earn/EarnCollectScreen.test.tsx
index c19e74bca2..7618efd199 100644
--- a/src/earn/EarnCollectScreen.test.tsx
+++ b/src/earn/EarnCollectScreen.test.tsx
@@ -356,7 +356,7 @@ describe('EarnCollectScreen', () => {
 
     expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_collect_earnings_press, {
       tokenId: mockArbUsdcTokenId,
-      amount: '10.75',
+      tokenAmount: '10.75',
       networkId: NetworkId['arbitrum-sepolia'],
       providerId: 'aave-v3',
       rewards: [{ amount: '0.01', tokenId: mockArbArbTokenId }],
diff --git a/src/earn/EarnCollectScreen.tsx b/src/earn/EarnCollectScreen.tsx
index 801da7a4e6..2190f6b9df 100644
--- a/src/earn/EarnCollectScreen.tsx
+++ b/src/earn/EarnCollectScreen.tsx
@@ -70,7 +70,7 @@ export default function EarnCollectScreen({ route }: Props) {
 
     ValoraAnalytics.track(EarnEvents.earn_collect_earnings_press, {
       tokenId: depositTokenId,
-      amount: poolToken.balance.toString(),
+      tokenAmount: poolToken.balance.toString(),
       networkId: depositToken.networkId,
       providerId: 'aave-v3',
       rewards: serializedRewards,
diff --git a/src/earn/saga.test.ts b/src/earn/saga.test.ts
index 4ccdc9bed2..2f61b01c88 100644
--- a/src/earn/saga.test.ts
+++ b/src/earn/saga.test.ts
@@ -11,6 +11,8 @@ import {
   depositError,
   depositStart,
   depositSuccess,
+  withdrawCancel,
+  withdrawError,
   withdrawStart,
   withdrawSuccess,
 } from 'src/earn/slice'
@@ -22,7 +24,12 @@ import { SerializableTransactionRequest } from 'src/viem/preparedTransactionSeri
 import { sendPreparedTransactions } from 'src/viem/saga'
 import networkConfig from 'src/web3/networkConfig'
 import { createMockStore } from 'test/utils'
-import { mockArbUsdcTokenId, mockTokenBalances, mockUSDCAddress } from 'test/values'
+import {
+  mockArbArbTokenId,
+  mockArbUsdcTokenId,
+  mockTokenBalances,
+  mockUSDCAddress,
+} from 'test/values'
 import { Address, decodeFunctionData } from 'viem'
 
 jest.mock('viem', () => ({
@@ -46,6 +53,23 @@ jest.mock('src/transactions/types', () => {
   }
 })
 
+const mockTxReceipt1 = {
+  status: 'success',
+  blockNumber: BigInt(1234),
+  transactionHash: '0x1',
+  cumulativeGasUsed: BigInt(3_129_217),
+  effectiveGasPrice: BigInt(5_000_000_000),
+  gasUsed: BigInt(51_578),
+}
+const mockTxReceipt2 = {
+  status: 'success',
+  blockNumber: BigInt(1234),
+  transactionHash: '0x2',
+  cumulativeGasUsed: BigInt(3_899_547),
+  effectiveGasPrice: BigInt(5_000_000_000),
+  gasUsed: BigInt(371_674),
+}
+
 describe('depositSubmitSaga', () => {
   const serializableApproveTx: SerializableTransactionRequest = {
     from: '0xa',
@@ -61,22 +85,7 @@ describe('depositSubmitSaga', () => {
     data: '0x02',
     gas: '50000',
   }
-  const mockApproveTxReceipt = {
-    status: 'success',
-    blockNumber: BigInt(1234),
-    transactionHash: '0x1',
-    cumulativeGasUsed: BigInt(3_129_217),
-    effectiveGasPrice: BigInt(5_000_000_000),
-    gasUsed: BigInt(51_578),
-  }
-  const mockDepositTxReceipt = {
-    status: 'success',
-    blockNumber: BigInt(1234),
-    transactionHash: '0x2',
-    cumulativeGasUsed: BigInt(3_899_547),
-    effectiveGasPrice: BigInt(5_000_000_000),
-    gasUsed: BigInt(371_674),
-  }
+
   const mockStandbyHandler = jest.fn()
 
   const sagaProviders: StaticProvider[] = [
@@ -99,11 +108,11 @@ describe('depositSubmitSaga', () => {
     ],
     [
       call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x1' }),
-      mockApproveTxReceipt,
+      mockTxReceipt1,
     ],
     [
       call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x2' }),
-      mockDepositTxReceipt,
+      mockTxReceipt2,
     ],
   ]
 
@@ -293,7 +302,7 @@ describe('depositSubmitSaga', () => {
       .provide([
         [
           call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x2' }),
-          { ...mockDepositTxReceipt, status: 'reverted' },
+          { ...mockTxReceipt2, status: 'reverted' },
         ],
         ...sagaProviders,
       ])
@@ -322,19 +331,272 @@ describe('depositSubmitSaga', () => {
 })
 
 describe('withdrawSubmitSaga', () => {
-  it('navigates home and fires success event', async () => {
+  const mockRewards = [{ tokenId: mockArbArbTokenId, amount: '1' }]
+  const serializableWithdrawTx: SerializableTransactionRequest = {
+    from: '0xa',
+    to: '0xb',
+    value: '100',
+    data: '0x02',
+    gas: '20000',
+  }
+  const serializableClaimRewardTx: SerializableTransactionRequest = {
+    from: '0xa',
+    to: '0xc',
+    value: '100',
+    data: '0x01',
+    gas: '50000',
+  }
+
+  const mockStandbyHandler = jest.fn()
+
+  const sagaProviders: StaticProvider[] = [
+    [
+      matchers.call.fn(sendPreparedTransactions),
+      dynamic(({ args: [txs, _networkId, standbyHandlers] }) => {
+        if (txs.length === 1) {
+          mockStandbyHandler(standbyHandlers[0]('0x1'))
+          return ['0x1']
+        } else {
+          mockStandbyHandler(standbyHandlers[0]('0x1'))
+          mockStandbyHandler(standbyHandlers[1]('0x2'))
+          return ['0x1', '0x2']
+        }
+      }),
+    ],
+    [
+      call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x1' }),
+      mockTxReceipt1,
+    ],
+    [
+      call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x2' }),
+      mockTxReceipt2,
+    ],
+  ]
+
+  const expectedAnalyticsPropsWithRewards = {
+    tokenId: mockArbUsdcTokenId,
+    tokenAmount: '100',
+    networkId: NetworkId['arbitrum-sepolia'],
+    providerId: 'aave-v3',
+    rewards: mockRewards,
+  }
+
+  const expectedAnalyticsPropsNoRewards = {
+    ...expectedAnalyticsPropsWithRewards,
+    rewards: [],
+  }
+
+  // TODO: replace with EarnWithdraw type
+  const expectedWithdrawStandbyTx = {
+    __typename: 'TokenExchangeV3',
+    context: {
+      id: 'id-earn/saga-Earn/Withdraw',
+      tag: 'earn/saga',
+      description: 'Earn/Withdraw',
+    },
+    networkId: NetworkId['arbitrum-sepolia'],
+    inAmount: {
+      value: '100',
+      tokenId: mockArbUsdcTokenId,
+    },
+    outAmount: {
+      value: '100',
+      tokenId: networkConfig.aaveArbUsdcTokenId,
+    },
+    transactionHash: '0x1',
+    type: TokenTransactionTypeV2.SwapTransaction,
+    feeCurrencyId: undefined,
+  }
+
+  // TODO: replace with EarnClaimReward type
+  const expectedClaimRewardTx = {
+    __typename: 'TokenTransferV3',
+    context: {
+      id: 'id-earn/saga-Earn/ClaimReward-1',
+      tag: 'earn/saga',
+      description: 'Earn/ClaimReward-1',
+    },
+    networkId: NetworkId['arbitrum-sepolia'],
+    amount: {
+      value: '1',
+      tokenId: mockArbArbTokenId,
+    },
+    transactionHash: '0x2',
+    type: TokenTransactionTypeV2.Received,
+    feeCurrencyId: undefined,
+    address: '',
+    metadata: {},
+  }
+
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('sends withdraw and claim transactions, navigates home and dispatches the success action', async () => {
+    await expectSaga(withdrawSubmitSaga, {
+      type: withdrawStart.type,
+      payload: {
+        amount: '100',
+        tokenId: mockArbUsdcTokenId,
+        preparedTransactions: [serializableWithdrawTx, serializableClaimRewardTx],
+        rewards: mockRewards,
+      },
+    })
+      .withState(createMockStore({ tokens: { tokenBalances: mockTokenBalances } }).getState())
+      .provide(sagaProviders)
+      .put(withdrawSuccess())
+      .call.like({ fn: sendPreparedTransactions })
+      .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x1' })
+      .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x2' })
+      .run()
+
+    expect(navigateHome).toHaveBeenCalled()
+    expect(mockStandbyHandler).toHaveBeenCalledTimes(2)
+    expect(mockStandbyHandler).toHaveBeenNthCalledWith(1, expectedWithdrawStandbyTx)
+    expect(mockStandbyHandler).toHaveBeenNthCalledWith(2, expectedClaimRewardTx)
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_withdraw_submit_start,
+      expectedAnalyticsPropsWithRewards
+    )
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_withdraw_submit_success,
+      expectedAnalyticsPropsWithRewards
+    )
+  })
+
+  it('sends only withdraw if there are no rewards', async () => {
     await expectSaga(withdrawSubmitSaga, {
       type: withdrawStart.type,
       payload: {
         amount: '100',
         tokenId: mockArbUsdcTokenId,
-        preparedTransactions: [],
+        preparedTransactions: [serializableWithdrawTx],
         rewards: [],
       },
     })
+      .withState(createMockStore({ tokens: { tokenBalances: mockTokenBalances } }).getState())
+      .provide(sagaProviders)
       .put(withdrawSuccess())
+      .call.like({ fn: sendPreparedTransactions })
+      .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x1' })
       .run()
 
     expect(navigateHome).toHaveBeenCalled()
+    expect(mockStandbyHandler).toHaveBeenCalledTimes(1)
+    expect(mockStandbyHandler).toHaveBeenNthCalledWith(1, expectedWithdrawStandbyTx)
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_withdraw_submit_start,
+      expectedAnalyticsPropsNoRewards
+    )
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_withdraw_submit_success,
+      expectedAnalyticsPropsNoRewards
+    )
+  })
+
+  it('dispatches cancel action if pin input is cancelled and does not navigate home', async () => {
+    await expectSaga(withdrawSubmitSaga, {
+      type: withdrawStart.type,
+      payload: {
+        amount: '100',
+        tokenId: mockArbUsdcTokenId,
+        preparedTransactions: [serializableWithdrawTx],
+        rewards: [],
+      },
+    })
+      .withState(createMockStore({ tokens: { tokenBalances: mockTokenBalances } }).getState())
+      .provide([
+        [matchers.call.fn(sendPreparedTransactions), throwError(CANCELLED_PIN_INPUT as any)],
+        ...sagaProviders,
+      ])
+      .put(withdrawCancel())
+      .call.like({ fn: sendPreparedTransactions })
+      .not.call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'])
+      .run()
+    expect(navigateHome).not.toHaveBeenCalled()
+    expect(mockStandbyHandler).not.toHaveBeenCalled()
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_withdraw_submit_start,
+      expectedAnalyticsPropsNoRewards
+    )
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_withdraw_submit_cancel,
+      expectedAnalyticsPropsNoRewards
+    )
   })
+
+  it('dispatches error action if transaction submission fails and does not navigate home', async () => {
+    await expectSaga(withdrawSubmitSaga, {
+      type: withdrawStart.type,
+      payload: {
+        amount: '100',
+        tokenId: mockArbUsdcTokenId,
+        preparedTransactions: [serializableWithdrawTx, serializableClaimRewardTx],
+        rewards: mockRewards,
+      },
+    })
+      .withState(createMockStore({ tokens: { tokenBalances: mockTokenBalances } }).getState())
+      .provide([
+        [matchers.call.fn(sendPreparedTransactions), throwError(new Error('Transaction failed'))],
+        ...sagaProviders,
+      ])
+      .put(withdrawError())
+      .call.like({ fn: sendPreparedTransactions })
+      .not.call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'])
+      .run()
+    expect(navigateHome).not.toHaveBeenCalled()
+    expect(decodeFunctionData).not.toHaveBeenCalled()
+    expect(mockStandbyHandler).not.toHaveBeenCalled()
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_withdraw_submit_start,
+      expectedAnalyticsPropsWithRewards
+    )
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_withdraw_submit_error, {
+      ...expectedAnalyticsPropsWithRewards,
+      error: 'Transaction failed',
+    })
+  })
+
+  it.each([
+    { txType: 'withdraw', receipt: mockTxReceipt1, hash: '0x1', num: 1 },
+    { txType: 'claim reward', receipt: mockTxReceipt2, hash: '0x2', num: 2 },
+  ])(
+    'dispatches error action and navigates home if $txType transaction status is reverted',
+    async ({ receipt, hash, num }) => {
+      await expectSaga(withdrawSubmitSaga, {
+        type: withdrawStart.type,
+        payload: {
+          amount: '100',
+          tokenId: mockArbUsdcTokenId,
+          preparedTransactions: [serializableWithdrawTx, serializableClaimRewardTx],
+          rewards: mockRewards,
+        },
+      })
+        .withState(createMockStore({ tokens: { tokenBalances: mockTokenBalances } }).getState())
+        .provide([
+          [
+            call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash }),
+            { ...receipt, status: 'reverted' },
+          ],
+          ...sagaProviders,
+        ])
+        .put(withdrawError())
+        .call.like({ fn: sendPreparedTransactions })
+        .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x1' })
+        .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x2' })
+        .run()
+      expect(navigateHome).toHaveBeenCalled()
+      expect(mockStandbyHandler).toHaveBeenCalledTimes(2)
+      expect(mockStandbyHandler).toHaveBeenNthCalledWith(1, expectedWithdrawStandbyTx)
+      expect(mockStandbyHandler).toHaveBeenNthCalledWith(2, expectedClaimRewardTx)
+      expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+        EarnEvents.earn_withdraw_submit_start,
+        expectedAnalyticsPropsWithRewards
+      )
+      expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_withdraw_submit_error, {
+        ...expectedAnalyticsPropsWithRewards,
+        error: `Transaction ${num} reverted: ${hash}`,
+      })
+    }
+  )
 })
diff --git a/src/earn/saga.ts b/src/earn/saga.ts
index ffe7d066b0..f689a069fa 100644
--- a/src/earn/saga.ts
+++ b/src/earn/saga.ts
@@ -8,6 +8,8 @@ import {
   depositError,
   depositStart,
   depositSuccess,
+  withdrawCancel,
+  withdrawError,
   withdrawStart,
   withdrawSuccess,
 } from 'src/earn/slice'
@@ -182,9 +184,154 @@ export function* depositSubmitSaga(action: PayloadAction<DepositInfo>) {
 }
 
 export function* withdrawSubmitSaga(action: PayloadAction<WithdrawInfo>) {
-  // TODO: submit the tx
-  navigateHome()
-  yield* put(withdrawSuccess())
+  const {
+    tokenId,
+    preparedTransactions: serializablePreparedTransactions,
+    amount,
+    rewards,
+  } = action.payload
+
+  const preparedTransactions = getPreparedTransactions(serializablePreparedTransactions)
+
+  const tokenInfo = yield* call(getTokenInfo, tokenId)
+
+  if (!tokenInfo) {
+    Logger.error(`${TAG}/withdrawSubmitSaga`, 'Token info not found for token id', tokenId)
+    yield* put(withdrawError())
+    return
+  }
+
+  const networkId = tokenInfo.networkId
+  let submitted = false
+  const commonAnalyticsProps = {
+    tokenId,
+    networkId,
+    tokenAmount: amount,
+    providerId: 'aave-v3',
+    rewards,
+  }
+
+  try {
+    Logger.debug(
+      `${TAG}/withdrawSubmitSaga`,
+      `Starting withdraw for token ${tokenId}, total transactions: ${preparedTransactions.length}`
+    )
+
+    const createWithdrawStandbyTxHandlers = []
+
+    // Assumes the first tx is withdraw and the rest are claim rewards
+    const createWithdrawStandbyTxHandler = (
+      transactionHash: string,
+      feeCurrencyId?: string
+    ): BaseStandbyTransaction => {
+      return {
+        // TODO: replace with withdraw pending tx
+        context: newTransactionContext(TAG, 'Earn/Withdraw'),
+        __typename: 'TokenExchangeV3',
+        networkId,
+        type: TokenTransactionTypeV2.SwapTransaction,
+        inAmount: {
+          value: amount,
+          tokenId,
+        },
+        outAmount: {
+          value: amount,
+          tokenId: networkConfig.aaveArbUsdcTokenId,
+        },
+        transactionHash,
+        feeCurrencyId,
+      }
+    }
+
+    createWithdrawStandbyTxHandlers.push(createWithdrawStandbyTxHandler)
+
+    rewards.forEach(({ amount, tokenId }, index) => {
+      const createClaimRewardStandbyTx = (
+        transactionHash: string,
+        feeCurrencyId?: string
+      ): BaseStandbyTransaction => {
+        return {
+          // TODO: replace with claim reward pending tx
+          context: newTransactionContext(TAG, `Earn/ClaimReward-${index + 1}`),
+          __typename: 'TokenTransferV3',
+          networkId,
+          amount: {
+            value: amount,
+            tokenId,
+          },
+          type: TokenTransactionTypeV2.Received,
+          transactionHash,
+          feeCurrencyId,
+          address: '',
+          metadata: {},
+        }
+      }
+      createWithdrawStandbyTxHandlers.push(createClaimRewardStandbyTx)
+    })
+
+    ValoraAnalytics.track(EarnEvents.earn_withdraw_submit_start, commonAnalyticsProps)
+
+    const txHashes = yield* call(
+      sendPreparedTransactions,
+      serializablePreparedTransactions,
+      networkId,
+      createWithdrawStandbyTxHandlers
+    )
+
+    Logger.debug(
+      `${TAG}/withd`,
+      'Successfully sent withdraw transaction(s) to the network',
+      txHashes
+    )
+
+    navigateHome()
+    submitted = true
+
+    // wait for the tx receipts, so that we can track them
+    Logger.debug(`${TAG}/withdrawSubmitSaga`, 'Waiting for transaction receipts')
+    const txReceipts = yield* all(
+      txHashes.map((txHash) => {
+        return call([publicClient[networkIdToNetwork[networkId]], 'waitForTransactionReceipt'], {
+          hash: txHash,
+        })
+      })
+    )
+    txReceipts.forEach((receipt, index) => {
+      Logger.debug(
+        `${TAG}/withdrawSubmitSaga`,
+        `Received transaction receipt ${index + 1} of ${txReceipts.length}`,
+        receipt
+      )
+    })
+
+    txReceipts.forEach((receipt, index) => {
+      if (receipt.status !== 'success') {
+        throw new Error(`Transaction ${index + 1} reverted: ${receipt?.transactionHash}`)
+      }
+    })
+
+    yield* put(withdrawSuccess())
+    ValoraAnalytics.track(EarnEvents.earn_withdraw_submit_success, commonAnalyticsProps)
+  } catch (err) {
+    if (err === CANCELLED_PIN_INPUT) {
+      Logger.info(`${TAG}/withdrawSubmitSaga`, 'Transaction cancelled by user')
+      yield* put(withdrawCancel())
+      ValoraAnalytics.track(EarnEvents.earn_withdraw_submit_cancel, commonAnalyticsProps)
+      return
+    }
+
+    const error = ensureError(err)
+    Logger.error(`${TAG}/withdrawSubmitSaga`, 'Error sending withdraw transaction', error)
+    yield* put(withdrawError())
+    ValoraAnalytics.track(EarnEvents.earn_withdraw_submit_error, {
+      ...commonAnalyticsProps,
+      error: error.message,
+    })
+
+    if (!submitted) {
+      vibrateError()
+    }
+  }
 }
 
 export function* earnSaga() {

From 6cc676a5d5cfc12fe88cb39b48cfb90d0d283831 Mon Sep 17 00:00:00 2001
From: mpgaarciaa <96873750+mpgaarciaa@users.noreply.github.com>
Date: Mon, 20 May 2024 17:05:06 -0300
Subject: [PATCH 022/133] chore: Supercharge sunsetting copy (#5438)

Co-authored-by: Valora Bot <89419329+valora-bot@users.noreply.github.com>
---
 locales/base/translation.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/locales/base/translation.json b/locales/base/translation.json
index f6f2beec0f..4b229429f3 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -255,8 +255,8 @@
       "text": "Anyone with your Phrase will have access to your account and all of its funds. Don’t share it with others."
     }
   ],
-  "consumerIncentivesTitle": "Get started with Supercharge",
-  "consumerIncentivesSummary": "Supercharge is here! Get {{percent}}% annual rewards on your highest stablecoin balance (cUSD, cEUR, or cREAL). Available for a limited time. Here's how it works:",
+  "consumerIncentivesTitle": "Supercharge is ending",
+  "consumerIncentivesSummary": "But more rewards are headed your way. Until May 28, get {{percent}}% annual rewards on your highest stablecoin balance (cUSD, cEUR, or cREAL). Here's how it works:",
   "earnWeekly": {
     "header": "Connect your phone number",
     "text": "Tap Connect Number if you haven't connected it yet."
@@ -271,14 +271,14 @@
     "text": "This will ensure your rewards are safe and in your control."
   },
   "conclusion": "It’s that simple. Supercharge your crypto today!",
-  "superchargeTitle": "Start Supercharging",
-  "superchargeDescription": "Get {{apy}}% annual rewards on your {{token}} balance. Here's how to start:",
+  "superchargeTitle": "Supercharge is ending",
+  "superchargeDescription": "But more rewards are headed your way. Until May 28, get {{apy}}% annual rewards on your highest {{token}} balance. Here's how it works:",
   "superchargeConnectNumber": "Connect your phone number",
   "superchargeReconnectNumber": "Reconnect your phone number\n<0>We have launched an improved Supercharge experience. Reconnect your phone number to keep earning rewards on your {{token}}.</0>",
   "superchargeMinimumBalance": "Add a minimum balance of {{amount}} {{token}}",
-  "superchargeDisclaimer": "Max-out rewards by adding up to {{amount}} {{token}}",
-  "superchargeDisclaimerMaxRewards": "You’re getting maximum rewards on your {{token}}",
-  "superchargeDisclaimerDayLimit": "Your rewards must be claimed within 28 days. <0>Learn more</0>",
+  "superchargeDisclaimer": "This will not affect your balance or previous earnings.",
+  "superchargeDisclaimerMaxRewards": "This will not affect your balance or previous earnings.",
+  "superchargeDisclaimerDayLimit": "This will not affect your balance or previous earnings. <0>Learn more</0>",
   "superchargeTokenDetailsDialog": {
     "title": "Which assets can I Supercharge?",
     "body": "You’ll get rewarded weekly on your Celo stablecoin with the highest value (cEUR, cUSD, cREAL).",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "App update required",
   "superchargingDescription": "Update the Valora app to continue receiving your weekly Supercharge rewards.",
-  "superchargingTitleV1_54": "Your {{token}} is being Supercharged",
-  "superchargingDescriptionV1_54": "You’re getting {{apy}}% annually. Every week you'll get a notification when your rewards are ready, come back here to claim them.",
+  "superchargingTitleV1_54": "Supercharge is ending",
+  "superchargingDescriptionV1_54": "Weekly rewards will be available to claim until Tuesday, May 28, at 23:59 UTC. Beginning May 29, you will nor longer be able to claim Supercharge rewards.",
   "superchargeRewardsAvailable": "You have {{amount}} {{token}} available to claim!",
   "superchargeRewardsAvailableMultipleTokens": "You have {{amounts}} available to claim!",
-  "superchargeClaimText": "Claim your rewards to add them to your balance.",
+  "superchargeClaimText": "Claim your rewards until Tuesday, May 28, at 23:59 UTC. Beginning May 29, you will no longer be able to claim Supercharge rewards.",
   "superchargeClaimButton": "Claim Rewards",
   "superchargeFetchRewardsFailed": "Error while fetching pending Supercharge rewards. Please try again later.",
   "superchargeClaimSuccess": "Your Supercharge rewards have been added to your Total Balance.",

From 85a9d0cc6b6227165570adb545a9abf34e6c2419 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Mon, 20 May 2024 13:42:17 -0700
Subject: [PATCH 023/133] feat(earn): add pending transaction types (#5434)

### Description

Use the correct pending transaction type for earn txs. Also refactors
existing pending tx types to avoid duplication

### Test plan

Unit tests, manual

### Related issues

- Part of ACT-1182

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)

---------

Co-authored-by: Tom McGuire <mcgtom10@gmail.com>
---
 src/earn/saga.test.ts       |  18 +-
 src/earn/saga.ts            |  19 +-
 src/transactions/actions.ts |  25 ++-
 src/transactions/types.ts   |  39 ++--
 test/RootStateSchema.json   | 408 +++++++++++++++++++++++++++++++++---
 5 files changed, 430 insertions(+), 79 deletions(-)

diff --git a/src/earn/saga.test.ts b/src/earn/saga.test.ts
index 2f61b01c88..df6b3f3179 100644
--- a/src/earn/saga.test.ts
+++ b/src/earn/saga.test.ts
@@ -139,7 +139,7 @@ describe('depositSubmitSaga', () => {
   }
 
   const expectedDepositStandbyTx = {
-    __typename: 'TokenExchangeV3',
+    __typename: 'EarnDeposit',
     context: {
       id: 'id-earn/saga-Earn/Deposit',
       tag: 'earn/saga',
@@ -155,8 +155,9 @@ describe('depositSubmitSaga', () => {
       tokenId: mockArbUsdcTokenId,
     },
     transactionHash: '0x2',
-    type: TokenTransactionTypeV2.SwapTransaction,
+    type: TokenTransactionTypeV2.EarnDeposit,
     feeCurrencyId: undefined,
+    providerId: 'aave-v3',
   }
 
   beforeEach(() => {
@@ -386,9 +387,8 @@ describe('withdrawSubmitSaga', () => {
     rewards: [],
   }
 
-  // TODO: replace with EarnWithdraw type
   const expectedWithdrawStandbyTx = {
-    __typename: 'TokenExchangeV3',
+    __typename: 'EarnWithdraw',
     context: {
       id: 'id-earn/saga-Earn/Withdraw',
       tag: 'earn/saga',
@@ -404,13 +404,14 @@ describe('withdrawSubmitSaga', () => {
       tokenId: networkConfig.aaveArbUsdcTokenId,
     },
     transactionHash: '0x1',
-    type: TokenTransactionTypeV2.SwapTransaction,
+    type: TokenTransactionTypeV2.EarnWithdraw,
     feeCurrencyId: undefined,
+    providerId: 'aave-v3',
   }
 
   // TODO: replace with EarnClaimReward type
   const expectedClaimRewardTx = {
-    __typename: 'TokenTransferV3',
+    __typename: 'EarnClaimReward',
     context: {
       id: 'id-earn/saga-Earn/ClaimReward-1',
       tag: 'earn/saga',
@@ -422,10 +423,9 @@ describe('withdrawSubmitSaga', () => {
       tokenId: mockArbArbTokenId,
     },
     transactionHash: '0x2',
-    type: TokenTransactionTypeV2.Received,
+    type: TokenTransactionTypeV2.EarnClaimReward,
     feeCurrencyId: undefined,
-    address: '',
-    metadata: {},
+    providerId: 'aave-v3',
   }
 
   beforeEach(() => {
diff --git a/src/earn/saga.ts b/src/earn/saga.ts
index f689a069fa..31db696c75 100644
--- a/src/earn/saga.ts
+++ b/src/earn/saga.ts
@@ -100,9 +100,9 @@ export function* depositSubmitSaga(action: PayloadAction<DepositInfo>) {
     ): BaseStandbyTransaction => {
       return {
         context: newTransactionContext(TAG, 'Earn/Deposit'),
-        __typename: 'TokenExchangeV3',
+        __typename: 'EarnDeposit',
         networkId,
-        type: TokenTransactionTypeV2.SwapTransaction,
+        type: TokenTransactionTypeV2.EarnDeposit,
         inAmount: {
           value: amount,
           tokenId: networkConfig.aaveArbUsdcTokenId,
@@ -111,6 +111,7 @@ export function* depositSubmitSaga(action: PayloadAction<DepositInfo>) {
           value: amount,
           tokenId,
         },
+        providerId: 'aave-v3',
         transactionHash,
         feeCurrencyId,
       }
@@ -225,11 +226,10 @@ export function* withdrawSubmitSaga(action: PayloadAction<WithdrawInfo>) {
       feeCurrencyId?: string
     ): BaseStandbyTransaction => {
       return {
-        // TODO: replace with withdraw pending tx
         context: newTransactionContext(TAG, 'Earn/Withdraw'),
-        __typename: 'TokenExchangeV3',
+        __typename: 'EarnWithdraw',
         networkId,
-        type: TokenTransactionTypeV2.SwapTransaction,
+        type: TokenTransactionTypeV2.EarnWithdraw,
         inAmount: {
           value: amount,
           tokenId,
@@ -240,6 +240,7 @@ export function* withdrawSubmitSaga(action: PayloadAction<WithdrawInfo>) {
         },
         transactionHash,
         feeCurrencyId,
+        providerId: 'aave-v3',
       }
     }
 
@@ -251,19 +252,17 @@ export function* withdrawSubmitSaga(action: PayloadAction<WithdrawInfo>) {
         feeCurrencyId?: string
       ): BaseStandbyTransaction => {
         return {
-          // TODO: replace with claim reward pending tx
           context: newTransactionContext(TAG, `Earn/ClaimReward-${index + 1}`),
-          __typename: 'TokenTransferV3',
+          __typename: 'EarnClaimReward',
           networkId,
           amount: {
             value: amount,
             tokenId,
           },
-          type: TokenTransactionTypeV2.Received,
+          type: TokenTransactionTypeV2.EarnClaimReward,
           transactionHash,
           feeCurrencyId,
-          address: '',
-          metadata: {},
+          providerId: 'aave-v3',
         }
       }
       createWithdrawStandbyTxHandlers.push(createClaimRewardStandbyTx)
diff --git a/src/transactions/actions.ts b/src/transactions/actions.ts
index a4705a7675..c5c33cea79 100644
--- a/src/transactions/actions.ts
+++ b/src/transactions/actions.ts
@@ -1,13 +1,17 @@
 import { NumberToRecipient } from 'src/recipients/recipient'
 import { InviteTransactions } from 'src/transactions/reducer'
 import {
+  EarnClaimReward,
+  EarnDeposit,
+  EarnWithdraw,
   Fee,
   NetworkId,
-  PendingStandbyApproval,
-  PendingStandbyNFTTransfer,
-  PendingStandbySwap,
-  PendingStandbyTransfer,
+  NftTransfer,
+  PendingStandbyTransaction,
+  TokenApproval,
+  TokenExchange,
   TokenTransaction,
+  TokenTransfer,
   TransactionStatus,
 } from 'src/transactions/types'
 
@@ -22,11 +26,16 @@ export enum Actions {
   UPDATE_INVITE_TRANSACTIONS = 'TRANSACTIONS/UPDATE_INVITE_TRANSACTIONS',
 }
 
+type BaseStandbyTransactionType<T> = Omit<PendingStandbyTransaction<T>, 'timestamp' | 'status'>
+
 export type BaseStandbyTransaction =
-  | Omit<PendingStandbyTransfer, 'timestamp' | 'status'>
-  | Omit<PendingStandbySwap, 'timestamp' | 'status'>
-  | Omit<PendingStandbyApproval, 'timestamp' | 'status'>
-  | Omit<PendingStandbyNFTTransfer, 'timestamp' | 'status'>
+  | BaseStandbyTransactionType<TokenTransfer>
+  | BaseStandbyTransactionType<TokenExchange>
+  | BaseStandbyTransactionType<TokenApproval>
+  | BaseStandbyTransactionType<NftTransfer>
+  | BaseStandbyTransactionType<EarnDeposit>
+  | BaseStandbyTransactionType<EarnWithdraw>
+  | BaseStandbyTransactionType<EarnClaimReward>
 
 export interface AddStandbyTransactionAction {
   type: Actions.ADD_STANDBY_TRANSACTION
diff --git a/src/transactions/types.ts b/src/transactions/types.ts
index d78139ed3b..a10671729b 100644
--- a/src/transactions/types.ts
+++ b/src/transactions/types.ts
@@ -26,39 +26,21 @@ export enum NetworkId {
   'base-sepolia' = 'base-sepolia',
 }
 
-export type PendingStandbySwap = {
+export type PendingStandbyTransaction<T> = {
   transactionHash?: string
   context: TransactionContext
   status: TransactionStatus.Pending
   feeCurrencyId?: string
-} & Omit<TokenExchange, 'block' | 'fees' | 'transactionHash' | 'status'>
-
-export type PendingStandbyTransfer = {
-  transactionHash?: string
-  context: TransactionContext
-  status: TransactionStatus.Pending
-  feeCurrencyId?: string
-} & Omit<TokenTransfer, 'block' | 'fees' | 'transactionHash' | 'status'>
-
-export type PendingStandbyApproval = {
-  transactionHash?: string
-  context: TransactionContext
-  status: TransactionStatus.Pending
-  feeCurrencyId?: string
-} & Omit<TokenApproval, 'block' | 'fees' | 'transactionHash' | 'status'>
-
-export type PendingStandbyNFTTransfer = {
-  transactionHash?: string
-  context: TransactionContext
-  status: TransactionStatus.Pending
-  feeCurrencyId?: string
-} & Omit<NftTransfer, 'block' | 'fees' | 'transactionHash' | 'status'>
+} & Omit<T, 'block' | 'fees' | 'transactionHash' | 'status'>
 
 export type ConfirmedStandbyTransaction = (
   | Omit<TokenExchange, 'status'>
   | Omit<TokenTransfer, 'status'>
   | Omit<TokenApproval, 'status'>
   | Omit<NftTransfer, 'status'>
+  | Omit<EarnDeposit, 'status'>
+  | Omit<EarnWithdraw, 'status'>
+  | Omit<EarnClaimReward, 'status'>
 ) & {
   status: TransactionStatus.Complete | TransactionStatus.Failed
   context: TransactionContext
@@ -66,10 +48,13 @@ export type ConfirmedStandbyTransaction = (
 }
 
 export type StandbyTransaction =
-  | PendingStandbySwap
-  | PendingStandbyTransfer
-  | PendingStandbyApproval
-  | PendingStandbyNFTTransfer
+  | PendingStandbyTransaction<TokenExchange>
+  | PendingStandbyTransaction<TokenTransfer>
+  | PendingStandbyTransaction<TokenApproval>
+  | PendingStandbyTransaction<NftTransfer>
+  | PendingStandbyTransaction<EarnDeposit>
+  | PendingStandbyTransaction<EarnWithdraw>
+  | PendingStandbyTransaction<EarnClaimReward>
   | ConfirmedStandbyTransaction
 
 // Context used for logging the transaction execution flow.
diff --git a/test/RootStateSchema.json b/test/RootStateSchema.json
index e498c16509..9becd2658b 100644
--- a/test/RootStateSchema.json
+++ b/test/RootStateSchema.json
@@ -2428,18 +2428,15 @@
             ],
             "type": "object"
         },
-        "PendingStandbyApproval": {
+        "PendingStandbyTransaction<EarnClaimReward>": {
             "additionalProperties": false,
             "properties": {
                 "__typename": {
-                    "const": "TokenApproval",
+                    "const": "EarnClaimReward",
                     "type": "string"
                 },
-                "approvedAmount": {
-                    "type": [
-                        "null",
-                        "string"
-                    ]
+                "amount": {
+                    "$ref": "#/definitions/TokenAmount"
                 },
                 "context": {
                     "$ref": "#/definitions/TransactionContext"
@@ -2450,6 +2447,9 @@
                 "networkId": {
                     "$ref": "#/definitions/NetworkId"
                 },
+                "providerId": {
+                    "type": "string"
+                },
                 "status": {
                     "const": "Pending",
                     "type": "string"
@@ -2457,9 +2457,57 @@
                 "timestamp": {
                     "type": "number"
                 },
-                "tokenId": {
+                "transactionHash": {
+                    "type": "string"
+                },
+                "type": {
+                    "$ref": "#/definitions/TokenTransactionTypeV2"
+                }
+            },
+            "required": [
+                "__typename",
+                "amount",
+                "context",
+                "networkId",
+                "providerId",
+                "status",
+                "timestamp",
+                "type"
+            ],
+            "type": "object"
+        },
+        "PendingStandbyTransaction<EarnDeposit>": {
+            "additionalProperties": false,
+            "properties": {
+                "__typename": {
+                    "const": "EarnDeposit",
                     "type": "string"
                 },
+                "context": {
+                    "$ref": "#/definitions/TransactionContext"
+                },
+                "feeCurrencyId": {
+                    "type": "string"
+                },
+                "inAmount": {
+                    "$ref": "#/definitions/TokenAmount"
+                },
+                "networkId": {
+                    "$ref": "#/definitions/NetworkId"
+                },
+                "outAmount": {
+                    "$ref": "#/definitions/TokenAmount"
+                },
+                "providerId": {
+                    "type": "string"
+                },
+                "status": {
+                    "const": "Pending",
+                    "type": "string"
+                },
+                "timestamp": {
+                    "type": "number"
+                },
                 "transactionHash": {
                     "type": "string"
                 },
@@ -2469,17 +2517,70 @@
             },
             "required": [
                 "__typename",
-                "approvedAmount",
                 "context",
+                "inAmount",
                 "networkId",
+                "outAmount",
+                "providerId",
                 "status",
                 "timestamp",
-                "tokenId",
                 "type"
             ],
             "type": "object"
         },
-        "PendingStandbyNFTTransfer": {
+        "PendingStandbyTransaction<EarnWithdraw>": {
+            "additionalProperties": false,
+            "properties": {
+                "__typename": {
+                    "const": "EarnWithdraw",
+                    "type": "string"
+                },
+                "context": {
+                    "$ref": "#/definitions/TransactionContext"
+                },
+                "feeCurrencyId": {
+                    "type": "string"
+                },
+                "inAmount": {
+                    "$ref": "#/definitions/TokenAmount"
+                },
+                "networkId": {
+                    "$ref": "#/definitions/NetworkId"
+                },
+                "outAmount": {
+                    "$ref": "#/definitions/TokenAmount"
+                },
+                "providerId": {
+                    "type": "string"
+                },
+                "status": {
+                    "const": "Pending",
+                    "type": "string"
+                },
+                "timestamp": {
+                    "type": "number"
+                },
+                "transactionHash": {
+                    "type": "string"
+                },
+                "type": {
+                    "$ref": "#/definitions/TokenTransactionTypeV2"
+                }
+            },
+            "required": [
+                "__typename",
+                "context",
+                "inAmount",
+                "networkId",
+                "outAmount",
+                "providerId",
+                "status",
+                "timestamp",
+                "type"
+            ],
+            "type": "object"
+        },
+        "PendingStandbyTransaction<NftTransfer>": {
             "additionalProperties": false,
             "properties": {
                 "__typename": {
@@ -2525,7 +2626,58 @@
             ],
             "type": "object"
         },
-        "PendingStandbySwap": {
+        "PendingStandbyTransaction<TokenApproval>": {
+            "additionalProperties": false,
+            "properties": {
+                "__typename": {
+                    "const": "TokenApproval",
+                    "type": "string"
+                },
+                "approvedAmount": {
+                    "type": [
+                        "null",
+                        "string"
+                    ]
+                },
+                "context": {
+                    "$ref": "#/definitions/TransactionContext"
+                },
+                "feeCurrencyId": {
+                    "type": "string"
+                },
+                "networkId": {
+                    "$ref": "#/definitions/NetworkId"
+                },
+                "status": {
+                    "const": "Pending",
+                    "type": "string"
+                },
+                "timestamp": {
+                    "type": "number"
+                },
+                "tokenId": {
+                    "type": "string"
+                },
+                "transactionHash": {
+                    "type": "string"
+                },
+                "type": {
+                    "$ref": "#/definitions/TokenTransactionTypeV2"
+                }
+            },
+            "required": [
+                "__typename",
+                "approvedAmount",
+                "context",
+                "networkId",
+                "status",
+                "timestamp",
+                "tokenId",
+                "type"
+            ],
+            "type": "object"
+        },
+        "PendingStandbyTransaction<TokenExchange>": {
             "additionalProperties": false,
             "properties": {
                 "__typename": {
@@ -2576,7 +2728,7 @@
             ],
             "type": "object"
         },
-        "PendingStandbyTransfer": {
+        "PendingStandbyTransaction<TokenTransfer>": {
             "additionalProperties": false,
             "properties": {
                 "__typename": {
@@ -3245,18 +3397,6 @@
         },
         "StandbyTransaction": {
             "anyOf": [
-                {
-                    "$ref": "#/definitions/PendingStandbySwap"
-                },
-                {
-                    "$ref": "#/definitions/PendingStandbyTransfer"
-                },
-                {
-                    "$ref": "#/definitions/PendingStandbyApproval"
-                },
-                {
-                    "$ref": "#/definitions/PendingStandbyNFTTransfer"
-                },
                 {
                     "additionalProperties": false,
                     "properties": {
@@ -3515,6 +3655,224 @@
                         "type"
                     ],
                     "type": "object"
+                },
+                {
+                    "additionalProperties": false,
+                    "properties": {
+                        "__typename": {
+                            "const": "EarnDeposit",
+                            "type": "string"
+                        },
+                        "block": {
+                            "type": "string"
+                        },
+                        "context": {
+                            "$ref": "#/definitions/TransactionContext"
+                        },
+                        "feeCurrencyId": {
+                            "type": "string"
+                        },
+                        "fees": {
+                            "items": {
+                                "$ref": "#/definitions/Fee"
+                            },
+                            "type": "array"
+                        },
+                        "inAmount": {
+                            "$ref": "#/definitions/TokenAmount"
+                        },
+                        "networkId": {
+                            "$ref": "#/definitions/NetworkId"
+                        },
+                        "outAmount": {
+                            "$ref": "#/definitions/TokenAmount"
+                        },
+                        "providerId": {
+                            "type": "string"
+                        },
+                        "status": {
+                            "enum": [
+                                "Complete",
+                                "Failed"
+                            ],
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "number"
+                        },
+                        "transactionHash": {
+                            "type": "string"
+                        },
+                        "type": {
+                            "$ref": "#/definitions/TokenTransactionTypeV2"
+                        }
+                    },
+                    "required": [
+                        "__typename",
+                        "block",
+                        "context",
+                        "fees",
+                        "inAmount",
+                        "networkId",
+                        "outAmount",
+                        "providerId",
+                        "status",
+                        "timestamp",
+                        "transactionHash",
+                        "type"
+                    ],
+                    "type": "object"
+                },
+                {
+                    "additionalProperties": false,
+                    "properties": {
+                        "__typename": {
+                            "const": "EarnWithdraw",
+                            "type": "string"
+                        },
+                        "block": {
+                            "type": "string"
+                        },
+                        "context": {
+                            "$ref": "#/definitions/TransactionContext"
+                        },
+                        "feeCurrencyId": {
+                            "type": "string"
+                        },
+                        "fees": {
+                            "items": {
+                                "$ref": "#/definitions/Fee"
+                            },
+                            "type": "array"
+                        },
+                        "inAmount": {
+                            "$ref": "#/definitions/TokenAmount"
+                        },
+                        "networkId": {
+                            "$ref": "#/definitions/NetworkId"
+                        },
+                        "outAmount": {
+                            "$ref": "#/definitions/TokenAmount"
+                        },
+                        "providerId": {
+                            "type": "string"
+                        },
+                        "status": {
+                            "enum": [
+                                "Complete",
+                                "Failed"
+                            ],
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "number"
+                        },
+                        "transactionHash": {
+                            "type": "string"
+                        },
+                        "type": {
+                            "$ref": "#/definitions/TokenTransactionTypeV2"
+                        }
+                    },
+                    "required": [
+                        "__typename",
+                        "block",
+                        "context",
+                        "fees",
+                        "inAmount",
+                        "networkId",
+                        "outAmount",
+                        "providerId",
+                        "status",
+                        "timestamp",
+                        "transactionHash",
+                        "type"
+                    ],
+                    "type": "object"
+                },
+                {
+                    "additionalProperties": false,
+                    "properties": {
+                        "__typename": {
+                            "const": "EarnClaimReward",
+                            "type": "string"
+                        },
+                        "amount": {
+                            "$ref": "#/definitions/TokenAmount"
+                        },
+                        "block": {
+                            "type": "string"
+                        },
+                        "context": {
+                            "$ref": "#/definitions/TransactionContext"
+                        },
+                        "feeCurrencyId": {
+                            "type": "string"
+                        },
+                        "fees": {
+                            "items": {
+                                "$ref": "#/definitions/Fee"
+                            },
+                            "type": "array"
+                        },
+                        "networkId": {
+                            "$ref": "#/definitions/NetworkId"
+                        },
+                        "providerId": {
+                            "type": "string"
+                        },
+                        "status": {
+                            "enum": [
+                                "Complete",
+                                "Failed"
+                            ],
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "number"
+                        },
+                        "transactionHash": {
+                            "type": "string"
+                        },
+                        "type": {
+                            "$ref": "#/definitions/TokenTransactionTypeV2"
+                        }
+                    },
+                    "required": [
+                        "__typename",
+                        "amount",
+                        "block",
+                        "context",
+                        "fees",
+                        "networkId",
+                        "providerId",
+                        "status",
+                        "timestamp",
+                        "transactionHash",
+                        "type"
+                    ],
+                    "type": "object"
+                },
+                {
+                    "$ref": "#/definitions/PendingStandbyTransaction<TokenExchange>"
+                },
+                {
+                    "$ref": "#/definitions/PendingStandbyTransaction<TokenTransfer>"
+                },
+                {
+                    "$ref": "#/definitions/PendingStandbyTransaction<TokenApproval>"
+                },
+                {
+                    "$ref": "#/definitions/PendingStandbyTransaction<NftTransfer>"
+                },
+                {
+                    "$ref": "#/definitions/PendingStandbyTransaction<EarnDeposit>"
+                },
+                {
+                    "$ref": "#/definitions/PendingStandbyTransaction<EarnWithdraw>"
+                },
+                {
+                    "$ref": "#/definitions/PendingStandbyTransaction<EarnClaimReward>"
                 }
             ]
         },

From 6380cc87fb813621ed6c456f3d384a0406886f65 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Mon, 20 May 2024 14:18:01 -0700
Subject: [PATCH 024/133] feat(earn): not enough gas error for collect screen
 (#5436)

### Description

Adds not enough gas error on collect screen which takes users to CICO on
press.

### Test plan

- [x] Unit tests added

### Related issues

- Part of ACT-1180

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)

---------

Co-authored-by: Finnian Jacobson-Schulte <140328381+finnian0826@users.noreply.github.com>
Co-authored-by: Tom McGuire <mcgtom10@gmail.com>
---
 locales/base/translation.json       |  5 +++-
 src/analytics/Events.tsx            |  1 +
 src/analytics/Properties.tsx        |  1 +
 src/analytics/docs.ts               |  1 +
 src/earn/EarnCollectScreen.test.tsx | 44 +++++++++++++++++++++++++++++
 src/earn/EarnCollectScreen.tsx      | 28 ++++++++++++++++++
 6 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/locales/base/translation.json b/locales/base/translation.json
index 4b229429f3..a4db7250af 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -2397,7 +2397,10 @@
       "fee": "Gas Fee",
       "cta": "Collect Earnings",
       "errorTitle": "Something went wrong",
-      "errorDescription": "Unable to fetch deposit details. Please try again."
+      "errorDescription": "Unable to fetch deposit details. Please try again.",
+      "noGasTitle": "You need more {{symbol}} to continue",
+      "noGasDescription": "Add {{symbol}} on {{network}} to cover your gas fees",
+      "noGasCta": "Buy {{symbol}} on {{network}}"
     },
     "transactionFeed": {
       "earnClaimTitle": "Collected",
diff --git a/src/analytics/Events.tsx b/src/analytics/Events.tsx
index 75ece9210f..3fa8a7fe2c 100644
--- a/src/analytics/Events.tsx
+++ b/src/analytics/Events.tsx
@@ -696,4 +696,5 @@ export enum EarnEvents {
   earn_withdraw_submit_success = 'earn_withdraw_submit_success',
   earn_withdraw_submit_error = 'earn_withdraw_submit_error',
   earn_withdraw_submit_cancel = 'earn_withdraw_submit_cancel',
+  earn_withdraw_add_gas_press = 'earn_withdraw_add_gas_press',
 }
diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 6cf714ddf6..b050dc2e49 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -1624,6 +1624,7 @@ interface EarnEventsProperties {
     error: string
   }
   [EarnEvents.earn_withdraw_submit_cancel]: EarnWithdrawProperties
+  [EarnEvents.earn_withdraw_add_gas_press]: { gasTokenId: string }
 }
 
 export type AnalyticsPropertiesList = AppEventsProperties &
diff --git a/src/analytics/docs.ts b/src/analytics/docs.ts
index 1bdfd7f616..198f18cdce 100644
--- a/src/analytics/docs.ts
+++ b/src/analytics/docs.ts
@@ -611,6 +611,7 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [EarnEvents.earn_withdraw_submit_success]: `When the withdraw and claim transactions succeed`,
   [EarnEvents.earn_withdraw_submit_error]: `When the withdraw and claim transactions fail`,
   [EarnEvents.earn_withdraw_submit_cancel]: `When the user cancels the withdraw and claim transactions after submitting by cancelling PIN input`,
+  [EarnEvents.earn_withdraw_add_gas_press]: `When the user doesn't have enough for gas and clicks on the button to add gas token`,
 
   // Legacy event docs
   //  The below events had docs, but are no longer produced by the latest app version.
diff --git a/src/earn/EarnCollectScreen.test.tsx b/src/earn/EarnCollectScreen.test.tsx
index 7618efd199..f901a174d0 100644
--- a/src/earn/EarnCollectScreen.test.tsx
+++ b/src/earn/EarnCollectScreen.test.tsx
@@ -8,6 +8,8 @@ import EarnCollectScreen from 'src/earn/EarnCollectScreen'
 import { fetchAavePoolInfo, fetchAaveRewards } from 'src/earn/poolInfo'
 import { prepareWithdrawAndClaimTransactions } from 'src/earn/prepareTransactions'
 import { withdrawStart } from 'src/earn/slice'
+import { navigate } from 'src/navigator/NavigationService'
+import { Screens } from 'src/navigator/Screens'
 import { NetworkId } from 'src/transactions/types'
 import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
 import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
@@ -380,4 +382,46 @@ describe('EarnCollectScreen', () => {
     expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
     expect(getByTestId('EarnCollectScreen/CTA')).toContainElement(getByTestId('Button/Loading'))
   })
+
+  it('navigate and fire analytics on no gas CTA press', async () => {
+    jest.mocked(prepareWithdrawAndClaimTransactions).mockResolvedValue({
+      type: 'not-enough-balance-for-gas',
+      feeCurrencies: [mockPreparedTransaction.feeCurrency],
+    })
+
+    const { getByText, queryByTestId } = render(
+      <Provider store={store}>
+        <MockedNavigator
+          component={EarnCollectScreen}
+          params={{
+            depositTokenId: mockArbUsdcTokenId,
+            poolTokenId: networkConfig.aaveArbUsdcTokenId,
+          }}
+        />
+      </Provider>
+    )
+
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/RewardsLoading')).toBeFalsy()
+    })
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/ApyLoading')).toBeFalsy()
+    })
+
+    expect(
+      getByText('earnFlow.collect.noGasCta, {"symbol":"ETH","network":"Arbitrum Sepolia"}')
+    ).toBeTruthy()
+    fireEvent.press(
+      getByText('earnFlow.collect.noGasCta, {"symbol":"ETH","network":"Arbitrum Sepolia"}')
+    )
+
+    expect(navigate).toBeCalledWith(Screens.FiatExchangeAmount, {
+      flow: 'CashIn',
+      tokenId: mockArbEthTokenId,
+      tokenSymbol: 'ETH',
+    })
+    expect(ValoraAnalytics.track).toBeCalledWith(EarnEvents.earn_withdraw_add_gas_press, {
+      gasTokenId: mockArbEthTokenId,
+    })
+  })
 })
diff --git a/src/earn/EarnCollectScreen.tsx b/src/earn/EarnCollectScreen.tsx
index 2190f6b9df..62d843db78 100644
--- a/src/earn/EarnCollectScreen.tsx
+++ b/src/earn/EarnCollectScreen.tsx
@@ -13,9 +13,12 @@ import TokenIcon, { IconSize } from 'src/components/TokenIcon'
 import { useAavePoolInfo, useAaveRewardsInfoAndPrepareTransactions } from 'src/earn/hooks'
 import { withdrawStatusSelector } from 'src/earn/selectors'
 import { withdrawStart } from 'src/earn/slice'
+import { CICOFlow } from 'src/fiatExchanges/utils'
+import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { StackParamList } from 'src/navigator/types'
 import { useDispatch, useSelector } from 'src/redux/hooks'
+import { NETWORK_NAMES } from 'src/shared/conts'
 import Colors from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
 import { Spacing } from 'src/styles/styles'
@@ -132,6 +135,31 @@ export default function EarnCollectScreen({ route }: Props) {
             style={styles.error}
           />
         )}
+        {asyncPreparedTransactions.result?.type === 'not-enough-balance-for-gas' && (
+          <InLineNotification
+            variant={NotificationVariant.Warning}
+            title={t('earnFlow.collect.noGasTitle', { symbol: feeCurrencies[0].symbol })}
+            description={t('earnFlow.collect.noGasDescription', {
+              symbol: feeCurrencies[0].symbol,
+              network: NETWORK_NAMES[depositToken.networkId],
+            })}
+            ctaLabel={t('earnFlow.collect.noGasCta', {
+              symbol: feeCurrencies[0].symbol,
+              network: NETWORK_NAMES[depositToken.networkId],
+            })}
+            onPressCta={() => {
+              ValoraAnalytics.track(EarnEvents.earn_withdraw_add_gas_press, {
+                gasTokenId: feeCurrencies[0].tokenId,
+              })
+              navigate(Screens.FiatExchangeAmount, {
+                tokenId: feeCurrencies[0].tokenId,
+                flow: CICOFlow.CashIn,
+                tokenSymbol: feeCurrencies[0].symbol,
+              })
+            }}
+            style={styles.error}
+          />
+        )}
       </ScrollView>
 
       <Button

From 742174598391f94f397d94e949646cbb6ed2a85c Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Tue, 21 May 2024 09:25:33 +1200
Subject: [PATCH 025/133] feat(earn): Add enter amount screen (#5399)

### Description

Add EarnEnterAmount screen.

### Test plan
Unit tests added.

**Manual tests:**

When a user has USDC on arbitrum:


https://github.com/valora-inc/wallet/assets/140328381/5103c167-3447-4df5-bb86-2318bf2c021a



When a user doesn't have enough USDC on arbitrum:


https://github.com/valora-inc/wallet/assets/140328381/459a6671-e8bc-42ca-84ef-e8c6d104a427



Clicking the info button:


https://github.com/valora-inc/wallet/assets/140328381/86c47948-61c2-4c1b-89b9-b02be943f534



### Related issues

- Fixes #ACT-1176

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [X] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 locales/base/translation.json     |  18 +
 src/analytics/Events.tsx          |   4 +
 src/analytics/Properties.tsx      |  11 +
 src/analytics/docs.ts             |   4 +
 src/components/TokenIcon.tsx      |   7 +
 src/earn/EarnCard.tsx             |   2 +-
 src/earn/EarnCta.test.tsx         |   2 +-
 src/earn/EarnCta.tsx              |   5 +-
 src/earn/EarnEnterAmount.test.tsx | 212 ++++++++++
 src/earn/EarnEnterAmount.tsx      | 634 ++++++++++++++++++++++++++++++
 src/earn/prepareTransactions.ts   |  24 ++
 src/navigator/Navigator.tsx       |   6 +
 src/navigator/Screens.tsx         |   1 +
 src/navigator/types.tsx           |   3 +
 src/send/EnterAmount.tsx          |   2 +-
 src/statsig/constants.ts          |   1 +
 test/RootStateSchema.json         |   1 +
 17 files changed, 933 insertions(+), 4 deletions(-)
 create mode 100644 src/earn/EarnEnterAmount.test.tsx
 create mode 100644 src/earn/EarnEnterAmount.tsx

diff --git a/locales/base/translation.json b/locales/base/translation.json
index a4db7250af..9689399001 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -2369,6 +2369,24 @@
       "subtitle": "Deposit today and earn returns",
       "description": "See how much you can earn when supplying a lending pool"
     },
+    "enterAmount": {
+      "earnUpToLabel": "You could earn up to:",
+      "rateLabel": "Rate (est.)",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / yr",
+      "rate": "{{rate}}% APY",
+      "continue": "Continue",
+      "info": "This pool is powered by Aave",
+      "infoBottomSheet": {
+        "title": "Why this pool?",
+        "description": "This Aave pool has over $150M TVL and more than 6,000 contributors, indicating strong liquidity and trustworthiness. It also uses USDC as its token and Abritrum as its network, which reduces volatility and ensures users will receive inexpensive gas rates.\n\nAll together this makes it a safe and attractive option with competitive APY, ensuring a beneficial investment opportunity for our users.\n\nYou can explore other Aave pools <0>here</0>.",
+        "dismiss": "Dismiss"
+      },
+      "notEnoughBalanceForGasWarning": {
+        "title": "You need more {{feeTokenSymbol}} to continue",
+        "description": "Add {{feeTokenSymbol}} on {{network}} to cover your gas fees",
+        "noGasCta": "Buy {{feeTokenSymbol}} on {{network}}"
+      }
+    },
     "activePools": {
       "title": "Active Pools",
       "totalValue": "Total Value:",
diff --git a/src/analytics/Events.tsx b/src/analytics/Events.tsx
index 3fa8a7fe2c..eb6f794e11 100644
--- a/src/analytics/Events.tsx
+++ b/src/analytics/Events.tsx
@@ -689,7 +689,11 @@ export enum EarnEvents {
   earn_deposit_submit_error = 'earn_deposit_submit_error',
   earn_deposit_submit_cancel = 'earn_deposit_submit_cancel',
   earn_view_pools_press = 'earn_view_pools_press',
+  earn_enter_amount_info_press = 'earn_enter_amount_info_press',
+  earn_enter_amount_continue_press = 'earn_enter_amount_continue_press',
+  earn_enter_amount_info_more_pools = 'earn_enter_amount_info_more_pools',
   earn_exit_pool_press = 'earn_exit_pool_press',
+  earn_deposit_add_gas_press = 'earn_deposit_add_gas_press',
   earn_feed_item_select = 'earn_feed_item_select',
   earn_collect_earnings_press = 'earn_collect_earnings_press',
   earn_withdraw_submit_start = 'earn_withdraw_submit_start',
diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index b050dc2e49..f42c548a37 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -1608,12 +1608,23 @@ interface EarnEventsProperties {
   }
   [EarnEvents.earn_deposit_submit_cancel]: EarnDepositProperties
   [EarnEvents.earn_view_pools_press]: undefined
+  [EarnEvents.earn_enter_amount_info_press]: undefined
+  [EarnEvents.earn_enter_amount_continue_press]: {
+    userHasFunds: boolean
+    tokenAmount: string
+    amountInUsd: string
+    amountEnteredIn: AmountEnteredIn
+    tokenId: string
+    networkId: string
+  }
+  [EarnEvents.earn_enter_amount_info_more_pools]: undefined
   [EarnEvents.earn_exit_pool_press]: {
     poolTokenId: string
     networkId: NetworkId
     tokenAmount: string
     providerId: string
   }
+  [EarnEvents.earn_deposit_add_gas_press]: { gasTokenId: string }
   [EarnEvents.earn_feed_item_select]: {
     origin: 'EarnDeposit' | 'EarnWithdraw' | 'EarnClaimReward'
   }
diff --git a/src/analytics/docs.ts b/src/analytics/docs.ts
index 198f18cdce..8be0cf8353 100644
--- a/src/analytics/docs.ts
+++ b/src/analytics/docs.ts
@@ -604,7 +604,11 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [EarnEvents.earn_deposit_submit_error]: `When the deposit transaction fails`,
   [EarnEvents.earn_deposit_submit_cancel]: `When the user cancels the deposit after submitting by cancelling PIN input`,
   [EarnEvents.earn_view_pools_press]: `When the user taps on the view pools button from token details`,
+  [EarnEvents.earn_enter_amount_info_press]: `When a user taps on the info icon on the earn enter amount screen`,
+  [EarnEvents.earn_enter_amount_continue_press]: `When a user taps continue on the earn enter amount`,
+  [EarnEvents.earn_enter_amount_info_more_pools]: `When a user taps to see other Aave pools`,
   [EarnEvents.earn_exit_pool_press]: `When the user taps on the exit pool button from the earn card in discover tab`,
+  [EarnEvents.earn_deposit_add_gas_press]: `When the user doesn't have enough for gas when trying to deposit and clicks on the button to add gas token`,
   [EarnEvents.earn_feed_item_select]: `When the users taps on an earn transaction feed item`,
   [EarnEvents.earn_collect_earnings_press]: `When the user taps on the collect earnings button in the collect screen`,
   [EarnEvents.earn_withdraw_submit_start]: `When the wallet is about to submit the withdraw and claim transactions to the network`,
diff --git a/src/components/TokenIcon.tsx b/src/components/TokenIcon.tsx
index 65286dff94..82fec73f35 100644
--- a/src/components/TokenIcon.tsx
+++ b/src/components/TokenIcon.tsx
@@ -5,6 +5,7 @@ import colors from 'src/styles/colors'
 import { BaseToken } from 'src/tokens/slice'
 
 export enum IconSize {
+  XSMALL = 'xsmall',
   SMALL = 'small',
   MEDIUM = 'medium',
   LARGE = 'large',
@@ -12,6 +13,12 @@ export enum IconSize {
 }
 
 const IconSizeToStyle = {
+  [IconSize.XSMALL]: {
+    tokenImageSize: 20,
+    networkImageSize: 10,
+    networkImagePosition: 12,
+    tokenTextSize: 4,
+  },
   [IconSize.SMALL]: {
     tokenImageSize: 24,
     networkImageSize: 9,
diff --git a/src/earn/EarnCard.tsx b/src/earn/EarnCard.tsx
index 4b0b8cdfad..147f99439d 100644
--- a/src/earn/EarnCard.tsx
+++ b/src/earn/EarnCard.tsx
@@ -25,7 +25,7 @@ export function EarnCardDiscover({ depositTokenId, poolTokenId }: Props) {
         poolTokenId={poolTokenId}
       />
     ) : (
-      <EarnCta />
+      <EarnCta depositTokenId={depositTokenId} />
     )
   }
   return null
diff --git a/src/earn/EarnCta.test.tsx b/src/earn/EarnCta.test.tsx
index 176487db81..f36ebdd727 100644
--- a/src/earn/EarnCta.test.tsx
+++ b/src/earn/EarnCta.test.tsx
@@ -30,7 +30,7 @@ describe('EarnCta', () => {
   it('should render correctly', () => {
     const { getByText, getByTestId } = render(
       <Provider store={store}>
-        <EarnCta />
+        <EarnCta depositTokenId={'arbitrum-sepolia:0x123'} />
       </Provider>
     )
 
diff --git a/src/earn/EarnCta.tsx b/src/earn/EarnCta.tsx
index eebe304e3c..fa084ed4ed 100644
--- a/src/earn/EarnCta.tsx
+++ b/src/earn/EarnCta.tsx
@@ -5,11 +5,13 @@ import { EarnEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import Touchable from 'src/components/Touchable'
 import EarnAave from 'src/icons/EarnAave'
+import { navigate } from 'src/navigator/NavigationService'
+import { Screens } from 'src/navigator/Screens'
 import Colors from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
 import { Spacing } from 'src/styles/styles'
 
-export default function EarnCta() {
+export default function EarnCta({ depositTokenId }: { depositTokenId: string }) {
   const { t } = useTranslation()
   return (
     <View style={styles.container}>
@@ -18,6 +20,7 @@ export default function EarnCta() {
         style={styles.touchable}
         onPress={() => {
           ValoraAnalytics.track(EarnEvents.earn_cta_press)
+          navigate(Screens.EarnEnterAmount, { tokenId: depositTokenId })
         }}
         testID="EarnCta"
       >
diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
new file mode 100644
index 0000000000..9c52ec64a8
--- /dev/null
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -0,0 +1,212 @@
+import { fireEvent, render, waitFor } from '@testing-library/react-native'
+import BigNumber from 'bignumber.js'
+import React from 'react'
+import { Provider } from 'react-redux'
+import { EarnEvents } from 'src/analytics/Events'
+import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
+import EarnEnterAmount from 'src/earn/EarnEnterAmount'
+import { usePrepareSupplyTransactions } from 'src/earn/prepareTransactions'
+import { TokenBalance } from 'src/tokens/slice'
+import { NetworkId } from 'src/transactions/types'
+import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
+import networkConfig from 'src/web3/networkConfig'
+import MockedNavigator from 'test/MockedNavigator'
+import { createMockStore } from 'test/utils'
+import { mockAccount, mockArbEthTokenId, mockTokenBalances } from 'test/values'
+
+jest.mock('src/earn/prepareTransactions')
+
+const mockPreparedTransaction: PreparedTransactionsPossible = {
+  type: 'possible' as const,
+  transactions: [
+    {
+      from: '0xfrom',
+      to: '0xto',
+      data: '0xdata',
+      gas: BigInt(5e16),
+      _baseFeePerGas: BigInt(1),
+      maxFeePerGas: BigInt(1),
+      maxPriorityFeePerGas: undefined,
+    },
+    {
+      from: '0xfrom',
+      to: '0xto',
+      data: '0xdata',
+      gas: BigInt(1e16),
+      _baseFeePerGas: BigInt(1),
+      maxFeePerGas: BigInt(1),
+      maxPriorityFeePerGas: undefined,
+    },
+  ],
+  feeCurrency: {
+    ...mockTokenBalances[mockArbEthTokenId],
+    isNative: true,
+    balance: new BigNumber(10),
+    priceUsd: new BigNumber(1),
+    lastKnownPriceUsd: new BigNumber(1),
+  },
+}
+
+const mockFeeCurrencies: TokenBalance[] = [
+  {
+    ...mockTokenBalances[mockArbEthTokenId],
+    isNative: true,
+    balance: new BigNumber(1),
+    priceUsd: new BigNumber(1500),
+    lastKnownPriceUsd: new BigNumber(1500),
+  },
+]
+
+const priceFetchedAt = Date.now()
+
+const store = createMockStore({
+  tokens: {
+    tokenBalances: {
+      [networkConfig.arbUsdcTokenId]: {
+        tokenId: networkConfig.arbUsdcTokenId,
+        symbol: 'USDC',
+        priceUsd: '1',
+        priceFetchedAt: priceFetchedAt,
+        networkId: NetworkId['arbitrum-sepolia'],
+        balance: '10',
+      },
+      mockArbEthTokenId: {
+        ...mockTokenBalances[mockArbEthTokenId],
+        balance: '1',
+      },
+    },
+  },
+})
+
+const refreshPreparedTransactionsSpy = jest.fn()
+jest.mocked(usePrepareSupplyTransactions).mockReturnValue({
+  prepareTransactionsResult: undefined,
+  refreshPreparedTransactions: refreshPreparedTransactionsSpy,
+  clearPreparedTransactions: jest.fn(),
+  prepareTransactionError: undefined,
+})
+
+const params = {
+  tokenId: networkConfig.arbUsdcTokenId,
+}
+
+describe('EarnEnterAmount', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('should render APY and EarnUpTo', () => {
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <MockedNavigator component={EarnEnterAmount} params={params} />
+      </Provider>
+    )
+    expect(getByTestId('EarnEnterAmount/Apy')).toBeTruthy()
+    expect(getByTestId('EarnEnterAmount/EarnUpTo')).toBeTruthy()
+  })
+
+  it('should be able to tap info icon', async () => {
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <MockedNavigator component={EarnEnterAmount} params={params} />
+      </Provider>
+    )
+    fireEvent.press(getByTestId('EarnEnterAmount/InfoIcon'))
+    await waitFor(() => expect(ValoraAnalytics.track).toHaveBeenCalledTimes(1))
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_enter_amount_info_press)
+  })
+
+  it('should prepare transactions with the expected inputs', async () => {
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <MockedNavigator component={EarnEnterAmount} params={params} />
+      </Provider>
+    )
+
+    fireEvent.changeText(getByTestId('EarnEnterAmount/TokenAmountInput'), '.25')
+
+    await waitFor(() => expect(refreshPreparedTransactionsSpy).toHaveBeenCalledTimes(1))
+    expect(refreshPreparedTransactionsSpy).toHaveBeenCalledWith({
+      amount: '0.25',
+      token: {
+        tokenId: networkConfig.arbUsdcTokenId,
+        symbol: 'USDC',
+        priceUsd: new BigNumber(1),
+        lastKnownPriceUsd: new BigNumber(1),
+        priceFetchedAt: priceFetchedAt,
+        networkId: NetworkId['arbitrum-sepolia'],
+        balance: new BigNumber(10),
+      },
+      walletAddress: mockAccount.toLowerCase(),
+      poolContractAddress: networkConfig.arbAavePoolV3ContractAddress,
+      feeCurrencies: mockFeeCurrencies,
+    })
+  })
+
+  it('should handle navigating to the deposit bottom sheet', async () => {
+    jest.mocked(usePrepareSupplyTransactions).mockReturnValue({
+      prepareTransactionsResult: mockPreparedTransaction,
+      refreshPreparedTransactions: jest.fn(),
+      clearPreparedTransactions: jest.fn(),
+      prepareTransactionError: undefined,
+    })
+    const { getByTestId, getByText } = render(
+      <Provider store={store}>
+        <MockedNavigator component={EarnEnterAmount} params={params} />
+      </Provider>
+    )
+
+    fireEvent.changeText(getByTestId('EarnEnterAmount/TokenAmountInput'), '8')
+
+    await waitFor(() => expect(getByText('earnFlow.enterAmount.continue')).not.toBeDisabled())
+    fireEvent.press(getByText('earnFlow.enterAmount.continue'))
+
+    await waitFor(() => expect(ValoraAnalytics.track).toHaveBeenCalledTimes(1))
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_enter_amount_continue_press,
+      {
+        amountEnteredIn: 'token',
+        amountInUsd: '8.00',
+        networkId: NetworkId['arbitrum-sepolia'],
+        tokenAmount: '8',
+        tokenId: networkConfig.arbUsdcTokenId,
+        userHasFunds: true,
+      }
+    )
+    await waitFor(() => expect(getByText('earnFlow.depositBottomSheet.title')).toBeVisible())
+  })
+  it('should handle navigating to the add crypto bottom sheet', async () => {
+    jest.mocked(usePrepareSupplyTransactions).mockReturnValue({
+      prepareTransactionsResult: mockPreparedTransaction,
+      refreshPreparedTransactions: jest.fn(),
+      clearPreparedTransactions: jest.fn(),
+      prepareTransactionError: undefined,
+    })
+    const { getByTestId, getByText } = render(
+      <Provider store={store}>
+        <MockedNavigator component={EarnEnterAmount} params={params} />
+      </Provider>
+    )
+
+    fireEvent.changeText(getByTestId('EarnEnterAmount/TokenAmountInput'), '12')
+
+    await waitFor(() => expect(getByText('earnFlow.enterAmount.continue')).not.toBeDisabled())
+    fireEvent.press(getByText('earnFlow.enterAmount.continue'))
+
+    await waitFor(() => expect(ValoraAnalytics.track).toHaveBeenCalledTimes(1))
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_enter_amount_continue_press,
+      {
+        amountEnteredIn: 'token',
+        amountInUsd: '12.00',
+        networkId: NetworkId['arbitrum-sepolia'],
+        tokenAmount: '12',
+        tokenId: networkConfig.arbUsdcTokenId,
+        userHasFunds: false,
+      }
+    )
+    await waitFor(() =>
+      expect(getByText('earnFlow.addCryptoBottomSheet.description')).toBeVisible()
+    )
+  })
+})
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
new file mode 100644
index 0000000000..4c29069b43
--- /dev/null
+++ b/src/earn/EarnEnterAmount.tsx
@@ -0,0 +1,634 @@
+import { parseInputAmount } from '@celo/utils/lib/parsing'
+import { NativeStackScreenProps } from '@react-navigation/native-stack'
+import BigNumber from 'bignumber.js'
+import React, { useEffect, useMemo, useRef, useState } from 'react'
+import { Trans, useTranslation } from 'react-i18next'
+import {
+  TextInput as RNTextInput,
+  SafeAreaView,
+  StyleSheet,
+  Text,
+  TouchableOpacity,
+  View,
+} from 'react-native'
+import { getNumberFormatSettings } from 'react-native-localize'
+import { EarnEvents, SendEvents } from 'src/analytics/Events'
+import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
+import BackButton from 'src/components/BackButton'
+import BottomSheet, { BottomSheetRefType } from 'src/components/BottomSheet'
+import Button, { BtnSizes, BtnTypes } from 'src/components/Button'
+import InLineNotification, { NotificationVariant } from 'src/components/InLineNotification'
+import KeyboardAwareScrollView from 'src/components/KeyboardAwareScrollView'
+import KeyboardSpacer from 'src/components/KeyboardSpacer'
+import TokenIcon, { IconSize } from 'src/components/TokenIcon'
+import Touchable from 'src/components/Touchable'
+import CustomHeader from 'src/components/header/CustomHeader'
+import EarnAddCryptoBottomSheet from 'src/earn/EarnAddCryptoBottomSheet'
+import EarnDepositBottomSheet from 'src/earn/EarnDepositBottomSheet'
+import { useAavePoolInfo } from 'src/earn/hooks'
+import { usePrepareSupplyTransactions } from 'src/earn/prepareTransactions'
+import { CICOFlow } from 'src/fiatExchanges/utils'
+import InfoIcon from 'src/icons/InfoIcon'
+import { LocalCurrencySymbol } from 'src/localCurrency/consts'
+import { getLocalCurrencySymbol } from 'src/localCurrency/selectors'
+import { navigate } from 'src/navigator/NavigationService'
+import { Screens } from 'src/navigator/Screens'
+import { StackParamList } from 'src/navigator/types'
+import { useSelector } from 'src/redux/hooks'
+import { AmountInput, ProceedArgs } from 'src/send/EnterAmount'
+import { AmountEnteredIn } from 'src/send/types'
+import { NETWORK_NAMES } from 'src/shared/conts'
+import { getDynamicConfigParams } from 'src/statsig'
+import { DynamicConfigs } from 'src/statsig/constants'
+import { StatsigDynamicConfigs } from 'src/statsig/types'
+import Colors from 'src/styles/colors'
+import { typeScale } from 'src/styles/fonts'
+import { Spacing } from 'src/styles/styles'
+import variables from 'src/styles/variables'
+import { useLocalToTokenAmount, useTokenInfo, useTokenToLocalAmount } from 'src/tokens/hooks'
+import { feeCurrenciesSelector } from 'src/tokens/selectors'
+import { TokenBalance } from 'src/tokens/slice'
+import Logger from 'src/utils/Logger'
+import networkConfig from 'src/web3/networkConfig'
+import { walletAddressSelector } from 'src/web3/selectors'
+import { isAddress } from 'viem'
+
+type Props = NativeStackScreenProps<StackParamList, Screens.EarnEnterAmount>
+
+const TAG = 'EarnEnterAmount'
+
+const TOKEN_SELECTOR_BORDER_RADIUS = 100
+const MAX_BORDER_RADIUS = 96
+const FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME = 250
+
+type ProceedComponentProps = Omit<ProceedArgs, 'tokenAmount'> & {
+  onPressProceed(args: ProceedArgs): void
+  onPressInfo(): void
+  disabled: boolean
+  tokenAmount: BigNumber | null
+}
+
+function EarnEnterAmount({ route }: Props) {
+  const { t } = useTranslation()
+
+  const { tokenId } = route.params
+  const token = useTokenInfo(tokenId)
+
+  if (!token) {
+    throw new Error(`Token info not found for token ID ${tokenId}`)
+  }
+
+  const infoBottomSheetRef = useRef<BottomSheetRefType>(null)
+  const addCryptoBottomSheetRef = useRef<BottomSheetRefType>(null)
+  const reviewBottomSheetRef = useRef<BottomSheetRefType>(null)
+  const tokenAmountInputRef = useRef<RNTextInput>(null)
+  const localAmountInputRef = useRef<RNTextInput>(null)
+
+  const [tokenAmountInput, setTokenAmountInput] = useState<string>('')
+  const [localAmountInput, setLocalAmountInput] = useState<string>('')
+  const [enteredIn, setEnteredIn] = useState<AmountEnteredIn>('token')
+  // this should never be null, just adding a default to make TS happy
+  const localCurrencySymbol = useSelector(getLocalCurrencySymbol) ?? LocalCurrencySymbol.USD
+
+  const {
+    prepareTransactionsResult,
+    refreshPreparedTransactions,
+    clearPreparedTransactions,
+    prepareTransactionError,
+  } = usePrepareSupplyTransactions()
+
+  const walletAddress = useSelector(walletAddressSelector)
+
+  const handleRefreshPreparedTransactions = (
+    amount: BigNumber,
+    token: TokenBalance,
+    feeCurrencies: TokenBalance[]
+  ) => {
+    if (!walletAddress || !isAddress(walletAddress)) {
+      Logger.error(TAG, 'Wallet address not set. Cannot refresh prepared transactions.')
+      return
+    }
+
+    return refreshPreparedTransactions({
+      amount: amount.toString(),
+      token,
+      walletAddress,
+      feeCurrencies,
+      poolContractAddress: networkConfig.arbAavePoolV3ContractAddress,
+    })
+  }
+
+  const { decimalSeparator, groupingSeparator } = getNumberFormatSettings()
+  // only allow numbers, one decimal separator, and two decimal places
+  const localAmountRegex = new RegExp(
+    `^(\\d+([${decimalSeparator}])?\\d{0,2}|[${decimalSeparator}]\\d{0,2}|[${decimalSeparator}])$`
+  )
+  // only allow numbers, one decimal separator
+  const tokenAmountRegex = new RegExp(
+    `^(?:\\d+[${decimalSeparator}]?\\d*|[${decimalSeparator}]\\d*|[${decimalSeparator}])$`
+  )
+  const parsedTokenAmount = useMemo(
+    () => parseInputAmount(tokenAmountInput, decimalSeparator),
+    [tokenAmountInput]
+  )
+  const parsedLocalAmount = useMemo(
+    () =>
+      parseInputAmount(
+        localAmountInput.replaceAll(groupingSeparator, '').replace(localCurrencySymbol, ''),
+        decimalSeparator
+      ),
+    [localAmountInput]
+  )
+
+  const tokenToLocal = useTokenToLocalAmount(parsedTokenAmount, token.tokenId)
+  const localToToken = useLocalToTokenAmount(parsedLocalAmount, token.tokenId)
+  const { tokenAmount, localAmount } = useMemo(() => {
+    if (enteredIn === 'token') {
+      setLocalAmountInput(
+        tokenToLocal && tokenToLocal.gt(0)
+          ? `${localCurrencySymbol}${tokenToLocal.toFormat(2)}` // automatically adds grouping separators
+          : ''
+      )
+      return {
+        tokenAmount: parsedTokenAmount,
+        localAmount: tokenToLocal,
+      }
+    } else {
+      setTokenAmountInput(
+        localToToken && localToToken.gt(0)
+          ? // no group separator for token amount, round to token.decimals and strip trailing zeros
+            localToToken
+              .toFormat(token.decimals, { decimalSeparator })
+              .replace(new RegExp(`[${decimalSeparator}]?0+$`), '')
+          : ''
+      )
+      return {
+        tokenAmount: localToToken,
+        localAmount: parsedLocalAmount,
+      }
+    }
+  }, [tokenAmountInput, localAmountInput, enteredIn, token])
+
+  const feeCurrencies = useSelector((state) => feeCurrenciesSelector(state, token.networkId))
+
+  useEffect(() => {
+    clearPreparedTransactions()
+
+    if (
+      !tokenAmount ||
+      tokenAmount.isLessThanOrEqualTo(0) ||
+      tokenAmount.isGreaterThan(token.balance)
+    ) {
+      return
+    }
+    const debouncedRefreshTransactions = setTimeout(() => {
+      return handleRefreshPreparedTransactions(tokenAmount, token, feeCurrencies)
+    }, FETCH_UPDATED_TRANSACTIONS_DEBOUNCE_TIME)
+    return () => clearTimeout(debouncedRefreshTransactions)
+  }, [tokenAmount, token])
+
+  const isAmountLessThanBalance = tokenAmount && tokenAmount.lte(token.balance)
+  const showNotEnoughBalanceForGasWarning =
+    isAmountLessThanBalance &&
+    prepareTransactionsResult &&
+    prepareTransactionsResult.type === 'not-enough-balance-for-gas'
+  const transactionIsPossible =
+    isAmountLessThanBalance &&
+    prepareTransactionsResult &&
+    prepareTransactionsResult.type === 'possible' &&
+    prepareTransactionsResult.transactions.length > 0
+
+  const disabled =
+    // Should disable if the user enters 0 or has enough balance but the transaction is not possible,
+    // shouldn't disable if they enter an amount larger than their balance as they will go to add flow
+    !!tokenAmount?.isZero() || (!!tokenAmount?.lte(token.balance) && !transactionIsPossible)
+
+  const onTokenAmountInputChange = (value: string) => {
+    if (!value) {
+      setTokenAmountInput('')
+      setEnteredIn('token')
+    } else {
+      if (value.startsWith(decimalSeparator)) {
+        value = `0${value}`
+      }
+      if (value.match(tokenAmountRegex)) {
+        setTokenAmountInput(value)
+        setEnteredIn('token')
+      }
+    }
+  }
+
+  const onLocalAmountInputChange = (value: string) => {
+    // remove leading currency symbol and grouping separators
+    if (value.startsWith(localCurrencySymbol)) {
+      value = value.slice(1)
+    }
+    value = value.replaceAll(groupingSeparator, '')
+    if (!value) {
+      setLocalAmountInput('')
+      setEnteredIn('local')
+    } else {
+      if (value.startsWith(decimalSeparator)) {
+        value = `0${value}`
+      }
+      if (value.match(localAmountRegex)) {
+        // add back currency symbol and grouping separators
+        setLocalAmountInput(
+          `${localCurrencySymbol}${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, groupingSeparator)
+        )
+        setEnteredIn('local')
+      }
+    }
+  }
+
+  const onMaxAmountPress = async () => {
+    // eventually we may want to do something smarter here, like subtracting gas fees from the max amount if
+    // this is a gas-paying token. for now, we are just showing a warning to the user prompting them to lower the amount
+    // if there is not enough for gas
+    setTokenAmountInput(token.balance.toString())
+    setEnteredIn('token')
+    tokenAmountInputRef.current?.blur()
+    localAmountInputRef.current?.blur()
+    ValoraAnalytics.track(SendEvents.max_pressed, {
+      tokenId: token.tokenId,
+      tokenAddress: token.address,
+      networkId: token.networkId,
+    })
+  }
+
+  const onPressContinue = ({ tokenAmount, token, amountEnteredIn }: ProceedArgs) => {
+    ValoraAnalytics.track(EarnEvents.earn_enter_amount_continue_press, {
+      userHasFunds: !!isAmountLessThanBalance,
+      tokenAmount: tokenAmount.toString(),
+      amountInUsd: tokenAmount.multipliedBy(token.priceUsd ?? 0).toFixed(2),
+      amountEnteredIn,
+      tokenId: token.tokenId,
+      networkId: token.networkId,
+    })
+    isAmountLessThanBalance
+      ? reviewBottomSheetRef.current?.snapToIndex(0)
+      : addCryptoBottomSheetRef.current?.snapToIndex(0)
+  }
+
+  const onPressInfo = () => {
+    ValoraAnalytics.track(EarnEvents.earn_enter_amount_info_press)
+    infoBottomSheetRef.current?.snapToIndex(0)
+  }
+
+  return (
+    <SafeAreaView style={styles.safeAreaContainer}>
+      <CustomHeader style={{ paddingHorizontal: Spacing.Thick24 }} left={<BackButton />} />
+      <KeyboardAwareScrollView contentContainerStyle={styles.contentContainer}>
+        <View style={styles.inputContainer}>
+          <Text style={styles.title}>{t('sendEnterAmountScreen.title')}</Text>
+          <View style={styles.inputBox}>
+            <View style={styles.inputRow}>
+              <AmountInput
+                inputRef={tokenAmountInputRef}
+                inputValue={tokenAmountInput}
+                onInputChange={onTokenAmountInputChange}
+                inputStyle={styles.inputText}
+                autoFocus
+                placeholder={new BigNumber(0).toFormat(2)}
+                testID="EarnEnterAmount/TokenAmountInput"
+              />
+              <View style={styles.tokenView} testID="EarnEnterAmount/TokenSelect">
+                <>
+                  <TokenIcon token={token} size={IconSize.SMALL} />
+                  <Text style={styles.tokenName}>{token.symbol}</Text>
+                </>
+              </View>
+            </View>
+            <View style={styles.localAmountRow}>
+              <AmountInput
+                inputValue={token.priceUsd ? localAmountInput : '-'}
+                onInputChange={onLocalAmountInputChange}
+                inputRef={localAmountInputRef}
+                inputStyle={styles.localAmount}
+                placeholder={`${localCurrencySymbol}${new BigNumber(0).toFormat(2)}`}
+                testID="EarnEnterAmount/LocalAmountInput"
+                editable={!!token.priceUsd}
+              />
+              {!token.balance.isZero() && (
+                <Touchable
+                  borderRadius={MAX_BORDER_RADIUS}
+                  onPress={onMaxAmountPress}
+                  style={styles.maxTouchable}
+                  testID="EarnEnterAmount/Max"
+                >
+                  <Text style={styles.maxText}>{t('max')}</Text>
+                </Touchable>
+              )}
+            </View>
+          </View>
+        </View>
+        {showNotEnoughBalanceForGasWarning && (
+          <InLineNotification
+            variant={NotificationVariant.Warning}
+            title={t('earnFlow.enterAmount.notEnoughBalanceForGasWarning.title', {
+              feeTokenSymbol: prepareTransactionsResult.feeCurrencies[0].symbol,
+            })}
+            description={t('earnFlow.enterAmount.notEnoughBalanceForGasWarning.description', {
+              feeTokenSymbol: prepareTransactionsResult.feeCurrencies[0].symbol,
+              network: NETWORK_NAMES[prepareTransactionsResult.feeCurrencies[0].networkId],
+            })}
+            ctaLabel={t('earnFlow.enterAmount.notEnoughBalanceForGasWarning.noGasCta', {
+              feeTokenSymbol: feeCurrencies[0].symbol,
+              network: NETWORK_NAMES[prepareTransactionsResult.feeCurrencies[0].networkId],
+            })}
+            onPressCta={() => {
+              ValoraAnalytics.track(EarnEvents.earn_deposit_add_gas_press, {
+                gasTokenId: feeCurrencies[0].tokenId,
+              })
+              navigate(Screens.FiatExchangeAmount, {
+                tokenId: prepareTransactionsResult.feeCurrencies[0].tokenId,
+                flow: CICOFlow.CashIn,
+                tokenSymbol: prepareTransactionsResult.feeCurrencies[0].symbol,
+              })
+            }}
+            style={styles.warning}
+            testID="EarnEnterAmount/NotEnoughForGasWarning"
+          />
+        )}
+        {prepareTransactionError && (
+          <InLineNotification
+            variant={NotificationVariant.Error}
+            title={t('sendEnterAmountScreen.prepareTransactionError.title')}
+            description={t('sendEnterAmountScreen.prepareTransactionError.description')}
+            style={styles.warning}
+            testID="EarnEnterAmount/PrepareTransactionError"
+          />
+        )}
+        <EarnProceed
+          tokenAmount={tokenAmount}
+          localAmount={localAmount}
+          token={token}
+          amountEnteredIn={enteredIn}
+          onPressProceed={onPressContinue}
+          onPressInfo={onPressInfo}
+          disabled={disabled}
+        />
+        <KeyboardSpacer />
+      </KeyboardAwareScrollView>
+      <InfoBottomSheet infoBottomSheetRef={infoBottomSheetRef} />
+      <EarnAddCryptoBottomSheet
+        forwardedRef={addCryptoBottomSheetRef}
+        token={token}
+        tokenAmount={tokenAmount ? tokenAmount.minus(token.balance) : new BigNumber(0)}
+      />
+      {tokenAmount && prepareTransactionsResult?.type === 'possible' && (
+        <EarnDepositBottomSheet
+          forwardedRef={reviewBottomSheetRef}
+          preparedTransaction={prepareTransactionsResult}
+          amount={tokenAmount.toString()}
+          tokenId={token.tokenId}
+        />
+      )}
+    </SafeAreaView>
+  )
+}
+
+function EarnProceed({
+  tokenAmount,
+  localAmount,
+  token,
+  amountEnteredIn,
+  disabled,
+  onPressProceed,
+  onPressInfo,
+}: ProceedComponentProps) {
+  const { t } = useTranslation()
+  const localCurrencySymbol = useSelector(getLocalCurrencySymbol)
+
+  const asyncPoolInfo = useAavePoolInfo({ depositTokenId: token.tokenId })
+
+  return (
+    <View style={styles.infoContainer}>
+      <View style={styles.line}>
+        <Text style={styles.label}>{t('earnFlow.enterAmount.earnUpToLabel')}</Text>
+        <Text style={styles.label}>{t('earnFlow.enterAmount.rateLabel')}</Text>
+      </View>
+      <View style={styles.line}>
+        <Text style={styles.valuesText} testID="EarnEnterAmount/EarnUpTo">
+          {t('earnFlow.enterAmount.earnUpTo', {
+            fiatSymbol: localCurrencySymbol,
+            amount:
+              asyncPoolInfo?.result && !!asyncPoolInfo.result.apy && tokenAmount?.gt(0)
+                ? tokenAmount.multipliedBy(new BigNumber(asyncPoolInfo.result.apy)).toFormat(2)
+                : '--',
+          })}
+        </Text>
+        <View style={styles.apy}>
+          <TokenIcon token={token} size={IconSize.XSMALL} />
+          <Text style={styles.valuesText} testID="EarnEnterAmount/Apy">
+            {t('earnFlow.enterAmount.rate', {
+              rate:
+                asyncPoolInfo?.result && !!asyncPoolInfo.result.apy
+                  ? (asyncPoolInfo.result.apy * 100).toFixed(2)
+                  : '--',
+            })}
+          </Text>
+        </View>
+      </View>
+      <Button
+        onPress={() =>
+          tokenAmount && onPressProceed({ tokenAmount, localAmount, token, amountEnteredIn })
+        }
+        text={t('earnFlow.enterAmount.continue')}
+        style={styles.continueButton}
+        size={BtnSizes.FULL}
+        disabled={disabled}
+      />
+      <View style={styles.row}>
+        <Text style={styles.infoText}>{t('earnFlow.enterAmount.info')}</Text>
+        <TouchableOpacity
+          onPress={onPressInfo}
+          hitSlop={variables.iconHitslop}
+          testID="EarnEnterAmount/InfoIcon"
+        >
+          <InfoIcon color={Colors.black} />
+        </TouchableOpacity>
+      </View>
+    </View>
+  )
+}
+
+function InfoBottomSheet({
+  infoBottomSheetRef,
+}: {
+  infoBottomSheetRef: React.RefObject<BottomSheetRefType>
+}) {
+  const { t } = useTranslation()
+
+  const { moreAavePoolsUrl } = getDynamicConfigParams(
+    DynamicConfigs[StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG]
+  )
+  const onPressDismiss = () => {
+    infoBottomSheetRef.current?.close()
+  }
+  const onPressMorePools = () => {
+    ValoraAnalytics.track(EarnEvents.earn_enter_amount_info_more_pools)
+    moreAavePoolsUrl && navigate(Screens.WebViewScreen, { uri: moreAavePoolsUrl })
+  }
+
+  return (
+    <BottomSheet
+      forwardedRef={infoBottomSheetRef}
+      title={t('earnFlow.enterAmount.infoBottomSheet.title')}
+      testId={'Earn/EnterAmount/InfoBottomSheet'}
+      titleStyle={styles.infoBottomSheetTitle}
+    >
+      <Text style={styles.infoBottomSheetText}>
+        <Trans i18nKey="earnFlow.enterAmount.infoBottomSheet.description">
+          <Text
+            testID={'Earn/EnterAmount/InfoBottomSheet/Link'}
+            onPress={onPressMorePools}
+            style={styles.linkText}
+          />
+        </Trans>
+      </Text>
+      <Button
+        onPress={onPressDismiss}
+        text={t('earnFlow.enterAmount.infoBottomSheet.dismiss')}
+        size={BtnSizes.FULL}
+        type={BtnTypes.GRAY_WITH_BORDER}
+      />
+    </BottomSheet>
+  )
+}
+
+const styles = StyleSheet.create({
+  infoContainer: {
+    padding: Spacing.Regular16,
+    borderRadius: 16,
+    borderWidth: 1,
+    borderColor: Colors.gray2,
+    marginTop: 20,
+  },
+  line: {
+    flexDirection: 'row',
+    alignSelf: 'flex-end',
+    justifyContent: 'space-between',
+    width: '100%',
+    gap: Spacing.Smallest8,
+  },
+  row: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center',
+    flex: 1,
+    gap: Spacing.Tiny4,
+  },
+  apy: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: Spacing.Tiny4,
+  },
+  label: {
+    ...typeScale.bodySmall,
+    color: Colors.gray4,
+  },
+  continueButton: {
+    paddingVertical: Spacing.Thick24,
+  },
+  valuesText: {
+    ...typeScale.labelSemiBoldSmall,
+    marginVertical: Spacing.Tiny4,
+  },
+  infoText: {
+    ...typeScale.bodyXSmall,
+    color: Colors.gray4,
+  },
+  infoBottomSheetTitle: {
+    ...typeScale.titleSmall,
+    color: Colors.black,
+  },
+  infoBottomSheetText: {
+    ...typeScale.bodySmall,
+    marginBottom: Spacing.Thick24,
+    color: Colors.black,
+  },
+  linkText: {
+    textDecorationLine: 'underline',
+  },
+  safeAreaContainer: {
+    flex: 1,
+  },
+  contentContainer: {
+    paddingHorizontal: Spacing.Thick24,
+    paddingTop: Spacing.Thick24,
+  },
+  title: {
+    ...typeScale.titleSmall,
+    color: Colors.black,
+  },
+  inputContainer: {
+    flex: 1,
+  },
+  inputBox: {
+    marginTop: Spacing.Large32,
+    backgroundColor: '#FAFAFA',
+    borderWidth: 1,
+    borderRadius: 16,
+    borderColor: Colors.gray2,
+  },
+  inputRow: {
+    paddingHorizontal: Spacing.Regular16,
+    paddingTop: Spacing.Smallest8,
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  localAmountRow: {
+    marginTop: Spacing.Thick24,
+    marginLeft: Spacing.Regular16,
+    paddingRight: Spacing.Regular16,
+    paddingBottom: Spacing.Regular16,
+    paddingTop: Spacing.Thick24,
+    borderTopColor: Colors.gray2,
+    borderTopWidth: 1,
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  inputText: {
+    ...typeScale.titleMedium,
+    color: Colors.black,
+  },
+  tokenView: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    backgroundColor: Colors.white,
+    borderWidth: 1,
+    borderColor: Colors.gray2,
+    borderRadius: TOKEN_SELECTOR_BORDER_RADIUS,
+    paddingHorizontal: Spacing.Smallest8,
+    paddingVertical: Spacing.Tiny4,
+  },
+  tokenName: {
+    ...typeScale.labelSmall,
+    paddingLeft: Spacing.Tiny4,
+    paddingRight: Spacing.Smallest8,
+    color: Colors.black,
+  },
+  localAmount: {
+    ...typeScale.labelMedium,
+  },
+  maxTouchable: {
+    paddingHorizontal: 12,
+    paddingVertical: 6,
+    backgroundColor: Colors.gray2,
+    borderWidth: 1,
+    borderColor: Colors.gray2,
+    borderRadius: MAX_BORDER_RADIUS,
+  },
+  maxText: {
+    ...typeScale.labelSmall,
+    color: Colors.black,
+  },
+  warning: {
+    marginTop: Spacing.Regular16,
+    paddingHorizontal: Spacing.Regular16,
+    borderRadius: 16,
+  },
+})
+
+export default EarnEnterAmount
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index ca168303d7..b5675c0f23 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -1,4 +1,5 @@
 import BigNumber from 'bignumber.js'
+import { useAsyncCallback } from 'react-async-hook'
 import aaveIncentivesV3Abi from 'src/abis/AaveIncentivesV3'
 import aavePool from 'src/abis/AavePoolV3'
 import erc20 from 'src/abis/IERC20'
@@ -7,12 +8,16 @@ import { getDynamicConfigParams } from 'src/statsig'
 import { DynamicConfigs } from 'src/statsig/constants'
 import { StatsigDynamicConfigs } from 'src/statsig/types'
 import { TokenBalance } from 'src/tokens/slice'
+import Logger from 'src/utils/Logger'
+import { ensureError } from 'src/utils/ensureError'
 import { fetchWithTimeout } from 'src/utils/fetchWithTimeout'
 import { publicClient } from 'src/viem'
 import { TransactionRequest, prepareTransactions } from 'src/viem/prepareTransactions'
 import networkConfig, { networkIdToNetwork } from 'src/web3/networkConfig'
 import { Address, encodeFunctionData, isAddress, parseUnits } from 'viem'
 
+const TAG = 'earn/prepareTransactions'
+
 type SimulatedTransactionResponse = {
   status: 'OK'
   simulatedTransactions: {
@@ -134,6 +139,25 @@ export async function prepareSupplyTransactions({
   })
 }
 
+/**
+ * Hook to prepare transactions for supplying crypto.
+ */
+export function usePrepareSupplyTransactions() {
+  const prepareTransactions = useAsyncCallback(prepareSupplyTransactions, {
+    onError: (err) => {
+      const error = ensureError(err)
+      Logger.error(TAG, 'usePrepareSupplyTransactions', error)
+    },
+  })
+
+  return {
+    prepareTransactionsResult: prepareTransactions.result,
+    refreshPreparedTransactions: prepareTransactions.execute,
+    clearPreparedTransactions: prepareTransactions.reset,
+    prepareTransactionError: prepareTransactions.error,
+  }
+}
+
 export async function prepareWithdrawAndClaimTransactions({
   amount,
   token,
diff --git a/src/navigator/Navigator.tsx b/src/navigator/Navigator.tsx
index 027417b2d0..c2f5e1d306 100644
--- a/src/navigator/Navigator.tsx
+++ b/src/navigator/Navigator.tsx
@@ -32,6 +32,7 @@ import DappKitSignTxScreen from 'src/dappkit/DappKitSignTxScreen'
 import DappShortcutTransactionRequest from 'src/dapps/DappShortcutTransactionRequest'
 import DappShortcutsRewards from 'src/dapps/DappShortcutsRewards'
 import EarnCollectScreen from 'src/earn/EarnCollectScreen'
+import EarnEnterAmount from 'src/earn/EarnEnterAmount'
 import EscrowedPaymentListScreen from 'src/escrow/EscrowedPaymentListScreen'
 import ReclaimPaymentConfirmationScreen from 'src/escrow/ReclaimPaymentConfirmationScreen'
 import BidaliScreen from 'src/fiatExchanges/BidaliScreen'
@@ -542,6 +543,11 @@ const earnScreens = (Navigator: typeof Stack) => (
       component={EarnCollectScreen}
       options={headerWithBackButton}
     />
+    <Navigator.Screen
+      name={Screens.EarnEnterAmount}
+      component={EarnEnterAmount}
+      options={noHeader}
+    />
   </>
 )
 
diff --git a/src/navigator/Screens.tsx b/src/navigator/Screens.tsx
index 8905d8c77f..64f16043f3 100644
--- a/src/navigator/Screens.tsx
+++ b/src/navigator/Screens.tsx
@@ -16,6 +16,7 @@ export enum Screens {
   DappShortcutsRewards = 'DappShortcutsRewards',
   DappShortcutTransactionRequest = 'DappShortcutTransactionRequest',
   Debug = 'Debug',
+  EarnEnterAmount = 'EarnEnterAmount',
   EarnCollectScreen = 'EarnCollectScreen',
   EnableBiometry = 'EnableBiometry',
   ErrorScreen = 'ErrorScreen',
diff --git a/src/navigator/types.tsx b/src/navigator/types.tsx
index 21707f348f..7ebe19c54c 100644
--- a/src/navigator/types.tsx
+++ b/src/navigator/types.tsx
@@ -81,6 +81,9 @@ export type StackParamList = {
     rewardId: string
   }
   [Screens.Debug]: undefined
+  [Screens.EarnEnterAmount]: {
+    tokenId: string
+  }
   [Screens.EarnCollectScreen]: {
     depositTokenId: string
     poolTokenId: string
diff --git a/src/send/EnterAmount.tsx b/src/send/EnterAmount.tsx
index bf2c072dc8..dcf76c8630 100644
--- a/src/send/EnterAmount.tsx
+++ b/src/send/EnterAmount.tsx
@@ -466,7 +466,7 @@ function EnterAmount({
   )
 }
 
-function AmountInput({
+export function AmountInput({
   inputValue,
   onInputChange,
   inputRef,
diff --git a/src/statsig/constants.ts b/src/statsig/constants.ts
index 879926cc75..8ac70b3e49 100644
--- a/src/statsig/constants.ts
+++ b/src/statsig/constants.ts
@@ -142,6 +142,7 @@ export const DynamicConfigs = {
       providerLogoUrl: '',
       providerTermsAndConditionsUrl: '',
       depositGasPadding: 0,
+      moreAavePoolsUrl: '',
     },
   },
 } satisfies {
diff --git a/test/RootStateSchema.json b/test/RootStateSchema.json
index 9becd2658b..d6487610c7 100644
--- a/test/RootStateSchema.json
+++ b/test/RootStateSchema.json
@@ -3120,6 +3120,7 @@
                 "DappShortcutsRewards",
                 "Debug",
                 "EarnCollectScreen",
+                "EarnEnterAmount",
                 "EnableBiometry",
                 "ErrorScreen",
                 "EscrowedPaymentListScreen",

From d03677c000491e29423c0b62b144a09a459b7617 Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Tue, 21 May 2024 09:57:25 +1200
Subject: [PATCH 026/133] feat(earn): Add feature gate for covering gas fees
 (#5437)

### Description

feature gate:
https://console.statsig.com/4plizaPmWwPL21ASV4QAO0/gates/subsidize_stablecoin_earn_gas_fees

### Test plan

N/A

### Related issues

- Fixes #ACT-1190

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [X] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/statsig/constants.ts | 1 +
 src/statsig/types.ts     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/statsig/constants.ts b/src/statsig/constants.ts
index 8ac70b3e49..aef3a0d4fc 100644
--- a/src/statsig/constants.ts
+++ b/src/statsig/constants.ts
@@ -28,6 +28,7 @@ export const FeatureGates = {
   [StatsigFeatureGates.SHOW_JUMPSTART_SEND]: false,
   [StatsigFeatureGates.SHOW_POINTS]: false,
   [StatsigFeatureGates.SHOW_STABLECOIN_EARN]: false,
+  [StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES]: false,
 } satisfies { [key in StatsigFeatureGates]: boolean }
 
 export const ExperimentConfigs = {
diff --git a/src/statsig/types.ts b/src/statsig/types.ts
index 61a24a70f9..39f1da54e8 100644
--- a/src/statsig/types.ts
+++ b/src/statsig/types.ts
@@ -31,6 +31,7 @@ export enum StatsigFeatureGates {
   SHOW_JUMPSTART_SEND = 'show_jumpstart_send',
   SHOW_POINTS = 'show_points',
   SHOW_STABLECOIN_EARN = 'show_stablecoin_earn',
+  SUBSIDIZE_STABLECOIN_EARN_GAS_FEES = 'subsidize_stablecoin_earn_gas_fees',
 }
 
 export enum StatsigExperiments {

From 86c921d8318c37b547014946ab5bb3004ec91153 Mon Sep 17 00:00:00 2001
From: valora-bot-crowdin
 <80050969+valora-bot-crowdin@users.noreply.github.com>
Date: Mon, 20 May 2024 15:28:15 -0700
Subject: [PATCH 027/133] chore(l10n): update translations from Crowdin (#5435)

---
 locales/de/translation.json     | 55 ++++++++++++++++++++++++++-------
 locales/en-US/translation.json  | 53 +++++++++++++++++++++++++------
 locales/es-419/translation.json | 55 ++++++++++++++++++++++++++-------
 locales/fr-FR/translation.json  | 55 ++++++++++++++++++++++++++-------
 locales/it-IT/translation.json  | 55 ++++++++++++++++++++++++++-------
 locales/pl-PL/translation.json  | 55 ++++++++++++++++++++++++++-------
 locales/pt-BR/translation.json  | 55 ++++++++++++++++++++++++++-------
 locales/ru-RU/translation.json  | 55 ++++++++++++++++++++++++++-------
 locales/th-TH/translation.json  | 55 ++++++++++++++++++++++++++-------
 locales/tr-TR/translation.json  | 55 ++++++++++++++++++++++++++-------
 locales/uk-UA/translation.json  | 55 ++++++++++++++++++++++++++-------
 locales/vi-VN/translation.json  | 55 ++++++++++++++++++++++++++-------
 locales/zh-CN/translation.json  | 55 ++++++++++++++++++++++++++-------
 13 files changed, 571 insertions(+), 142 deletions(-)

diff --git a/locales/de/translation.json b/locales/de/translation.json
index aace9e3cc4..d9363baaaa 100644
--- a/locales/de/translation.json
+++ b/locales/de/translation.json
@@ -255,8 +255,8 @@
       "text": "Jeder mit deiner Phrase hat Zugriff auf dein Konto und alle Guthaben. Teile es nicht mit anderen."
     }
   ],
-  "consumerIncentivesTitle": "Beginne Supercharge",
-  "consumerIncentivesSummary": "Supercharge ist da! Erhalte {{percent}}% jährliche Rewards auf dein höchstes Stablecoin-Guthaben (cUSD, cEUR, oder cREAL). Nur für eine begrenzte Zeit verfügbar. Und so funktioniert's:",
+  "consumerIncentivesTitle": "Supercharge wird beendet",
+  "consumerIncentivesSummary": "Aber es warten noch mehr Belohnungen auf dich. Bis zum 28. Mai bekommst du {{percent}}% jährliche Rewards auf dein höchstes Stablecoin-Guthaben (cUSD, cEUR, oder cREAL). Und so funktioniert's:",
   "earnWeekly": {
     "header": "Verbinde deine Telefonnummer",
     "text": "Tippe auf Nummer verbinden, wenn du sie noch nicht verbunden hast."
@@ -271,14 +271,14 @@
     "text": "Dies wird sicherstellen, dass deine Rewards sicher und in deiner Kontrolle sind."
   },
   "conclusion": "Es ist ganz einfach. Lade dein Guthaben noch heute auf!",
-  "superchargeTitle": "Supercharge starten",
-  "superchargeDescription": "Erhalte {{apy}}% jährliche Rewards auf dein {{token}} -Guthaben. Hier ist, wie man beginnt:",
+  "superchargeTitle": "Supercharge wird beendet",
+  "superchargeDescription": "Aber es kommen noch mehr Prämien auf dich zu. Bis zum 28. Mai bekommst du {{apy}}% Jahresprämie auf dein höchstes {{token}} Guthaben. Und so funktioniert's:",
   "superchargeConnectNumber": "Verbinde deine Telefonnummer",
   "superchargeReconnectNumber": "Verbinde deine Telefonnummer erneut. \n<0>Wir haben das Supercharge-Erlebnis eingeführt und verbessert. Verbinde deine Telefonnummer erneut, um weiterhin Rewards auf deinem {{token}} zu verdienen.</0>",
   "superchargeMinimumBalance": "Füge einen Mindestsaldo von {{amount}} {{token}} hinzu",
-  "superchargeDisclaimer": "Maximiere die Rewards, indem du bis zu {{amount}} {{token}} hinzufügst",
-  "superchargeDisclaimerMaxRewards": "Du erhältst maximale Rewards für dein {{token}}",
-  "superchargeDisclaimerDayLimit": "Deine Rewards müssen innerhalb von 28 Tagen in Anspruch genommen werden. <0>Mehr Infos</0>",
+  "superchargeDisclaimer": "Dies hat keine Auswirkungen auf dein Guthaben oder deine bisherigen Einnahmen.",
+  "superchargeDisclaimerMaxRewards": "Dies hat keine Auswirkungen auf dein Guthaben oder deine bisherigen Einnahmen.",
+  "superchargeDisclaimerDayLimit": "Dies hat keine Auswirkungen auf dein Guthaben oder deine bisherigen Einnahmen. <0>Mehr erfahren</0>",
   "superchargeTokenDetailsDialog": {
     "title": "Welche Vermögen kann ich aufladen?",
     "body": "Du wirst wöchentlich für deinen Celo-Stablecoin mit dem höchsten Guthaben (cEUR, cUSD, cREAL) belohnt.",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "Aktualisierung der App erforderlich",
   "superchargingDescription": "Aktualisiere die Valora-App, um weiterhin deine wöchentlichen Supercharge-Rewards zu erhalten.",
-  "superchargingTitleV1_54": "Dein {{token}} wird aufgeladen",
-  "superchargingDescriptionV1_54": "Du erhältst jährlich {{apy}} %. Du erhältst jede Woche eine Benachrichtigung, wenn deine Rewards bereit sind – komm hierher zurück, um sie in Anspruch zu nehmen.",
+  "superchargingTitleV1_54": "Supercharge wird beendet",
+  "superchargingDescriptionV1_54": "Die wöchentlichen Belohnungen kannst du bis Dienstag, den 28. Mai, um 23:59 Uhr UTC einfordern. Ab dem 29. Mai kannst du keine Supercharge-Belohnungen mehr einfordern.",
   "superchargeRewardsAvailable": "Du hast {{amount}} {{token}} verfügbar zum Abholen!",
   "superchargeRewardsAvailableMultipleTokens": "Du hast {{amounts}} verfügbar zum Abholen!",
-  "superchargeClaimText": "Beanspruche deine Rewards, um sie deinem Guthaben hinzuzufügen.",
+  "superchargeClaimText": "Fordere deine Rewards bis Dienstag, 28. Mai, um 23:59 Uhr UTC an. Ab dem 29. Mai kannst du keine Supercharge-Belohnungen mehr einfordern.",
   "superchargeClaimButton": "Rewards beanspruchen",
   "superchargeFetchRewardsFailed": "Fehler beim Abrufen ausstehender Supercharge-Rewards. Bitte versuche es später erneut.",
   "superchargeClaimSuccess": "Deine Supercharge-Rewards wurden deinem Gesamtguthaben hinzugefügt.",
@@ -2367,6 +2367,24 @@
       "subtitle": "Heute einzahlen und Rendite verdienen",
       "description": "Erfahre, wie viel du verdienen kannst, wenn du einen Kreditpool bereitstellst"
     },
+    "enterAmount": {
+      "earnUpToLabel": "Du könntest bis zu:",
+      "rateLabel": "Rate (geschätzt)",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / yr",
+      "rate": "{{rate}}% APY",
+      "continue": "Weiter",
+      "info": "Dieser Pool wird von Aave betrieben",
+      "infoBottomSheet": {
+        "title": "Warum dieser Pool?",
+        "description": "Dieser Aave-Pool hat über 150 Mio. USD TVL und mehr als 6.000 Beitragszahler, was für eine hohe Liquidität und Vertrauenswürdigkeit spricht. Außerdem verwendet er USDC als Token und Abritrum als Netzwerk, was die Volatilität reduziert und sicherstellt, dass die Nutzer günstige Gasraten erhalten.\n\nAlles zusammen macht es zu einer sicheren und attraktiven Option mit wettbewerbsfähigen APY, die eine vorteilhafte Investitionsmöglichkeit für unsere Nutzer/innen darstellt.\n\nAndere Aave-Pools kannst du <0>hier</0> entdecken.",
+        "dismiss": "Verwerfen"
+      },
+      "notEnoughBalanceForGasWarning": {
+        "title": "Du brauchst mehr {{feeTokenSymbol}} um weiterzumachen",
+        "description": "Füge {{feeTokenSymbol}} auf {{network}} hinzu, um deine Gaskosten zu decken.",
+        "noGasCta": "Kaufen Sie {{feeTokenSymbol}} auf {{network}}"
+      }
+    },
     "activePools": {
       "title": "Aktive Pools",
       "totalValue": "Gesamtwert:",
@@ -2395,7 +2413,10 @@
       "fee": "Gasgebühr",
       "cta": "Verdienste sammeln",
       "errorTitle": "Etwas ist schief gelaufen",
-      "errorDescription": "Die Einzahlungsdetails können nicht abgerufen werden. Bitte versuche es erneut."
+      "errorDescription": "Die Einzahlungsdetails können nicht abgerufen werden. Bitte versuche es erneut.",
+      "noGasTitle": "Du brauchst mehr {{symbol}} um weiterzumachen",
+      "noGasDescription": "Füge {{symbol}} auf {{network}} hinzu, um deine Gaskosten zu decken.",
+      "noGasCta": "Kaufen Sie {{symbol}} auf {{network}}"
     },
     "transactionFeed": {
       "earnClaimTitle": "Gesammelt",
@@ -2404,6 +2425,18 @@
       "earnDepositSubtitle": "zu {{providerName}} Pool",
       "earnWithdrawTitle": "Zurückgezogen",
       "earnWithdrawSubtitle": "von {{providerName}} Pool"
+    },
+    "transactionDetails": {
+      "descriptionLabel": "Details",
+      "earnClaimTitle": "Gesammelt",
+      "earnClaimSubtitle": "Gesammelt {{tokenSymbol}} von {{providerName}} Pool",
+      "earnClaimDetails": "Eingesammelter Betrag",
+      "earnDepositTitle": "Hinterlegt",
+      "earnDepositSubtitle": "Hinterlegt {{tokenSymbol}} auf {{providerName}} Pool",
+      "earnDepositDetails": "Eingezahlter Betrag",
+      "earnWithdrawTitle": "Zurückgezogen",
+      "earnWithdrawSubtitle": "Ziehe {{tokenSymbol}} aus dem {{providerName}} Pool zurück",
+      "earnWithdrawDetails": "Betrag abgehoben"
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/en-US/translation.json b/locales/en-US/translation.json
index c96e46c598..0f79d87340 100644
--- a/locales/en-US/translation.json
+++ b/locales/en-US/translation.json
@@ -255,7 +255,7 @@
       "text": "Anyone with your Phrase will have access to your account and all of its funds. Don’t share it with others."
     }
   ],
-  "consumerIncentivesTitle": "Get started with Supercharge",
+  "consumerIncentivesTitle": "Supercharge is ending",
   "consumerIncentivesSummary": "But more rewards are headed your way. Until May 28, get {{percent}}% annual rewards on your highest stablecoin balance (cUSD, cEUR, or cREAL). Here's how it works:",
   "earnWeekly": {
     "header": "Connect your phone number",
@@ -271,14 +271,14 @@
     "text": "This will ensure your rewards are safe and in your control."
   },
   "conclusion": "It’s that simple. Supercharge your crypto today!",
-  "superchargeTitle": "Start Supercharging",
-  "superchargeDescription": "Get {{apy}}% annual rewards on your {{token}} balance. Here's how to start:",
+  "superchargeTitle": "Supercharge is ending",
+  "superchargeDescription": "But more rewards are headed your way. Until May 28, get {{apy}}% annual rewards on your highest {{token}} balance. Here's how it works:",
   "superchargeConnectNumber": "Connect your phone number",
   "superchargeReconnectNumber": "Reconnect your phone number\n<0>We have launched an improved Supercharge experience. Reconnect your phone number to keep earning rewards on your {{token}}.</0>",
   "superchargeMinimumBalance": "Add a minimum balance of {{amount}} {{token}}",
-  "superchargeDisclaimer": "Max-out rewards by adding up to {{amount}} {{token}}",
-  "superchargeDisclaimerMaxRewards": "You’re getting maximum rewards on your {{token}}",
-  "superchargeDisclaimerDayLimit": "Your rewards must be claimed within 28 days. <0>Learn more</0>",
+  "superchargeDisclaimer": "This will not affect your balance or previous earnings.",
+  "superchargeDisclaimerMaxRewards": "This will not affect your balance or previous earnings.",
+  "superchargeDisclaimerDayLimit": "This will not affect your balance or previous earnings. <0>Learn more</0>",
   "superchargeTokenDetailsDialog": {
     "title": "Which assets can I Supercharge?",
     "body": "You’ll get rewarded weekly on your Celo stablecoin with the highest value (cEUR, cUSD, cREAL).",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "App update required",
   "superchargingDescription": "Update the Valora app to continue receiving your weekly Supercharge rewards.",
-  "superchargingTitleV1_54": "Your {{token}} is being Supercharged",
-  "superchargingDescriptionV1_54": "You’re getting {{apy}}% annually. Every week you'll get a notification when your rewards are ready, come back here to claim them.",
+  "superchargingTitleV1_54": "Supercharge is ending",
+  "superchargingDescriptionV1_54": "Weekly rewards will be available to claim until Tuesday, May 28, at 23:59 UTC. Beginning May 29, you will nor longer be able to claim Supercharge rewards.",
   "superchargeRewardsAvailable": "You have {{amount}} {{token}} available to claim!",
   "superchargeRewardsAvailableMultipleTokens": "You have {{amounts}} available to claim!",
-  "superchargeClaimText": "Claim your rewards to add them to your balance.",
+  "superchargeClaimText": "Claim your rewards until Tuesday, May 28, at 23:59 UTC. Beginning May 29, you will no longer be able to claim Supercharge rewards.",
   "superchargeClaimButton": "Claim Rewards",
   "superchargeFetchRewardsFailed": "Error while fetching pending Supercharge rewards. Please try again later.",
   "superchargeClaimSuccess": "Your Supercharge rewards have been added to your Total Balance.",
@@ -2367,6 +2367,24 @@
       "subtitle": "Deposit today and earn returns",
       "description": "See how much you can earn when supplying a lending pool"
     },
+    "enterAmount": {
+      "earnUpToLabel": "You could earn up to:",
+      "rateLabel": "Rate (est.)",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / yr",
+      "rate": "{{rate}}% APY",
+      "continue": "Continue",
+      "info": "This pool is powered by Aave",
+      "infoBottomSheet": {
+        "title": "Why this pool?",
+        "description": "This Aave pool has over $150M TVL and more than 6,000 contributors, indicating strong liquidity and trustworthiness. It also uses USDC as its token and Abritrum as its network, which reduces volatility and ensures users will receive inexpensive gas rates.\n\nAll together this makes it a safe and attractive option with competitive APY, ensuring a beneficial investment opportunity for our users.\n\nYou can explore other Aave pools <0>here</0>.",
+        "dismiss": "Dismiss"
+      },
+      "notEnoughBalanceForGasWarning": {
+        "title": "You need more {{feeTokenSymbol}} to continue",
+        "description": "Add {{feeTokenSymbol}} on {{network}} to cover your gas fees",
+        "noGasCta": "Buy {{feeTokenSymbol}} on {{network}}"
+      }
+    },
     "activePools": {
       "title": "Active Pools",
       "totalValue": "Total Value:",
@@ -2395,7 +2413,10 @@
       "fee": "Gas Fee",
       "cta": "Collect Earnings",
       "errorTitle": "Something went wrong",
-      "errorDescription": "Unable to fetch deposit details. Please try again."
+      "errorDescription": "Unable to fetch deposit details. Please try again.",
+      "noGasTitle": "You need more {{symbol}} to continue",
+      "noGasDescription": "Add {{symbol}} on {{network}} to cover your gas fees",
+      "noGasCta": "Buy {{symbol}} on {{network}}"
     },
     "transactionFeed": {
       "earnClaimTitle": "Collected",
@@ -2404,6 +2425,18 @@
       "earnDepositSubtitle": "to {{providerName}} Pool",
       "earnWithdrawTitle": "Withdrew",
       "earnWithdrawSubtitle": "from {{providerName}} Pool"
+    },
+    "transactionDetails": {
+      "descriptionLabel": "Details",
+      "earnClaimTitle": "Collected",
+      "earnClaimSubtitle": "Collected {{tokenSymbol}} from {{providerName}} Pool",
+      "earnClaimDetails": "Amount Collected",
+      "earnDepositTitle": "Deposited",
+      "earnDepositSubtitle": "Deposited {{tokenSymbol}} to {{providerName}} Pool",
+      "earnDepositDetails": "Amount Deposited",
+      "earnWithdrawTitle": "Withdrew",
+      "earnWithdrawSubtitle": "Withdrew {{tokenSymbol}} from {{providerName}} Pool",
+      "earnWithdrawDetails": "Amount Withdrawn"
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/es-419/translation.json b/locales/es-419/translation.json
index cd4d50d730..1889805f35 100644
--- a/locales/es-419/translation.json
+++ b/locales/es-419/translation.json
@@ -255,8 +255,8 @@
       "text": "Cualquier persona que acceda a tu frase tendrá acceso a tu cuenta y a todos tus fondos. No la compartas con nadie."
     }
   ],
-  "consumerIncentivesTitle": "Gana recompensas con Supercharge",
-  "consumerIncentivesSummary": "¡Supercharge está aquí! Obtén un {{percent}}% de recompensas anuales sobre tu mayor saldo en stablecoin (cUSD, cEUR, o cREAL). Disponible por tiempo limitado. Así funciona:",
+  "consumerIncentivesTitle": "Se acaba la Supercarga",
+  "consumerIncentivesSummary": "Pero te esperan más recompensas. Hasta el 28 de mayo, obtén {{percent}}% de recompensas anuales en tu saldo más alto de stablecoin (cUSD, cEUR o cREAL). Así es como funciona:",
   "earnWeekly": {
     "header": "Conecta tu número de teléfono",
     "text": "Toca Conecta tu número si aún no lo haz hecho."
@@ -271,14 +271,14 @@
     "text": "Esto garantizará que tus fondos estén seguros y siempre tengas acceso a ellos."
   },
   "conclusion": "Es así de simple. ¡Recárgate de cripto hoy!",
-  "superchargeTitle": "¡Súmate a Supercharge!",
-  "superchargeDescription": "Obtén un {{apy}}% de recompensas anuales en tu balance de {{token}} . Aquí está cómo empezar:",
+  "superchargeTitle": "Se acaba la Supercarga",
+  "superchargeDescription": "Pero te esperan más recompensas. Hasta el 28 de mayo, obtén {{apy}}% de recompensa anual en tu saldo más alto de {{token}} . Así es como funciona:",
   "superchargeConnectNumber": "Conecta tu número de teléfono",
   "superchargeReconnectNumber": "Reconecta tu número de teléfono\n<0>Lanzamos un experiencia mejorada de Supercharge. Reconecta tu número de teléfono para seguir recibiendo recompensas sobre tus {{token}}.</0>",
   "superchargeMinimumBalance": "Agrega un saldo mínimo de {{amount}} {{token}}",
-  "superchargeDisclaimer": "Maximiza las recompensas sumando hasta {{amount}} {{token}}",
-  "superchargeDisclaimerMaxRewards": "Has alcanzado el saldo máximo en {{token}} sobre el cual puedes recibir recompensas",
-  "superchargeDisclaimerDayLimit": "Debes reclamar tus recompensas dentro de los 28 días de distribuidas. <0>Más información</0>",
+  "superchargeDisclaimer": "Esto no afectará a tu saldo ni a tus ganancias anteriores.",
+  "superchargeDisclaimerMaxRewards": "Esto no afectará a tu saldo ni a tus ganancias anteriores.",
+  "superchargeDisclaimerDayLimit": "Esto no afectará a tu saldo ni a tus ganancias anteriores. <0>Más información</0>",
   "superchargeTokenDetailsDialog": {
     "title": "¿Qué activos generan recompensas con Supercharge?",
     "body": "Recibirás recompensas semanales sobre tu stablecoin Celo con mayor saldo (cEUR, cUSD, cREAL).",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "Actualización de aplicación necesaria",
   "superchargingDescription": "Actualiza la app Valora para seguir recibiendo tus recompensas semanales Supercharge.",
-  "superchargingTitleV1_54": "Estás participando en Supercharge con tus {{token}}",
-  "superchargingDescriptionV1_54": "Estás recibiendo un {{apy}}% anual en recompensas. Recibirás una notificación cada semana cuando las recompensas estén listas, vuelve a esta pantalla para reclamarlas.",
+  "superchargingTitleV1_54": "Se acaba la Supercarga",
+  "superchargingDescriptionV1_54": "Podrás reclamar las recompensas semanales hasta el martes 28 de mayo a las 23:59 UTC. A partir del 29 de mayo, ya no podrás reclamar recompensas de Supercarga.",
   "superchargeRewardsAvailable": "¡Has acumulado {{amount}} {{token}} en recompensas!",
   "superchargeRewardsAvailableMultipleTokens": "¡Has acumulado {{amounts}} en recompensas!",
-  "superchargeClaimText": "Reclama tus recompensas y multiplica tu saldo.",
+  "superchargeClaimText": "Reclama tus recompensas hasta el martes 28 de mayo a las 23:59 UTC. A partir del 29 de mayo, ya no podrás reclamar recompensas de Supercarga.",
   "superchargeClaimButton": "Reclamar recompensas",
   "superchargeFetchRewardsFailed": "Hubo un error al recuperar tus recompensas de Supercharge pendientes. Vuelve a intentarlo más tarde.",
   "superchargeClaimSuccess": "Se agregaron tus recompensas de Supercharge a tu saldo total.",
@@ -2367,6 +2367,24 @@
       "subtitle": "Deposita hoy y obtén beneficios",
       "description": "Comprueba cuánto puedes ganar al abastecer un fondo común de préstamos"
     },
+    "enterAmount": {
+      "earnUpToLabel": "Podrías ganar hasta:",
+      "rateLabel": "Tasa (est.)",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / año",
+      "rate": "{{rate}}% APY",
+      "continue": "Continuar",
+      "info": "Esta piscina funciona con Aave",
+      "infoBottomSheet": {
+        "title": "¿Por qué esta piscina?",
+        "description": "Este pool de Aave tiene más de 150 millones de USDC y más de 6.000 contribuyentes, lo que indica una gran liquidez y fiabilidad. También utiliza USDC como token y Abritrum como red, lo que reduce la volatilidad y garantiza que los usuarios recibirán tarifas de gas baratas.\n\nTodo ello lo convierte en una opción segura y atractiva con un APY competitivo, que garantiza una oportunidad de inversión beneficiosa para nuestros usuarios.\n\nPuedes explorar otros fondos de Aave <0>aquí</0>.",
+        "dismiss": "Ignorar"
+      },
+      "notEnoughBalanceForGasWarning": {
+        "title": "Necesitas más {{feeTokenSymbol}} para continuar",
+        "description": "Añade {{feeTokenSymbol}} en {{network}} para cubrir tus gastos de gasolina",
+        "noGasCta": "Compra {{feeTokenSymbol}} en {{network}}"
+      }
+    },
     "activePools": {
       "title": "Piscinas activas",
       "totalValue": "Valor total:",
@@ -2395,7 +2413,10 @@
       "fee": "Tasa del gas",
       "cta": "Recaudar ingresos",
       "errorTitle": "Algo salió mal",
-      "errorDescription": "No se han podido obtener los datos del depósito. Vuelve a intentarlo."
+      "errorDescription": "No se han podido obtener los datos del depósito. Vuelve a intentarlo.",
+      "noGasTitle": "Necesitas más {{symbol}} para continuar",
+      "noGasDescription": "Añade {{symbol}} en {{network}} para cubrir tus gastos de gasolina",
+      "noGasCta": "Compra {{symbol}} en {{network}}"
     },
     "transactionFeed": {
       "earnClaimTitle": "Recopilado",
@@ -2404,6 +2425,18 @@
       "earnDepositSubtitle": "a {{providerName}} Piscina",
       "earnWithdrawTitle": "Retirada",
       "earnWithdrawSubtitle": "de {{providerName}} Pool"
+    },
+    "transactionDetails": {
+      "descriptionLabel": "Detalles",
+      "earnClaimTitle": "Recopilado",
+      "earnClaimSubtitle": "Recogida {{tokenSymbol}} de {{providerName}} Piscina",
+      "earnClaimDetails": "Importe recaudado",
+      "earnDepositTitle": "Depositado",
+      "earnDepositSubtitle": "Depositado {{tokenSymbol}} en {{providerName}} Pool",
+      "earnDepositDetails": "Monto depositado",
+      "earnWithdrawTitle": "Retirada",
+      "earnWithdrawSubtitle": "Retirado {{tokenSymbol}} de {{providerName}} Pool",
+      "earnWithdrawDetails": "Monto retirado"
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/fr-FR/translation.json b/locales/fr-FR/translation.json
index bd099caf36..bd14ee364f 100644
--- a/locales/fr-FR/translation.json
+++ b/locales/fr-FR/translation.json
@@ -255,8 +255,8 @@
       "text": "Quiconque possède votre phrase pourra accéder à votre compte et à tous les fonds qui s'y trouvent. Ne la partagez avec personne."
     }
   ],
-  "consumerIncentivesTitle": "Démarrez avec Supercharge",
-  "consumerIncentivesSummary": "Le programme Supercharge est désormais disponible ! Obtenez 12 % de récompenses annuelles sur votre stablecoin avec le solde le plus élevé (cUSD, cEUR, ou cREAL). Disponible pour une durée limitée :",
+  "consumerIncentivesTitle": "La supercharge se termine",
+  "consumerIncentivesSummary": "Mais d'autres récompenses t'attendent. Jusqu'au 28 mai, obtiens {{percent}}% de récompenses annuelles sur ton solde stablecoin le plus élevé (cUSD, cEUR ou cREAL). Voici comment cela fonctionne :",
   "earnWeekly": {
     "header": "Connectez votre numéro de téléphone",
     "text": "Appuyez sur Connecter le numéro si vous ne l'avez pas encore connecté."
@@ -271,14 +271,14 @@
     "text": "Cela vous assurera que vos récompenses sont sécurisées et sous votre contrôle."
   },
   "conclusion": "C'est aussi simple que ça. Superchargez votre compte crypto sans attendre !",
-  "superchargeTitle": "Commencez avec Supercharge !",
-  "superchargeDescription": "Obtenez {{apy}} % de récompenses annuelles sur votre solde en {{token}} . Voici comment commencer :",
+  "superchargeTitle": "La supercharge se termine",
+  "superchargeDescription": "Mais d'autres récompenses t'attendent. Jusqu'au 28 mai, obtiens {{apy}}% de récompenses annuelles sur ton solde {{token}} le plus élevé. Voici comment cela fonctionne :",
   "superchargeConnectNumber": "Connectez votre numéro de téléphone",
   "superchargeReconnectNumber": "Reconnectez votre numéro de téléphone\n<0>Nous vous proposons un programme Supercharge amélioré. Reconnectez votre numéro de téléphone pour continuer à gagner des récompenses en {{token}}.</0>",
   "superchargeMinimumBalance": "Ajoutez un minimum de {{amount}} {{token}}",
-  "superchargeDisclaimer": "Ajoutez jusqu'à {{maxBalance}} {{currency}} pour maximiser vos récompenses.",
-  "superchargeDisclaimerMaxRewards": "Vous obtenez désormais le maximum de récompenses sur vos {{token}}",
-  "superchargeDisclaimerDayLimit": "Vos récompenses doivent être réclamées dans un délai de 28 jours. <0>En savoir plus</0>",
+  "superchargeDisclaimer": "Cela n'affectera pas ton solde ou tes gains antérieurs.",
+  "superchargeDisclaimerMaxRewards": "Cela n'affectera pas ton solde ou tes gains antérieurs.",
+  "superchargeDisclaimerDayLimit": "Cela n'affectera pas ton solde ou tes gains antérieurs. <0>En savoir plus</0>",
   "superchargeTokenDetailsDialog": {
     "title": "Quels actifs puis-je Supercharger ?",
     "body": "Vous serez récompensé chaque semaine sur votre stablecoin Celo avec le solde la plus élevée (cEUR, cUSD, cREAL).",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "Mise à jour nécessaire",
   "superchargingDescription": "Mettez à jour l'appli pour continuer à recevoir vos récompenses Supercharge hebdomadaires.",
-  "superchargingTitleV1_54": "Vos {{token}} sont Superchargé",
-  "superchargingDescriptionV1_54": "Vous recevez {{apy}}% par an. Chaque semaine, vous recevrez une notification quand vos récompenses seront prêtes, revenez ici pour les demander.",
+  "superchargingTitleV1_54": "La supercharge se termine",
+  "superchargingDescriptionV1_54": "Les récompenses hebdomadaires pourront être réclamées jusqu'au mardi 28 mai à 23h59 UTC. À partir du 29 mai, tu ne pourras plus réclamer de récompenses Supercharge.",
   "superchargeRewardsAvailable": "Vous avez {{amount}} {{token}} à réclamer !",
   "superchargeRewardsAvailableMultipleTokens": "Vous avez {{amounts}} à réclamer !",
-  "superchargeClaimText": "Réclamez vos récompenses pour les ajouter à votre solde.",
+  "superchargeClaimText": "Réclame tes récompenses jusqu'au mardi 28 mai à 23h59 UTC. À partir du 29 mai, tu ne pourras plus réclamer de récompenses Supercharge.",
   "superchargeClaimButton": "Réclamer des récompenses",
   "superchargeFetchRewardsFailed": "Une erreur s'est produite lors de la récupération des récompenses. Veuillez réessayer plus tard.",
   "superchargeClaimSuccess": "Vos récompenses Supercharge ont été ajoutées à votre solde total.",
@@ -2367,6 +2367,24 @@
       "subtitle": "Dépose aujourd'hui et gagne en rendement",
       "description": "Vois combien tu peux gagner en alimentant un pool de prêt."
     },
+    "enterAmount": {
+      "earnUpToLabel": "Tu pourrais gagner jusqu'à :",
+      "rateLabel": "Taux (est.)",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / an",
+      "rate": "{{rate}}% APY",
+      "continue": "Continuer",
+      "info": "Cette piscine est alimentée par Aave",
+      "infoBottomSheet": {
+        "title": "Pourquoi cette piscine ?",
+        "description": "Ce pool Aave dispose de plus de 150 millions de dollars de TVL et de plus de 6 000 contributeurs, ce qui indique une forte liquidité et une grande fiabilité. Il utilise également USDC comme jeton et Abritrum comme réseau, ce qui réduit la volatilité et garantit que les utilisateurs recevront des taux de gaz peu coûteux.\n\nTout cela en fait une option sûre et attrayante avec un APY compétitif, garantissant une opportunité d'investissement bénéfique pour nos utilisateurs.\n\nTu peux explorer d'autres pools Aave <0>ici</0>.",
+        "dismiss": "Refuser"
+      },
+      "notEnoughBalanceForGasWarning": {
+        "title": "Tu as besoin de plus de {{feeTokenSymbol}} pour continuer",
+        "description": "Ajoute {{feeTokenSymbol}} sur {{network}} pour couvrir tes frais d'essence.",
+        "noGasCta": "Acheter {{feeTokenSymbol}} sur {{network}}"
+      }
+    },
     "activePools": {
       "title": "Piscines actives",
       "totalValue": "Valeur totale :",
@@ -2395,7 +2413,10 @@
       "fee": "Frais de gaz",
       "cta": "Collecter les gains",
       "errorTitle": "Une erreur s'est produite",
-      "errorDescription": "Impossible de récupérer les détails du dépôt. Essaie à nouveau."
+      "errorDescription": "Impossible de récupérer les détails du dépôt. Essaie à nouveau.",
+      "noGasTitle": "Tu as besoin de plus de {{symbol}} pour continuer",
+      "noGasDescription": "Ajoute {{symbol}} sur {{network}} pour couvrir tes frais d'essence.",
+      "noGasCta": "Acheter {{symbol}} sur {{network}}"
     },
     "transactionFeed": {
       "earnClaimTitle": "Recueilli",
@@ -2404,6 +2425,18 @@
       "earnDepositSubtitle": "à {{providerName}} Pool",
       "earnWithdrawTitle": "Retire-toi",
       "earnWithdrawSubtitle": "de {{providerName}} Pool"
+    },
+    "transactionDetails": {
+      "descriptionLabel": "Détails",
+      "earnClaimTitle": "Recueilli",
+      "earnClaimSubtitle": "Recueille {{tokenSymbol}} à partir de {{providerName}} Pool",
+      "earnClaimDetails": "Montant perçu",
+      "earnDepositTitle": "Déposé",
+      "earnDepositSubtitle": "Dépôt {{tokenSymbol}} à {{providerName}} Pool",
+      "earnDepositDetails": "Montant déposé",
+      "earnWithdrawTitle": "Retire-toi",
+      "earnWithdrawSubtitle": "Retire {{tokenSymbol}} de la cagnotte {{providerName}}",
+      "earnWithdrawDetails": "Montant du retrait"
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/it-IT/translation.json b/locales/it-IT/translation.json
index bd508b48d9..48a2ceccdf 100644
--- a/locales/it-IT/translation.json
+++ b/locales/it-IT/translation.json
@@ -255,8 +255,8 @@
       "text": "Chiunque conosca la tua Frase di recupero avrà accesso al tuo conto e a tutti i fondi che contiene. Non condividerla."
     }
   ],
-  "consumerIncentivesTitle": "Intoduzione ai bonus Supercharge",
-  "consumerIncentivesSummary": "I bonus sono arrivati! Ottieni ricompense annue del {{percent}}% sul tuo saldo in stablecoin (cUSD, cEUR, o cREAL) più alto. Disponibile per un periodo limitato. Ecco come funziona:",
+  "consumerIncentivesTitle": "Supercharge sta per finire",
+  "consumerIncentivesSummary": "Ma altri premi sono in arrivo per te. Fino al 28 maggio, ottieni {{percent}}% di premi annuali sul tuo saldo in stablecoin più alto (cUSD, cEUR o cREAL). Ecco come funziona:",
   "earnWeekly": {
     "header": "Collega il tuo numero telefonico",
     "text": "Tocca Collega numero se non lo hai ancora collegato."
@@ -271,14 +271,14 @@
     "text": "Questo assicurerà che le tue ricompense siano al sicuro e sotto il tuo controllo."
   },
   "conclusion": "Non potrebbe essere più semplice. Ottieni oggi stesso bonus dalla tua criptovaluta.",
-  "superchargeTitle": "Inizia Supercharge",
-  "superchargeDescription": "Ottieni ricompense annue del {{apy}}% sul tuo saldo {{token}}. Ecco come iniziare:",
+  "superchargeTitle": "Supercharge sta per finire",
+  "superchargeDescription": "Ma altri premi sono in arrivo per te. Fino al 28 maggio, ottieni {{apy}}% di premi annuali sul tuo saldo più alto {{token}} . Ecco come funziona:",
   "superchargeConnectNumber": "Collega il tuo numero telefonico",
   "superchargeReconnectNumber": "Ricollega il tuo numero telefonico\n<0>Abbiamo avviato un’esperienza Supercharge migliorata. Ricollega il tuo numero telefonico per continuare a ricevere ricompense in {{token}}.</0>",
   "superchargeMinimumBalance": "Aggiungi un saldo minimo di {{amount}} {{token}}",
-  "superchargeDisclaimer": "Aggiungi fino a {{amount}} {{token}} per massimizzare le tue ricompense.",
-  "superchargeDisclaimerMaxRewards": "Stai ottenendo il massimo dei ricompense sui tuoi {{token}}",
-  "superchargeDisclaimerDayLimit": "I tuoi ricompense devono essere richiesti entro 28 giorni. <0>Ulteriori informazioni</0>",
+  "superchargeDisclaimer": "Questo non influirà sul tuo saldo o sui tuoi guadagni precedenti.",
+  "superchargeDisclaimerMaxRewards": "Questo non influirà sul tuo saldo o sui tuoi guadagni precedenti.",
+  "superchargeDisclaimerDayLimit": "Questo non influirà sul tuo saldo o sui tuoi precedenti guadagni. <0>Per saperne di più</0>",
   "superchargeTokenDetailsDialog": {
     "title": "A quali asset posso applicare i Supercharge?",
     "body": "Sarai ricompensato settimanalmente sulla tua stablecoin Celo con il saldo più alto (cEUR, cUSD, cREAL).",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "È necessario aggiornare l’app",
   "superchargingDescription": "Aggiorna l’app Valora per continuare a ricevere le ricompense Supercharge settimanali.",
-  "superchargingTitleV1_54": "Stai ricevendo ricompense sui tuoi {{token}}",
-  "superchargingDescriptionV1_54": "Stai ricevendo ricompense pari al {{apy}}% annuo. Ogni settimana riceverai una notifica quando le tue ricompense saranno pronte, torna qui per richiederle.",
+  "superchargingTitleV1_54": "Supercharge sta per finire",
+  "superchargingDescriptionV1_54": "Le ricompense settimanali potranno essere richieste fino a martedì 28 maggio alle 23:59 UTC. A partire dal 29 maggio, non sarà più possibile richiedere le ricompense Supercharge.",
   "superchargeRewardsAvailable": "Hai {{amount}} {{token}} disponibili per reclamare!",
   "superchargeRewardsAvailableMultipleTokens": "Hai {{amounts}} disponibili per reclamare!",
-  "superchargeClaimText": "Richiedi le tue ricompense per aggiungerle al tuo saldo.",
+  "superchargeClaimText": "Richiedi i tuoi premi fino a martedì 28 maggio alle 23:59 UTC. A partire dal 29 maggio, non potrai più richiedere i premi Supercharge.",
   "superchargeClaimButton": "Richiedi ricompense",
   "superchargeFetchRewardsFailed": "Si è verificato un errore durante il recupero delle ricompense Supercharge. Riprova più tardi.",
   "superchargeClaimSuccess": "Le tue ricompense Supercharge sono state aggiunte al tuo saldo totale.",
@@ -2367,6 +2367,24 @@
       "subtitle": "Deposita oggi stesso e guadagna",
       "description": "Scopri quanto puoi guadagnare fornendo un pool di prestiti"
     },
+    "enterAmount": {
+      "earnUpToLabel": "Potresti guadagnare fino a:",
+      "rateLabel": "Tasso (est.)",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / anno",
+      "rate": "{{rate}}% APY",
+      "continue": "Continua",
+      "info": "Questa piscina è alimentata da Aave",
+      "infoBottomSheet": {
+        "title": "Perché questa piscina?",
+        "description": "Questo pool di Aave ha oltre 150 milioni di dollari di TVL e più di 6.000 contributori, il che indica una forte liquidità e affidabilità. Inoltre, utilizza USDC come token e Abritrum come rete, il che riduce la volatilità e garantisce agli utenti tariffe economiche.\n\nTutto ciò la rende un'opzione sicura e attraente con un APY competitivo, garantendo un'opportunità di investimento vantaggiosa per i nostri utenti.\n\nPuoi esplorare gli altri pool di Aave <0>qui</0>.",
+        "dismiss": "Ignorare"
+      },
+      "notEnoughBalanceForGasWarning": {
+        "title": "Hai bisogno di più {{feeTokenSymbol}} per continuare",
+        "description": "Aggiungi {{feeTokenSymbol}} su {{network}} per coprire le spese del gas.",
+        "noGasCta": "Acquista {{feeTokenSymbol}} su {{network}}"
+      }
+    },
     "activePools": {
       "title": "Piscine attive",
       "totalValue": "Valore totale:",
@@ -2395,7 +2413,10 @@
       "fee": "Tassa sul gas",
       "cta": "Raccogli i guadagni",
       "errorTitle": "Si è verificato un errore",
-      "errorDescription": "Impossibile recuperare i dettagli del deposito. Riprova."
+      "errorDescription": "Impossibile recuperare i dettagli del deposito. Riprova.",
+      "noGasTitle": "Hai bisogno di più {{symbol}} per continuare",
+      "noGasDescription": "Aggiungi {{symbol}} su {{network}} per coprire le spese del gas.",
+      "noGasCta": "Acquista {{symbol}} su {{network}}"
     },
     "transactionFeed": {
       "earnClaimTitle": "Raccolta",
@@ -2404,6 +2425,18 @@
       "earnDepositSubtitle": "a {{providerName}} Pool",
       "earnWithdrawTitle": "Ritirata",
       "earnWithdrawSubtitle": "da {{providerName}} Pool"
+    },
+    "transactionDetails": {
+      "descriptionLabel": "Dettagli",
+      "earnClaimTitle": "Raccolta",
+      "earnClaimSubtitle": "Raccolta {{tokenSymbol}} da {{providerName}} Pool",
+      "earnClaimDetails": "Importo riscosso",
+      "earnDepositTitle": "Depositato",
+      "earnDepositSubtitle": "Depositato {{tokenSymbol}} al pool {{providerName}}",
+      "earnDepositDetails": "Somma depositata",
+      "earnWithdrawTitle": "Ritirata",
+      "earnWithdrawSubtitle": "Ha ritirato {{tokenSymbol}} dal pool {{providerName}}",
+      "earnWithdrawDetails": "Importo prelevato"
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/pl-PL/translation.json b/locales/pl-PL/translation.json
index 2f031e3566..4abe302abd 100644
--- a/locales/pl-PL/translation.json
+++ b/locales/pl-PL/translation.json
@@ -255,8 +255,8 @@
       "text": "Każdy, kto pozna Twoją frazę, będzie mieć dostęp do Twojego konta i wszystkich jego środków. Nie udostępniaj jej nikomu."
     }
   ],
-  "consumerIncentivesTitle": "Zacznij korzystać z programu Supercharge",
-  "consumerIncentivesSummary": "Program Supercharge jest już dostępny! Otrzymuj {{percent}}% rocznych nagród od najwyższego salda stablecoinów (cUSD, cEUR lub cREAL). Oferta ograniczona czasowo. Oto jak działa:",
+  "consumerIncentivesTitle": "Supercharge dobiega końca",
+  "consumerIncentivesSummary": "Ale jeszcze więcej nagród czeka na Ciebie. Do 28 maja otrzymuj {{percent}}% rocznych nagród od najwyższego salda stablecoinów (cUSD, cEUR lub cREAL). Oto jak to działa:",
   "earnWeekly": {
     "header": "Podłącz swój numer telefonu",
     "text": "Jeśli nie masz jeszcze podłączonego numeru telefonu, naciśnij polecenie Podłącz numer."
@@ -271,14 +271,14 @@
     "text": "Dzięki temu Twoje nagrody będą bezpieczne i zawsze pod Twoją kontrolą."
   },
   "conclusion": "To takie proste. Doładuj swoją kryptowalutę już dziś!",
-  "superchargeTitle": "Skorzystaj z programu Supercharge",
-  "superchargeDescription": "Otrzymuj {{apy}}% rocznych nagród za saldo tokenów {{token}}. Oto jak zacząć:",
+  "superchargeTitle": "Supercharge dobiega końca",
+  "superchargeDescription": "Ale jeszcze więcej nagród czeka na Ciebie. Do 28 maja zdobądź {{apy}}% rocznych nagród za najwyższe saldo {{token}} . Oto jak to działa:",
   "superchargeConnectNumber": "Podłącz swój numer telefonu",
   "superchargeReconnectNumber": "Podłącz ponownie swój numer telefonu\n<0>Uruchomiliśmy ulepszoną obsługę programu Supercharge. Podłącz ponownie swój numer telefonu, aby zdobywać nagrody na {{token}}.</0>",
   "superchargeMinimumBalance": "Dodaj minimalne saldo {{amount}} {{token}}",
-  "superchargeDisclaimer": "Maksymalizuj nagrody, zwiększając saldo do {{amount}} {{token}}",
-  "superchargeDisclaimerMaxRewards": "Otrzymujesz maksymalne nagrody za swoje saldo tokenów {{token}}",
-  "superchargeDisclaimerDayLimit": "Nagrody muszą zostać odebrane w ciągu 28 dni. <0>Dowiedz się więcej</0>",
+  "superchargeDisclaimer": "Nie wpłynie to na Twoje saldo ani poprzednie zarobki.",
+  "superchargeDisclaimerMaxRewards": "Nie wpłynie to na Twoje saldo ani poprzednie zarobki.",
+  "superchargeDisclaimerDayLimit": "Nie wpłynie to na Twoje saldo ani poprzednie zarobki. <0>Dowiedz się więcej</0>",
   "superchargeTokenDetailsDialog": {
     "title": "Które aktywa są objęte programem Supercharge?",
     "body": "Otrzymasz cotygodniową nagrodę za swój stablecoin Celo o najwyższej wartości (cEUR, cUSD lub cREAL).",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "Wymagana aktualizacja aplikacji",
   "superchargingDescription": "Zaktualizuj aplikację Valora, aby kontynuować otrzymywanie cotygodniowych nagród w programie Supercharge.",
-  "superchargingTitleV1_54": "Twoje tokeny {{token}} biorą udział w programie Supercharge",
-  "superchargingDescriptionV1_54": "Otrzymujesz {{apy}}% rocznie. Co tydzień otrzymasz powiadomienie, gdy nagrody będą gotowe. Wróć tutaj, aby je odebrać.",
+  "superchargingTitleV1_54": "Supercharge dobiega końca",
+  "superchargingDescriptionV1_54": "Nagrody tygodniowe będzie można odbierać do wtorku, 28 maja, do godziny 23:59 UTC. Od 29 maja nie będziesz już mógł odbierać nagród Supercharge.",
   "superchargeRewardsAvailable": "Masz {{amount}} {{token}} dostępne do odbioru!",
   "superchargeRewardsAvailableMultipleTokens": "Masz {{amounts}} dostępne do odbioru!",
-  "superchargeClaimText": "Odbierz nagrody, aby dodać je do swojego salda.",
+  "superchargeClaimText": "Odbierz swoje nagrody do wtorku, 28 maja, do godziny 23:59 UTC. Od 29 maja nie będziesz już mógł odbierać nagród Supercharge.",
   "superchargeClaimButton": "Odbierz nagrody",
   "superchargeFetchRewardsFailed": "Wystąpił błąd podczas pobierania oczekujących nagród w ramach programu Supercharge. Spróbuj ponownie później.",
   "superchargeClaimSuccess": "Twoje nagrody Supercharge zostały dodane do Twojego salda całkowitego.",
@@ -2371,6 +2371,24 @@
       "subtitle": "Dokonaj wpłaty już dziś i zarabiaj",
       "description": "Zobacz ile możesz zarobić zasilając pulę pożyczkową"
     },
+    "enterAmount": {
+      "earnUpToLabel": "Możesz zarobić do:",
+      "rateLabel": "Stawka (szacunkowa)",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / rok",
+      "rate": "{{rate}}% RRSO",
+      "continue": "Kontynuuj",
+      "info": "Ta pula jest zasilana przez Aave",
+      "infoBottomSheet": {
+        "title": "Dlaczego ten basen?",
+        "description": "Ta pula Aave ma ponad 150 mln USD TVL i ponad 6000 współpracowników, co wskazuje na dużą płynność i wiarygodność. Wykorzystuje również USDC jako token i Abritrum jako sieć, co zmniejsza zmienność i zapewnia użytkownikom niedrogie stawki za gaz.\n\nWszystko to razem sprawia, że jest to bezpieczna i atrakcyjna opcja z konkurencyjnym APY, zapewniająca korzystne możliwości inwestycyjne dla naszych użytkowników.\n\nMożesz zapoznać się z innymi pulami Aave <0>tutaj</0>.",
+        "dismiss": "Odrzuć"
+      },
+      "notEnoughBalanceForGasWarning": {
+        "title": "Potrzebujesz więcej {{feeTokenSymbol}} , aby kontynuować",
+        "description": "Dodaj {{feeTokenSymbol}} na {{network}} , aby pokryć opłaty za gaz",
+        "noGasCta": "Kup {{feeTokenSymbol}} na {{network}}"
+      }
+    },
     "activePools": {
       "title": "Aktywne baseny",
       "totalValue": "Całkowita wartość:",
@@ -2399,7 +2417,10 @@
       "fee": "Opłata za gaz",
       "cta": "Zbieraj zarobki",
       "errorTitle": "Coś poszło nie tak",
-      "errorDescription": "Nie można pobrać szczegółów wpłaty. Spróbuj ponownie."
+      "errorDescription": "Nie można pobrać szczegółów wpłaty. Spróbuj ponownie.",
+      "noGasTitle": "Potrzebujesz więcej {{symbol}} , aby kontynuować",
+      "noGasDescription": "Dodaj {{symbol}} na {{network}} , aby pokryć opłaty za gaz",
+      "noGasCta": "Kup {{symbol}} na {{network}}"
     },
     "transactionFeed": {
       "earnClaimTitle": "Zebrane",
@@ -2408,6 +2429,18 @@
       "earnDepositSubtitle": "na {{providerName}} Pool",
       "earnWithdrawTitle": "Wycofany",
       "earnWithdrawSubtitle": "z {{providerName}} Pool"
+    },
+    "transactionDetails": {
+      "descriptionLabel": "Szczegóły",
+      "earnClaimTitle": "Zebrane",
+      "earnClaimSubtitle": "Zebrano {{tokenSymbol}} z {{providerName}} Pool",
+      "earnClaimDetails": "Zebrana kwota",
+      "earnDepositTitle": "Wpłacono",
+      "earnDepositSubtitle": "Wpłacono {{tokenSymbol}} do puli {{providerName}}",
+      "earnDepositDetails": "Kwota wpłacona",
+      "earnWithdrawTitle": "Wycofany",
+      "earnWithdrawSubtitle": "Wycofano {{tokenSymbol}} z puli {{providerName}}",
+      "earnWithdrawDetails": "Wypłacona kwota"
     }
   },
   "celoDollarAmount_0": "<0></0> Celo Dolar",
diff --git a/locales/pt-BR/translation.json b/locales/pt-BR/translation.json
index 4374ca455a..ecc1a74052 100644
--- a/locales/pt-BR/translation.json
+++ b/locales/pt-BR/translation.json
@@ -255,8 +255,8 @@
       "text": "Qualquer pessoa com sua frase terá acesso à sua conta e a todos os seus fundos. Não compartilhe com outras pessoas."
     }
   ],
-  "consumerIncentivesTitle": "Comece com o Supercharge",
-  "consumerIncentivesSummary": "O Supercharge chegou! Obtenha {{percent}}% de recompensas anuais sobre seu saldo mais alto de stablecoins (cUSD, cEUR ou cREAL). Disponível por um tempo limitado. Veja com funciona:",
+  "consumerIncentivesTitle": "O Supercharge está acabando",
+  "consumerIncentivesSummary": "Mas mais recompensas estão chegando até você. Até 28 de maio, você receberá {{percent}}% de recompensas anuais sobre seu saldo mais alto em stablecoin (cUSD, cEUR ou cREAL). Veja como isso funciona:",
   "earnWeekly": {
     "header": "Conecte seu número de celular",
     "text": "Toque em Conectar o número caso ainda não o tenha conectado."
@@ -271,14 +271,14 @@
     "text": "Isto irá garantir que suas recompensas estejam seguras em seu controle."
   },
   "conclusion": "É muito simples. Aumente seu cripto hoje mesmo!",
-  "superchargeTitle": "Entre no Supercharge",
-  "superchargeDescription": "Receba {{apy}}% de recompensas anuais no seu saldo de {{token}} . Veja como começar:",
+  "superchargeTitle": "O Supercharge está acabando",
+  "superchargeDescription": "Mas mais recompensas estão indo em sua direção. Até 28 de maio, você receberá {{apy}}% de prêmios anuais sobre seu saldo mais alto no site {{token}} . Veja como funciona:",
   "superchargeConnectNumber": "Conecte seu número de celular",
   "superchargeReconnectNumber": "Reconecte seu número de celular\n<0>Lançamos uma experiência aprimorada do Supercharge. Reconecte o seu número de celular para continuar ganhando recompensas com {{token}}.</0>",
   "superchargeMinimumBalance": "Adicione um saldo mínimo de {{amount}} {{token}}",
-  "superchargeDisclaimer": "Obtenha o máximo de recompensas com até {{amount}} {{token}}",
-  "superchargeDisclaimerMaxRewards": "Você está recebendo o máximo de recompensas no seus {{token}}",
-  "superchargeDisclaimerDayLimit": "As suas recompensas devem ser reclamadas dentro de 28 dias. <0>Saiba mais</0>",
+  "superchargeDisclaimer": "Isso não afetará seu saldo ou ganhos anteriores.",
+  "superchargeDisclaimerMaxRewards": "Isso não afetará seu saldo ou ganhos anteriores.",
+  "superchargeDisclaimerDayLimit": "Isso não afetará seu saldo ou ganhos anteriores. <0>Saiba mais</0>",
   "superchargeTokenDetailsDialog": {
     "title": "Quais ativos recebem recompensas de Supercharge?",
     "body": "Você receberá recompensas semanalmente na sua stablecoin de Celo com o maior saldo (cEUR, cUSD, cREAL).",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "Atualização do app necessária",
   "superchargingDescription": "Atualize o app da Valora para continuar recebendo recompensas do Supercharge semanalmente.",
-  "superchargingTitleV1_54": "Você está recebendo recompensas de Supercharge no seus {{token}}",
-  "superchargingDescriptionV1_54": "Você recebe {{apy}}% anualmente. Toda semana você receberá uma notificação avisando quando as suas recompensas estiverem pronta. Basta voltar aqui para resgatá-las.",
+  "superchargingTitleV1_54": "O Supercharge está acabando",
+  "superchargingDescriptionV1_54": "Você poderá resgatar as recompensas semanais até terça-feira, 28 de maio, às 23h59 UTC. A partir de 29 de maio, você não poderá mais resgatar as recompensas do Supercharge.",
   "superchargeRewardsAvailable": "Você tem {{amount}} {{token}} disponíveis para resgatar!",
   "superchargeRewardsAvailableMultipleTokens": "Você tem {{amounts}} disponíveis para resgatar!",
-  "superchargeClaimText": "Resgate suas recompensas para adicioná-las ao seu saldo.",
+  "superchargeClaimText": "Você pode solicitar suas recompensas até terça-feira, 28 de maio, às 23h59 UTC. A partir de 29 de maio, você não poderá mais reivindicar as recompensas do Supercharge.",
   "superchargeClaimButton": "Resgatar recompensas",
   "superchargeFetchRewardsFailed": "Ocorreu um erro ao resgatar recompensas de Supercharge pendentes. Tente novamente mais tarde.",
   "superchargeClaimSuccess": "Suas recompensas de Supercharge foram adicionadas ao seu saldo total.",
@@ -2367,6 +2367,24 @@
       "subtitle": "Deposite hoje e ganhe retornos",
       "description": "Veja quanto você pode ganhar ao fornecer um pool de empréstimos"
     },
+    "enterAmount": {
+      "earnUpToLabel": "Você pode ganhar até:",
+      "rateLabel": "Taxa (est.)",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / ano",
+      "rate": "{{rate}}% APY",
+      "continue": "Continuar",
+      "info": "Esta piscina é alimentada por Aave",
+      "infoBottomSheet": {
+        "title": "Por que essa piscina?",
+        "description": "Esse pool da Aave tem mais de US$ 150 milhões em TVL e mais de 6.000 contribuintes, o que indica forte liquidez e confiabilidade. Ele também usa USDC como seu token e Abritrum como sua rede, o que reduz a volatilidade e garante que os usuários recebam taxas de gás baratas.\n\nTudo isso faz dela uma opção segura e atraente com APY competitivo, garantindo uma oportunidade de investimento benéfica para nossos usuários.\n\nVocê pode explorar outros pools da Aave <0>aqui</0>.",
+        "dismiss": "Ignorar"
+      },
+      "notEnoughBalanceForGasWarning": {
+        "title": "Você precisa de mais {{feeTokenSymbol}} para continuar",
+        "description": "Adicione {{feeTokenSymbol}} em {{network}} para cobrir suas taxas de gás",
+        "noGasCta": "Compre {{feeTokenSymbol}} em {{network}}"
+      }
+    },
     "activePools": {
       "title": "Piscinas ativas",
       "totalValue": "Valor Total:",
@@ -2395,7 +2413,10 @@
       "fee": "Taxa de gás",
       "cta": "Coleta de ganhos",
       "errorTitle": "Algo deu errado",
-      "errorDescription": "Não foi possível obter os detalhes do depósito. Por favor, tente novamente."
+      "errorDescription": "Não foi possível obter os detalhes do depósito. Por favor, tente novamente.",
+      "noGasTitle": "Você precisa de mais {{symbol}} para continuar",
+      "noGasDescription": "Adicione {{symbol}} em {{network}} para cobrir suas taxas de gás",
+      "noGasCta": "Compre {{symbol}} em {{network}}"
     },
     "transactionFeed": {
       "earnClaimTitle": "Coletânea",
@@ -2404,6 +2425,18 @@
       "earnDepositSubtitle": "para {{providerName}} Pool",
       "earnWithdrawTitle": "Retirada",
       "earnWithdrawSubtitle": "do site {{providerName}} Pool"
+    },
+    "transactionDetails": {
+      "descriptionLabel": "Detalhes",
+      "earnClaimTitle": "Coletânea",
+      "earnClaimSubtitle": "Coletado {{tokenSymbol}} de {{providerName}} Pool",
+      "earnClaimDetails": "Valor coletado",
+      "earnDepositTitle": "Depositado",
+      "earnDepositSubtitle": "Depositado {{tokenSymbol}} para {{providerName}} Pool",
+      "earnDepositDetails": "Quantia depositada",
+      "earnWithdrawTitle": "Retirada",
+      "earnWithdrawSubtitle": "Você retirou o site {{tokenSymbol}} do pool {{providerName}}",
+      "earnWithdrawDetails": "Quantia retirada"
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/ru-RU/translation.json b/locales/ru-RU/translation.json
index 9496813fbd..763f277cf0 100644
--- a/locales/ru-RU/translation.json
+++ b/locales/ru-RU/translation.json
@@ -255,8 +255,8 @@
       "text": "Любое лицо с помощью вашей фразы получит доступ к вашему аккаунту и всем его средствам. Не сообщайте ее другим людям."
     }
   ],
-  "consumerIncentivesTitle": "Программа Supercharge",
-  "consumerIncentivesSummary": "Воспользуйтесь программой Supercharge! Получите в качестве вознаграждения {{percent}}% годовых на ваш максимальный остаток в стейблкоинах (cUSD, cEUR или cREAL). Предложение действует в течение ограниченного времени. Вот как это работает.",
+  "consumerIncentivesTitle": "Суперзарядка заканчивается",
+  "consumerIncentivesSummary": "Но еще больше вознаграждений направляется в твою сторону. До 28 мая получай {{percent}}% годовых на свой самый высокий баланс в стабильных монетах (cUSD, cEUR или cREAL). Вот как это работает:",
   "earnWeekly": {
     "header": "Подключить номер телефона",
     "text": "Нажмите \"Подключить номер\", если подключение еще не выполнено."
@@ -271,14 +271,14 @@
     "text": "Это будет гарантировать, что ваши вознаграждения в безопасности и под вашим контролем."
   },
   "conclusion": "Все просто. Повысьте свои доходы от криптовалюты за счет программы Supercharge!",
-  "superchargeTitle": "Присоединяйтесь к программе Supercharge",
-  "superchargeDescription": "Получите вознаграждение {{apy}}% годовых на свой баланс {{token}}. Вот как начать:",
+  "superchargeTitle": "Суперзарядка заканчивается",
+  "superchargeDescription": "Но тебя ждут еще большие вознаграждения. До 28 мая получи {{apy}}% годовых на свой самый высокий баланс {{token}} . Вот как это работает:",
   "superchargeConnectNumber": "Подключите свой номер телефона",
   "superchargeReconnectNumber": "Переподключите свой номер телефона\n<0>Мы улучшили работу Supercharge. Переподключите свой номер телефона для получения вознаграждения по вашему {{token}}.</0>",
   "superchargeMinimumBalance": "Внесите минимальную сумму {{amount}} {{token}}",
-  "superchargeDisclaimer": "Получите максимальное вознаграждение, внеся до {{amount}} {{token}}",
-  "superchargeDisclaimerMaxRewards": "Вы получаете максимальное вознаграждение за {{token}}",
-  "superchargeDisclaimerDayLimit": "Вознаграждения необходимо получить в течение 28 дней. <0>Подробнее</0>",
+  "superchargeDisclaimer": "Это не повлияет на твой баланс или предыдущий заработок.",
+  "superchargeDisclaimerMaxRewards": "Это не повлияет на твой баланс или предыдущий заработок.",
+  "superchargeDisclaimerDayLimit": "Это не повлияет на твой баланс или предыдущие доходы. <0>Узнать больше</0>",
   "superchargeTokenDetailsDialog": {
     "title": "На какие активы распространяется программа Supercharge?",
     "body": "Вы будете еженедельно получать вознаграждение за стейблкойн Celo с наибольшей стоимостью (cEUR, cUSD, cREAL).",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "Требуется обновление приложения",
   "superchargingDescription": "Обновите приложение Valora, чтобы по-прежнему получать вознаграждения по программе Supercharge.",
-  "superchargingTitleV1_54": "Для вашего {{token}} действует программа Supercharge",
-  "superchargingDescriptionV1_54": "Вы получаете {{apy}}% годовых. По готовности вознаграждений вы будете еженедельно получать уведомление. Вернитесь сюда, чтобы потребовать их.",
+  "superchargingTitleV1_54": "Суперзарядка заканчивается",
+  "superchargingDescriptionV1_54": "Еженедельные награды будут доступны для получения до вторника, 28 мая, в 23:59 по Гринвичу. Начиная с 29 мая ты больше не сможешь требовать вознаграждения за Supercharge.",
   "superchargeRewardsAvailable": "Вы можете заявить {{amount}} {{token}}!",
   "superchargeRewardsAvailableMultipleTokens": "У вас есть {{amounts}} для подачи заявки!",
-  "superchargeClaimText": "Заявите о своих вознаграждениях, чтобы добавить их на свой баланс.",
+  "superchargeClaimText": "Получи свои награды до вторника, 28 мая, в 23:59 по Гринвичу. Начиная с 29 мая ты больше не сможешь претендовать на награды Supercharge.",
   "superchargeClaimButton": "Заявить о вознаграждениях",
   "superchargeFetchRewardsFailed": "Ошибка при получении ожидаемых вознаграждений Supercharge. Повторите попытку позже.",
   "superchargeClaimSuccess": "Ваши вознаграждения Supercharge были добавлены на ваш общий баланс.",
@@ -2371,6 +2371,24 @@
       "subtitle": "Сделай депозит сегодня и получи доход",
       "description": "Узнай, сколько ты сможешь заработать, предоставляя кредитный пул."
     },
+    "enterAmount": {
+      "earnUpToLabel": "Ты можешь заработать до:",
+      "rateLabel": "Ставка (эст.)",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / год",
+      "rate": "{{rate}}% APY",
+      "continue": "Продолжить",
+      "info": "Этот бассейн работает под управлением Aave",
+      "infoBottomSheet": {
+        "title": "Почему именно этот бассейн?",
+        "description": "Этот пул Aave имеет более $150M TVL и более 6 000 вкладчиков, что говорит о высокой ликвидности и надежности. Кроме того, он использует USDC в качестве своего токена и Abritrum в качестве сети, что снижает волатильность и гарантирует пользователям недорогие тарифы на газ.\n\nВсе вместе это делает его безопасным и привлекательным вариантом с конкурентоспособной APY, обеспечивая выгодную инвестиционную возможность для наших пользователей.\n\nИзучить другие пулы Aave ты можешь <0>здесь</0>.",
+        "dismiss": "Отклонить"
+      },
+      "notEnoughBalanceForGasWarning": {
+        "title": "Тебе нужно больше {{feeTokenSymbol}} , чтобы продолжить",
+        "description": "Добавь {{feeTokenSymbol}} на {{network}} , чтобы покрыть расходы на бензин.",
+        "noGasCta": "Купить {{feeTokenSymbol}} на {{network}}"
+      }
+    },
     "activePools": {
       "title": "Активные бассейны",
       "totalValue": "Общая стоимость:",
@@ -2399,7 +2417,10 @@
       "fee": "Плата за газ",
       "cta": "Собирайте заработок",
       "errorTitle": "Что-то пошло не так",
-      "errorDescription": "Невозможно получить данные о депозите. Пожалуйста, попробуй еще раз."
+      "errorDescription": "Невозможно получить данные о депозите. Пожалуйста, попробуй еще раз.",
+      "noGasTitle": "Тебе нужно больше {{symbol}} , чтобы продолжить",
+      "noGasDescription": "Добавь {{symbol}} на {{network}} , чтобы покрыть расходы на бензин.",
+      "noGasCta": "Купить {{symbol}} на {{network}}"
     },
     "transactionFeed": {
       "earnClaimTitle": "Собрано",
@@ -2408,6 +2429,18 @@
       "earnDepositSubtitle": "на {{providerName}} Pool",
       "earnWithdrawTitle": "Отказаться от",
       "earnWithdrawSubtitle": "с сайта {{providerName}} Pool"
+    },
+    "transactionDetails": {
+      "descriptionLabel": "Подробности",
+      "earnClaimTitle": "Собрано",
+      "earnClaimSubtitle": "Собрал {{tokenSymbol}} в бассейне {{providerName}}",
+      "earnClaimDetails": "Собранная сумма",
+      "earnDepositTitle": "Депозит",
+      "earnDepositSubtitle": "Депозит {{tokenSymbol}} на {{providerName}}",
+      "earnDepositDetails": "Вложенная сумма",
+      "earnWithdrawTitle": "Отказаться от",
+      "earnWithdrawSubtitle": "Вывел {{tokenSymbol}} из пула {{providerName}}",
+      "earnWithdrawDetails": "Сумма выведено"
     }
   },
   "celoDollarAmount_0": "<0></0> Celo Dollar",
diff --git a/locales/th-TH/translation.json b/locales/th-TH/translation.json
index 1fa7ead0fd..d024f506ef 100644
--- a/locales/th-TH/translation.json
+++ b/locales/th-TH/translation.json
@@ -255,8 +255,8 @@
       "text": "ใครก็ตามที่มีวลีของคุณจะมีสิทธิ์เข้าถึงบัญชีและเงินทั้งหมดในบัญชีของคุณ ดังนั้นโปรดอย่าแบ่งปันให้ผู้อื่นทราบ"
     }
   ],
-  "consumerIncentivesTitle": "เริ่มต้นใช้งานด้วย Supercharge",
-  "consumerIncentivesSummary": "Supercharge มาแล้ว! รับรางวัลรายปี {{percent}}% ในยอดคงเหลือ Stablecoin ที่สูงที่สุดของคุณ (cUSD, cEUR หรือ cREAL) ก่อนที่จะหมดเวลา โดยมีหลักการดังนี้",
+  "consumerIncentivesTitle": "Supercharge is ending",
+  "consumerIncentivesSummary": "But more rewards are headed your way. Until May 28, get {{percent}}% annual rewards on your highest stablecoin balance (cUSD, cEUR, or cREAL). Here's how it works:",
   "earnWeekly": {
     "header": "เชื่อมต่อหมายเลขโทรศัพท์ของคุณ",
     "text": "แตะเชื่อมต่อหมายเลข หากคุณยังไม่เชื่อมต่อ"
@@ -271,14 +271,14 @@
     "text": "เพื่อให้แน่ใจว่ารางวัลของคุณปลอดภัยและอยู่ในการควบคุมของคุณ"
   },
   "conclusion": "ง่ายเพียงเท่านี้ Supercharge คริปโตของคุณวันนี้",
-  "superchargeTitle": "เริ่ม Supercharge",
-  "superchargeDescription": "รับรางวัลรายปี {{apy}}% ในยอดคงเหลือ {{token}} ของคุณ โดยมีวิธีการเริ่มต้นดังนี้",
+  "superchargeTitle": "Supercharge is ending",
+  "superchargeDescription": "But more rewards are headed your way. Until May 28, get {{apy}}% annual rewards on your highest {{token}} balance. Here's how it works:",
   "superchargeConnectNumber": "เชื่อมต่อหมายเลขโทรศัพท์ของคุณ",
   "superchargeReconnectNumber": "เชื่อมต่อหมายเลขโทรศัพท์อีกครั้ง\n<0>เราได้เปิดตัว Supercharge ที่ปรับปรุงใหม่ โปรดเชื่อมต่อหมายเลขโทรศัพท์ของคุณอีกครั้งเพื่อรับรางวัลเป็น {{token}} ของคุณ</0>",
   "superchargeMinimumBalance": "เพิ่มยอดคงเหลือขั้นต่ำที่ {{amount}} {{token}}",
-  "superchargeDisclaimer": "รับรางวัลสูงสุดโดยการเพิ่มให้ถึง {{amount}} {{token}}",
-  "superchargeDisclaimerMaxRewards": "คุณกำลังจะได้รับรางวัลสูงสุดเป็น {{token}}",
-  "superchargeDisclaimerDayLimit": "คุณต้องขอรับรางวัลภายใน 28 วัน<0>ดูข้อมูลเพิ่มเติม</0>",
+  "superchargeDisclaimer": "This will not affect your balance or previous earnings.",
+  "superchargeDisclaimerMaxRewards": "This will not affect your balance or previous earnings.",
+  "superchargeDisclaimerDayLimit": "This will not affect your balance or previous earnings. <0>Learn more</0>",
   "superchargeTokenDetailsDialog": {
     "title": "สินทรัพย์ใดที่ฉันสามารถ Supercharge ได้",
     "body": "คุณจะได้รับรางวัลทุกสัปดาห์ในรูปแบบ Celo stablecoin ด้วยมูลค่าสูงสุด (cEUR, cUSD, cREAL)",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "ต้องอัปเดตแอป",
   "superchargingDescription": "อัปเดตแอป Valora เพื่อรับรางวัล Supercharge ทุกสัปดาห์อย่างต่อเนื่อง.",
-  "superchargingTitleV1_54": "กำลัง Supercharge {{token}} ของคุณ",
-  "superchargingDescriptionV1_54": "คุณจะได้รับ {{apy}}% ทุกปี ในแต่ละสัปดาห์ คุณจะได้รับการแจ้งเตือนเมื่อรางวัลของคุณพร้อม กลับมาที่นี่เพื่อขอรับรางวัล",
+  "superchargingTitleV1_54": "Supercharge is ending",
+  "superchargingDescriptionV1_54": "Weekly rewards will be available to claim until Tuesday, May 28, at 23:59 UTC. Beginning May 29, you will nor longer be able to claim Supercharge rewards.",
   "superchargeRewardsAvailable": "คุณมี {{amount}} {{token}} ที่สามารถขอรับได้!",
   "superchargeRewardsAvailableMultipleTokens": "คุณมี {{amounts}} ที่สามารถขอรับได้!",
-  "superchargeClaimText": "ขอรับรางวัลเพื่อเพิ่มไปยังยอดคงเหลือของคุณ",
+  "superchargeClaimText": "Claim your rewards until Tuesday, May 28, at 23:59 UTC. Beginning May 29, you will no longer be able to claim Supercharge rewards.",
   "superchargeClaimButton": "ขอรับรางวัล",
   "superchargeFetchRewardsFailed": "เกิดข้อผิดพลาดขณะเรียกดูรางวัล Supercharge ที่รอดำเนินการ โปรดลองอีกครั้งภายหลัง",
   "superchargeClaimSuccess": "เพิ่มรางวัล Supercharge ของคุณไปยังยอดคงเหลือรวมแล้ว",
@@ -2365,6 +2365,24 @@
       "subtitle": "Deposit today and earn returns",
       "description": "See how much you can earn when supplying a lending pool"
     },
+    "enterAmount": {
+      "earnUpToLabel": "You could earn up to:",
+      "rateLabel": "Rate (est.)",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / yr",
+      "rate": "{{rate}}% APY",
+      "continue": "ดำเนินการต่อ",
+      "info": "This pool is powered by Aave",
+      "infoBottomSheet": {
+        "title": "Why this pool?",
+        "description": "This Aave pool has over $150M TVL and more than 6,000 contributors, indicating strong liquidity and trustworthiness. It also uses USDC as its token and Abritrum as its network, which reduces volatility and ensures users will receive inexpensive gas rates.\n\nAll together this makes it a safe and attractive option with competitive APY, ensuring a beneficial investment opportunity for our users.\n\nYou can explore other Aave pools <0>here</0>.",
+        "dismiss": "ปิด"
+      },
+      "notEnoughBalanceForGasWarning": {
+        "title": "You need more {{feeTokenSymbol}} to continue",
+        "description": "Add {{feeTokenSymbol}} on {{network}} to cover your gas fees",
+        "noGasCta": "Buy {{feeTokenSymbol}} on {{network}}"
+      }
+    },
     "activePools": {
       "title": "Active Pools",
       "totalValue": "Total Value:",
@@ -2393,7 +2411,10 @@
       "fee": "Gas Fee",
       "cta": "Collect Earnings",
       "errorTitle": "มีบางอย่างผิดปกติ",
-      "errorDescription": "Unable to fetch deposit details. Please try again."
+      "errorDescription": "Unable to fetch deposit details. Please try again.",
+      "noGasTitle": "You need more {{symbol}} to continue",
+      "noGasDescription": "Add {{symbol}} on {{network}} to cover your gas fees",
+      "noGasCta": "Buy {{symbol}} on {{network}}"
     },
     "transactionFeed": {
       "earnClaimTitle": "Collected",
@@ -2402,6 +2423,18 @@
       "earnDepositSubtitle": "to {{providerName}} Pool",
       "earnWithdrawTitle": "Withdrew",
       "earnWithdrawSubtitle": "from {{providerName}} Pool"
+    },
+    "transactionDetails": {
+      "descriptionLabel": "รายละเอียด",
+      "earnClaimTitle": "Collected",
+      "earnClaimSubtitle": "Collected {{tokenSymbol}} from {{providerName}} Pool",
+      "earnClaimDetails": "Amount Collected",
+      "earnDepositTitle": "Deposited",
+      "earnDepositSubtitle": "Deposited {{tokenSymbol}} to {{providerName}} Pool",
+      "earnDepositDetails": "จำนวนเงินที่ฝาก",
+      "earnWithdrawTitle": "Withdrew",
+      "earnWithdrawSubtitle": "Withdrew {{tokenSymbol}} from {{providerName}} Pool",
+      "earnWithdrawDetails": "จำนวนเงินที่ถอนแล้ว"
     }
   },
   "celoDollarAmount_0": "&amp;lt;0&amp;gt;&amp;lt;/0&amp;gt; Celo ดอลลาร์"
diff --git a/locales/tr-TR/translation.json b/locales/tr-TR/translation.json
index 28c678f4b6..dcdfaf7a79 100644
--- a/locales/tr-TR/translation.json
+++ b/locales/tr-TR/translation.json
@@ -255,8 +255,8 @@
       "text": "Kurtarma Kelimelerinize sahip herhangi bir kişi hesabınıza erişebilir. Başkaları ile paylaşmayın."
     }
   ],
-  "consumerIncentivesTitle": "Supercharge'ı kullanmaya başlayın",
-  "consumerIncentivesSummary": "Karşınızda Supercharge! Supercharge ile en yüksek Celo stablecoin bakiyeniz için (cEUR, cUSD, cREAL, vb.) yıllık {{percent}}% ödüller kazanın. Sınırlı bir süre için geçerlidir. Supercharge şöyle çalışır:",
+  "consumerIncentivesTitle": "Supercharge sona eriyor",
+  "consumerIncentivesSummary": "Ancak daha fazla ödül size doğru geliyor. 28 Mayıs'a kadar, en yüksek stablecoin bakiyeniz (cUSD, cEUR veya cREAL) üzerinden {{percent}}% yıllık ödüller kazanın. İşte nasıl çalıştığı:",
   "earnWeekly": {
     "header": "Telefon numaranızı bağlayın",
     "text": "Daha önce bağlamadıysanız Telefon Numaranı Bağlaya dokun."
@@ -271,14 +271,14 @@
     "text": "Böylelikle ödüllerinizin güvende ve kontrolünüzde olmasını sağlanacaktır."
   },
   "conclusion": "İşte bu kadar basit. Kriptonuzu hemen Supercharge'layın!",
-  "superchargeTitle": "Supercharge'lamaya başlayın",
-  "superchargeDescription": "{{token}} bakiyeniz için yıllık %12 oranında ödül kazanın. Başlamak için şunları yapmanız yeterli:",
+  "superchargeTitle": "Supercharge sona eriyor",
+  "superchargeDescription": "Ama daha fazla ödül size doğru geliyor. 28 Mayıs'a kadar en yüksek {{token}} bakiyeniz üzerinden {{apy}}% yıllık ödül kazanın. İşte nasıl çalıştığı:",
   "superchargeConnectNumber": "Telefon numaranı bağla",
   "superchargeReconnectNumber": "Telefon numaranızı yeniden bağlayın\n<0>Gelişmiş bir Süper charge deneyimi başlattık. {{token}} tokeninizde ödüller kazanmaya devam etmek için telefon numaranızı yeniden bağlayın.</0>",
   "superchargeMinimumBalance": "En az {{amount}} {{token}} olacak şekilde bakiye ekleyin",
-  "superchargeDisclaimer": "Maksimum ödül kazanmak için {{amount}} {{token}}'a kadar ekleme yapabilirsiniz",
-  "superchargeDisclaimerMaxRewards": "{{token}} ile maksimum ödül alıyorsunuz",
-  "superchargeDisclaimerDayLimit": "Ödülleriniz 28 gün içinde talep edilmelidir. <0>Daha fazla bilgi edinin</0>",
+  "superchargeDisclaimer": "Bu durum bakiyenizi veya önceki kazançlarınızı etkilemeyecektir.",
+  "superchargeDisclaimerMaxRewards": "Bu durum bakiyenizi veya önceki kazançlarınızı etkilemeyecektir.",
+  "superchargeDisclaimerDayLimit": "Bu durum bakiyenizi veya önceki kazançlarınızı etkilemeyecektir. <0>Daha fazla bilgi</0>",
   "superchargeTokenDetailsDialog": {
     "title": "Hangi varlıklara Supercharge uygulayabilirim?",
     "body": "Celo stablecoinlerinizden en yüksek değeri olanla (cEUR, cUSD, cREAL) haftalık olarak ödüllendirileceksiniz.",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "Uygulama güncellemesi gerekli",
   "superchargingDescription": "Supercharge ödüllerini almaya devam etmek için Valora uygulamasını güncelleyin.",
-  "superchargingTitleV1_54": "Supercharge uygulanan varlık: {{token}}",
-  "superchargingDescriptionV1_54": "Yıllık %{{apy}} alıyorsunuz. Ödülleriniz hazır olduğunda her hafta bir bildirim alacaksınız, onları almak için buraya geri gelin.",
+  "superchargingTitleV1_54": "Supercharge sona eriyor",
+  "superchargingDescriptionV1_54": "Haftalık ödüller 28 Mayıs Salı günü UTC ile saat 23:59'a kadar talep edilebilecektir. 29 Mayıs'tan itibaren Süper Şarj ödüllerini artık talep edemeyeceksiniz.",
   "superchargeRewardsAvailable": "{{amount}} {{token}} almaya hak kazandınız!",
   "superchargeRewardsAvailableMultipleTokens": "{{amounts}} almaya hak kazandınız!",
-  "superchargeClaimText": "Отримайте свої нагороди, щоб додати їх до вашого залишку.",
+  "superchargeClaimText": "Ödüllerinizi 28 Mayıs Salı günü UTC ile saat 23:59'a kadar talep edin. 29 Mayıs'tan itibaren artık Süper Şarj ödüllerini talep edemeyeceksiniz.",
   "superchargeClaimButton": "Ödüllerinizi Alın",
   "superchargeFetchRewardsFailed": "Bekleyen Supercharge ödüllerini alırken bir hata oluştu. Lütfen tekrar deneyin.",
   "superchargeClaimSuccess": "Supercharge ödülleriniz Toplam Bakiyenize eklendi.",
@@ -2367,6 +2367,24 @@
       "subtitle": "Bugün para yatırın ve getiri kazanın",
       "description": "Bir kredi havuzu sağlarken ne kadar kazanabileceğinizi görün"
     },
+    "enterAmount": {
+      "earnUpToLabel": "Şu kadar kazanabilirsiniz:",
+      "rateLabel": "Oran (tahmini)",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / yıl",
+      "rate": "{{rate}}% APY",
+      "continue": "İleri",
+      "info": "Bu havuz Aave tarafından desteklenmektedir",
+      "infoBottomSheet": {
+        "title": "Neden bu havuz?",
+        "description": "Bu Aave havuzu 150 milyon doların üzerinde TVL'ye ve 6.000'den fazla katılımcıya sahiptir, bu da güçlü likidite ve güvenilirliği gösterir. Ayrıca token olarak USDC ve ağ olarak Abritrum kullanır, bu da oynaklığı azaltır ve kullanıcıların ucuz gaz oranları almasını sağlar.\n\nTüm bunlar bir araya geldiğinde, rekabetçi APY ile güvenli ve cazip bir seçenek haline gelir ve kullanıcılarımız için faydalı bir yatırım fırsatı sağlar.\n\nDiğer Aave havuzlarını <0>buradan</0> keşfedebilirsiniz.",
+        "dismiss": "Yoksay"
+      },
+      "notEnoughBalanceForGasWarning": {
+        "title": "Devam etmek için daha fazlasına ihtiyacınız var {{feeTokenSymbol}}",
+        "description": "Gaz ücretlerinizi karşılamak için {{feeTokenSymbol}} adresini {{network}} adresine ekleyin",
+        "noGasCta": "{{feeTokenSymbol}} adresini {{network}}adresinden satın alın"
+      }
+    },
     "activePools": {
       "title": "Aktif Havuzlar",
       "totalValue": "Toplam Değer:",
@@ -2395,7 +2413,10 @@
       "fee": "Gaz Ücreti",
       "cta": "Kazançları Toplayın",
       "errorTitle": "Bir şeyler ters gitti",
-      "errorDescription": "Para yatırma detayları alınamıyor. Lütfen tekrar deneyin."
+      "errorDescription": "Para yatırma detayları alınamıyor. Lütfen tekrar deneyin.",
+      "noGasTitle": "Devam etmek için daha fazlasına ihtiyacınız var {{symbol}}",
+      "noGasDescription": "Gaz ücretlerinizi karşılamak için {{symbol}} adresini {{network}} adresine ekleyin",
+      "noGasCta": "{{symbol}} adresini {{network}}adresinden satın alın"
     },
     "transactionFeed": {
       "earnClaimTitle": "Toplanmış",
@@ -2404,6 +2425,18 @@
       "earnDepositSubtitle": "{{providerName}} Havuzuna",
       "earnWithdrawTitle": "Geri çekildi",
       "earnWithdrawSubtitle": "{{providerName}} Pool'dan"
+    },
+    "transactionDetails": {
+      "descriptionLabel": "Detaylar",
+      "earnClaimTitle": "Toplanmış",
+      "earnClaimSubtitle": "{{tokenSymbol}} {{providerName}} Havuzundan Toplandı",
+      "earnClaimDetails": "Tahsil Edilen Tutar",
+      "earnDepositTitle": "Yatırılan",
+      "earnDepositSubtitle": "{{tokenSymbol}} adresinden {{providerName}} Havuzuna yatırıldı",
+      "earnDepositDetails": "Yatırılan Toplam",
+      "earnWithdrawTitle": "Geri çekildi",
+      "earnWithdrawSubtitle": "{{tokenSymbol}} adresini {{providerName}} havuzundan geri çekti",
+      "earnWithdrawDetails": "Çekilen Tutar"
     }
   },
   "celoDollarAmount": "<0></0> Celo Dollar",
diff --git a/locales/uk-UA/translation.json b/locales/uk-UA/translation.json
index d5f8f8b299..174c68f951 100644
--- a/locales/uk-UA/translation.json
+++ b/locales/uk-UA/translation.json
@@ -255,8 +255,8 @@
       "text": "Будь-хто з вашою фразою матиме доступ до вашого облікового запису та всіх його коштів. Не повідомляйте її іншим."
     }
   ],
-  "consumerIncentivesTitle": "Почніть із надбавкою",
-  "consumerIncentivesSummary": "Надбавка вже тут! Отримайте нагороду в розмірі {{percent}}% річних на ваш найбільший залишок у стейблкойнах (cUSD, cEUR, або cREAL). Доступно протягом обмеженого часу. Ось як це працює:",
+  "consumerIncentivesTitle": "Суперзаряд закінчується",
+  "consumerIncentivesSummary": "Але на вас чекають ще більші винагороди. До 28 травня отримуйте {{percent}}% річної винагороди на свій найбільший баланс у стейблкоінах (cUSD, CEUR або cREAL). Ось як це працює:",
   "earnWeekly": {
     "header": "Під’єднайте ваш телефонний номер",
     "text": "Натисніть «Під’єднати», якщо ви ще не під’єдналися до мережі."
@@ -271,14 +271,14 @@
     "text": "Це гарантуватиме, що ваші винагороди безпечні та під вашим контролем."
   },
   "conclusion": "Це так просто. Отримуйте надбавку за криптовалюту сьогодні!",
-  "superchargeTitle": "Почати дію надбавки",
-  "superchargeDescription": "Отримайте нагороду в розмірі {{apy}}% річних на залишок у {{token}}. Ось як почати:",
+  "superchargeTitle": "Суперзаряд закінчується",
+  "superchargeDescription": "Але на вас чекають ще більші винагороди. До 28 травня отримуйте {{apy}}% річних винагород на свій найбільший баланс {{token}} . Ось як це працює:",
   "superchargeConnectNumber": "Під’єднати свій телефонний номер",
   "superchargeReconnectNumber": "Повторно під’єднайте свій номер телефону\n<0>Ми випустили оновлення щодо винагород Supercharge. Повторно під’єднайте свій номер телефону, щоб і надалі отримувати винагороди на свій {{token}}.</0>",
   "superchargeMinimumBalance": "Додати мінімальний залишок {{amount}} {{token}}",
-  "superchargeDisclaimer": "Максимізуйте винагороду, додавши суму до {{amount}} {{token}}",
-  "superchargeDisclaimerMaxRewards": "Ви отримуєте максимальну винагороду в {{token}}",
-  "superchargeDisclaimerDayLimit": "Вашу винагороду має бути зараховано протягом 28 днів. <0>Дізнатися більше</0>",
+  "superchargeDisclaimer": "Це не вплине на ваш баланс або попередні заробітки.",
+  "superchargeDisclaimerMaxRewards": "Це не вплине на ваш баланс або попередні заробітки.",
+  "superchargeDisclaimerDayLimit": "Це не вплине на ваш баланс або попередні заробітки. <0>Дізнатися більше</0>",
   "superchargeTokenDetailsDialog": {
     "title": "Які активи можна суперзарядити?",
     "body": "Ви отримаєте винагороду щотижня за ваші стейблкойни Celo з найбільшою вартістю (cEUR, cUSD, cREAL).",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "Треба оновити застосунок",
   "superchargingDescription": "Оновіть застосунок Valora, щоб і надалі щотижня отримувати винагороди Supercharge.",
-  "superchargingTitleV1_54": "Ваш {{token}} отримав надбавку",
-  "superchargingDescriptionV1_54": "Ви отримуєте {{apy}}% річних. Щотижня ви отримуватимете повідомлення, коли ваші винагороди будуть готові, повертайтеся сюди, щоб забрати їх.",
+  "superchargingTitleV1_54": "Суперзаряд закінчується",
+  "superchargingDescriptionV1_54": "Щотижневі винагороди можна буде отримати до вівторка, 28 травня, 23:59 UTC. Починаючи з 29 травня, ви більше не зможете отримати винагороди Supercharge.",
   "superchargeRewardsAvailable": "У вас доступно {{amount}} {{token}} для запиту!",
   "superchargeRewardsAvailableMultipleTokens": "У вас доступно {{amounts}} для запиту!",
-  "superchargeClaimText": "Отримайте свої нагороди, щоб додати їх до вашого залишку. Якщо ви берете участь у Supercharge зі стейблкойнами Moola, ви зможете отримати всі свої винагороди, коли Moola знову запрацює.",
+  "superchargeClaimText": "Отримайте свої винагороди до вівторка, 28 травня, 23:59 UTC. Починаючи з 29 травня, ви більше не зможете отримати винагороди Supercharge.",
   "superchargeClaimButton": "Запит винагороди",
   "superchargeFetchRewardsFailed": "Помилка при отриманні очікуваних нагород за надбавку. Просимо, спробуйте ще раз пізніше.",
   "superchargeClaimSuccess": "Ваші нагороди за надбавку додані до вашого загального залишку.",
@@ -2371,6 +2371,24 @@
       "subtitle": "Поповнюйте рахунок сьогодні та отримуйте прибуток",
       "description": "Дізнайтеся, скільки ви можете заробити, надаючи послуги кредитного пулу"
     },
+    "enterAmount": {
+      "earnUpToLabel": "Ти можеш заробити до..:",
+      "rateLabel": "Ставка (ест.)",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / yr",
+      "rate": "{{rate}}% APY",
+      "continue": "Продовжити",
+      "info": "Цей басейн працює від Aave",
+      "infoBottomSheet": {
+        "title": "Чому саме цей басейн?",
+        "description": "Цей пул Aave має понад $150 млн ТВЛ і понад 6 000 учасників, що свідчить про високу ліквідність і надійність. Він також використовує USDC як токен і Abritrum як мережу, що знижує волатильність і гарантує користувачам недорогі тарифи на газ.\n\nВсе це робить його безпечним і привабливим варіантом з конкурентоспроможним APY, що забезпечує вигідні інвестиційні можливості для наших користувачів.\n\nВи можете ознайомитися з іншими пулами Aave <0>тут</0>.",
+        "dismiss": "Відхилити"
+      },
+      "notEnoughBalanceForGasWarning": {
+        "title": "Вам потрібно більше {{feeTokenSymbol}} для продовження",
+        "description": "Додайте {{feeTokenSymbol}} на {{network}} , щоб оплатити рахунки за газ",
+        "noGasCta": "Купуйте {{feeTokenSymbol}} на {{network}}"
+      }
+    },
     "activePools": {
       "title": "Активні пули",
       "totalValue": "Загальна вартість:",
@@ -2399,7 +2417,10 @@
       "fee": "Плата за газ",
       "cta": "Збирайте заробіток",
       "errorTitle": "Щось пішло не так",
-      "errorDescription": "Не вдається отримати інформацію про депозит. Спробуйте ще раз."
+      "errorDescription": "Не вдається отримати інформацію про депозит. Спробуйте ще раз.",
+      "noGasTitle": "Вам потрібно більше {{symbol}} для продовження",
+      "noGasDescription": "Додайте {{symbol}} на {{network}} , щоб оплатити рахунки за газ",
+      "noGasCta": "Купуйте {{symbol}} на {{network}}"
     },
     "transactionFeed": {
       "earnClaimTitle": "Зібрано",
@@ -2408,6 +2429,18 @@
       "earnDepositSubtitle": "на {{providerName}} Пул",
       "earnWithdrawTitle": "Вийшов з гри.",
       "earnWithdrawSubtitle": "від {{providerName}} Пул"
+    },
+    "transactionDetails": {
+      "descriptionLabel": "Подробиці",
+      "earnClaimTitle": "Зібрано",
+      "earnClaimSubtitle": "Зібрано {{tokenSymbol}} з пулу {{providerName}}",
+      "earnClaimDetails": "Сума зібраних коштів",
+      "earnDepositTitle": "Депоновано",
+      "earnDepositSubtitle": "Вніс {{tokenSymbol}} на рахунок {{providerName}} Пулу",
+      "earnDepositDetails": "Суму внесено",
+      "earnWithdrawTitle": "Вийшов з гри.",
+      "earnWithdrawSubtitle": "Виведено {{tokenSymbol}} з пулу {{providerName}}",
+      "earnWithdrawDetails": "Знята сума"
     }
   },
   "celoDollarAmount_0": "<0></0> Celo Dollar",
diff --git a/locales/vi-VN/translation.json b/locales/vi-VN/translation.json
index fb9f4bc620..228119fa6a 100644
--- a/locales/vi-VN/translation.json
+++ b/locales/vi-VN/translation.json
@@ -255,8 +255,8 @@
       "text": "Bất kỳ ai có Cụm từ của bạn đều sẽ được quyền truy cập vào tài khoản của bạn và tất cả tiền trong đó. Không chia sẻ Cụm từ này cho bất kỳ ai."
     }
   ],
-  "consumerIncentivesTitle": "Bắt đầu với chương trình Supercharge",
-  "consumerIncentivesSummary": "Chương trình Supercharge đã ra mắt! Nhận {{percent}}% tiền thưởng mỗi năm tính trên số dư stablecoin cao nhất của bạn (cUSD, cEUR hoặc cREAL). Có áp dụng giới hạn thời gian triển khai. Cách thức như sau:",
+  "consumerIncentivesTitle": "Supercharge is ending",
+  "consumerIncentivesSummary": "But more rewards are headed your way. Until May 28, get {{percent}}% annual rewards on your highest stablecoin balance (cUSD, cEUR, or cREAL). Here's how it works:",
   "earnWeekly": {
     "header": "Kết nối số điện thoại của bạn",
     "text": "Nhấn vào Kết nối số nếu bạn chưa kết nối."
@@ -271,14 +271,14 @@
     "text": "Cụm từ này đảm bảo tiền thưởng được an toàn và bạn luôn nắm được quyền kiểm soát."
   },
   "conclusion": "Đơn giản vậy thôi. Hãy kiếm thêm tiền điện tử ngay hôm nay với Supercharge!",
-  "superchargeTitle": "Bắt đầu tham gia Supercharge",
-  "superchargeDescription": "Nhận {{apy}}% tiền thưởng hằng năm tính trên số dư {{token}}. Sau đây là cách bắt đầu:",
+  "superchargeTitle": "Supercharge is ending",
+  "superchargeDescription": "But more rewards are headed your way. Until May 28, get {{apy}}% annual rewards on your highest {{token}} balance. Here's how it works:",
   "superchargeConnectNumber": "Kết nối số điện thoại của bạn",
   "superchargeReconnectNumber": "Kết nối lại với điện thoại\n<0>Chúng tôi đã khởi chạy trải nghiệm chương trình Supercharge cải tiến. Kết nối lại số điện thoại của bạn để tiếp tục kiếm tiền thưởng từ {{token}}.</0>",
   "superchargeMinimumBalance": "Thêm số dư tối thiểu là {{amount}} {{token}}",
-  "superchargeDisclaimer": "Tăng tối đa tiền thưởng bằng cách nạp đến {{amount}} {{token}}",
-  "superchargeDisclaimerMaxRewards": "Bạn sẽ nhận được tiền thưởng tối đa tính trên {{token}} của mình",
-  "superchargeDisclaimerDayLimit": "Bạn phải xác nhận tiền thưởng trong vòng 28 ngày. <0>Tìm hiểu thêm </0>",
+  "superchargeDisclaimer": "This will not affect your balance or previous earnings.",
+  "superchargeDisclaimerMaxRewards": "This will not affect your balance or previous earnings.",
+  "superchargeDisclaimerDayLimit": "This will not affect your balance or previous earnings. <0>Learn more</0>",
   "superchargeTokenDetailsDialog": {
     "title": "Tôi có thể sử dụng Supercharge cho những tài sản nào?",
     "body": "Bạn sẽ được nhận thưởng mỗi tuần tính trên stablecoin Celo có giá trị cao nhất (cEUR, cUSD, cREAL).",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "Cần cập nhật ứng dụng",
   "superchargingDescription": "Cập nhật ứng dụng Valora để tiếp tục nhận tiền thưởng Supercharge hàng tuần.",
-  "superchargingTitleV1_54": "{{token}} của bạn đang được áp dụng Supercharge",
-  "superchargingDescriptionV1_54": "Bạn đang nhận được {{apy}}% mỗi năm. Hằng tuần, bạn sẽ nhận được thông báo khi tiền thưởng đã về, hãy quay lại đây để xác nhận.",
+  "superchargingTitleV1_54": "Supercharge is ending",
+  "superchargingDescriptionV1_54": "Weekly rewards will be available to claim until Tuesday, May 28, at 23:59 UTC. Beginning May 29, you will nor longer be able to claim Supercharge rewards.",
   "superchargeRewardsAvailable": "Bạn có {{amount}} {{token}} cần xác nhận!",
   "superchargeRewardsAvailableMultipleTokens": "Bạn có {{amounts}} cần xác nhận!",
-  "superchargeClaimText": "Xác nhận tiền thưởng của bạn để thêm vào số dư.",
+  "superchargeClaimText": "Claim your rewards until Tuesday, May 28, at 23:59 UTC. Beginning May 29, you will no longer be able to claim Supercharge rewards.",
   "superchargeClaimButton": "Xác nhận tiền thưởng",
   "superchargeFetchRewardsFailed": "Đã xảy ra lỗi khi tìm nạp tiền thưởng Supercharge đang chờ xử lý. Vui lòng thử lại sau.",
   "superchargeClaimSuccess": "Tiền thưởng Supercharge đã được thêm vào Tổng số dư của bạn.",
@@ -2365,6 +2365,24 @@
       "subtitle": "Deposit today and earn returns",
       "description": "See how much you can earn when supplying a lending pool"
     },
+    "enterAmount": {
+      "earnUpToLabel": "You could earn up to:",
+      "rateLabel": "Rate (est.)",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / yr",
+      "rate": "{{rate}}% APY",
+      "continue": "Tiếp tục",
+      "info": "This pool is powered by Aave",
+      "infoBottomSheet": {
+        "title": "Why this pool?",
+        "description": "This Aave pool has over $150M TVL and more than 6,000 contributors, indicating strong liquidity and trustworthiness. It also uses USDC as its token and Abritrum as its network, which reduces volatility and ensures users will receive inexpensive gas rates.\n\nAll together this makes it a safe and attractive option with competitive APY, ensuring a beneficial investment opportunity for our users.\n\nYou can explore other Aave pools <0>here</0>.",
+        "dismiss": "Loại bỏ"
+      },
+      "notEnoughBalanceForGasWarning": {
+        "title": "You need more {{feeTokenSymbol}} to continue",
+        "description": "Add {{feeTokenSymbol}} on {{network}} to cover your gas fees",
+        "noGasCta": "Buy {{feeTokenSymbol}} on {{network}}"
+      }
+    },
     "activePools": {
       "title": "Active Pools",
       "totalValue": "Total Value:",
@@ -2393,7 +2411,10 @@
       "fee": "Gas Fee",
       "cta": "Collect Earnings",
       "errorTitle": "Đã xảy ra lỗi",
-      "errorDescription": "Unable to fetch deposit details. Please try again."
+      "errorDescription": "Unable to fetch deposit details. Please try again.",
+      "noGasTitle": "You need more {{symbol}} to continue",
+      "noGasDescription": "Add {{symbol}} on {{network}} to cover your gas fees",
+      "noGasCta": "Buy {{symbol}} on {{network}}"
     },
     "transactionFeed": {
       "earnClaimTitle": "Collected",
@@ -2402,6 +2423,18 @@
       "earnDepositSubtitle": "to {{providerName}} Pool",
       "earnWithdrawTitle": "Withdrew",
       "earnWithdrawSubtitle": "from {{providerName}} Pool"
+    },
+    "transactionDetails": {
+      "descriptionLabel": "Chi tiết",
+      "earnClaimTitle": "Collected",
+      "earnClaimSubtitle": "Collected {{tokenSymbol}} from {{providerName}} Pool",
+      "earnClaimDetails": "Amount Collected",
+      "earnDepositTitle": "Deposited",
+      "earnDepositSubtitle": "Deposited {{tokenSymbol}} to {{providerName}} Pool",
+      "earnDepositDetails": "Số tiền đã nạp",
+      "earnWithdrawTitle": "Withdrew",
+      "earnWithdrawSubtitle": "Withdrew {{tokenSymbol}} from {{providerName}} Pool",
+      "earnWithdrawDetails": "Số tiền đã rút"
     }
   },
   "celoDollarAmount_0": "&amp;lt;0&amp;gt;&amp;lt;/0&amp;gt; Đô la Celo"
diff --git a/locales/zh-CN/translation.json b/locales/zh-CN/translation.json
index d02c1941b1..63595498d0 100644
--- a/locales/zh-CN/translation.json
+++ b/locales/zh-CN/translation.json
@@ -255,8 +255,8 @@
       "text": "任何拥有您的短语的人都将能够访问您的账户和其中的所有资金。切勿将短语泄露给他人。"
     }
   ],
-  "consumerIncentivesTitle": "Supercharge 入门",
-  "consumerIncentivesSummary": "Supercharge 计划启动！基于您的稳定币 (cUSD、cEUR 或 cREAL) 最高余额，获取 {{percent}}% 的年度奖励。限时福利，切勿错过。具体方式如下：",
+  "consumerIncentivesTitle": "超级充电站即将关闭",
+  "consumerIncentivesSummary": "但更多奖励正在向您走来。在 5 月 28 日之前，稳定币最高余额（cUSD、cEUR 或 cREAL）可获得 {{percent}}% 的年度奖励。具体操作如下",
   "earnWeekly": {
     "header": "关联您的手机号码",
     "text": "如果您尚未关联，请点按“关联号码”。"
@@ -271,14 +271,14 @@
     "text": "这将确保您的奖励安全可控。"
   },
   "conclusion": "就是如此简单，立即 Supercharge 您的加密货币吧！",
-  "superchargeTitle": "开始 Supercharge",
-  "superchargeDescription": "基于您的 {{token}} 余额获取 {{apy}}% 的年度奖励。具体方式如下：",
+  "superchargeTitle": "超级充电站即将关闭",
+  "superchargeDescription": "但更多奖励正在向您走来。在 5 月 28 日之前， {{token}} 最高余额可获得 {{apy}}% 的年度奖励。具体操作如下：",
   "superchargeConnectNumber": "关联您的手机号码",
   "superchargeReconnectNumber": "重新关联您的手机号码\n<0>我们已经改进 Supercharge 体验。重新关联您的手机号码，继续获取基于您的 {{token}} 的奖励。</0>",
   "superchargeMinimumBalance": "添加 {{amount}} {{token}} 的最低余额",
-  "superchargeDisclaimer": "通过添加至 {{amount}} {{token}} 获取最高奖励",
-  "superchargeDisclaimerMaxRewards": "您即将获得基于您的 {{token}} 的最高奖励",
-  "superchargeDisclaimerDayLimit": "您必须在 28 天内领取奖励。<0>了解更多</0>",
+  "superchargeDisclaimer": "这不会影响您的余额或之前的收入。",
+  "superchargeDisclaimerMaxRewards": "这不会影响您的余额或之前的收入。",
+  "superchargeDisclaimerDayLimit": "这不会影响您的余额或之前的收入。<0>了解更多信息</0>",
   "superchargeTokenDetailsDialog": {
     "title": "我可以 Supercharge 哪种资产？",
     "body": "您将每周获得基于您的 Celo 稳定币最高价值（cEUR、cUSD、cREAL）的奖励。",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "必须更新应用",
   "superchargingDescription": "更新 Valora 应用以继续领取您每周的 Supercharge 奖励.",
-  "superchargingTitleV1_54": "您的 {{token}} 正在进行 Supercharge",
-  "superchargingDescriptionV1_54": "您将获得年度 {{apy}}% 的奖励。每周当您的奖励准备就绪时，您将获得通知，请记得返回此处领取奖励。",
+  "superchargingTitleV1_54": "超级充电站即将关闭",
+  "superchargingDescriptionV1_54": "每周奖励可在 5 月 28 日（星期二）23:59（世界协调时）之前领取。从 5 月 29 日起，您将无法再领取超级充值奖励。",
   "superchargeRewardsAvailable": "您有 {{amount}} {{token}} 可领取！",
   "superchargeRewardsAvailableMultipleTokens": "您有 {{amounts}} 可领取！",
-  "superchargeClaimText": "领取您的奖励以将它添加到您的余额。",
+  "superchargeClaimText": "在世界协调时 5 月 28 日（星期二）23:59 之前领取奖励。自 5 月 29 日起，您将无法再领取超级充值奖励。",
   "superchargeClaimButton": "领取奖励",
   "superchargeFetchRewardsFailed": "获取待处理的 Supercharge 奖励时出错。请稍后再试。",
   "superchargeClaimSuccess": "您的 Supercharge 奖励已添加到您的总余额中。",
@@ -2365,6 +2365,24 @@
       "subtitle": "立即存款，赚取回报",
       "description": "了解您在提供贷款池时能赚多少钱"
     },
+    "enterAmount": {
+      "earnUpToLabel": "您最多可以获得",
+      "rateLabel": "比率（估计值）",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / 年",
+      "rate": "{{rate}}年利率",
+      "continue": "继续",
+      "info": "本泳池由 Aave 提供能源",
+      "infoBottomSheet": {
+        "title": "为什么是这个泳池？",
+        "description": "该 Aave 池拥有超过 1.5 亿美元的 TVL 和 6000 多名贡献者，这表明它具有很强的流动性和可信度。它还使用 USDC 作为代币，使用 Abritrum 作为网络，从而降低了波动性，确保用户获得低廉的天然气价格。\n\n所有这些都使其成为一个安全、有吸引力且年利率具有竞争力的选择，确保为我们的用户提供有利的投资机会。\n\n您可以<0>在这里</0>探索其他 Aave 池。",
+        "dismiss": "忽略"
+      },
+      "notEnoughBalanceForGasWarning": {
+        "title": "您需要更多 {{feeTokenSymbol}} 才能继续",
+        "description": "在 {{network}} 上添加 {{feeTokenSymbol}} 以支付汽油费",
+        "noGasCta": "在 {{network}}上购买 {{feeTokenSymbol}}"
+      }
+    },
     "activePools": {
       "title": "活动泳池",
       "totalValue": "总价值",
@@ -2393,7 +2411,10 @@
       "fee": "燃气费",
       "cta": "收取收益",
       "errorTitle": "出错了",
-      "errorDescription": "无法获取存款详情。请重试。"
+      "errorDescription": "无法获取存款详情。请重试。",
+      "noGasTitle": "您需要更多 {{symbol}} 才能继续",
+      "noGasDescription": "在 {{network}} 上添加 {{symbol}} 以支付汽油费",
+      "noGasCta": "在 {{network}}上购买 {{symbol}}"
     },
     "transactionFeed": {
       "earnClaimTitle": "收藏",
@@ -2402,6 +2423,18 @@
       "earnDepositSubtitle": "至 {{providerName}} 池",
       "earnWithdrawTitle": "撤回",
       "earnWithdrawSubtitle": "来自 {{providerName}} Pool"
+    },
+    "transactionDetails": {
+      "descriptionLabel": "详细信息",
+      "earnClaimTitle": "收藏",
+      "earnClaimSubtitle": "从 {{providerName}} Pool 收集的 {{tokenSymbol}}",
+      "earnClaimDetails": "收款金额",
+      "earnDepositTitle": "存入",
+      "earnDepositSubtitle": "存入 {{tokenSymbol}} 至 {{providerName}} 奖池",
+      "earnDepositDetails": "已转入金额",
+      "earnWithdrawTitle": "撤回",
+      "earnWithdrawSubtitle": "从 {{providerName}} Pool 提取 {{tokenSymbol}}",
+      "earnWithdrawDetails": "已提取金额"
     }
   },
   "celoDollarAmount_0": "&amp;lt;0&amp;gt;&amp;lt;/0&amp;gt; Celo 美元"

From 8dd50802a499a0fd4878fe19cdbcf07dd76c54e2 Mon Sep 17 00:00:00 2001
From: Kathy Luo <kathyluo18@gmail.com>
Date: Tue, 21 May 2024 09:48:56 +0200
Subject: [PATCH 028/133] feat(jumpstart): add specific error messaging when
 link is already claimed (#5427)

### Description

As the title

### Test plan


https://github.com/valora-inc/wallet/assets/20150449/b701d6b9-758e-4742-99f8-02da11641ba9


### Related issues

- Fixes RET-1075

### Backwards compatibility

Y

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [ ] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 locales/base/translation.json                |  7 ++--
 src/jumpstart/JumpstartClaimStatusToasts.tsx | 19 ++++++----
 src/jumpstart/jumpstartLinkHandler.test.ts   | 38 ++++++++++++--------
 src/jumpstart/jumpstartLinkHandler.ts        | 23 +++++++-----
 src/jumpstart/saga.test.ts                   | 37 ++++++++++++-------
 src/jumpstart/saga.ts                        |  6 ++--
 src/jumpstart/selectors.test.ts              | 21 -----------
 src/jumpstart/selectors.ts                   |  8 ++---
 src/jumpstart/slice.test.ts                  |  2 +-
 src/jumpstart/slice.ts                       | 10 ++----
 test/RootStateSchema.json                    |  1 +
 11 files changed, 89 insertions(+), 83 deletions(-)
 delete mode 100644 src/jumpstart/selectors.test.ts

diff --git a/locales/base/translation.json b/locales/base/translation.json
index 9689399001..10a7d84073 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -2240,12 +2240,13 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Your funds are on their way",
-      "description": "The funds that your friend gave you are being sent over. Please wait... "
+      "title": "Checking on your funds",
+      "description": "Please wait while we check your Live Link. Claimable funds will arrive shortly."
     },
     "error": {
       "title": "Unable to claim funds",
-      "description": "Try your live link again to attempt to receive funds, or ask your friend to try sending a new link",
+      "description": "This link was not able to be claimed for an unknown reason",
+      "alreadyClaimedDescription": "The link has already been claimed. Please ask your friend to send a new link",
       "contactSupport": "Contact Support",
       "dismiss": "Dismiss"
     }
diff --git a/src/jumpstart/JumpstartClaimStatusToasts.tsx b/src/jumpstart/JumpstartClaimStatusToasts.tsx
index f9498ca703..bbaa327daf 100644
--- a/src/jumpstart/JumpstartClaimStatusToasts.tsx
+++ b/src/jumpstart/JumpstartClaimStatusToasts.tsx
@@ -5,7 +5,7 @@ import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import { NotificationVariant } from 'src/components/InLineNotification'
 import Toast from 'src/components/Toast'
 import GreenLoadingSpinner from 'src/icons/GreenLoadingSpinner'
-import { showJumstartClaimError, showJumstartClaimLoading } from 'src/jumpstart/selectors'
+import { jumpstartClaimStatusSelector } from 'src/jumpstart/selectors'
 import { jumpstartClaimErrorDismissed, jumpstartClaimLoadingDismissed } from 'src/jumpstart/slice'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -15,8 +15,7 @@ import { Spacing } from 'src/styles/styles'
 export default function JumpstartClaimStatusToasts() {
   const { t } = useTranslation()
   const dispatch = useDispatch()
-  const showLoading = useSelector(showJumstartClaimLoading)
-  const showError = useSelector(showJumstartClaimError)
+  const claimStatus = useSelector(jumpstartClaimStatusSelector)
 
   const handleLoadingDismiss = () => {
     ValoraAnalytics.track(JumpstartEvents.jumpstart_claim_loading_dismissed)
@@ -38,7 +37,7 @@ export default function JumpstartClaimStatusToasts() {
     <>
       <Toast
         swipeable
-        showToast={showLoading}
+        showToast={claimStatus === 'loading'}
         variant={NotificationVariant.Info}
         title={t('jumpstartStatus.loading.title')}
         description={t('jumpstartStatus.loading.description')}
@@ -46,11 +45,17 @@ export default function JumpstartClaimStatusToasts() {
         onDismiss={handleLoadingDismiss}
       />
       <Toast
-        showToast={showError}
+        showToast={claimStatus === 'error' || claimStatus === 'errorAlreadyClaimed'}
         variant={NotificationVariant.Error}
         title={t('jumpstartStatus.error.title')}
-        description={t('jumpstartStatus.error.description')}
-        ctaLabel={t('jumpstartStatus.error.contactSupport')}
+        description={
+          claimStatus === 'errorAlreadyClaimed'
+            ? t('jumpstartStatus.error.alreadyClaimedDescription')
+            : t('jumpstartStatus.error.description')
+        }
+        ctaLabel={
+          claimStatus === 'errorAlreadyClaimed' ? null : t('jumpstartStatus.error.contactSupport')
+        }
         onPressCta={handleContactSupport}
         ctaLabel2={t('jumpstartStatus.error.dismiss')}
         onPressCta2={handleErrorDismiss}
diff --git a/src/jumpstart/jumpstartLinkHandler.test.ts b/src/jumpstart/jumpstartLinkHandler.test.ts
index 91c0923aa0..8143d30be1 100644
--- a/src/jumpstart/jumpstartLinkHandler.test.ts
+++ b/src/jumpstart/jumpstartLinkHandler.test.ts
@@ -3,21 +3,13 @@ import networkConfig from 'src/web3/networkConfig'
 import { mockAccount, mockAccount2 } from 'test/values'
 import { jumpstartLinkHandler } from './jumpstartLinkHandler'
 
-jest.mock('src/web3/providers')
+const mockErc20ClaimsCall = jest.fn()
 jest.mock('src/web3/utils', () => ({
   ...(jest.requireActual('src/web3/utils') as any),
   getContract: jest.fn().mockImplementation(() => ({
     methods: {
       erc20Claims: (_: string, index: number) => ({
-        call: () => {
-          if (index === 0) {
-            return { claimed: true }
-          } else if (index === 1) {
-            return { claimed: false }
-          } else {
-            throw new Error('execution reverted')
-          }
-        },
+        call: () => mockErc20ClaimsCall(),
       }),
       erc721Claims: () => ({
         call: () => {
@@ -27,6 +19,7 @@ jest.mock('src/web3/utils', () => ({
     },
   })),
 }))
+jest.mock('src/web3/providers')
 jest.mock('src/utils/fetchWithTimeout')
 
 describe('jumpstartLinkHandler', () => {
@@ -36,11 +29,14 @@ describe('jumpstartLinkHandler', () => {
     jest.clearAllMocks()
   })
 
-  it('calls executeClaims with correct parameters', async () => {
-    ;(fetchWithTimeout as jest.Mock).mockImplementation(() => ({
-      ok: true,
-      json: async () => ({ result: { transactionHash: '0xHASH' } }),
-    }))
+  it('claims any unclaimed funds associated with the private key', async () => {
+    mockErc20ClaimsCall.mockResolvedValueOnce({ claimed: true })
+    mockErc20ClaimsCall.mockResolvedValueOnce({ claimed: false })
+    mockErc20ClaimsCall.mockRejectedValue(new Error('execution reverted'))
+
+    jest
+      .mocked(fetchWithTimeout)
+      .mockResolvedValue(new Response(JSON.stringify({ result: { transactionHash: '0xHASH' } })))
     const contractAddress = '0xTEST'
 
     const result = await jumpstartLinkHandler(
@@ -58,4 +54,16 @@ describe('jumpstartLinkHandler', () => {
       expect.any(Number)
     )
   })
+
+  it('throws an error if all funds were already claimed', async () => {
+    mockErc20ClaimsCall.mockResolvedValueOnce({ claimed: true })
+    mockErc20ClaimsCall.mockResolvedValueOnce({ claimed: true })
+    mockErc20ClaimsCall.mockRejectedValue(new Error('execution reverted'))
+
+    await expect(
+      jumpstartLinkHandler(networkConfig.defaultNetworkId, '0xTEST', privateKey, mockAccount2)
+    ).rejects.toThrow('Already claimed all jumpstart rewards for celo-alfajores')
+
+    expect(fetchWithTimeout).not.toHaveBeenCalled()
+  })
 })
diff --git a/src/jumpstart/jumpstartLinkHandler.ts b/src/jumpstart/jumpstartLinkHandler.ts
index ad0f1190f2..9a29a38379 100644
--- a/src/jumpstart/jumpstartLinkHandler.ts
+++ b/src/jumpstart/jumpstartLinkHandler.ts
@@ -29,14 +29,18 @@ export async function jumpstartLinkHandler(
 
   const jumpstart: Contract = await getContract(walletJumpstart.abi, contractAddress)
 
-  const transactionHashes = (
-    await Promise.all([
-      executeClaims(kit, jumpstart, publicKey, userAddress, 'erc20', privateKey, networkId),
-      executeClaims(kit, jumpstart, publicKey, userAddress, 'erc721', privateKey, networkId),
-    ])
-  ).flat()
+  const results = await Promise.all([
+    executeClaims(kit, jumpstart, publicKey, userAddress, 'erc20', privateKey, networkId),
+    executeClaims(kit, jumpstart, publicKey, userAddress, 'erc721', privateKey, networkId),
+  ])
+
+  const transactionHashes = results.flatMap((result) => result.transactionHashes)
+  const hasClaimedAssets = results.some((result) => result.hasClaimedAssets)
 
   if (transactionHashes.length === 0) {
+    if (hasClaimedAssets) {
+      throw new Error(`Already claimed all jumpstart rewards for ${networkId}`)
+    }
     throw new Error(`Failed to claim any jumpstart reward for ${networkId}`)
   }
 
@@ -51,16 +55,19 @@ export async function executeClaims(
   assetType: 'erc20' | 'erc721',
   privateKey: string,
   networkId: NetworkId
-): Promise<Hash[]> {
+): Promise<{ transactionHashes: Hash[]; hasClaimedAssets: boolean }> {
   let index = 0
   const transactionHashes: Hash[] = []
+  let hasClaimedAssets = false
   while (true) {
     try {
       const info =
         assetType === 'erc20'
           ? await jumpstart.methods.erc20Claims(beneficiary, index).call()
           : await jumpstart.methods.erc721Claims(beneficiary, index).call()
+
       if (info.claimed) {
+        hasClaimedAssets = true
         continue
       }
 
@@ -102,7 +109,7 @@ export async function executeClaims(
       } else {
         Logger.error(TAG, 'Error claiming jumpstart reward', error)
       }
-      return transactionHashes
+      return { transactionHashes, hasClaimedAssets }
     } finally {
       index++
     }
diff --git a/src/jumpstart/saga.test.ts b/src/jumpstart/saga.test.ts
index 415cc9b4b8..857ec91a9e 100644
--- a/src/jumpstart/saga.test.ts
+++ b/src/jumpstart/saga.test.ts
@@ -109,13 +109,12 @@ const mockErc721Logs = [
 ] as unknown as ReturnType<typeof parseEventLogs>
 
 describe('jumpstartClaim', () => {
-  afterEach(() => {
+  beforeEach(() => {
     jest.clearAllMocks()
-  })
-
-  it('handles the happy path', async () => {
     jest.mocked(getDynamicConfigParams).mockReturnValue(mockJumpstartRemoteConfig)
+  })
 
+  it('handles a successful claim', async () => {
     await expectSaga(jumpstartClaim, mockPrivateKey, networkId, mockWalletAddress)
       .provide([
         [matchers.call.fn(jumpstartLinkHandler), mockTransactionHashes],
@@ -130,12 +129,10 @@ describe('jumpstartClaim', () => {
   })
 
   it('handles the jumpstartLinkHandler error', async () => {
-    jest.mocked(getDynamicConfigParams).mockReturnValue(mockJumpstartRemoteConfig)
-
     await expectSaga(jumpstartClaim, mockPrivateKey, networkId, mockWalletAddress)
       .provide([[matchers.call.fn(jumpstartLinkHandler), throwError(mockError)]])
       .put(jumpstartClaimStarted())
-      .put(jumpstartClaimFailed())
+      .put(jumpstartClaimFailed({ isAlreadyClaimed: false }))
       .run()
 
     expect(Logger.error).toHaveBeenCalledWith(
@@ -147,9 +144,23 @@ describe('jumpstartClaim', () => {
     expect(ValoraAnalytics.track).toHaveBeenCalledWith(JumpstartEvents.jumpstart_claim_failed)
   })
 
-  it('does not fail when dispatching pending transactions fails', async () => {
-    jest.mocked(getDynamicConfigParams).mockReturnValue(mockJumpstartRemoteConfig)
+  it('handles the already claimed error', async () => {
+    const alreadyClaimedError = new Error('Already claimed')
+    await expectSaga(jumpstartClaim, mockPrivateKey, networkId, mockWalletAddress)
+      .provide([[matchers.call.fn(jumpstartLinkHandler), throwError(alreadyClaimedError)]])
+      .put(jumpstartClaimStarted())
+      .put(jumpstartClaimFailed({ isAlreadyClaimed: true }))
+      .run()
 
+    expect(Logger.error).toHaveBeenCalledWith(
+      'WalletJumpstart/saga',
+      'Error handling jumpstart link',
+      alreadyClaimedError
+    )
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(JumpstartEvents.jumpstart_claim_failed)
+  })
+
+  it('does not fail when dispatching pending transactions fails', async () => {
     return expectSaga(jumpstartClaim, mockPrivateKey, networkId, mockWalletAddress)
       .provide([
         [matchers.call.fn(jumpstartLinkHandler), mockTransactionHashes],
@@ -166,7 +177,7 @@ describe('jumpstartClaim', () => {
     await expectSaga(jumpstartClaim, mockPrivateKey, networkId, mockWalletAddress)
       .provide([[matchers.call.fn(jumpstartLinkHandler), mockTransactionHashes]])
       .put(jumpstartClaimStarted())
-      .put(jumpstartClaimFailed())
+      .put(jumpstartClaimFailed({ isAlreadyClaimed: false }))
       .run()
 
     expect(ValoraAnalytics.track).toHaveBeenCalledWith(JumpstartEvents.jumpstart_claim_failed)
@@ -174,7 +185,7 @@ describe('jumpstartClaim', () => {
 })
 
 describe('dispatchPendingTransactions', () => {
-  afterEach(() => {
+  beforeEach(() => {
     jest.clearAllMocks()
   })
 
@@ -213,7 +224,7 @@ describe('dispatchPendingTransactions', () => {
 })
 
 describe('dispatchPendingERC20Transactions', () => {
-  afterEach(() => {
+  beforeEach(() => {
     jest.clearAllMocks()
   })
 
@@ -273,7 +284,7 @@ describe('dispatchPendingERC20Transactions', () => {
 })
 
 describe('dispatchPendingERC721Transactions', () => {
-  afterEach(() => {
+  beforeEach(() => {
     jest.clearAllMocks()
   })
 
diff --git a/src/jumpstart/saga.ts b/src/jumpstart/saga.ts
index 96bd66e650..c8f7b143bb 100644
--- a/src/jumpstart/saga.ts
+++ b/src/jumpstart/saga.ts
@@ -67,10 +67,12 @@ export function* jumpstartClaim(privateKey: string, networkId: NetworkId, wallet
     ValoraAnalytics.track(JumpstartEvents.jumpstart_claim_succeeded)
 
     yield* put(jumpstartClaimSucceeded())
-  } catch (error) {
+  } catch (error: any) {
     Logger.error(TAG, 'Error handling jumpstart link', error)
     ValoraAnalytics.track(JumpstartEvents.jumpstart_claim_failed)
-    yield* put(jumpstartClaimFailed())
+    yield* put(
+      jumpstartClaimFailed({ isAlreadyClaimed: error?.message?.includes('Already claimed') })
+    )
   }
 }
 
diff --git a/src/jumpstart/selectors.test.ts b/src/jumpstart/selectors.test.ts
deleted file mode 100644
index 5769f87a55..0000000000
--- a/src/jumpstart/selectors.test.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { showJumstartClaimError, showJumstartClaimLoading } from 'src/jumpstart/selectors'
-
-describe('jumpstart selectors', () => {
-  it('should return the correct value for showJumpstartLoading', () => {
-    const state: any = {
-      jumpstart: {
-        claimStatus: 'loading',
-      },
-    }
-    expect(showJumstartClaimLoading(state)).toEqual(true)
-  })
-
-  it('should return the correct value for showJumpstartError', () => {
-    const state: any = {
-      jumpstart: {
-        claimStatus: 'error',
-      },
-    }
-    expect(showJumstartClaimError(state)).toEqual(true)
-  })
-})
diff --git a/src/jumpstart/selectors.ts b/src/jumpstart/selectors.ts
index 2e4d7f38da..9682f0e15a 100644
--- a/src/jumpstart/selectors.ts
+++ b/src/jumpstart/selectors.ts
@@ -1,11 +1,7 @@
 import { RootState } from 'src/redux/reducers'
 
-export const showJumstartClaimLoading = (state: RootState) => {
-  return state.jumpstart.claimStatus === 'loading'
-}
-
-export const showJumstartClaimError = (state: RootState) => {
-  return state.jumpstart.claimStatus === 'error'
+export const jumpstartClaimStatusSelector = (state: RootState) => {
+  return state.jumpstart.claimStatus
 }
 
 export const jumpstartSendStatusSelector = (state: RootState) => {
diff --git a/src/jumpstart/slice.test.ts b/src/jumpstart/slice.test.ts
index 1a2f87fe92..fba0b1dd82 100644
--- a/src/jumpstart/slice.test.ts
+++ b/src/jumpstart/slice.test.ts
@@ -20,7 +20,7 @@ describe('Wallet Jumpstart', () => {
   })
 
   it('should handle jumpstart claim failure', () => {
-    const updatedState = reducer(undefined, jumpstartClaimFailed())
+    const updatedState = reducer(undefined, jumpstartClaimFailed({ isAlreadyClaimed: false }))
 
     expect(updatedState).toHaveProperty('claimStatus', 'error')
   })
diff --git a/src/jumpstart/slice.ts b/src/jumpstart/slice.ts
index e89b985c16..8ebcb92eb4 100644
--- a/src/jumpstart/slice.ts
+++ b/src/jumpstart/slice.ts
@@ -15,7 +15,7 @@ export interface JumpstartTransactionStartedAction {
   sendAmount: string
 }
 interface State {
-  claimStatus: 'idle' | 'loading' | 'error'
+  claimStatus: 'idle' | 'loading' | 'error' | 'errorAlreadyClaimed'
   depositStatus: 'idle' | 'loading' | 'error' | 'success'
   reclaimStatus: 'idle' | 'loading' | 'error' | 'success'
 }
@@ -34,22 +34,18 @@ const slice = createSlice({
       ...state,
       claimStatus: 'loading',
     }),
-
     jumpstartClaimSucceeded: (state) => ({
       ...state,
       claimStatus: 'idle',
     }),
-
-    jumpstartClaimFailed: (state) => ({
+    jumpstartClaimFailed: (state, action: PayloadAction<{ isAlreadyClaimed: boolean }>) => ({
       ...state,
-      claimStatus: 'error',
+      claimStatus: action.payload.isAlreadyClaimed ? 'errorAlreadyClaimed' : 'error',
     }),
-
     jumpstartClaimLoadingDismissed: (state) => ({
       ...state,
       claimStatus: 'idle',
     }),
-
     jumpstartClaimErrorDismissed: (state) => ({
       ...state,
       claimStatus: 'idle',
diff --git a/test/RootStateSchema.json b/test/RootStateSchema.json
index d6487610c7..578e00ef16 100644
--- a/test/RootStateSchema.json
+++ b/test/RootStateSchema.json
@@ -4800,6 +4800,7 @@
                 "claimStatus": {
                     "enum": [
                         "error",
+                        "errorAlreadyClaimed",
                         "idle",
                         "loading"
                     ],

From 5946f1950f97028282765c31c2319c4cdfd6eabf Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 21 May 2024 02:13:50 -0700
Subject: [PATCH 029/133] fix(earn): navigation to enter amount on deposit more
 tap (#5439)

### Description

Hooks up the deposit more button on the Earn cta to navigation and
analytics.

### Test plan

- [x] Tested locally on iOS
- [x] Unit tests added

### Related issues

- Part of ACT-1176

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/analytics/Events.tsx         |  1 +
 src/analytics/Properties.tsx     |  4 ++++
 src/analytics/docs.ts            |  1 +
 src/earn/EarnActivePool.test.tsx | 21 +++++++++++++++++++++
 src/earn/EarnActivePool.tsx      |  8 +++++---
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/analytics/Events.tsx b/src/analytics/Events.tsx
index eb6f794e11..eedd7c13c0 100644
--- a/src/analytics/Events.tsx
+++ b/src/analytics/Events.tsx
@@ -693,6 +693,7 @@ export enum EarnEvents {
   earn_enter_amount_continue_press = 'earn_enter_amount_continue_press',
   earn_enter_amount_info_more_pools = 'earn_enter_amount_info_more_pools',
   earn_exit_pool_press = 'earn_exit_pool_press',
+  earn_deposit_more_press = 'earn_deposit_more_press',
   earn_deposit_add_gas_press = 'earn_deposit_add_gas_press',
   earn_feed_item_select = 'earn_feed_item_select',
   earn_collect_earnings_press = 'earn_collect_earnings_press',
diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index f42c548a37..0a4189bc93 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -1624,6 +1624,10 @@ interface EarnEventsProperties {
     tokenAmount: string
     providerId: string
   }
+  [EarnEvents.earn_deposit_more_press]: {
+    depositTokenId: string
+    providerId: string
+  }
   [EarnEvents.earn_deposit_add_gas_press]: { gasTokenId: string }
   [EarnEvents.earn_feed_item_select]: {
     origin: 'EarnDeposit' | 'EarnWithdraw' | 'EarnClaimReward'
diff --git a/src/analytics/docs.ts b/src/analytics/docs.ts
index 8be0cf8353..85f0921b1a 100644
--- a/src/analytics/docs.ts
+++ b/src/analytics/docs.ts
@@ -608,6 +608,7 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [EarnEvents.earn_enter_amount_continue_press]: `When a user taps continue on the earn enter amount`,
   [EarnEvents.earn_enter_amount_info_more_pools]: `When a user taps to see other Aave pools`,
   [EarnEvents.earn_exit_pool_press]: `When the user taps on the exit pool button from the earn card in discover tab`,
+  [EarnEvents.earn_deposit_more_press]: `When the user taps deposit more button from the earn card in discover tab`,
   [EarnEvents.earn_deposit_add_gas_press]: `When the user doesn't have enough for gas when trying to deposit and clicks on the button to add gas token`,
   [EarnEvents.earn_feed_item_select]: `When the users taps on an earn transaction feed item`,
   [EarnEvents.earn_collect_earnings_press]: `When the user taps on the collect earnings button in the collect screen`,
diff --git a/src/earn/EarnActivePool.test.tsx b/src/earn/EarnActivePool.test.tsx
index a6670cdc6b..e8d74fab2a 100644
--- a/src/earn/EarnActivePool.test.tsx
+++ b/src/earn/EarnActivePool.test.tsx
@@ -100,4 +100,25 @@ describe('EarnActivePool', () => {
       poolTokenId: networkConfig.aaveArbUsdcTokenId,
     })
   })
+
+  it('should have correct analytics and navigation with deposit more cta tap', () => {
+    const { getByText } = render(
+      <Provider store={store}>
+        <EarnActivePool
+          cta="ExitAndDeposit"
+          depositTokenId={networkConfig.arbUsdcTokenId}
+          poolTokenId={networkConfig.aaveArbUsdcTokenId}
+        />
+      </Provider>
+    )
+
+    fireEvent.press(getByText('earnFlow.activePools.depositMore'))
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_deposit_more_press, {
+      depositTokenId: networkConfig.arbUsdcTokenId,
+      providerId: 'aave-v3',
+    })
+    expect(navigate).toBeCalledWith(Screens.EarnEnterAmount, {
+      tokenId: networkConfig.arbUsdcTokenId,
+    })
+  })
 })
diff --git a/src/earn/EarnActivePool.tsx b/src/earn/EarnActivePool.tsx
index 15837ae21f..7b8a7b5287 100644
--- a/src/earn/EarnActivePool.tsx
+++ b/src/earn/EarnActivePool.tsx
@@ -107,9 +107,11 @@ export default function EarnActivePool({ depositTokenId, poolTokenId, cta }: Pro
             />
             <Button
               onPress={() => {
-                // TODO (act-1176) create earn enter amount screen
-                // Will navigate to this screen with appropriate props
-                // fire analytics
+                ValoraAnalytics.track(EarnEvents.earn_deposit_more_press, {
+                  depositTokenId,
+                  providerId: 'aave-v3',
+                })
+                navigate(Screens.EarnEnterAmount, { tokenId: depositTokenId })
               }}
               text={t('earnFlow.activePools.depositMore')}
               type={BtnTypes.PRIMARY}

From 3a4fd74f4d9e02e08efbc8fcf31ced91db3fb102 Mon Sep 17 00:00:00 2001
From: Kathy Luo <kathyluo18@gmail.com>
Date: Tue, 21 May 2024 18:58:08 +0200
Subject: [PATCH 030/133] chore: update bug report issue template (#5443)

### Description

We'll point any discord devs to file bug reports via GH going forward.

### Test plan

n/a

### Related issues

n/a

### Backwards compatibility

n/a

### Network scalability
 n/a
---
 .github/ISSUE_TEMPLATE/1-bug-report.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md
index ba2b26cef5..eaa7efcaea 100644
--- a/.github/ISSUE_TEMPLATE/1-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/1-bug-report.md
@@ -10,8 +10,6 @@ assignees: ''
 
 Have an issue that needs support, e.g. transaction issues specific to an account? Contact our support team in-app, the preferred method, by shaking your device or navigating to: ☰ > (?) Help > Contact. Alternatively, contact support from our website 👉 https://valoraapp.com/support
 
-Have a question about development? Join our Discord 👉 https://discord.gg/7tKnCbHv5j
-
 As an open source project - it may take some time for your issue to be addressed. Please be patient and we will respond as soon as we can. 🙏 -->
 
 ### Current behavior

From ea65cbcd200090e9604bd491088f35235bffbaac Mon Sep 17 00:00:00 2001
From: Joe Bergeron <jbergero@alum.mit.edu>
Date: Tue, 21 May 2024 13:23:37 -0400
Subject: [PATCH 031/133] feat(swap): Initial Swap screen redesign (#5409)

### Description

First part of
[RET-1065](https://linear.app/valora/issue/RET-1065/[wallet]-swap-screen-redesign).
Updates the design of swap screen to match the [designs in
Figma](https://www.figma.com/design/fjpfHZdVSLazv330kT2sQz/Cross-chain-swaps?node-id=606-1653&t=Bq4e7bCLkjpGu4D0-4).
The rest of the behavior outlined in the ticket will come in followup
PRs.

### Test plan

Unit and manual tested. See video below:



https://github.com/valora-inc/wallet/assets/569401/c078eb34-4cd2-4fe9-a9a2-f5eba85c0c47



### Related issues

- Part of
[RET-1065](https://linear.app/valora/issue/RET-1065/[wallet]-swap-screen-redesign).

### Backwards compatibility

Yes.

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 locales/base/translation.json |   3 +
 src/analytics/Events.tsx      |   1 +
 src/analytics/Properties.tsx  |   4 +
 src/analytics/docs.ts         |   1 +
 src/components/Touchable.tsx  |  33 +++-
 src/icons/DownIndicator.tsx   |   5 +-
 src/swap/SwapAmountInput.tsx  | 287 ++++++++++++++++------------------
 src/swap/SwapScreen.test.tsx  |  48 ++++--
 src/swap/SwapScreen.tsx       |  58 +++++--
 9 files changed, 260 insertions(+), 180 deletions(-)

diff --git a/locales/base/translation.json b/locales/base/translation.json
index 10a7d84073..d960ee8ae1 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -1769,6 +1769,9 @@
     "swapToTokenSelection": "SWAP TO",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "The selected tokens aren't supported by our swap providers.",
+    "selectTokenLabel": "Select token",
+    "tokenBottomSheetTitle": "Select Token",
+    "onNetwork": "on {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "You switched to the {{networkName}} network",
       "body_swapFrom": "Select a token to swap from on the {{networkName}} network to continue.",
diff --git a/src/analytics/Events.tsx b/src/analytics/Events.tsx
index eedd7c13c0..157d42ccf9 100644
--- a/src/analytics/Events.tsx
+++ b/src/analytics/Events.tsx
@@ -568,6 +568,7 @@ export enum SwapEvents {
   swap_show_info = 'swap_show_info',
   swap_show_fund_your_wallet = 'swap_show_fund_your_wallet',
   swap_add_funds = 'swap_add_funds',
+  swap_switch_tokens = 'swap_switch_tokens',
 }
 
 export enum CeloNewsEvents {
diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 0a4189bc93..f4543433b0 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -1319,6 +1319,10 @@ interface SwapEventsProperties {
   }
   [SwapEvents.swap_show_fund_your_wallet]: undefined
   [SwapEvents.swap_add_funds]: undefined
+  [SwapEvents.swap_switch_tokens]: {
+    fromTokenId: string | undefined
+    toTokenId: string | undefined
+  }
 }
 
 interface CeloNewsEventsProperties {
diff --git a/src/analytics/docs.ts b/src/analytics/docs.ts
index 85f0921b1a..870d12546e 100644
--- a/src/analytics/docs.ts
+++ b/src/analytics/docs.ts
@@ -551,6 +551,7 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [SwapEvents.swap_show_info]: `When a user taps an info icon to show more information on the swap screen`,
   [SwapEvents.swap_show_fund_your_wallet]: `When "Fund your wallet" bottom sheet is displayed`,
   [SwapEvents.swap_add_funds]: `When user taps "Add funds" button is "Fund your wallet" bottom sheet`,
+  [SwapEvents.swap_switch_tokens]: `When a user taps the button to switch the to and from tokens`,
   [CeloNewsEvents.celo_news_screen_open]: `When the screen is mounted`,
   [CeloNewsEvents.celo_news_article_tap]: `When a user taps on a news article`,
   [CeloNewsEvents.celo_news_bottom_read_more_tap]: `When a user taps on the read more button at the bottom of the screen`,
diff --git a/src/components/Touchable.tsx b/src/components/Touchable.tsx
index 40ebb0f108..1f9711f3d6 100644
--- a/src/components/Touchable.tsx
+++ b/src/components/Touchable.tsx
@@ -1,27 +1,48 @@
 import * as React from 'react'
-import { TouchableWithoutFeedbackProps, View } from 'react-native'
+import { TouchableWithoutFeedbackProps, View, ViewStyle } from 'react-native'
 import PlatformTouchable from 'react-native-platform-touchable'
 
+type BorderRadiusStyle = Pick<
+  ViewStyle,
+  | 'borderTopLeftRadius'
+  | 'borderTopRightRadius'
+  | 'borderBottomLeftRadius'
+  | 'borderBottomRightRadius'
+>
+
 export interface Props extends TouchableWithoutFeedbackProps {
   borderless?: boolean
   children: React.ReactNode // must only have one direct child. see https://github.com/react-native-community/react-native-platform-touchable#touchable
-  borderRadius?: number
+  borderRadius?: number | BorderRadiusStyle
+  shouldRenderRippleAbove?: boolean
 }
 
 /**
  * @param borderless - If true, the touchable has a borderless ripple effect.
- * @param borderRadius - should be added if the touchable component has rounded corners, to prevent the ripple effect from going outside the component on tap (Android)
+ * @param borderRadius - should be added if the touchable component has rounded corners, to prevent the ripple effect from going outside the component on tap (Android). Can either be a number
+ *   representing a single border radius, or an object individually specifying each corner's radius.
+ * @param shouldRenderRippleAbove - If present, ensures that the ripple effect will render above the touchable component. See https://github.com/facebook/react-native/issues/17200
  * @returns A touchable component
  */
-export default function Touchable({ borderless, borderRadius = 0, ...passThroughProps }: Props) {
+export default function Touchable({
+  shouldRenderRippleAbove,
+  borderless,
+  borderRadius = 0,
+  ...passThroughProps
+}: Props) {
   const background = borderless
     ? PlatformTouchable.SelectableBackgroundBorderless()
     : PlatformTouchable.SelectableBackground()
+  const borderStyle = typeof borderRadius === 'number' ? { borderRadius } : borderRadius
   return borderRadius === 0 ? (
     <PlatformTouchable {...passThroughProps} background={background} />
   ) : (
-    <View style={[{ borderRadius }, !borderless && { overflow: 'hidden' }]}>
-      <PlatformTouchable {...passThroughProps} background={background} />
+    <View style={[borderStyle, !borderless && { overflow: 'hidden' }]}>
+      <PlatformTouchable
+        {...passThroughProps}
+        background={shouldRenderRippleAbove ? undefined : background}
+        foreground={shouldRenderRippleAbove ? background : undefined}
+      />
     </View>
   )
 }
diff --git a/src/icons/DownIndicator.tsx b/src/icons/DownIndicator.tsx
index d4f2bf63d9..3da77eeb53 100644
--- a/src/icons/DownIndicator.tsx
+++ b/src/icons/DownIndicator.tsx
@@ -5,11 +5,12 @@ import Svg, { Path } from 'svgs'
 export interface Props {
   color?: string
   testID?: string
+  size?: number
 }
 
-function DownIndicator({ color = colors.error, testID }: Props) {
+function DownIndicator({ color = colors.error, testID, size = 10 }: Props) {
   return (
-    <Svg width="10" height="10" viewBox="0 0 10 10" fill="none" testID={testID}>
+    <Svg width={size} height={size} viewBox="0 0 10 10" fill="none" testID={testID}>
       <Path
         fill={color}
         d="M4.369 0H5.63v7.576l3.473-3.472L10 5l-5 5-5-5 .896-.896L4.37 7.576V0Z"
diff --git a/src/swap/SwapAmountInput.tsx b/src/swap/SwapAmountInput.tsx
index 6f58dd588d..9ae5b00724 100644
--- a/src/swap/SwapAmountInput.tsx
+++ b/src/swap/SwapAmountInput.tsx
@@ -20,9 +20,9 @@ import Colors from 'src/styles/colors'
 import fontStyles, { typeScale } from 'src/styles/fonts'
 import { Spacing } from 'src/styles/styles'
 import { TokenBalance } from 'src/tokens/slice'
+import { NETWORK_NAMES } from 'src/shared/conts'
 
 interface Props {
-  label: string
   onInputChange(value: string): void
   inputValue?: string | null
   parsedInputValue?: BigNumber | null
@@ -35,10 +35,10 @@ interface Props {
   style?: StyleProp<ViewStyle>
   buttonPlaceholder: string
   editable?: boolean
+  borderRadius?: number
 }
 
 const SwapAmountInput = ({
-  label,
   onInputChange,
   inputValue,
   parsedInputValue,
@@ -51,6 +51,7 @@ const SwapAmountInput = ({
   style,
   buttonPlaceholder,
   editable = true,
+  borderRadius,
 }: Props) => {
   const { t } = useTranslation()
 
@@ -66,143 +67,143 @@ const SwapAmountInput = ({
     }
   }
 
+  const touchableBorderStyle = token
+    ? {
+        borderTopLeftRadius: borderRadius,
+        borderTopRightRadius: borderRadius,
+      }
+    : borderRadius
+
   return (
-    <View style={[styles.container, style]} testID="SwapAmountInput">
-      <Text style={styles.label}>{label}</Text>
-      <View style={styles.contentContainer}>
-        <View style={styles.inputContainer}>
-          <TextInput
-            forwardedRef={textInputRef}
-            onChangeText={(value) => {
-              handleSetStartPosition(undefined)
-              onInputChange(value)
-            }}
-            value={inputValue || undefined}
-            placeholder="0"
-            // hide input when loading so that the value is not visible under the loader
-            style={{ opacity: loading ? 0 : 1 }}
-            editable={editable && !loading}
-            keyboardType="decimal-pad"
-            // Work around for RN issue with Samsung keyboards
-            // https://github.com/facebook/react-native/issues/22005
-            autoCapitalize="words"
-            autoFocus={autoFocus}
-            // unset lineHeight to allow ellipsis on long inputs on iOS
-            inputStyle={[styles.inputText, inputError ? styles.inputError : {}]}
-            testID="SwapAmountInput/Input"
-            onBlur={() => {
-              handleSetStartPosition(0)
-            }}
-            onFocus={() => {
-              handleSetStartPosition(inputValue?.length ?? 0)
-            }}
-            onSelectionChange={() => {
-              handleSetStartPosition(undefined)
-            }}
-            selection={
-              Platform.OS === 'android' && typeof startPosition === 'number'
-                ? { start: startPosition }
-                : undefined
-            }
-          />
-          {loading && (
-            <View style={[styles.loaderContainer, { paddingVertical: Spacing.Small12 }]}>
-              <SkeletonPlaceholder
-                borderRadius={100} // ensure rounded corners with font scaling
-                backgroundColor={Colors.gray2}
-                highlightColor={Colors.white}
-                testID="SwapAmountInput/Loader"
-              >
-                <View style={styles.loader} />
-              </SkeletonPlaceholder>
-            </View>
-          )}
-        </View>
-        {onPressMax && (
-          <Touchable
-            borderless
-            onPress={() => {
-              onPressMax()
-              textInputRef.current?.blur()
-            }}
-            style={styles.maxButton}
-            testID="SwapAmountInput/MaxButton"
-          >
-            <Text style={styles.maxText}>{t('max')}</Text>
-          </Touchable>
-        )}
-        <Touchable
-          borderless
-          onPress={onSelectToken}
-          style={styles.tokenSelectButton}
-          testID="SwapAmountInput/TokenSelect"
-        >
+    <View style={[styles.container, { borderRadius }, style]} testID="SwapAmountInput">
+      <Touchable
+        borderless
+        borderRadius={touchableBorderStyle}
+        onPress={onSelectToken}
+        testID="SwapAmountInput/TokenSelect"
+      >
+        <View style={styles.contentContainer}>
           {token ? (
-            <>
-              <TokenIcon token={token} viewStyle={styles.tokenImage} size={IconSize.SMALL} />
-              <Text style={styles.tokenName}>{token.symbol}</Text>
-              <DownArrowIcon color={Colors.gray5} />
-            </>
+            <View style={styles.tokenInfo}>
+              <TokenIcon token={token} size={IconSize.MEDIUM} />
+              <View style={styles.tokenInfoText}>
+                <Text style={styles.tokenName}>{token.symbol}</Text>
+                <Text style={styles.tokenNetwork}>
+                  {t('swapScreen.onNetwork', { networkName: NETWORK_NAMES[token.networkId] })}
+                </Text>
+              </View>
+            </View>
           ) : (
-            <>
-              <Text style={styles.tokenNamePlaceholder}>{buttonPlaceholder}</Text>
-              <DownArrowIcon color={Colors.gray5} />
-            </>
+            <Text style={styles.tokenNamePlaceholder}>{buttonPlaceholder}</Text>
           )}
-        </Touchable>
-      </View>
-      <View testID="SwapAmountInput/FiatValue">
-        <Text
-          style={[
-            styles.fiatValue,
-            {
-              opacity: loading || !parsedInputValue?.gt(0) || !token ? 0 : 1,
-            },
-          ]}
-        >
-          <TokenDisplay
-            amount={parsedInputValue ?? 0}
-            showLocalAmount
-            showApprox
-            errorFallback={t('swapScreen.tokenUsdValueUnknown') ?? undefined}
-            tokenId={token?.tokenId}
-          />
-        </Text>
-        {loading && (
-          <View style={styles.loaderContainer}>
-            <SkeletonPlaceholder
-              borderRadius={100} // ensure rounded corners with font scaling
-              backgroundColor={Colors.gray2}
-              highlightColor={Colors.white}
-              testID="SwapAmountInput/FiatValueLoader"
-            >
-              <View style={styles.fiatValueLoader} />
-            </SkeletonPlaceholder>
+          <DownArrowIcon height={24} color={Colors.gray3} />
+        </View>
+      </Touchable>
+      {token && (
+        <View style={[styles.contentContainer, styles.bottomContainer]}>
+          <View style={styles.inputContainer}>
+            <TextInput
+              forwardedRef={textInputRef}
+              onChangeText={(value) => {
+                handleSetStartPosition(undefined)
+                onInputChange(value)
+              }}
+              value={inputValue || undefined}
+              placeholder="0"
+              // hide input when loading so that the value is not visible under the loader
+              style={{ opacity: loading ? 0 : 1 }}
+              editable={editable && !loading}
+              keyboardType="decimal-pad"
+              // Work around for RN issue with Samsung keyboards
+              // https://github.com/facebook/react-native/issues/22005
+              autoCapitalize="words"
+              autoFocus={autoFocus}
+              // unset lineHeight to allow ellipsis on long inputs on iOS
+              inputStyle={[styles.inputText, inputError ? styles.inputError : {}]}
+              testID="SwapAmountInput/Input"
+              onBlur={() => {
+                handleSetStartPosition(0)
+              }}
+              onFocus={() => {
+                handleSetStartPosition(inputValue?.length ?? 0)
+              }}
+              onSelectionChange={() => {
+                handleSetStartPosition(undefined)
+              }}
+              selection={
+                Platform.OS === 'android' && typeof startPosition === 'number'
+                  ? { start: startPosition }
+                  : undefined
+              }
+            />
+            {loading && (
+              <View style={styles.loaderContainer}>
+                <SkeletonPlaceholder
+                  borderRadius={100} // ensure rounded corners with font scaling
+                  backgroundColor={Colors.gray2}
+                  highlightColor={Colors.white}
+                  testID="SwapAmountInput/Loader"
+                >
+                  <View style={styles.loader} />
+                </SkeletonPlaceholder>
+              </View>
+            )}
           </View>
-        )}
-      </View>
+          {!loading && parsedInputValue?.gt(0) && token && (
+            <Text numberOfLines={1} style={styles.fiatValue} testID="SwapAmountInput/FiatValue">
+              <TokenDisplay
+                amount={parsedInputValue ?? 0}
+                showLocalAmount
+                showApprox
+                errorFallback={t('swapScreen.tokenUsdValueUnknown') ?? undefined}
+                tokenId={token?.tokenId}
+              />
+            </Text>
+          )}
+          {onPressMax && (
+            <View style={styles.maxButtonWrapper}>
+              <Touchable
+                borderRadius={Spacing.Tiny4}
+                onPress={() => {
+                  onPressMax()
+                  textInputRef.current?.blur()
+                }}
+                style={styles.maxButton}
+                testID="SwapAmountInput/MaxButton"
+              >
+                <Text style={styles.maxText}>{t('max')}</Text>
+              </Touchable>
+            </View>
+          )}
+        </View>
+      )}
     </View>
   )
 }
 
 const styles = StyleSheet.create({
   container: {
-    padding: Spacing.Regular16,
     backgroundColor: Colors.gray1,
     borderColor: Colors.gray2,
     borderWidth: 1,
   },
-  label: {
-    ...fontStyles.xsmall,
-    fontWeight: 'bold',
+  tokenInfo: {
+    alignItems: 'center',
+    flexDirection: 'row',
   },
   contentContainer: {
+    height: 64,
+    paddingHorizontal: Spacing.Regular16,
     flexDirection: 'row',
     alignItems: 'center',
+    justifyContent: 'space-between',
+  },
+  bottomContainer: {
+    borderColor: Colors.gray2,
+    borderTopWidth: 1,
   },
   inputContainer: {
     flex: 1,
-    marginRight: Spacing.Smallest8,
   },
   inputError: {
     color: Colors.error,
@@ -214,61 +215,51 @@ const styles = StyleSheet.create({
     paddingVertical: Spacing.Smallest8,
   },
   loaderContainer: {
-    position: 'absolute',
-    top: 0,
-    left: 0,
-    width: '100%',
-    height: '100%',
+    paddingVertical: Spacing.Small12,
   },
   loader: {
     height: '100%',
     width: '100%',
   },
-  fiatValueLoader: {
-    height: '100%',
-    width: '40%',
+  maxButtonWrapper: {
+    marginLeft: Spacing.Smallest8,
   },
   maxButton: {
     backgroundColor: Colors.white,
     borderWidth: 1,
     borderColor: Colors.gray2,
-    borderRadius: 4,
-    paddingVertical: 2,
-    paddingHorizontal: 4,
-    marginRight: Spacing.Smallest8,
+    borderRadius: Spacing.Tiny4,
+    paddingVertical: Spacing.Tiny4,
+    paddingHorizontal: Spacing.Tiny4,
   },
   maxText: {
-    ...fontStyles.small,
+    ...typeScale.labelXXSmall,
     color: Colors.gray5,
     fontSize: 10,
   },
-  tokenSelectButton: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    backgroundColor: Colors.white,
-    borderWidth: 1,
-    borderColor: Colors.gray2,
-    borderRadius: 100,
-    paddingHorizontal: Spacing.Smallest8,
-    paddingVertical: 4,
-  },
   tokenName: {
-    ...fontStyles.small600,
+    ...typeScale.labelSemiBoldXSmall,
     paddingHorizontal: 4,
   },
-  tokenNamePlaceholder: {
-    ...fontStyles.small600,
+  tokenNetwork: {
+    ...typeScale.bodyXSmall,
+    color: Colors.gray4,
     paddingHorizontal: 4,
-    color: Colors.primary,
   },
-  tokenImage: {
-    width: 24,
-    height: 24,
-    borderRadius: 12,
+  tokenInfoText: {
+    paddingLeft: Spacing.Smallest8,
+  },
+  tokenNamePlaceholder: {
+    ...typeScale.labelMedium,
+    paddingHorizontal: 4,
+    color: Colors.gray3,
   },
   fiatValue: {
     ...typeScale.bodyXSmall,
+    paddingLeft: Spacing.Smallest8,
+    maxWidth: '40%',
     color: Colors.gray4,
+    paddingVertical: Spacing.Smallest8,
   },
 })
 
diff --git a/src/swap/SwapScreen.test.tsx b/src/swap/SwapScreen.test.tsx
index b6064b1829..3b8ad54425 100644
--- a/src/swap/SwapScreen.test.tsx
+++ b/src/swap/SwapScreen.test.tsx
@@ -318,28 +318,25 @@ describe('SwapScreen', () => {
     expect(getByText('swapScreen.title')).toBeTruthy()
     expect(getByText('swapScreen.confirmSwap')).toBeDisabled()
 
-    expect(within(swapFromContainer).getByText('swapScreen.swapFrom')).toBeTruthy()
-    expect(within(swapFromContainer).getByTestId('SwapAmountInput/MaxButton')).toBeTruthy()
+    expect(within(swapFromContainer).getByText('swapScreen.selectTokenLabel')).toBeTruthy()
     expect(within(swapFromContainer).getByTestId('SwapAmountInput/TokenSelect')).toBeTruthy()
-    expect(within(swapFromContainer).getByText('swapScreen.swapFromTokenSelection')).toBeTruthy()
 
-    expect(within(swapToContainer).getByText('swapScreen.swapTo')).toBeTruthy()
+    expect(within(swapToContainer).getByText('swapScreen.selectTokenLabel')).toBeTruthy()
     expect(within(swapToContainer).getByTestId('SwapAmountInput/TokenSelect')).toBeTruthy()
-    expect(within(swapToContainer).getByText('swapScreen.swapToTokenSelection')).toBeTruthy()
   })
 
   it('should display the token set via fromTokenId prop', () => {
     const { swapFromContainer, swapToContainer } = renderScreen({ fromTokenId: mockCeurTokenId })
 
     expect(within(swapFromContainer).getByText('cEUR')).toBeTruthy()
-    expect(within(swapToContainer).getByText('swapScreen.swapToTokenSelection')).toBeTruthy()
+    expect(within(swapToContainer).getByText('swapScreen.selectTokenLabel')).toBeTruthy()
   })
 
   it('should allow selecting tokens', async () => {
     const { swapFromContainer, swapToContainer, swapScreen } = renderScreen({})
 
-    expect(within(swapFromContainer).getByText('swapScreen.swapFromTokenSelection')).toBeTruthy()
-    expect(within(swapToContainer).getByText('swapScreen.swapToTokenSelection')).toBeTruthy()
+    expect(within(swapFromContainer).getByText('swapScreen.selectTokenLabel')).toBeTruthy()
+    expect(within(swapToContainer).getByText('swapScreen.selectTokenLabel')).toBeTruthy()
 
     selectSwapTokens('CELO', 'cUSD', swapScreen)
 
@@ -419,7 +416,7 @@ describe('SwapScreen', () => {
       )
     ).toBeFalsy()
     expect(tokenBottomSheet).toBeVisible()
-    expect(within(swapToContainer).getByText('swapScreen.swapToTokenSelection')).toBeTruthy()
+    expect(within(swapToContainer).getByText('swapScreen.selectTokenLabel')).toBeTruthy()
     expect(ValoraAnalytics.track).not.toHaveBeenCalledWith(
       SwapEvents.swap_screen_confirm_token,
       expect.anything()
@@ -442,7 +439,7 @@ describe('SwapScreen', () => {
 
     selectSwapTokens('CELO', 'CELO', swapScreen)
 
-    expect(within(swapFromContainer).getByText('swapScreen.swapFromTokenSelection')).toBeTruthy()
+    expect(within(swapFromContainer).getByText('swapScreen.selectTokenLabel')).toBeTruthy()
     expect(within(swapToContainer).getByText('CELO')).toBeTruthy()
   })
 
@@ -1180,12 +1177,41 @@ describe('SwapScreen', () => {
     expect(within(tokenBottomSheet).queryByText('Test Token')).toBeFalsy()
   })
 
-  it('should disable buy amount input when swap buy amount experiment is set is false', () => {
+  it('should not show input sections if tokens are not selected', () => {
     jest.mocked(getExperimentParams).mockReturnValue({
       swapBuyAmountEnabled: false,
     })
     const { swapFromContainer, swapToContainer } = renderScreen({})
 
+    expect(within(swapFromContainer).queryByTestId('SwapAmountInput/Input')).toBeFalsy()
+    expect(within(swapToContainer).queryByTestId('SwapAmountInput/Input')).toBeFalsy()
+  })
+
+  it('should be able to switch tokens by pressing arrow button', async () => {
+    jest.mocked(getExperimentParams).mockReturnValue({
+      swapBuyAmountEnabled: false,
+    })
+    const { swapFromContainer, swapToContainer, swapScreen, getByTestId } = renderScreen({})
+
+    selectSwapTokens('CELO', 'cUSD', swapScreen)
+
+    expect(within(swapFromContainer).getByTestId('SwapAmountInput/Input')).toBeTruthy()
+    expect(within(swapToContainer).getByTestId('SwapAmountInput/Input')).toBeTruthy()
+
+    fireEvent.press(getByTestId('SwapScreen/SwitchTokens'))
+
+    expect(within(swapFromContainer).getByTestId('SwapAmountInput/Input')).toBeTruthy()
+    expect(within(swapToContainer).getByTestId('SwapAmountInput/Input')).toBeTruthy()
+  })
+
+  it('should disable buy amount input when swap buy amount experiment is set is false', () => {
+    jest.mocked(getExperimentParams).mockReturnValue({
+      swapBuyAmountEnabled: false,
+    })
+    const { swapFromContainer, swapToContainer, swapScreen } = renderScreen({})
+
+    selectSwapTokens('CELO', 'cUSD', swapScreen)
+
     expect(within(swapFromContainer).getByTestId('SwapAmountInput/Input').props.editable).toBe(true)
     expect(within(swapToContainer).getByTestId('SwapAmountInput/Input').props.editable).toBe(false)
   })
diff --git a/src/swap/SwapScreen.tsx b/src/swap/SwapScreen.tsx
index 1127a61555..e00d7122ff 100644
--- a/src/swap/SwapScreen.tsx
+++ b/src/swap/SwapScreen.tsx
@@ -57,6 +57,9 @@ import { getFeeCurrencyAndAmounts } from 'src/viem/prepareTransactions'
 import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
 import networkConfig from 'src/web3/networkConfig'
 import { v4 as uuidv4 } from 'uuid'
+import DownIndicator from 'src/icons/DownIndicator'
+import CircledIcon from 'src/icons/CircledIcon'
+import Touchable from 'src/components/Touchable'
 
 const TAG = 'SwapScreen'
 
@@ -473,6 +476,17 @@ export function SwapScreen({ route }: Props) {
     }
   }
 
+  const handleSwitchTokens = () => {
+    ValoraAnalytics.track(SwapEvents.swap_switch_tokens, { fromTokenId, toTokenId })
+    localDispatch(
+      selectTokens({
+        fromTokenId: toTokenId,
+        toTokenId: fromTokenId,
+        switchedToNetworkId: null,
+      })
+    )
+  }
+
   const handleShowTokenSelect = (fieldType: Field) => () => {
     ValoraAnalytics.track(SwapEvents.swap_screen_select_token, { fieldType })
     localDispatch(startSelectToken({ fieldType }))
@@ -684,14 +698,12 @@ export function SwapScreen({ route }: Props) {
     {
       fieldType: Field.FROM,
       tokens: swappableFromTokens,
-      title: t('swapScreen.swapFromTokenSelection'),
       filterChips: filterChipsFrom,
       origin: TokenPickerOrigin.SwapFrom,
     },
     {
       fieldType: Field.TO,
       tokens: swappableToTokens,
-      title: t('swapScreen.swapToTokenSelection'),
       filterChips: filterChipsTo,
       origin: TokenPickerOrigin.SwapTo,
     },
@@ -710,7 +722,6 @@ export function SwapScreen({ route }: Props) {
       >
         <View style={styles.swapAmountsContainer}>
           <SwapAmountInput
-            label={t('swapScreen.swapFrom')}
             onInputChange={handleChangeAmount(Field.FROM)}
             inputValue={inputSwapAmount[Field.FROM]}
             parsedInputValue={parsedSwapAmount[Field.FROM]}
@@ -721,10 +732,24 @@ export function SwapScreen({ route }: Props) {
             autoFocus
             inputError={fromSwapAmountError}
             onPressMax={handleSetMaxFromAmount}
-            buttonPlaceholder={t('swapScreen.swapFromTokenSelection')}
+            buttonPlaceholder={t('swapScreen.selectTokenLabel')}
+            borderRadius={Spacing.Regular16}
           />
+          <View style={styles.switchTokensContainer}>
+            <Touchable
+              borderless
+              borderRadius={Spacing.Regular16}
+              shouldRenderRippleAbove
+              style={styles.switchTokens}
+              onPress={handleSwitchTokens}
+              testID="SwapScreen/SwitchTokens"
+            >
+              <CircledIcon radius={Spacing.Large32} backgroundColor={colors.black}>
+                <DownIndicator color={colors.white} size={15} />
+              </CircledIcon>
+            </Touchable>
+          </View>
           <SwapAmountInput
-            label={t('swapScreen.swapTo')}
             onInputChange={handleChangeAmount(Field.TO)}
             parsedInputValue={parsedSwapAmount[Field.TO]}
             inputValue={inputSwapAmount[Field.TO]}
@@ -732,8 +757,9 @@ export function SwapScreen({ route }: Props) {
             token={toToken}
             style={styles.toSwapAmountInput}
             loading={updatedField === Field.FROM && quoteUpdatePending}
-            buttonPlaceholder={t('swapScreen.swapToTokenSelection')}
+            buttonPlaceholder={t('swapScreen.selectTokenLabel')}
             editable={swapBuyAmountEnabled}
+            borderRadius={Spacing.Regular16}
           />
 
           <SwapTransactionDetails
@@ -831,12 +857,12 @@ export function SwapScreen({ route }: Props) {
           showLoading={confirmSwapIsLoading}
         />
       </ScrollView>
-      {tokenBottomSheetsConfig.map(({ fieldType, tokens, title, filterChips, origin }) => (
+      {tokenBottomSheetsConfig.map(({ fieldType, tokens, filterChips, origin }) => (
         <TokenBottomSheet
           key={`TokenBottomSheet/${fieldType}`}
           forwardedRef={tokenBottomSheetRefs[fieldType]}
           tokens={tokens}
-          title={title}
+          title={t('swapScreen.tokenBottomSheetTitle')}
           filterChips={filterChips}
           origin={origin}
           snapPoints={['90%']}
@@ -989,13 +1015,9 @@ const styles = StyleSheet.create({
     flex: 1,
   },
   fromSwapAmountInput: {
-    borderBottomWidth: 0,
-    borderTopLeftRadius: 16,
-    borderTopRightRadius: 16,
+    marginBottom: Spacing.Smallest8,
   },
   toSwapAmountInput: {
-    borderBottomLeftRadius: 16,
-    borderBottomRightRadius: 16,
     marginBottom: Spacing.Small12,
   },
   disclaimerText: {
@@ -1019,6 +1041,16 @@ const styles = StyleSheet.create({
     ...typeScale.titleSmall,
     marginTop: -Spacing.Regular16,
   },
+  switchTokens: {
+    position: 'absolute',
+    top: -20,
+    left: -Spacing.Regular16,
+    zIndex: 1,
+  },
+  switchTokensContainer: {
+    zIndex: 1,
+    alignItems: 'center',
+  },
 })
 
 export default SwapScreen

From 3ab8550a65e1e08550616bbc21dbcc9711e9ea01 Mon Sep 17 00:00:00 2001
From: Jean Regisser <jean.regisser@gmail.com>
Date: Tue, 21 May 2024 19:45:29 +0200
Subject: [PATCH 032/133] chore(swap): update app fee bottom sheet copy (#5444)

### Description

As the title says.

### Test plan

<img
src="https://github.com/valora-inc/wallet/assets/57791/ca093108-4c12-405c-8929-cf18fba474c3"
width="50%" />

### Related issues

- See slack
[thread](https://valora-app.slack.com/archives/C0684TXDR3K/p1715871860339939?thread_ts=1715778214.825739&cid=C0684TXDR3K)

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 locales/base/translation.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/base/translation.json b/locales/base/translation.json
index d960ee8ae1..cea39a4e6d 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -1825,7 +1825,7 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Free",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Fee\n\nWe charge a fee to swap tokens on {{appName}}. The fee is {{appFeePercentage}}% of the amount you are exchanging.",
+      "appFeeInfo": "{{appName}} Fee\n\nThe {{appName}} fee of {{appFeePercentage}}% is designed to enhance your experience by ensuring fast, reliable, and secure swaps.",
       "appFeeInfo_free": "{{appName}} Fee\n\nThis swap is free of charge.",
       "appFeeInfo_placeholder": "{{appName}} Fee\n\nThe fee is calculated based on the quote you receive.",
       "appFeeInfoDismissButton": "Got it",

From e5f3242d2ed3ab0c1b818fd09c63956d5669e7bb Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 21 May 2024 13:09:02 -0700
Subject: [PATCH 033/133] fix(earn): android header back button (#5446)

### Description

On Android the header back button was displayed in the status bar this
should fix that issue.

#### Screenshots

| Android Before | Android After |
| ----- | ----- |
|
![](https://github.com/valora-inc/wallet/assets/26950305/b941cac5-6644-4a1e-8832-ee9474efe67a
"Android Before") |
![](https://github.com/valora-inc/wallet/assets/26950305/810f81fd-e695-4149-a061-2ac94bc17e72
"Android After") |

### Test plan

- [x] Tested locally on Android.

### Related issues

N/A

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/earn/EarnEnterAmount.tsx | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 4c29069b43..befa93356b 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -3,15 +3,9 @@ import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import BigNumber from 'bignumber.js'
 import React, { useEffect, useMemo, useRef, useState } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
-import {
-  TextInput as RNTextInput,
-  SafeAreaView,
-  StyleSheet,
-  Text,
-  TouchableOpacity,
-  View,
-} from 'react-native'
+import { TextInput as RNTextInput, StyleSheet, Text, TouchableOpacity, View } from 'react-native'
 import { getNumberFormatSettings } from 'react-native-localize'
+import { SafeAreaView } from 'react-native-safe-area-context'
 import { EarnEvents, SendEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import BackButton from 'src/components/BackButton'

From a36105ff6277118ca094e50aaafbcc63549a3551 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Tue, 21 May 2024 13:48:51 -0700
Subject: [PATCH 034/133] feat(earn): add gas related analytics properties
 (#5447)

### Description

Adding gas fields to analytics properties similar to swaps for the earn
deposit transaction

### Test plan

Unit tests

### Related issues

N/A

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/analytics/Properties.tsx | 20 ++++++--
 src/earn/saga.test.ts        | 75 +++++++++++++++++++++++-----
 src/earn/saga.ts             | 64 ++++++++++++++++++++++--
 src/swap/saga.ts             | 97 +++++-------------------------------
 src/transactions/types.ts    |  8 +++
 src/transactions/utils.ts    | 74 +++++++++++++++++++++++++++
 6 files changed, 233 insertions(+), 105 deletions(-)

diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index f4543433b0..5406c4cac5 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -1596,6 +1596,17 @@ interface EarnWithdrawProperties {
   rewards: SerializableRewardsInfo[]
 }
 
+// Adds `deposit` prefix to all properties of TxReceiptProperties
+type DepositTxReceiptProperties = PrefixedTxReceiptProperties<'deposit'>
+
+export type EarnDepositTxsReceiptProperties = Partial<ApproveTxReceiptProperties> &
+  Partial<DepositTxReceiptProperties> &
+  Partial<{
+    gasUsed: number // Gas used by the deposit (approve + deposit)
+    gasFee: number | undefined // Actual gas fee of the deposit (approve + deposit) in feeCurrency (decimal value)
+    gasFeeUsd: number | undefined // Actual gas fee of the deposit (approve + deposit) in USD
+  }>
+
 interface EarnEventsProperties {
   [EarnEvents.earn_cta_press]: undefined
   [EarnEvents.earn_add_crypto_action_press]: {
@@ -1606,10 +1617,11 @@ interface EarnEventsProperties {
   [EarnEvents.earn_deposit_complete]: undefined
   [EarnEvents.earn_deposit_cancel]: undefined
   [EarnEvents.earn_deposit_submit_start]: EarnDepositProperties
-  [EarnEvents.earn_deposit_submit_success]: EarnDepositProperties
-  [EarnEvents.earn_deposit_submit_error]: EarnDepositProperties & {
-    error: string
-  }
+  [EarnEvents.earn_deposit_submit_success]: EarnDepositProperties & EarnDepositTxsReceiptProperties
+  [EarnEvents.earn_deposit_submit_error]: EarnDepositProperties &
+    EarnDepositTxsReceiptProperties & {
+      error: string
+    }
   [EarnEvents.earn_deposit_submit_cancel]: EarnDepositProperties
   [EarnEvents.earn_view_pools_press]: undefined
   [EarnEvents.earn_enter_amount_info_press]: undefined
diff --git a/src/earn/saga.test.ts b/src/earn/saga.test.ts
index df6b3f3179..59f093da06 100644
--- a/src/earn/saga.test.ts
+++ b/src/earn/saga.test.ts
@@ -77,6 +77,8 @@ describe('depositSubmitSaga', () => {
     value: '100',
     data: '0x01',
     gas: '20000',
+    maxFeePerGas: '12000000000',
+    _baseFeePerGas: '6000000000',
   }
   const serializableDepositTx: SerializableTransactionRequest = {
     from: '0xa',
@@ -84,6 +86,8 @@ describe('depositSubmitSaga', () => {
     value: '100',
     data: '0x02',
     gas: '50000',
+    maxFeePerGas: '12000000000',
+    _baseFeePerGas: '6000000000',
   }
 
   const mockStandbyHandler = jest.fn()
@@ -160,6 +164,46 @@ describe('depositSubmitSaga', () => {
     providerId: 'aave-v3',
   }
 
+  const expectedApproveGasAnalyticsProperties = {
+    approveTxCumulativeGasUsed: 3129217,
+    approveTxEffectiveGasPrice: 5000000000,
+    approveTxEstimatedGasFee: 0.00012,
+    approveTxEstimatedGasFeeUsd: 0.18,
+    approveTxFeeCurrency: undefined,
+    approveTxFeeCurrencySymbol: 'ETH',
+    approveTxGas: 20000,
+    approveTxGasFee: 0.00025789,
+    approveTxGasFeeUsd: 0.386835,
+    approveTxGasUsed: 51578,
+    approveTxHash: '0x1',
+    approveTxMaxGasFee: 0.00024,
+    approveTxMaxGasFeeUsd: 0.36,
+  }
+
+  const expectedDepositGasAnalyticsProperties = {
+    depositTxCumulativeGasUsed: 3899547,
+    depositTxEffectiveGasPrice: 5000000000,
+    depositTxEstimatedGasFee: 0.0003,
+    depositTxEstimatedGasFeeUsd: 0.45,
+    depositTxFeeCurrency: undefined,
+    depositTxFeeCurrencySymbol: 'ETH',
+    depositTxGas: 50000,
+    depositTxGasFee: 0.00185837,
+    depositTxGasFeeUsd: 2.787555,
+    depositTxGasUsed: 371674,
+    depositTxHash: '0x2',
+    depositTxMaxGasFee: 0.0006,
+    depositTxMaxGasFeeUsd: 0.9,
+  }
+
+  const expectedCumulativeGasAnalyticsProperties = {
+    gasFee: 0.00211626,
+    gasFeeUsd: 3.17439,
+    gasUsed: 423252,
+    ...expectedApproveGasAnalyticsProperties,
+    ...expectedDepositGasAnalyticsProperties,
+  }
+
   beforeEach(() => {
     jest.clearAllMocks()
   })
@@ -192,10 +236,10 @@ describe('depositSubmitSaga', () => {
       EarnEvents.earn_deposit_submit_start,
       expectedAnalyticsProps
     )
-    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
-      EarnEvents.earn_deposit_submit_success,
-      expectedAnalyticsProps
-    )
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_deposit_submit_success, {
+      ...expectedAnalyticsProps,
+      ...expectedCumulativeGasAnalyticsProperties,
+    })
   })
 
   it('sends only deposit transaction, navigates home and dispatches the success action', async () => {
@@ -221,10 +265,13 @@ describe('depositSubmitSaga', () => {
       EarnEvents.earn_deposit_submit_start,
       expectedAnalyticsProps
     )
-    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
-      EarnEvents.earn_deposit_submit_success,
-      expectedAnalyticsProps
-    )
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_deposit_submit_success, {
+      ...expectedAnalyticsProps,
+      ...expectedDepositGasAnalyticsProperties,
+      gasFee: 0.00185837,
+      gasFeeUsd: 2.787555,
+      gasUsed: 371674,
+    })
   })
 
   it('dispatches cancel action if pin input is cancelled and does not navigate home', async () => {
@@ -284,10 +331,13 @@ describe('depositSubmitSaga', () => {
       EarnEvents.earn_deposit_submit_start,
       expectedAnalyticsProps
     )
-    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_deposit_submit_error, {
-      ...expectedAnalyticsProps,
-      error: 'Transaction failed',
-    })
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_deposit_submit_error,
+      expect.objectContaining({
+        ...expectedAnalyticsProps,
+        error: 'Transaction failed',
+      })
+    )
   })
 
   it('dispatches error action and navigates home if deposit transaction status is reverted', async () => {
@@ -327,6 +377,7 @@ describe('depositSubmitSaga', () => {
     expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_deposit_submit_error, {
       ...expectedAnalyticsProps,
       error: 'Deposit transaction reverted: 0x2',
+      ...expectedCumulativeGasAnalyticsProperties,
     })
   })
 })
diff --git a/src/earn/saga.ts b/src/earn/saga.ts
index 31db696c75..f3f4dfe538 100644
--- a/src/earn/saga.ts
+++ b/src/earn/saga.ts
@@ -2,6 +2,7 @@ import { PayloadAction } from '@reduxjs/toolkit'
 import BigNumber from 'bignumber.js'
 import erc20 from 'src/abis/IERC20'
 import { EarnEvents } from 'src/analytics/Events'
+import { EarnDepositTxsReceiptProperties } from 'src/analytics/Properties'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import {
   depositCancel,
@@ -18,8 +19,19 @@ import { navigateHome } from 'src/navigator/NavigationService'
 import { CANCELLED_PIN_INPUT } from 'src/pincode/authentication'
 import { vibrateError } from 'src/styles/hapticFeedback'
 import { getTokenInfo } from 'src/tokens/saga'
+import { tokensByIdSelector } from 'src/tokens/selectors'
+import { TokenBalances } from 'src/tokens/slice'
 import { BaseStandbyTransaction } from 'src/transactions/actions'
-import { TokenTransactionTypeV2, newTransactionContext } from 'src/transactions/types'
+import {
+  NetworkId,
+  TokenTransactionTypeV2,
+  TrackedTx,
+  newTransactionContext,
+} from 'src/transactions/types'
+import {
+  getPrefixedTxAnalyticsProperties,
+  getTxReceiptAnalyticsProperties,
+} from 'src/transactions/utils'
 import Logger from 'src/utils/Logger'
 import { ensureError } from 'src/utils/ensureError'
 import { safely } from 'src/utils/safely'
@@ -27,11 +39,36 @@ import { publicClient } from 'src/viem'
 import { getPreparedTransactions } from 'src/viem/preparedTransactionSerialization'
 import { sendPreparedTransactions } from 'src/viem/saga'
 import networkConfig, { networkIdToNetwork } from 'src/web3/networkConfig'
-import { all, call, put, takeLeading } from 'typed-redux-saga'
+import { all, call, put, select, takeLeading } from 'typed-redux-saga'
 import { decodeFunctionData } from 'viem'
 
 const TAG = 'earn/saga'
 
+function getDepositTxsReceiptAnalyticsProperties(
+  trackedTxs: TrackedTx[],
+  networkId: NetworkId,
+  tokensById: TokenBalances
+): EarnDepositTxsReceiptProperties {
+  const txs = trackedTxs.map((trackedTx) =>
+    getTxReceiptAnalyticsProperties(trackedTx, networkId, tokensById)
+  )
+
+  const approveTx = trackedTxs.length > 1 ? txs[0] : undefined
+  const depositTx = trackedTxs.length > 0 ? txs[txs.length - 1] : undefined
+
+  return {
+    ...getPrefixedTxAnalyticsProperties(approveTx || {}, 'approve'),
+    ...getPrefixedTxAnalyticsProperties(depositTx || {}, 'deposit'),
+    gasUsed: depositTx?.txGasUsed
+      ? txs.reduce((sum, tx) => sum + (tx.txGasUsed || 0), 0)
+      : undefined,
+    gasFee: depositTx?.txGasFee ? txs.reduce((sum, tx) => sum + (tx.txGasFee || 0), 0) : undefined,
+    gasFeeUsd: depositTx?.txGasFeeUsd
+      ? txs.reduce((sum, tx) => sum + (tx.txGasFeeUsd || 0), 0)
+      : undefined,
+  }
+}
+
 export function* depositSubmitSaga(action: PayloadAction<DepositInfo>) {
   const { tokenId, preparedTransactions: serializablePreparedTransactions, amount } = action.payload
 
@@ -44,6 +81,9 @@ export function* depositSubmitSaga(action: PayloadAction<DepositInfo>) {
     return
   }
 
+  const tokensById = yield* select((state) => tokensByIdSelector(state, [tokenInfo.networkId]))
+
+  const trackedTxs: TrackedTx[] = []
   const networkId = tokenInfo.networkId
   const commonAnalyticsProps = {
     tokenId,
@@ -60,6 +100,14 @@ export function* depositSubmitSaga(action: PayloadAction<DepositInfo>) {
       `Starting deposit for token ${tokenId}, total transactions: ${preparedTransactions.length}`
     )
 
+    for (const tx of preparedTransactions) {
+      trackedTxs.push({
+        tx,
+        txHash: undefined,
+        txReceipt: undefined,
+      })
+    }
+
     const createDepositStandbyTxHandlers = []
 
     if (preparedTransactions.length > 1 && preparedTransactions[0].data) {
@@ -126,6 +174,9 @@ export function* depositSubmitSaga(action: PayloadAction<DepositInfo>) {
       networkId,
       createDepositStandbyTxHandlers
     )
+    txHashes.forEach((txHash, i) => {
+      trackedTxs[i].txHash = txHash
+    })
 
     Logger.debug(
       `${TAG}/depositSubmitSaga`,
@@ -146,6 +197,7 @@ export function* depositSubmitSaga(action: PayloadAction<DepositInfo>) {
       })
     )
     txReceipts.forEach((receipt, index) => {
+      trackedTxs[index].txReceipt = receipt
       Logger.debug(
         `${TAG}/depositSubmitSaga`,
         `Received transaction receipt ${index + 1} of ${txReceipts.length}`,
@@ -158,7 +210,10 @@ export function* depositSubmitSaga(action: PayloadAction<DepositInfo>) {
       throw new Error(`Deposit transaction reverted: ${depositTxReceipt?.transactionHash}`)
     }
 
-    ValoraAnalytics.track(EarnEvents.earn_deposit_submit_success, commonAnalyticsProps)
+    ValoraAnalytics.track(EarnEvents.earn_deposit_submit_success, {
+      ...commonAnalyticsProps,
+      ...getDepositTxsReceiptAnalyticsProperties(trackedTxs, networkId, tokensById),
+    })
     yield* put(depositSuccess())
   } catch (err) {
     if (err === CANCELLED_PIN_INPUT) {
@@ -174,6 +229,7 @@ export function* depositSubmitSaga(action: PayloadAction<DepositInfo>) {
     ValoraAnalytics.track(EarnEvents.earn_deposit_submit_error, {
       ...commonAnalyticsProps,
       error: error.message,
+      ...getDepositTxsReceiptAnalyticsProperties(trackedTxs, networkId, tokensById),
     })
 
     // Only vibrate if we haven't already submitted the transaction
@@ -278,7 +334,7 @@ export function* withdrawSubmitSaga(action: PayloadAction<WithdrawInfo>) {
     )
 
     Logger.debug(
-      `${TAG}/withd`,
+      `${TAG}/withdraw`,
       'Successfully sent withdraw transaction(s) to the network',
       txHashes
     )
diff --git a/src/swap/saga.ts b/src/swap/saga.ts
index f10a522cc0..f7e719f77a 100644
--- a/src/swap/saga.ts
+++ b/src/swap/saga.ts
@@ -3,12 +3,7 @@ import { PayloadAction } from '@reduxjs/toolkit'
 import BigNumber from 'bignumber.js'
 import erc20 from 'src/abis/IERC20'
 import { SwapEvents } from 'src/analytics/Events'
-import {
-  PrefixedTxReceiptProperties,
-  SwapTimeMetrics,
-  SwapTxsReceiptProperties,
-  TxReceiptProperties,
-} from 'src/analytics/Properties'
+import { SwapTimeMetrics, SwapTxsReceiptProperties } from 'src/analytics/Properties'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import { navigateHome } from 'src/navigator/NavigationService'
 import { CANCELLED_PIN_INPUT } from 'src/pincode/authentication'
@@ -21,26 +16,27 @@ import { tokensByIdSelector } from 'src/tokens/selectors'
 import { TokenBalance, TokenBalances } from 'src/tokens/slice'
 import { getSupportedNetworkIdsForSwap } from 'src/tokens/utils'
 import { BaseStandbyTransaction } from 'src/transactions/actions'
-import { NetworkId, TokenTransactionTypeV2, newTransactionContext } from 'src/transactions/types'
+import {
+  NetworkId,
+  TokenTransactionTypeV2,
+  TrackedTx,
+  newTransactionContext,
+} from 'src/transactions/types'
+import {
+  getPrefixedTxAnalyticsProperties,
+  getTxReceiptAnalyticsProperties,
+} from 'src/transactions/utils'
 import Logger from 'src/utils/Logger'
 import { ensureError } from 'src/utils/ensureError'
 import { safely } from 'src/utils/safely'
 import { publicClient } from 'src/viem'
-import {
-  TransactionRequest,
-  getEstimatedGasFee,
-  getFeeCurrency,
-  getFeeCurrencyToken,
-  getFeeDecimals,
-  getMaxGasFee,
-} from 'src/viem/prepareTransactions'
 import { getPreparedTransactions } from 'src/viem/preparedTransactionSerialization'
 import { sendPreparedTransactions } from 'src/viem/saga'
 import { getViemWallet } from 'src/web3/contracts'
 import networkConfig from 'src/web3/networkConfig'
 import { getNetworkFromNetworkId } from 'src/web3/utils'
 import { call, put, select, takeEvery } from 'typed-redux-saga'
-import { Hash, TransactionReceipt, decodeFunctionData } from 'viem'
+import { decodeFunctionData } from 'viem'
 
 const TAG = 'swap/saga'
 
@@ -58,75 +54,6 @@ function calculateEstimatedUsdValue({
   return valueToBigNumber(tokenAmount).times(tokenInfo.priceUsd).toNumber()
 }
 
-interface TrackedTx {
-  tx: TransactionRequest | undefined
-  txHash: Hash | undefined
-  txReceipt: TransactionReceipt | undefined
-}
-
-function getTxReceiptAnalyticsProperties(
-  { tx, txHash, txReceipt }: TrackedTx,
-  networkId: NetworkId,
-  tokensById: TokenBalances
-): Partial<TxReceiptProperties> {
-  const feeCurrencyToken = tx && getFeeCurrencyToken([tx], networkId, tokensById)
-  const feeDecimals = tx && feeCurrencyToken ? getFeeDecimals([tx], feeCurrencyToken) : undefined
-
-  const txMaxGasFee = tx && feeDecimals ? getMaxGasFee([tx]).shiftedBy(-feeDecimals) : undefined
-  const txMaxGasFeeUsd =
-    feeCurrencyToken && txMaxGasFee && feeCurrencyToken.priceUsd
-      ? txMaxGasFee.times(feeCurrencyToken.priceUsd)
-      : undefined
-  const txEstimatedGasFee =
-    tx && feeDecimals ? getEstimatedGasFee([tx]).shiftedBy(-feeDecimals) : undefined
-  const txEstimatedGasFeeUsd =
-    feeCurrencyToken && txEstimatedGasFee && feeCurrencyToken.priceUsd
-      ? txEstimatedGasFee.times(feeCurrencyToken.priceUsd)
-      : undefined
-
-  const txGasFee =
-    txReceipt?.gasUsed && txReceipt?.effectiveGasPrice && feeDecimals
-      ? new BigNumber((txReceipt.gasUsed * txReceipt.effectiveGasPrice).toString()).shiftedBy(
-          -feeDecimals
-        )
-      : undefined
-  const txGasFeeUsd =
-    feeCurrencyToken && txGasFee && feeCurrencyToken.priceUsd
-      ? txGasFee.times(feeCurrencyToken.priceUsd)
-      : undefined
-
-  return {
-    txCumulativeGasUsed: txReceipt?.cumulativeGasUsed
-      ? Number(txReceipt.cumulativeGasUsed)
-      : undefined,
-    txEffectiveGasPrice: txReceipt?.effectiveGasPrice
-      ? Number(txReceipt.effectiveGasPrice)
-      : undefined,
-    txGas: tx?.gas ? Number(tx.gas) : undefined,
-    txMaxGasFee: txMaxGasFee?.toNumber(),
-    txMaxGasFeeUsd: txMaxGasFeeUsd?.toNumber(),
-    txEstimatedGasFee: txEstimatedGasFee?.toNumber(),
-    txEstimatedGasFeeUsd: txEstimatedGasFeeUsd?.toNumber(),
-    txGasUsed: txReceipt?.gasUsed ? Number(txReceipt.gasUsed) : undefined,
-    txGasFee: txGasFee?.toNumber(),
-    txGasFeeUsd: txGasFeeUsd?.toNumber(),
-    txHash,
-    txFeeCurrency: tx && getFeeCurrency(tx),
-    txFeeCurrencySymbol: feeCurrencyToken?.symbol,
-  }
-}
-
-function getPrefixedTxAnalyticsProperties<Prefix extends string>(
-  receiptProperties: Partial<TxReceiptProperties>,
-  prefix: Prefix
-): Partial<PrefixedTxReceiptProperties<Prefix>> {
-  const prefixedProperties: Record<string, any> = {}
-  for (const [key, value] of Object.entries(receiptProperties)) {
-    prefixedProperties[`${prefix}${key[0].toUpperCase()}${key.slice(1)}`] = value
-  }
-  return prefixedProperties as Partial<PrefixedTxReceiptProperties<Prefix>>
-}
-
 function getSwapTxsReceiptAnalyticsProperties(
   trackedTxs: TrackedTx[],
   networkId: NetworkId,
diff --git a/src/transactions/types.ts b/src/transactions/types.ts
index a10671729b..cb7541b4d9 100644
--- a/src/transactions/types.ts
+++ b/src/transactions/types.ts
@@ -1,6 +1,8 @@
 import BigNumber from 'bignumber.js'
 import { Nft } from 'src/nfts/types'
+import { TransactionRequest } from 'src/viem/prepareTransactions'
 import { v4 as uuidv4 } from 'uuid'
+import { Hash, TransactionReceipt } from 'viem'
 
 export enum Network {
   Celo = 'celo',
@@ -246,3 +248,9 @@ export interface EarnClaimReward {
   providerId: string
   status: TransactionStatus
 }
+
+export interface TrackedTx {
+  tx: TransactionRequest | undefined
+  txHash: Hash | undefined
+  txReceipt: TransactionReceipt | undefined
+}
diff --git a/src/transactions/utils.ts b/src/transactions/utils.ts
index 5b4b3cc72d..221d2941fd 100644
--- a/src/transactions/utils.ts
+++ b/src/transactions/utils.ts
@@ -1,5 +1,16 @@
+import BigNumber from 'bignumber.js'
+import { PrefixedTxReceiptProperties, TxReceiptProperties } from 'src/analytics/Properties'
 import i18n from 'src/i18n'
+import { TokenBalances } from 'src/tokens/slice'
+import { NetworkId, TrackedTx } from 'src/transactions/types'
 import { formatFeedSectionTitle, timeDeltaInDays } from 'src/utils/time'
+import {
+  getEstimatedGasFee,
+  getFeeCurrency,
+  getFeeCurrencyToken,
+  getFeeDecimals,
+  getMaxGasFee,
+} from 'src/viem/prepareTransactions'
 
 // Groupings:
 // Recent -> Last 7 days (pending transactions always at the top, followed by recent confirmed transactions).
@@ -46,3 +57,66 @@ export function groupFeedItemsInSections<T extends { timestamp: number }>(
       data: value.data,
     }))
 }
+
+export function getTxReceiptAnalyticsProperties(
+  { tx, txHash, txReceipt }: TrackedTx,
+  networkId: NetworkId,
+  tokensById: TokenBalances
+): Partial<TxReceiptProperties> {
+  const feeCurrencyToken = tx && getFeeCurrencyToken([tx], networkId, tokensById)
+  const feeDecimals = tx && feeCurrencyToken ? getFeeDecimals([tx], feeCurrencyToken) : undefined
+
+  const txMaxGasFee = tx && feeDecimals ? getMaxGasFee([tx]).shiftedBy(-feeDecimals) : undefined
+  const txMaxGasFeeUsd =
+    feeCurrencyToken && txMaxGasFee && feeCurrencyToken.priceUsd
+      ? txMaxGasFee.times(feeCurrencyToken.priceUsd)
+      : undefined
+  const txEstimatedGasFee =
+    tx && feeDecimals ? getEstimatedGasFee([tx]).shiftedBy(-feeDecimals) : undefined
+  const txEstimatedGasFeeUsd =
+    feeCurrencyToken && txEstimatedGasFee && feeCurrencyToken.priceUsd
+      ? txEstimatedGasFee.times(feeCurrencyToken.priceUsd)
+      : undefined
+
+  const txGasFee =
+    txReceipt?.gasUsed && txReceipt?.effectiveGasPrice && feeDecimals
+      ? new BigNumber((txReceipt.gasUsed * txReceipt.effectiveGasPrice).toString()).shiftedBy(
+          -feeDecimals
+        )
+      : undefined
+  const txGasFeeUsd =
+    feeCurrencyToken && txGasFee && feeCurrencyToken.priceUsd
+      ? txGasFee.times(feeCurrencyToken.priceUsd)
+      : undefined
+
+  return {
+    txCumulativeGasUsed: txReceipt?.cumulativeGasUsed
+      ? Number(txReceipt.cumulativeGasUsed)
+      : undefined,
+    txEffectiveGasPrice: txReceipt?.effectiveGasPrice
+      ? Number(txReceipt.effectiveGasPrice)
+      : undefined,
+    txGas: tx?.gas ? Number(tx.gas) : undefined,
+    txMaxGasFee: txMaxGasFee?.toNumber(),
+    txMaxGasFeeUsd: txMaxGasFeeUsd?.toNumber(),
+    txEstimatedGasFee: txEstimatedGasFee?.toNumber(),
+    txEstimatedGasFeeUsd: txEstimatedGasFeeUsd?.toNumber(),
+    txGasUsed: txReceipt?.gasUsed ? Number(txReceipt.gasUsed) : undefined,
+    txGasFee: txGasFee?.toNumber(),
+    txGasFeeUsd: txGasFeeUsd?.toNumber(),
+    txHash,
+    txFeeCurrency: tx && getFeeCurrency(tx),
+    txFeeCurrencySymbol: feeCurrencyToken?.symbol,
+  }
+}
+
+export function getPrefixedTxAnalyticsProperties<Prefix extends string>(
+  receiptProperties: Partial<TxReceiptProperties>,
+  prefix: Prefix
+): Partial<PrefixedTxReceiptProperties<Prefix>> {
+  const prefixedProperties: Record<string, any> = {}
+  for (const [key, value] of Object.entries(receiptProperties)) {
+    prefixedProperties[`${prefix}${key[0].toUpperCase()}${key.slice(1)}`] = value
+  }
+  return prefixedProperties as Partial<PrefixedTxReceiptProperties<Prefix>>
+}

From 211c71dceefce46d2675c39d482d51260b6cd8ba Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Tue, 21 May 2024 15:56:12 -0700
Subject: [PATCH 035/133] feat(earn): fetch token balances after a tx is
 submitted (#5448)

### Description

Should help with
https://valora-app.slack.com/archives/C04B61SJ6DS/p1716315055922759?thread_ts=1716314300.065339&cid=C04B61SJ6DS

### Test plan

Unit tests

### Related issues

- N/A

### Backwards compatibility

Y

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/earn/saga.test.ts | 11 +++++++++++
 src/earn/saga.ts      |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/earn/saga.test.ts b/src/earn/saga.test.ts
index 59f093da06..443ae1fdc7 100644
--- a/src/earn/saga.test.ts
+++ b/src/earn/saga.test.ts
@@ -18,6 +18,7 @@ import {
 } from 'src/earn/slice'
 import { navigateHome } from 'src/navigator/NavigationService'
 import { CANCELLED_PIN_INPUT } from 'src/pincode/authentication'
+import { fetchTokenBalances } from 'src/tokens/slice'
 import { Network, NetworkId, TokenTransactionTypeV2 } from 'src/transactions/types'
 import { publicClient } from 'src/viem'
 import { SerializableTransactionRequest } from 'src/viem/preparedTransactionSerialization'
@@ -220,6 +221,7 @@ describe('depositSubmitSaga', () => {
       .withState(createMockStore({ tokens: { tokenBalances: mockTokenBalances } }).getState())
       .provide(sagaProviders)
       .put(depositSuccess())
+      .put(fetchTokenBalances({ showLoading: false }))
       .call.like({ fn: sendPreparedTransactions })
       .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x1' })
       .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x2' })
@@ -254,6 +256,7 @@ describe('depositSubmitSaga', () => {
       .withState(createMockStore({ tokens: { tokenBalances: mockTokenBalances } }).getState())
       .provide(sagaProviders)
       .put(depositSuccess())
+      .put(fetchTokenBalances({ showLoading: false }))
       .call.like({ fn: sendPreparedTransactions })
       .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x2' })
       .run()
@@ -290,6 +293,7 @@ describe('depositSubmitSaga', () => {
         ...sagaProviders,
       ])
       .put(depositCancel())
+      .not.put.actionType(fetchTokenBalances.type)
       .call.like({ fn: sendPreparedTransactions })
       .not.call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'])
       .run()
@@ -321,6 +325,7 @@ describe('depositSubmitSaga', () => {
         ...sagaProviders,
       ])
       .put(depositError())
+      .not.put.actionType(fetchTokenBalances.type)
       .call.like({ fn: sendPreparedTransactions })
       .not.call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'])
       .run()
@@ -358,6 +363,7 @@ describe('depositSubmitSaga', () => {
         ...sagaProviders,
       ])
       .put(depositError())
+      .not.put.actionType(fetchTokenBalances.type)
       .call.like({ fn: sendPreparedTransactions })
       .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x1' })
       .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x2' })
@@ -496,6 +502,7 @@ describe('withdrawSubmitSaga', () => {
       .withState(createMockStore({ tokens: { tokenBalances: mockTokenBalances } }).getState())
       .provide(sagaProviders)
       .put(withdrawSuccess())
+      .put(fetchTokenBalances({ showLoading: false }))
       .call.like({ fn: sendPreparedTransactions })
       .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x1' })
       .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x2' })
@@ -528,6 +535,7 @@ describe('withdrawSubmitSaga', () => {
       .withState(createMockStore({ tokens: { tokenBalances: mockTokenBalances } }).getState())
       .provide(sagaProviders)
       .put(withdrawSuccess())
+      .put(fetchTokenBalances({ showLoading: false }))
       .call.like({ fn: sendPreparedTransactions })
       .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x1' })
       .run()
@@ -561,6 +569,7 @@ describe('withdrawSubmitSaga', () => {
         ...sagaProviders,
       ])
       .put(withdrawCancel())
+      .not.put.actionType(fetchTokenBalances.type)
       .call.like({ fn: sendPreparedTransactions })
       .not.call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'])
       .run()
@@ -592,6 +601,7 @@ describe('withdrawSubmitSaga', () => {
         ...sagaProviders,
       ])
       .put(withdrawError())
+      .not.put.actionType(fetchTokenBalances.type)
       .call.like({ fn: sendPreparedTransactions })
       .not.call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'])
       .run()
@@ -632,6 +642,7 @@ describe('withdrawSubmitSaga', () => {
           ...sagaProviders,
         ])
         .put(withdrawError())
+        .not.put.actionType(fetchTokenBalances.type)
         .call.like({ fn: sendPreparedTransactions })
         .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x1' })
         .call([publicClient[Network.Arbitrum], 'waitForTransactionReceipt'], { hash: '0x2' })
diff --git a/src/earn/saga.ts b/src/earn/saga.ts
index f3f4dfe538..670925c161 100644
--- a/src/earn/saga.ts
+++ b/src/earn/saga.ts
@@ -20,7 +20,7 @@ import { CANCELLED_PIN_INPUT } from 'src/pincode/authentication'
 import { vibrateError } from 'src/styles/hapticFeedback'
 import { getTokenInfo } from 'src/tokens/saga'
 import { tokensByIdSelector } from 'src/tokens/selectors'
-import { TokenBalances } from 'src/tokens/slice'
+import { TokenBalances, fetchTokenBalances } from 'src/tokens/slice'
 import { BaseStandbyTransaction } from 'src/transactions/actions'
 import {
   NetworkId,
@@ -215,6 +215,7 @@ export function* depositSubmitSaga(action: PayloadAction<DepositInfo>) {
       ...getDepositTxsReceiptAnalyticsProperties(trackedTxs, networkId, tokensById),
     })
     yield* put(depositSuccess())
+    yield* put(fetchTokenBalances({ showLoading: false }))
   } catch (err) {
     if (err === CANCELLED_PIN_INPUT) {
       Logger.info(`${TAG}/depositSubmitSaga`, 'Transaction cancelled by user')
@@ -366,6 +367,7 @@ export function* withdrawSubmitSaga(action: PayloadAction<WithdrawInfo>) {
     })
 
     yield* put(withdrawSuccess())
+    yield* put(fetchTokenBalances({ showLoading: false }))
     ValoraAnalytics.track(EarnEvents.earn_withdraw_submit_success, commonAnalyticsProps)
   } catch (err) {
     if (err === CANCELLED_PIN_INPUT) {

From 8b27b0a738b713a5c75276daa228f13d9b56f989 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Tue, 21 May 2024 19:01:22 -0700
Subject: [PATCH 036/133] refactor(earn): consolidate analytics events (#5450)

### Description

Use consistent naming, include some common properties in events

### Test plan

Unit tests

### Related issues

N/A

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/analytics/Properties.tsx             | 43 +++++++++++-------------
 src/earn/EarnActivePool.test.tsx         |  9 +++--
 src/earn/EarnActivePool.tsx              | 28 +++++++++------
 src/earn/EarnCollectScreen.test.tsx      |  2 +-
 src/earn/EarnCollectScreen.tsx           |  5 +--
 src/earn/EarnDepositBottomSheet.test.tsx | 33 +++++++++++++++---
 src/earn/EarnDepositBottomSheet.tsx      | 22 +++++++++---
 src/earn/EarnEnterAmount.test.tsx        |  6 ++--
 src/earn/EarnEnterAmount.tsx             |  5 ++-
 src/earn/constants.ts                    |  1 +
 src/earn/saga.test.ts                    |  4 +--
 src/earn/saga.ts                         |  9 ++---
 12 files changed, 111 insertions(+), 56 deletions(-)
 create mode 100644 src/earn/constants.ts

diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 5406c4cac5..11fd799052 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -1581,18 +1581,18 @@ interface PointsEventsProperties {
   [PointsEvents.points_screen_activity_learn_more_press]: undefined
 }
 
-interface EarnDepositProperties {
-  tokenId: string
+interface EarnCommonProperties {
+  providerId: 'aave-v3'
   networkId: NetworkId
+  depositTokenId: string
+}
+
+interface EarnDepositProperties extends EarnCommonProperties {
   tokenAmount: string
-  providerId: string
 }
 
-interface EarnWithdrawProperties {
-  tokenId: string
+interface EarnWithdrawProperties extends EarnCommonProperties {
   tokenAmount: string
-  networkId: NetworkId
-  providerId: string
   rewards: SerializableRewardsInfo[]
 }
 
@@ -1612,10 +1612,10 @@ interface EarnEventsProperties {
   [EarnEvents.earn_add_crypto_action_press]: {
     action: TokenActionName
   } & TokenProperties
-  [EarnEvents.earn_deposit_provider_info_press]: undefined
-  [EarnEvents.earn_deposit_terms_and_conditions_press]: undefined
-  [EarnEvents.earn_deposit_complete]: undefined
-  [EarnEvents.earn_deposit_cancel]: undefined
+  [EarnEvents.earn_deposit_provider_info_press]: EarnDepositProperties
+  [EarnEvents.earn_deposit_terms_and_conditions_press]: EarnDepositProperties
+  [EarnEvents.earn_deposit_complete]: EarnDepositProperties
+  [EarnEvents.earn_deposit_cancel]: EarnDepositProperties
   [EarnEvents.earn_deposit_submit_start]: EarnDepositProperties
   [EarnEvents.earn_deposit_submit_success]: EarnDepositProperties & EarnDepositTxsReceiptProperties
   [EarnEvents.earn_deposit_submit_error]: EarnDepositProperties &
@@ -1623,27 +1623,22 @@ interface EarnEventsProperties {
       error: string
     }
   [EarnEvents.earn_deposit_submit_cancel]: EarnDepositProperties
-  [EarnEvents.earn_view_pools_press]: undefined
+  [EarnEvents.earn_view_pools_press]: {
+    poolTokenId: string
+    networkId: string
+    providerId: 'aave-v3'
+  }
   [EarnEvents.earn_enter_amount_info_press]: undefined
   [EarnEvents.earn_enter_amount_continue_press]: {
     userHasFunds: boolean
-    tokenAmount: string
     amountInUsd: string
     amountEnteredIn: AmountEnteredIn
-    tokenId: string
-    networkId: string
-  }
+  } & EarnDepositProperties
   [EarnEvents.earn_enter_amount_info_more_pools]: undefined
   [EarnEvents.earn_exit_pool_press]: {
-    poolTokenId: string
-    networkId: NetworkId
     tokenAmount: string
-    providerId: string
-  }
-  [EarnEvents.earn_deposit_more_press]: {
-    depositTokenId: string
-    providerId: string
-  }
+  } & EarnCommonProperties
+  [EarnEvents.earn_deposit_more_press]: EarnCommonProperties
   [EarnEvents.earn_deposit_add_gas_press]: { gasTokenId: string }
   [EarnEvents.earn_feed_item_select]: {
     origin: 'EarnDeposit' | 'EarnWithdraw' | 'EarnClaimReward'
diff --git a/src/earn/EarnActivePool.test.tsx b/src/earn/EarnActivePool.test.tsx
index e8d74fab2a..6b56ed662c 100644
--- a/src/earn/EarnActivePool.test.tsx
+++ b/src/earn/EarnActivePool.test.tsx
@@ -73,7 +73,11 @@ describe('EarnActivePool', () => {
     )
 
     fireEvent.press(getByText('earnFlow.activePools.viewPools'))
-    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_view_pools_press)
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_view_pools_press, {
+      poolTokenId: networkConfig.aaveArbUsdcTokenId,
+      networkId: NetworkId['arbitrum-sepolia'],
+      providerId: 'aave-v3',
+    })
     expect(navigate).toBeCalledWith(Screens.TabDiscover)
   })
 
@@ -90,7 +94,7 @@ describe('EarnActivePool', () => {
 
     fireEvent.press(getByText('earnFlow.activePools.exitPool'))
     expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_exit_pool_press, {
-      poolTokenId: networkConfig.aaveArbUsdcTokenId,
+      depositTokenId: networkConfig.arbUsdcTokenId,
       networkId: NetworkId['arbitrum-sepolia'],
       tokenAmount: '10.75',
       providerId: 'aave-v3',
@@ -116,6 +120,7 @@ describe('EarnActivePool', () => {
     expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_deposit_more_press, {
       depositTokenId: networkConfig.arbUsdcTokenId,
       providerId: 'aave-v3',
+      networkId: NetworkId['arbitrum-sepolia'],
     })
     expect(navigate).toBeCalledWith(Screens.EarnEnterAmount, {
       tokenId: networkConfig.arbUsdcTokenId,
diff --git a/src/earn/EarnActivePool.tsx b/src/earn/EarnActivePool.tsx
index 7b8a7b5287..f7af550535 100644
--- a/src/earn/EarnActivePool.tsx
+++ b/src/earn/EarnActivePool.tsx
@@ -6,6 +6,7 @@ import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import Button, { BtnSizes, BtnTypes } from 'src/components/Button'
 import SkeletonPlaceholder from 'src/components/SkeletonPlaceholder'
 import TokenDisplay from 'src/components/TokenDisplay'
+import { PROVIDER_ID } from 'src/earn/constants'
 import { useAavePoolInfo } from 'src/earn/hooks'
 import UpwardGraph from 'src/icons/UpwardGraph'
 import { navigate } from 'src/navigator/NavigationService'
@@ -45,6 +46,12 @@ export default function EarnActivePool({ depositTokenId, poolTokenId, cta }: Pro
   const poolToken = useTokenInfo(poolTokenId)
   const asyncPoolInfo = useAavePoolInfo({ depositTokenId })
 
+  if (!poolToken) {
+    // should never happen
+    Logger.error(TAG, `No pool token found ${poolTokenId}`)
+    return null
+  }
+
   return (
     <View style={styles.card} testID="EarnActivePool">
       <View style={styles.container}>
@@ -52,7 +59,7 @@ export default function EarnActivePool({ depositTokenId, poolTokenId, cta }: Pro
         <View>
           <View style={styles.row}>
             <Text style={styles.totalValueText}>{t('earnFlow.activePools.totalValue')}</Text>
-            {poolToken && poolToken.balance && (
+            {poolToken.balance && (
               <TokenDisplay
                 amount={poolToken.balance}
                 showLocalAmount={false}
@@ -74,7 +81,7 @@ export default function EarnActivePool({ depositTokenId, poolTokenId, cta }: Pro
                 <UpwardGraph />
               </View>
             )}
-            {poolToken && poolToken.balance && (
+            {poolToken.balance && (
               <TokenDisplay
                 amount={poolToken.balance}
                 showLocalAmount={true}
@@ -88,15 +95,11 @@ export default function EarnActivePool({ depositTokenId, poolTokenId, cta }: Pro
           <View style={styles.buttonContainer}>
             <Button
               onPress={() => {
-                if (!poolToken) {
-                  Logger.warn(TAG, 'No pool token found')
-                  return
-                }
                 ValoraAnalytics.track(EarnEvents.earn_exit_pool_press, {
-                  poolTokenId,
+                  depositTokenId,
                   networkId: poolToken.networkId,
                   tokenAmount: poolToken.balance.toString(),
-                  providerId: 'aave-v3',
+                  providerId: PROVIDER_ID,
                 })
                 navigate(Screens.EarnCollectScreen, { depositTokenId, poolTokenId })
               }}
@@ -109,7 +112,8 @@ export default function EarnActivePool({ depositTokenId, poolTokenId, cta }: Pro
               onPress={() => {
                 ValoraAnalytics.track(EarnEvents.earn_deposit_more_press, {
                   depositTokenId,
-                  providerId: 'aave-v3',
+                  providerId: PROVIDER_ID,
+                  networkId: poolToken.networkId,
                 })
                 navigate(Screens.EarnEnterAmount, { tokenId: depositTokenId })
               }}
@@ -124,7 +128,11 @@ export default function EarnActivePool({ depositTokenId, poolTokenId, cta }: Pro
           <View style={styles.buttonContainer}>
             <Button
               onPress={() => {
-                ValoraAnalytics.track(EarnEvents.earn_view_pools_press)
+                ValoraAnalytics.track(EarnEvents.earn_view_pools_press, {
+                  poolTokenId,
+                  networkId: poolToken.networkId,
+                  providerId: PROVIDER_ID,
+                })
                 navigate(Screens.TabDiscover)
               }}
               text={t('earnFlow.activePools.viewPools')}
diff --git a/src/earn/EarnCollectScreen.test.tsx b/src/earn/EarnCollectScreen.test.tsx
index f901a174d0..d4a13666ac 100644
--- a/src/earn/EarnCollectScreen.test.tsx
+++ b/src/earn/EarnCollectScreen.test.tsx
@@ -357,7 +357,7 @@ describe('EarnCollectScreen', () => {
     ])
 
     expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_collect_earnings_press, {
-      tokenId: mockArbUsdcTokenId,
+      depositTokenId: mockArbUsdcTokenId,
       tokenAmount: '10.75',
       networkId: NetworkId['arbitrum-sepolia'],
       providerId: 'aave-v3',
diff --git a/src/earn/EarnCollectScreen.tsx b/src/earn/EarnCollectScreen.tsx
index 62d843db78..1f288dcbce 100644
--- a/src/earn/EarnCollectScreen.tsx
+++ b/src/earn/EarnCollectScreen.tsx
@@ -10,6 +10,7 @@ import Button, { BtnSizes } from 'src/components/Button'
 import InLineNotification, { NotificationVariant } from 'src/components/InLineNotification'
 import TokenDisplay from 'src/components/TokenDisplay'
 import TokenIcon, { IconSize } from 'src/components/TokenIcon'
+import { PROVIDER_ID } from 'src/earn/constants'
 import { useAavePoolInfo, useAaveRewardsInfoAndPrepareTransactions } from 'src/earn/hooks'
 import { withdrawStatusSelector } from 'src/earn/selectors'
 import { withdrawStart } from 'src/earn/slice'
@@ -72,10 +73,10 @@ export default function EarnCollectScreen({ route }: Props) {
     )
 
     ValoraAnalytics.track(EarnEvents.earn_collect_earnings_press, {
-      tokenId: depositTokenId,
+      depositTokenId,
       tokenAmount: poolToken.balance.toString(),
       networkId: depositToken.networkId,
-      providerId: 'aave-v3',
+      providerId: PROVIDER_ID,
       rewards: serializedRewards,
     })
   }
diff --git a/src/earn/EarnDepositBottomSheet.test.tsx b/src/earn/EarnDepositBottomSheet.test.tsx
index 55e7937fae..3a71b320a9 100644
--- a/src/earn/EarnDepositBottomSheet.test.tsx
+++ b/src/earn/EarnDepositBottomSheet.test.tsx
@@ -5,10 +5,12 @@ import { Provider } from 'react-redux'
 import { EarnEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import EarnDepositBottomSheet from 'src/earn/EarnDepositBottomSheet'
+import { PROVIDER_ID } from 'src/earn/constants'
 import { depositStart } from 'src/earn/slice'
 import { navigate } from 'src/navigator/NavigationService'
 import { getDynamicConfigParams } from 'src/statsig'
 import { StatsigDynamicConfigs } from 'src/statsig/types'
+import { NetworkId } from 'src/transactions/types'
 import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
 import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
 import { createMockStore } from 'test/utils'
@@ -48,6 +50,13 @@ const mockPreparedTransaction: PreparedTransactionsPossible = {
 }
 
 describe('EarnDepositBottomSheet', () => {
+  const expectedAnalyticsProperties = {
+    depositTokenId: mockArbEthTokenId,
+    tokenAmount: '100',
+    networkId: NetworkId['arbitrum-sepolia'],
+    providerId: PROVIDER_ID,
+  }
+
   beforeEach(() => {
     jest.clearAllMocks()
     jest.mocked(getDynamicConfigParams).mockImplementation(({ configName, defaultValues }) => {
@@ -72,6 +81,7 @@ describe('EarnDepositBottomSheet', () => {
           amount={'100'}
           tokenId={mockArbEthTokenId}
           preparedTransaction={mockPreparedTransaction}
+          networkId={NetworkId['arbitrum-sepolia']}
         />
       </Provider>
     )
@@ -106,12 +116,16 @@ describe('EarnDepositBottomSheet', () => {
           amount={'100'}
           tokenId={mockArbEthTokenId}
           preparedTransaction={mockPreparedTransaction}
+          networkId={NetworkId['arbitrum-sepolia']}
         />
       </Provider>
     )
 
     fireEvent.press(getByTestId('EarnDeposit/PrimaryCta'))
-    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_deposit_complete)
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_deposit_complete,
+      expectedAnalyticsProperties
+    )
     expect(store.getActions()).toEqual([
       {
         type: depositStart.type,
@@ -134,12 +148,16 @@ describe('EarnDepositBottomSheet', () => {
           amount={'100'}
           tokenId={mockArbEthTokenId}
           preparedTransaction={mockPreparedTransaction}
+          networkId={NetworkId['arbitrum-sepolia']}
         />
       </Provider>
     )
 
     fireEvent.press(getByTestId('EarnDeposit/SecondaryCta'))
-    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_deposit_cancel)
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_deposit_cancel,
+      expectedAnalyticsProperties
+    )
   })
 
   it('pressing provider info opens the terms and conditions', () => {
@@ -150,12 +168,16 @@ describe('EarnDepositBottomSheet', () => {
           amount={'100'}
           tokenId={mockArbEthTokenId}
           preparedTransaction={mockPreparedTransaction}
+          networkId={NetworkId['arbitrum-sepolia']}
         />
       </Provider>
     )
 
     fireEvent.press(getByTestId('EarnDeposit/ProviderInfo'))
-    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_deposit_provider_info_press)
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+      EarnEvents.earn_deposit_provider_info_press,
+      expectedAnalyticsProperties
+    )
     expect(navigate).toHaveBeenCalledWith('WebViewScreen', { uri: 'termsUrl' })
   })
 
@@ -167,13 +189,15 @@ describe('EarnDepositBottomSheet', () => {
           amount={'100'}
           tokenId={mockArbEthTokenId}
           preparedTransaction={mockPreparedTransaction}
+          networkId={NetworkId['arbitrum-sepolia']}
         />
       </Provider>
     )
 
     fireEvent.press(getByTestId('EarnDeposit/TermsAndConditions'))
     expect(ValoraAnalytics.track).toHaveBeenCalledWith(
-      EarnEvents.earn_deposit_terms_and_conditions_press
+      EarnEvents.earn_deposit_terms_and_conditions_press,
+      expectedAnalyticsProperties
     )
     expect(navigate).toHaveBeenCalledWith('WebViewScreen', { uri: 'termsUrl' })
   })
@@ -190,6 +214,7 @@ describe('EarnDepositBottomSheet', () => {
           amount={'100'}
           tokenId={mockArbEthTokenId}
           preparedTransaction={mockPreparedTransaction}
+          networkId={NetworkId['arbitrum-sepolia']}
         />
       </Provider>
     )
diff --git a/src/earn/EarnDepositBottomSheet.tsx b/src/earn/EarnDepositBottomSheet.tsx
index 2bb0b9c9d3..b05dcfdd1e 100644
--- a/src/earn/EarnDepositBottomSheet.tsx
+++ b/src/earn/EarnDepositBottomSheet.tsx
@@ -10,6 +10,7 @@ import BottomSheet, { BottomSheetRefType } from 'src/components/BottomSheet'
 import Button, { BtnSizes, BtnTypes } from 'src/components/Button'
 import TokenDisplay from 'src/components/TokenDisplay'
 import Touchable from 'src/components/Touchable'
+import { PROVIDER_ID } from 'src/earn/constants'
 import { depositStatusSelector } from 'src/earn/selectors'
 import { depositStart } from 'src/earn/slice'
 import InfoIcon from 'src/icons/InfoIcon'
@@ -24,6 +25,7 @@ import { StatsigDynamicConfigs } from 'src/statsig/types'
 import Colors from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
 import { Shadow, Spacing, getShadowStyle } from 'src/styles/styles'
+import { NetworkId } from 'src/transactions/types'
 import {
   PreparedTransactionsPossible,
   getFeeCurrencyAndAmounts,
@@ -37,17 +39,26 @@ export default function EarnDepositBottomSheet({
   preparedTransaction,
   amount,
   tokenId,
+  networkId,
 }: {
   forwardedRef: RefObject<BottomSheetRefType>
   preparedTransaction: PreparedTransactionsPossible
   amount: string
   tokenId: string
+  networkId: NetworkId
 }) {
   const { t } = useTranslation()
   const dispatch = useDispatch()
   const depositStatus = useSelector(depositStatusSelector)
   const transactionSubmitted = depositStatus === 'loading'
 
+  const commonAnalyticsProperties = {
+    providerId: PROVIDER_ID,
+    depositTokenId: tokenId,
+    tokenAmount: amount,
+    networkId,
+  }
+
   const { estimatedFeeAmount, feeCurrency } = getFeeCurrencyAndAmounts(preparedTransaction)
 
   if (!estimatedFeeAmount || !feeCurrency) {
@@ -60,13 +71,16 @@ export default function EarnDepositBottomSheet({
   )
 
   const onPressProviderIcon = () => {
-    ValoraAnalytics.track(EarnEvents.earn_deposit_provider_info_press)
+    ValoraAnalytics.track(EarnEvents.earn_deposit_provider_info_press, commonAnalyticsProperties)
     providerTermsAndConditionsUrl &&
       navigate(Screens.WebViewScreen, { uri: providerTermsAndConditionsUrl })
   }
 
   const onPressTermsAndConditions = () => {
-    ValoraAnalytics.track(EarnEvents.earn_deposit_terms_and_conditions_press)
+    ValoraAnalytics.track(
+      EarnEvents.earn_deposit_terms_and_conditions_press,
+      commonAnalyticsProperties
+    )
     providerTermsAndConditionsUrl &&
       navigate(Screens.WebViewScreen, { uri: providerTermsAndConditionsUrl })
   }
@@ -79,11 +93,11 @@ export default function EarnDepositBottomSheet({
         preparedTransactions: getSerializablePreparedTransactions(preparedTransaction.transactions),
       })
     )
-    ValoraAnalytics.track(EarnEvents.earn_deposit_complete)
+    ValoraAnalytics.track(EarnEvents.earn_deposit_complete, commonAnalyticsProperties)
   }
 
   const onPressCancel = () => {
-    ValoraAnalytics.track(EarnEvents.earn_deposit_cancel)
+    ValoraAnalytics.track(EarnEvents.earn_deposit_cancel, commonAnalyticsProperties)
     forwardedRef.current?.close()
   }
 
diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index 9c52ec64a8..07524495dd 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -169,8 +169,9 @@ describe('EarnEnterAmount', () => {
         amountInUsd: '8.00',
         networkId: NetworkId['arbitrum-sepolia'],
         tokenAmount: '8',
-        tokenId: networkConfig.arbUsdcTokenId,
+        depositTokenId: networkConfig.arbUsdcTokenId,
         userHasFunds: true,
+        providerId: 'aave-v3',
       }
     )
     await waitFor(() => expect(getByText('earnFlow.depositBottomSheet.title')).toBeVisible())
@@ -201,8 +202,9 @@ describe('EarnEnterAmount', () => {
         amountInUsd: '12.00',
         networkId: NetworkId['arbitrum-sepolia'],
         tokenAmount: '12',
-        tokenId: networkConfig.arbUsdcTokenId,
+        depositTokenId: networkConfig.arbUsdcTokenId,
         userHasFunds: false,
+        providerId: 'aave-v3',
       }
     )
     await waitFor(() =>
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index befa93356b..0f428d92f7 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -19,6 +19,7 @@ import Touchable from 'src/components/Touchable'
 import CustomHeader from 'src/components/header/CustomHeader'
 import EarnAddCryptoBottomSheet from 'src/earn/EarnAddCryptoBottomSheet'
 import EarnDepositBottomSheet from 'src/earn/EarnDepositBottomSheet'
+import { PROVIDER_ID } from 'src/earn/constants'
 import { useAavePoolInfo } from 'src/earn/hooks'
 import { usePrepareSupplyTransactions } from 'src/earn/prepareTransactions'
 import { CICOFlow } from 'src/fiatExchanges/utils'
@@ -256,8 +257,9 @@ function EarnEnterAmount({ route }: Props) {
       tokenAmount: tokenAmount.toString(),
       amountInUsd: tokenAmount.multipliedBy(token.priceUsd ?? 0).toFixed(2),
       amountEnteredIn,
-      tokenId: token.tokenId,
+      depositTokenId: token.tokenId,
       networkId: token.networkId,
+      providerId: PROVIDER_ID,
     })
     isAmountLessThanBalance
       ? reviewBottomSheetRef.current?.snapToIndex(0)
@@ -376,6 +378,7 @@ function EarnEnterAmount({ route }: Props) {
           preparedTransaction={prepareTransactionsResult}
           amount={tokenAmount.toString()}
           tokenId={token.tokenId}
+          networkId={token.networkId}
         />
       )}
     </SafeAreaView>
diff --git a/src/earn/constants.ts b/src/earn/constants.ts
new file mode 100644
index 0000000000..adbd0eb2ec
--- /dev/null
+++ b/src/earn/constants.ts
@@ -0,0 +1 @@
+export const PROVIDER_ID = 'aave-v3' as const
diff --git a/src/earn/saga.test.ts b/src/earn/saga.test.ts
index 443ae1fdc7..887961ff30 100644
--- a/src/earn/saga.test.ts
+++ b/src/earn/saga.test.ts
@@ -122,7 +122,7 @@ describe('depositSubmitSaga', () => {
   ]
 
   const expectedAnalyticsProps = {
-    tokenId: mockArbUsdcTokenId,
+    depositTokenId: mockArbUsdcTokenId,
     tokenAmount: '100',
     networkId: NetworkId['arbitrum-sepolia'],
     providerId: 'aave-v3',
@@ -432,7 +432,7 @@ describe('withdrawSubmitSaga', () => {
   ]
 
   const expectedAnalyticsPropsWithRewards = {
-    tokenId: mockArbUsdcTokenId,
+    depositTokenId: mockArbUsdcTokenId,
     tokenAmount: '100',
     networkId: NetworkId['arbitrum-sepolia'],
     providerId: 'aave-v3',
diff --git a/src/earn/saga.ts b/src/earn/saga.ts
index 670925c161..5539d32a89 100644
--- a/src/earn/saga.ts
+++ b/src/earn/saga.ts
@@ -4,6 +4,7 @@ import erc20 from 'src/abis/IERC20'
 import { EarnEvents } from 'src/analytics/Events'
 import { EarnDepositTxsReceiptProperties } from 'src/analytics/Properties'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
+import { PROVIDER_ID } from 'src/earn/constants'
 import {
   depositCancel,
   depositError,
@@ -86,10 +87,10 @@ export function* depositSubmitSaga(action: PayloadAction<DepositInfo>) {
   const trackedTxs: TrackedTx[] = []
   const networkId = tokenInfo.networkId
   const commonAnalyticsProps = {
-    tokenId,
+    depositTokenId: tokenId,
     networkId,
     tokenAmount: amount,
-    providerId: 'aave-v3',
+    providerId: PROVIDER_ID,
   }
 
   let submitted = false
@@ -262,10 +263,10 @@ export function* withdrawSubmitSaga(action: PayloadAction<WithdrawInfo>) {
   const networkId = tokenInfo.networkId
   let submitted = false
   const commonAnalyticsProps = {
-    tokenId,
+    depositTokenId: tokenId,
     networkId,
     tokenAmount: amount,
-    providerId: 'aave-v3',
+    providerId: PROVIDER_ID,
     rewards,
   }
 

From 782e24ecb9199f19042233b3ac1ed430816a2adc Mon Sep 17 00:00:00 2001
From: valora-bot-crowdin
 <80050969+valora-bot-crowdin@users.noreply.github.com>
Date: Tue, 21 May 2024 19:42:34 -0700
Subject: [PATCH 037/133] chore(l10n): update translations from Crowdin (#5440)

Co-authored-by: Valora Bot <89419329+valora-bot@users.noreply.github.com>
---
 locales/de/translation.json     | 12 ++++++++----
 locales/en-US/translation.json  | 12 ++++++++----
 locales/es-419/translation.json | 12 ++++++++----
 locales/fr-FR/translation.json  | 12 ++++++++----
 locales/it-IT/translation.json  | 12 ++++++++----
 locales/pl-PL/translation.json  | 12 ++++++++----
 locales/pt-BR/translation.json  | 12 ++++++++----
 locales/ru-RU/translation.json  | 12 ++++++++----
 locales/th-TH/translation.json  | 12 ++++++++----
 locales/tr-TR/translation.json  | 12 ++++++++----
 locales/uk-UA/translation.json  | 12 ++++++++----
 locales/vi-VN/translation.json  | 12 ++++++++----
 locales/zh-CN/translation.json  | 12 ++++++++----
 13 files changed, 104 insertions(+), 52 deletions(-)

diff --git a/locales/de/translation.json b/locales/de/translation.json
index d9363baaaa..70f34fccac 100644
--- a/locales/de/translation.json
+++ b/locales/de/translation.json
@@ -1767,6 +1767,9 @@
     "swapToTokenSelection": "TAUSCH ZU",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "Die ausgewählten Token werden von deinen Tausch-Anbietern nicht unterstützt.",
+    "selectTokenLabel": "Token auswählen",
+    "tokenBottomSheetTitle": "Token auswählen",
+    "onNetwork": "auf {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "Du bist zum Netzwerk {{networkName}} gewechselt",
       "body_swapFrom": "Wähle einen Token aus, den du im {{networkName}} Netzwerk tauschen möchtest, um fortzufahren.",
@@ -1820,7 +1823,7 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Kostenlos",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Gebühr\n\nWir erheben eine Gebühr für den Tausch von Token auf {{appName}}. Die Gebühr beträgt {{appFeePercentage}}% des Betrags, den du tauschst.",
+      "appFeeInfo": "{{appName}} Gebühr\n\nDie {{appName}} Gebühr von {{appFeePercentage}}% wurde entwickelt, um dein Erlebnis zu verbessern, indem wir schnelle, zuverlässige und sichere Swaps gewährleisten.",
       "appFeeInfo_free": "{{appName}} Gebühr\n\nDieser Tausch ist kostenlos.",
       "appFeeInfo_placeholder": "{{appName}} Gebühr\n\nDie Gebühr wird auf der Grundlage des Angebots berechnet, das du erhältst.",
       "appFeeInfoDismissButton": "Verstanden",
@@ -2238,12 +2241,13 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Dein Guthaben ist auf dem Weg",
-      "description": "Das Guthaben, das du von deinem Freund bekommen hast, wird gerade gesendet. Bitte warten ... "
+      "title": "Kontrolle über dein Geld",
+      "description": "Bitte warte, während wir deinen Live Link überprüfen. Anspruchsberechtigte Gelder werden in Kürze eintreffen."
     },
     "error": {
       "title": "Guthaben kann nicht in Anspruch genommen werden",
-      "description": "Probiere deinen Live-Link erneut aus, um zu versuchen, Guthaben zu erhalten, oder bitte deinen Freund, einen neuen Link zu senden",
+      "description": "Dieser Link konnte aus einem unbekannten Grund nicht beansprucht werden",
+      "alreadyClaimedDescription": "Der Link wurde bereits beansprucht. Bitte deinen Freund, einen neuen Link zu senden.",
       "contactSupport": "Support kontaktieren",
       "dismiss": "Verwerfen"
     }
diff --git a/locales/en-US/translation.json b/locales/en-US/translation.json
index 0f79d87340..5c775e0004 100644
--- a/locales/en-US/translation.json
+++ b/locales/en-US/translation.json
@@ -1767,6 +1767,9 @@
     "swapToTokenSelection": "SWAP TO",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "The selected tokens aren't supported by our swap providers.",
+    "selectTokenLabel": "Select token",
+    "tokenBottomSheetTitle": "Select Token",
+    "onNetwork": "on {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "You switched to the {{networkName}} network",
       "body_swapFrom": "Select a token to swap from on the {{networkName}} network to continue.",
@@ -1820,7 +1823,7 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Free",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Fee\n\nWe charge a fee to swap tokens on {{appName}}. The fee is {{appFeePercentage}}% of the amount you are exchanging.",
+      "appFeeInfo": "{{appName}} Fee\n\nThe {{appName}} fee of {{appFeePercentage}}% is designed to enhance your experience by ensuring fast, reliable, and secure swaps.",
       "appFeeInfo_free": "{{appName}} Fee\n\nThis swap is free of charge.",
       "appFeeInfo_placeholder": "{{appName}} Fee\n\nThe fee is calculated based on the quote you receive.",
       "appFeeInfoDismissButton": "Got it",
@@ -2238,12 +2241,13 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Your funds are on their way",
-      "description": "The funds that your friend gave you are being sent over. Please wait... "
+      "title": "Checking on your funds",
+      "description": "Please wait while we check your Live Link. Claimable funds will arrive shortly."
     },
     "error": {
       "title": "Unable to claim funds",
-      "description": "Try your live link again to attempt to receive funds, or ask your friend to try sending a new link",
+      "description": "This link was not able to be claimed for an unknown reason",
+      "alreadyClaimedDescription": "The link has already been claimed. Please ask your friend to send a new link",
       "contactSupport": "Contact Support",
       "dismiss": "Dismiss"
     }
diff --git a/locales/es-419/translation.json b/locales/es-419/translation.json
index 1889805f35..55c76d5d0d 100644
--- a/locales/es-419/translation.json
+++ b/locales/es-419/translation.json
@@ -1767,6 +1767,9 @@
     "swapToTokenSelection": "CAMBIAR A",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "Los tokens seleccionados no son compatibles con nuestros proveedores de swap.",
+    "selectTokenLabel": "Seleccionar ficha",
+    "tokenBottomSheetTitle": "Seleccionar token",
+    "onNetwork": "en {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "Has cambiado a la red {{networkName}}",
       "body_swapFrom": "Selecciona un token para intercambiar desde la red {{networkName}} para continuar.",
@@ -1820,7 +1823,7 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Gratis",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Comisión\n\nCobramos una comisión por intercambiar fichas en {{appName}}. La comisión es {{appFeePercentage}}% de la cantidad que intercambies.",
+      "appFeeInfo": "{{appName}} Comisión\n\nLa comisión {{appName}} de {{appFeePercentage}}% está diseñada para mejorar tu experiencia garantizando intercambios rápidos, fiables y seguros.",
       "appFeeInfo_free": "{{appName}} Tarifa\n\nEste intercambio es gratuito.",
       "appFeeInfo_placeholder": "{{appName}} Tarifa\n\nLa tarifa se calcula en función del presupuesto que recibas.",
       "appFeeInfoDismissButton": "Entendido",
@@ -2238,12 +2241,13 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Tus fondos están en camino",
-      "description": "Se están enviando los fondos que te dio tu amigo. Por favor, espera... "
+      "title": "Comprobación de tus fondos",
+      "description": "Espera mientras comprobamos tu Live Link. Los fondos reclamables llegarán en breve."
     },
     "error": {
       "title": "No se pueden recuperar los fondos",
-      "description": "Prueba de nuevo tu enlace activo para recibir fondos, o pide a tu amigo que intente enviar un nuevo enlace",
+      "description": "Este enlace no ha podido ser reclamado por una razón desconocida",
+      "alreadyClaimedDescription": "El enlace ya ha sido reclamado. Por favor, pide a tu amigo que envíe un nuevo enlace",
       "contactSupport": "Contactar a Soporte",
       "dismiss": "Ignorar"
     }
diff --git a/locales/fr-FR/translation.json b/locales/fr-FR/translation.json
index bd14ee364f..40b37e0a63 100644
--- a/locales/fr-FR/translation.json
+++ b/locales/fr-FR/translation.json
@@ -1767,6 +1767,9 @@
     "swapToTokenSelection": "ÉCHANGER CONTRE",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "Les jetons sélectionnés ne sont pas pris en charge par nos fournisseurs.",
+    "selectTokenLabel": "Sélectionne le jeton",
+    "tokenBottomSheetTitle": "Sélectionner un jeton",
+    "onNetwork": "sur {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "Vous êtes passé au réseau {{networkName}}",
       "body_swapFrom": "Sélectionnez un jeton à échanger sur le réseau {{networkName}} pour continuer.",
@@ -1820,7 +1823,7 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Gratuit",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Frais\n\nNous facturons des frais pour échanger des jetons sur {{appName}}. Ces frais s'élèvent à {{appFeePercentage}}% du montant que tu échanges.",
+      "appFeeInfo": "{{appName}} Frais\n\nLes frais {{appName}} de {{appFeePercentage}}% sont conçus pour améliorer ton expérience en garantissant des échanges rapides, fiables et sécurisés.",
       "appFeeInfo_free": "{{appName}} Frais\n\nCet échange est gratuit.",
       "appFeeInfo_placeholder": "{{appName}} Frais\n\nLes frais sont calculés en fonction du devis que tu reçois.",
       "appFeeInfoDismissButton": "J'ai compris",
@@ -2238,12 +2241,13 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Vos fonds sont en route",
-      "description": "Les fonds que votre ami vous a donnés sont en cours d'envoi. Veuillez patienter... "
+      "title": "Vérifier tes fonds",
+      "description": "Merci de patienter pendant que nous vérifions ton Live Link. Les fonds à réclamer arriveront sous peu."
     },
     "error": {
       "title": "Impossible de récupérer les fonds",
-      "description": "Réessayez votre lien direct pour faire une nouvelle tentative de récupération des fonds, ou demandez à votre ami de vous envoyer un nouveau lien",
+      "description": "Ce lien n'a pas pu être réclamé pour une raison inconnue.",
+      "alreadyClaimedDescription": "Le lien a déjà été réclamé. Demande à ton ami de t'envoyer un nouveau lien",
       "contactSupport": "Contacter le Support",
       "dismiss": "Refuser"
     }
diff --git a/locales/it-IT/translation.json b/locales/it-IT/translation.json
index 48a2ceccdf..b89cfbda83 100644
--- a/locales/it-IT/translation.json
+++ b/locales/it-IT/translation.json
@@ -1767,6 +1767,9 @@
     "swapToTokenSelection": "SCAMBIA CON",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "I token selezionati non sono supportati dai nostri provider di scambio.",
+    "selectTokenLabel": "Seleziona il token",
+    "tokenBottomSheetTitle": "Seleziona token",
+    "onNetwork": "su {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "Sei passato alla rete {{networkName}}",
       "body_swapFrom": "Per continuare, seleziona un token da cui eseguire lo scambio sulla rete {{networkName}}.",
@@ -1820,7 +1823,7 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Gratuito",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Commissione\n\nApplichiamo una commissione per lo scambio di token su {{appName}}. La commissione è pari al {{appFeePercentage}}% dell'importo che stai scambiando.",
+      "appFeeInfo": "{{appName}} Commissione\n\nLa commissione {{appName}} del {{appFeePercentage}}% è pensata per migliorare la tua esperienza garantendoti scambi veloci, affidabili e sicuri.",
       "appFeeInfo_free": "{{appName}} Costo\n\nQuesto scambio è gratuito.",
       "appFeeInfo_placeholder": "{{appName}} Tariffa\n\nLa tariffa viene calcolata in base al preventivo ricevuto.",
       "appFeeInfoDismissButton": "Ho capito",
@@ -2238,12 +2241,13 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "I tuoi fondi sono in arrivo",
-      "description": "I fondi che il tuo amico ti ha dato sono in fase di invio. Attendi... "
+      "title": "Controllo dei tuoi fondi",
+      "description": "Attendi che controlliamo il tuo Live Link. I fondi richiedibili arriveranno a breve."
     },
     "error": {
       "title": "Impossibile reclamare i fondi",
-      "description": "Riprova il tuo link diretto per tentare di ricevere i fondi, oppure chiedi al tuo amico di provare a inviare un nuovo link",
+      "description": "Per un motivo sconosciuto non è stato possibile richiedere questo link.",
+      "alreadyClaimedDescription": "Il link è già stato richiesto. Chiedi al tuo amico di inviare un nuovo link",
       "contactSupport": "Contatta il supporto tecnico",
       "dismiss": "Ignora"
     }
diff --git a/locales/pl-PL/translation.json b/locales/pl-PL/translation.json
index 4abe302abd..822d94a1aa 100644
--- a/locales/pl-PL/translation.json
+++ b/locales/pl-PL/translation.json
@@ -1771,6 +1771,9 @@
     "swapToTokenSelection": "ZAMIANA NA",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "Wybrane tokeny nie są obsługiwane przez naszych dostawców swapów.",
+    "selectTokenLabel": "Wybierz token",
+    "tokenBottomSheetTitle": "Wybierz token",
+    "onNetwork": "na {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "Przełączono do sieci {{networkName}}",
       "body_swapFrom": "Aby kontynuować, wybierz token do wymiany w sieci {{networkName}}.",
@@ -1824,7 +1827,7 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Bezpłatnie",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Opłata\n\nPobieramy opłatę za wymianę tokenów na {{appName}}. Opłata wynosi {{appFeePercentage}}% kwoty, którą wymieniasz.",
+      "appFeeInfo": "{{appName}} Opłata\n\nOpłata {{appName}} w wysokości {{appFeePercentage}}% ma na celu zwiększenie Twojego doświadczenia poprzez zapewnienie szybkich, niezawodnych i bezpiecznych swapów.",
       "appFeeInfo_free": "{{appName}} Opłata\n\nTa wymiana jest bezpłatna.",
       "appFeeInfo_placeholder": "{{appName}} Opłata\n\nOpłata jest obliczana na podstawie otrzymanej wyceny.",
       "appFeeInfoDismissButton": "Rozumiem",
@@ -2242,12 +2245,13 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Twoje środki są w drodze",
-      "description": "Środki, które przekazał Ci Twój znajomy, są właśnie przesyłane. Poczekaj… "
+      "title": "Sprawdzanie Twoich środków",
+      "description": "Poczekaj, aż sprawdzimy Twój Live Link. Wkrótce otrzymasz środki możliwe do odebrania."
     },
     "error": {
       "title": "Nie można odebrać środków",
-      "description": "Użyj ponownie swojego aktywnego linku, aby spróbować otrzymać środki, lub poproś znajomego, aby przesłał nowy link",
+      "description": "Z nieznanego powodu nie można było odebrać tego linku",
+      "alreadyClaimedDescription": "Link został już zajęty. Poproś znajomego o przesłanie nowego linku",
       "contactSupport": "Skontaktuj się z Działem wsparcia",
       "dismiss": "Odrzuć"
     }
diff --git a/locales/pt-BR/translation.json b/locales/pt-BR/translation.json
index ecc1a74052..679e9c666b 100644
--- a/locales/pt-BR/translation.json
+++ b/locales/pt-BR/translation.json
@@ -1767,6 +1767,9 @@
     "swapToTokenSelection": "TROCA PARA",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "Os tokens selecionados não são suportados por nossos fornecedores de troca.",
+    "selectTokenLabel": "Selecione o token",
+    "tokenBottomSheetTitle": "Selecionar token",
+    "onNetwork": "Em {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "Você mudou para a rede {{networkName}}",
       "body_swapFrom": "Selecione um token de origem para trocar na rede {{networkName}} para continuar.",
@@ -1820,7 +1823,7 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Grátis",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Taxa\n\nCobramos uma taxa para você trocar tokens em {{appName}}. A taxa é {{appFeePercentage}}% do valor que você está trocando.",
+      "appFeeInfo": "{{appName}} Taxa\n\nA taxa {{appName}} de {{appFeePercentage}}% foi criada para aprimorar sua experiência, garantindo swaps rápidos, confiáveis e seguros.",
       "appFeeInfo_free": "{{appName}} Tarifa\n\nEssa troca é gratuita.",
       "appFeeInfo_placeholder": "{{appName}} Taxa\n\nA taxa é calculada com base na cotação que você receber.",
       "appFeeInfoDismissButton": "Entendi",
@@ -2238,12 +2241,13 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Seus fundos estão a caminho",
-      "description": "Os fundos que seu amigo deu a você estão sendo transferidos. Aguarde... "
+      "title": "Verificação de seus fundos",
+      "description": "Aguarde enquanto verificamos seu Live Link. Você receberá os fundos reivindicados em breve."
     },
     "error": {
       "title": "Não foi possível resgatar os fundos",
-      "description": "Tente usar o link ativo novamente para tentar receber fundos ou peça ao seu amigo para tentar enviar um novo link",
+      "description": "Por um motivo desconhecido, não foi possível reivindicar este link",
+      "alreadyClaimedDescription": "O link já foi solicitado. Peça a seu amigo que envie um novo link",
       "contactSupport": "Contate o suporte",
       "dismiss": "Ignorar"
     }
diff --git a/locales/ru-RU/translation.json b/locales/ru-RU/translation.json
index 763f277cf0..a9429dc615 100644
--- a/locales/ru-RU/translation.json
+++ b/locales/ru-RU/translation.json
@@ -1771,6 +1771,9 @@
     "swapToTokenSelection": "На что обменять",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "Выбранные токены не поддерживаются.",
+    "selectTokenLabel": "Выберите токен",
+    "tokenBottomSheetTitle": "Выбрать токен",
+    "onNetwork": "на {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "Вы переключились на сеть {{networkName}}",
       "body_swapFrom": "Выберите токен, с которого нужно выполнить обмен, в сеть {{networkName}}.",
@@ -1824,7 +1827,7 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Бесплатно",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Комиссия\n\nМы взимаем комиссию за обмен токенов на сайте {{appName}}. Комиссия составляет {{appFeePercentage}}% от суммы, которую ты обмениваешь.",
+      "appFeeInfo": "{{appName}} Комиссия\n\nКомиссия {{appName}} в размере {{appFeePercentage}}% призвана улучшить твой опыт, обеспечивая быстрые, надежные и безопасные свопы.",
       "appFeeInfo_free": "{{appName}} Плата\n\nЭтот своп бесплатный.",
       "appFeeInfo_placeholder": "{{appName}} Гонорар\n\nГонорар рассчитывается на основе полученной тобой цитаты.",
       "appFeeInfoDismissButton": "Понятно",
@@ -2242,12 +2245,13 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Ваши средства уже в пути",
-      "description": "Средства, переданные вам вашим другом, отправляются. Пожалуйста, подождите... "
+      "title": "Проверяй свои средства",
+      "description": "Пожалуйста, подожди, пока мы проверим твою Live Link. Средства, на которые можно претендовать, поступят в ближайшее время."
     },
     "error": {
       "title": "Не удается востребовать средства",
-      "description": "Попробуйте снова отправить свою прямую ссылку, чтобы попытаться получить средства, или попросите друга отправить новую ссылку",
+      "description": "Эта ссылка не может быть использована по неизвестной причине",
+      "alreadyClaimedDescription": "Эта ссылка уже была использована. Пожалуйста, попроси своего друга прислать новую ссылку",
       "contactSupport": "Обратитесь в службу поддержки",
       "dismiss": "Отклонить"
     }
diff --git a/locales/th-TH/translation.json b/locales/th-TH/translation.json
index d024f506ef..a8c082e086 100644
--- a/locales/th-TH/translation.json
+++ b/locales/th-TH/translation.json
@@ -1765,6 +1765,9 @@
     "swapToTokenSelection": "สว็อปเป็น",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "ผู้ให้บริการสว็อปของเราไม่รองรับโทเค็นที่เลือก",
+    "selectTokenLabel": "Select token",
+    "tokenBottomSheetTitle": "Select Token",
+    "onNetwork": "on {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "คุณเปลี่ยนไปใช้เครือข่าย {{networkName}} แล้ว",
       "body_swapFrom": "เลือกโทเค็นที่จะสว็อปจากบนเครือข่าย {{networkName}} เพื่อดำเนินการต่อ",
@@ -1818,7 +1821,7 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "ฟรี",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Fee\n\nWe charge a fee to swap tokens on {{appName}}. The fee is {{appFeePercentage}}% of the amount you are exchanging.",
+      "appFeeInfo": "{{appName}} Fee\n\nThe {{appName}} fee of {{appFeePercentage}}% is designed to enhance your experience by ensuring fast, reliable, and secure swaps.",
       "appFeeInfo_free": "{{appName}} Fee\n\nThis swap is free of charge.",
       "appFeeInfo_placeholder": "{{appName}} Fee\n\nThe fee is calculated based on the quote you receive.",
       "appFeeInfoDismissButton": "เข้าใจแล้ว",
@@ -2236,12 +2239,13 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "คุณกำลังจะได้รับเงินทุนเร็วๆ นี้",
-      "description": "เงินทุนที่เพื่อนมอบให้คุณกำลังถูกส่งมา โปรดรอ... "
+      "title": "Checking on your funds",
+      "description": "Please wait while we check your Live Link. Claimable funds will arrive shortly."
     },
     "error": {
       "title": "ไม่สามารถขอรับเงินทุนได้",
-      "description": "ลองใช้ลิงก์สดของคุณอีกครั้งเพื่อพยายามรับเงินทุน หรือขอให้เพื่อนลองส่งลิงก์ใหม่ให้",
+      "description": "This link was not able to be claimed for an unknown reason",
+      "alreadyClaimedDescription": "The link has already been claimed. Please ask your friend to send a new link",
       "contactSupport": "ติดต่อฝ่ายบริการลูกค้า",
       "dismiss": "ปิด"
     }
diff --git a/locales/tr-TR/translation.json b/locales/tr-TR/translation.json
index dcdfaf7a79..a07bec6e3b 100644
--- a/locales/tr-TR/translation.json
+++ b/locales/tr-TR/translation.json
@@ -1767,6 +1767,9 @@
     "swapToTokenSelection": "ŞUNA TAKAS",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "Seçilen tokenleri swap sağlayıcılarımız desteklemiyor.",
+    "selectTokenLabel": "Belirteç seçin",
+    "tokenBottomSheetTitle": "Belirteç Seçin",
+    "onNetwork": "{{networkName}}adresinde",
     "switchedToNetworkWarning": {
       "title": "{{networkName}} ağına geçtiniz",
       "body_swapFrom": "Devam etmek için {{networkName}} ağında kendisinden swap yapılacak bir token seçin.",
@@ -1820,7 +1823,7 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Ücretsiz",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Ücret\n\nJetonları {{appName}}adresinde takas etmek için bir ücret alıyoruz. Ücret, takas ettiğiniz miktarın {{appFeePercentage}}%'sidir.",
+      "appFeeInfo": "{{appName}} Ücret\n\n {{appName}} ücreti {{appFeePercentage}}%, hızlı, güvenilir ve güvenli takaslar sağlayarak deneyiminizi geliştirmek için tasarlanmıştır.",
       "appFeeInfo_free": "{{appName}} Ücret\n\nBu takas ücretsizdir.",
       "appFeeInfo_placeholder": "{{appName}} Ücret\n\nÜcret, aldığınız teklife göre hesaplanır.",
       "appFeeInfoDismissButton": "Anladım",
@@ -2238,12 +2241,13 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Paranız yolda",
-      "description": "Arkadaşınızın size verdiği fon gönderiliyor. Lütfen bekleyin... "
+      "title": "Fonlarınızı kontrol etme",
+      "description": "Canlı Bağlantınızı kontrol ederken lütfen bekleyin. Talep edilebilir fonlar kısa süre içinde ulaşacaktır."
     },
     "error": {
       "title": "Fon talep edilemiyor",
-      "description": "Fon almayı denemek için canlı bağlantınızı tekrar deneyin veya arkadaşınızdan yeni bir bağlantı göndermeyi denemesini isteyin",
+      "description": "Bu bağlantı bilinmeyen bir nedenle talep edilemedi",
+      "alreadyClaimedDescription": "Bağlantı zaten talep edildi. Lütfen arkadaşınızdan yeni bir bağlantı göndermesini isteyin",
       "contactSupport": "Destek ile İletişime Geç",
       "dismiss": "Yoksay"
     }
diff --git a/locales/uk-UA/translation.json b/locales/uk-UA/translation.json
index 174c68f951..3f2ee44635 100644
--- a/locales/uk-UA/translation.json
+++ b/locales/uk-UA/translation.json
@@ -1771,6 +1771,9 @@
     "swapToTokenSelection": "СВОП НА",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "Вибрані токени не підтримуються організаторами свопа.",
+    "selectTokenLabel": "Виберіть токен",
+    "tokenBottomSheetTitle": "Виберіть токен",
+    "onNetwork": "на {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "Ви перейшли до мережі {{networkName}}",
       "body_swapFrom": "Щоб продовжити, виберіть, який токен ви хочете обміняти для свопу в мережі {{networkName}}.",
@@ -1824,7 +1827,7 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Безплатно",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Комісія\n\nМи стягуємо комісію за обмін токенів на {{appName}}. Комісія становить {{appFeePercentage}}% від суми, яку ви обмінюєте.",
+      "appFeeInfo": "{{appName}} Комісія\n\nКомісія {{appName}} у розмірі {{appFeePercentage}}% покликана покращити ваш досвід, забезпечуючи швидкі, надійні та безпечні обміни.",
       "appFeeInfo_free": "{{appName}} Вартість\n\nЦей обмін безкоштовний.",
       "appFeeInfo_placeholder": "{{appName}} Комісія\n\nКомісія розраховується на основі отриманої вами пропозиції.",
       "appFeeInfoDismissButton": "Зрозуміло",
@@ -2242,12 +2245,13 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Ваші кошти вже пройшли",
-      "description": "Надіслані вашим другом кошти пересилаються. Зачекайте…"
+      "title": "Перевірка стану ваших коштів",
+      "description": "Будь ласка, зачекайте, поки ми перевіримо ваше посилання. Кошти, на які можна претендувати, надійдуть найближчим часом."
     },
     "error": {
       "title": "Неможливо забрати кошти",
-      "description": "Спробуйте скористатися прямим посиланням ще раз, щоб отримати кошти, або попросіть свого друга надіслати нове посилання",
+      "description": "Це посилання не вдалося завантажити з невідомої причини",
+      "alreadyClaimedDescription": "Посилання вже було затребуване. Будь ласка, попросіть вашого друга надіслати нове посилання",
       "contactSupport": "Звернутися до служби підтримки",
       "dismiss": "Відхилити"
     }
diff --git a/locales/vi-VN/translation.json b/locales/vi-VN/translation.json
index 228119fa6a..a5208494b6 100644
--- a/locales/vi-VN/translation.json
+++ b/locales/vi-VN/translation.json
@@ -1765,6 +1765,9 @@
     "swapToTokenSelection": "TRAO ĐỔI SANG",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "Các nhà cung cấp dịch vụ trao đổi của chúng tôi không hỗ trợ token đã chọn.",
+    "selectTokenLabel": "Select token",
+    "tokenBottomSheetTitle": "Select Token",
+    "onNetwork": "on {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "Bạn đã chuyển sang mạng {{networkName}}",
       "body_swapFrom": "Để tiếp tục, hãy chọn một token để trao đổi từ mạng {{networkName}}.",
@@ -1818,7 +1821,7 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Miễn phí",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Fee\n\nWe charge a fee to swap tokens on {{appName}}. The fee is {{appFeePercentage}}% of the amount you are exchanging.",
+      "appFeeInfo": "{{appName}} Fee\n\nThe {{appName}} fee of {{appFeePercentage}}% is designed to enhance your experience by ensuring fast, reliable, and secure swaps.",
       "appFeeInfo_free": "{{appName}} Fee\n\nThis swap is free of charge.",
       "appFeeInfo_placeholder": "{{appName}} Fee\n\nThe fee is calculated based on the quote you receive.",
       "appFeeInfoDismissButton": "Đã hiểu",
@@ -2236,12 +2239,13 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Tiền của bạn đang được chuyển",
-      "description": "Số tiền mà bạn bè gửi cho bạn đang được chuyển qua. Vui lòng đợi... "
+      "title": "Checking on your funds",
+      "description": "Please wait while we check your Live Link. Claimable funds will arrive shortly."
     },
     "error": {
       "title": "Không nhận được tiền",
-      "description": "Hãy thử lại đường liên kết trực tiếp của mình để nhận tiền hoặc nhờ bạn bè gửi lại một đường liên kết mới",
+      "description": "This link was not able to be claimed for an unknown reason",
+      "alreadyClaimedDescription": "The link has already been claimed. Please ask your friend to send a new link",
       "contactSupport": "Liên hệ với bộ phận hỗ trợ",
       "dismiss": "Loại bỏ"
     }
diff --git a/locales/zh-CN/translation.json b/locales/zh-CN/translation.json
index 63595498d0..b6ffd77083 100644
--- a/locales/zh-CN/translation.json
+++ b/locales/zh-CN/translation.json
@@ -1765,6 +1765,9 @@
     "swapToTokenSelection": "替换至",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "我们的交换提供商不支持所选令牌。",
+    "selectTokenLabel": "选择令牌",
+    "tokenBottomSheetTitle": "选择令牌",
+    "onNetwork": "{{networkName}}",
     "switchedToNetworkWarning": {
       "title": "您已转至 {{networkName}} 网络",
       "body_swapFrom": "在 {{networkName}} 网络上选择用于交换的代币，然后继续。",
@@ -1818,7 +1821,7 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "免费",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} 费用\n\n我们对在 {{appName}}上交换代币收取一定费用。费用为您兑换金额的 {{appFeePercentage}}%。",
+      "appFeeInfo": "{{appName}} 费用\n\n {{appName}} 费用为 {{appFeePercentage}}%，旨在通过确保快速、可靠和安全的交换来提高您的体验。",
       "appFeeInfo_free": "{{appName}} 费用\n\n本次交换是免费的。",
       "appFeeInfo_placeholder": "{{appName}} 费用\n\n费用根据您收到的报价计算。",
       "appFeeInfoDismissButton": "知道了",
@@ -2236,12 +2239,13 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "您的资金正在到账中",
-      "description": "您朋友给您的资金正在汇入。请稍候... "
+      "title": "检查您的资金",
+      "description": "请稍候，我们将检查您的 Live Link。可申请的资金将很快到账。"
     },
     "error": {
       "title": "无法领取资金",
-      "description": "再次尝试您的实时链接以尝试接收资金，或请您的朋友尝试发送一个新链接",
+      "description": "此链接无法申请，原因不明",
+      "alreadyClaimedDescription": "链接已被使用。请让您的朋友发送一个新链接",
       "contactSupport": "联系支持团队",
       "dismiss": "忽略"
     }

From fdb6cdbe483fa02f931b284f4ecbaf41f122fb0d Mon Sep 17 00:00:00 2001
From: Valora Bot <89419329+valora-bot@users.noreply.github.com>
Date: Tue, 21 May 2024 20:20:39 -0700
Subject: [PATCH 038/133] chore: bump app version to 1.86.0  (#5451)

Co-authored-by: runner <runner@Mac-1716342061093.local>
---
 android/app/build.gradle           | 2 +-
 android/gradle.properties          | 2 +-
 ios/celo.xcodeproj/project.pbxproj | 8 ++++----
 package.json                       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index dfeb9b089b..5ba8bee54c 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -150,7 +150,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode appVersionCode
-        versionName "1.85.0"
+        versionName "1.86.0"
         multiDexEnabled true
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/android/gradle.properties b/android/gradle.properties
index beef6afe01..83b50034a2 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -23,7 +23,7 @@ CELO_RELEASE_KEY_ALIAS=celo-key-alias
 
 # Setting this manually based on version number until we have this deploying via Cloud Build
 # Example: v1.5.1 deployment number 1 = 1005001001 (1 005 001 001)
-VERSION_CODE=1021071669
+VERSION_CODE=1021071670
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
diff --git a/ios/celo.xcodeproj/project.pbxproj b/ios/celo.xcodeproj/project.pbxproj
index a69055ddaf..01c1601ddc 100644
--- a/ios/celo.xcodeproj/project.pbxproj
+++ b/ios/celo.xcodeproj/project.pbxproj
@@ -1205,7 +1205,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 150;
+				CURRENT_PROJECT_VERSION = 151;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
@@ -1225,7 +1225,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 1.85.0;
+				MARKETING_VERSION = 1.86.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
@@ -1257,7 +1257,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 150;
+				CURRENT_PROJECT_VERSION = 151;
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1274,7 +1274,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 1.85.0;
+				MARKETING_VERSION = 1.86.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
diff --git a/package.json b/package.json
index 4a2a2c8cd8..769304bf75 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@valora/wallet",
-  "version": "1.85.0",
+  "version": "1.86.0",
   "author": "Valora Inc",
   "license": "Apache-2.0",
   "private": true,

From c78bd4ea1a708eb8e7e56d3222b4cc0ec79b01cf Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Thu, 23 May 2024 05:40:51 +1200
Subject: [PATCH 039/133] feat(earn): Review and deposit updates - gas subsidy
 (#5452)

### Description

Adds copy and strikethrough gas fee if gas is subsidized

### Test plan

Unit test added.

Feature gate false (no change):

![false](https://github.com/valora-inc/wallet/assets/140328381/57adf70b-b20f-4154-b895-f59baaab1a56)

Feature gate true (strikethrough value, show copy):

![true](https://github.com/valora-inc/wallet/assets/140328381/09f9a08f-b54a-452c-b5f8-a2d112c5d156)

### Related issues

- Fixes #ACT-1195

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [X] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 locales/base/translation.json            |  1 +
 src/earn/EarnDepositBottomSheet.test.tsx | 31 +++++++++++++++++++++---
 src/earn/EarnDepositBottomSheet.tsx      | 17 ++++++++++---
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/locales/base/translation.json b/locales/base/translation.json
index cea39a4e6d..ea195fae88 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -2354,6 +2354,7 @@
     }
   },
   "earnFlow": {
+    "gasSubsidized": "Valora's covering gas for this transaction!",
     "addCryptoBottomSheet": {
       "title": "Add {{tokenSymbol}} on {{tokenNetwork}}",
       "description": "Once you add tokens you'll have to come back to finish depositing into a pool.",
diff --git a/src/earn/EarnDepositBottomSheet.test.tsx b/src/earn/EarnDepositBottomSheet.test.tsx
index 3a71b320a9..749fe71e04 100644
--- a/src/earn/EarnDepositBottomSheet.test.tsx
+++ b/src/earn/EarnDepositBottomSheet.test.tsx
@@ -8,8 +8,8 @@ import EarnDepositBottomSheet from 'src/earn/EarnDepositBottomSheet'
 import { PROVIDER_ID } from 'src/earn/constants'
 import { depositStart } from 'src/earn/slice'
 import { navigate } from 'src/navigator/NavigationService'
-import { getDynamicConfigParams } from 'src/statsig'
-import { StatsigDynamicConfigs } from 'src/statsig/types'
+import { getDynamicConfigParams, getFeatureGate } from 'src/statsig'
+import { StatsigDynamicConfigs, StatsigFeatureGates } from 'src/statsig/types'
 import { NetworkId } from 'src/transactions/types'
 import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
 import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
@@ -71,10 +71,11 @@ describe('EarnDepositBottomSheet', () => {
           return defaultValues
       }
     })
+    jest.mocked(getFeatureGate).mockReturnValue(false)
   })
 
   it('renders all elements', () => {
-    const { getByTestId, getByText } = render(
+    const { getByTestId, queryByTestId, getByText } = render(
       <Provider store={createMockStore({ tokens: { tokenBalances: mockTokenBalances } })}>
         <EarnDepositBottomSheet
           forwardedRef={{ current: null }}
@@ -88,6 +89,8 @@ describe('EarnDepositBottomSheet', () => {
     expect(getByText('earnFlow.depositBottomSheet.title')).toBeTruthy()
     expect(getByText('earnFlow.depositBottomSheet.description')).toBeTruthy()
 
+    expect(queryByTestId('EarnDeposit/GasSubsidized')).toBeFalsy()
+
     expect(getByText('earnFlow.depositBottomSheet.amount')).toBeTruthy()
     expect(getByTestId('EarnDeposit/Amount')).toHaveTextContent('100.00 ETH')
 
@@ -223,4 +226,26 @@ describe('EarnDepositBottomSheet', () => {
     expect(getByTestId('EarnDeposit/SecondaryCta')).toBeDisabled()
     expect(getByTestId('EarnDeposit/PrimaryCta')).toContainElement(getByTestId('Button/Loading'))
   })
+
+  it('shows gas subsidized copy if feature gate is set', () => {
+    jest
+      .mocked(getFeatureGate)
+      .mockImplementation(
+        (featureGateName) =>
+          featureGateName === StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES
+      )
+    const { getByTestId } = render(
+      <Provider store={createMockStore({ tokens: { tokenBalances: mockTokenBalances } })}>
+        <EarnDepositBottomSheet
+          forwardedRef={{ current: null }}
+          amount={'100'}
+          tokenId={mockArbEthTokenId}
+          preparedTransaction={mockPreparedTransaction}
+          networkId={NetworkId['arbitrum-sepolia']}
+        />
+      </Provider>
+    )
+
+    expect(getByTestId('EarnDeposit/GasSubsidized')).toBeTruthy()
+  })
 })
diff --git a/src/earn/EarnDepositBottomSheet.tsx b/src/earn/EarnDepositBottomSheet.tsx
index b05dcfdd1e..0bf028a138 100644
--- a/src/earn/EarnDepositBottomSheet.tsx
+++ b/src/earn/EarnDepositBottomSheet.tsx
@@ -19,9 +19,9 @@ import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { useSelector } from 'src/redux/hooks'
 import { NETWORK_NAMES } from 'src/shared/conts'
-import { getDynamicConfigParams } from 'src/statsig'
+import { getDynamicConfigParams, getFeatureGate } from 'src/statsig'
 import { DynamicConfigs } from 'src/statsig/constants'
-import { StatsigDynamicConfigs } from 'src/statsig/types'
+import { StatsigDynamicConfigs, StatsigFeatureGates } from 'src/statsig/types'
 import Colors from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
 import { Shadow, Spacing, getShadowStyle } from 'src/styles/styles'
@@ -66,6 +66,8 @@ export default function EarnDepositBottomSheet({
     return null
   }
 
+  const isGasSubsidized = getFeatureGate(StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES)
+
   const { providerName, providerLogoUrl, providerTermsAndConditionsUrl } = getDynamicConfigParams(
     DynamicConfigs[StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG]
   )
@@ -121,9 +123,14 @@ export default function EarnDepositBottomSheet({
             testID="EarnDeposit/Fee"
             amount={estimatedFeeAmount}
             tokenId={feeCurrency.tokenId}
-            style={styles.value}
+            style={[styles.value, isGasSubsidized && { textDecorationLine: 'line-through' }]}
             showLocalAmount={false}
           />
+          {isGasSubsidized && (
+            <Text style={styles.gasSubsidized} testID={'EarnDeposit/GasSubsidized'}>
+              {t('earnFlow.gasSubsidized')}
+            </Text>
+          )}
         </LabelledItem>
         <LabelledItem label={t('earnFlow.depositBottomSheet.provider')}>
           <View style={styles.providerNameContainer}>
@@ -266,4 +273,8 @@ const styles = StyleSheet.create({
     flexGrow: 1,
     flexBasis: 0,
   },
+  gasSubsidized: {
+    ...typeScale.labelXSmall,
+    color: Colors.primary,
+  },
 })

From 7ef466f369837317912856820ead729af6f18e69 Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Thu, 23 May 2024 09:41:45 +1200
Subject: [PATCH 040/133] feat(earn): Withdraw screen gas subsidy update
 (#5454)

### Description

If feature flag set, strikethrough gas token amount, don't show gas fiat
amount, show gas subsidized copy.

### Test plan

Unit tests updated/added.

Subsidize gas feature gate true:
![Simulator Screenshot - iPhone 14 Pro - 2024-05-22 at 12 31
52](https://github.com/valora-inc/wallet/assets/140328381/92d8c9bd-081a-44c7-8e8f-f1da274cfce5)

Subsidize gas feature gate false:

![collect-false](https://github.com/valora-inc/wallet/assets/140328381/8a98d885-1796-4d09-b75c-a8b3be2453ec)

### Related issues

- Fixes #ACT-1196

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [X] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/earn/EarnCollectScreen.test.tsx | 26 ++++++++++++++++++
 src/earn/EarnCollectScreen.tsx      | 42 ++++++++++++++++++++++-------
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/src/earn/EarnCollectScreen.test.tsx b/src/earn/EarnCollectScreen.test.tsx
index d4a13666ac..967fd1478e 100644
--- a/src/earn/EarnCollectScreen.test.tsx
+++ b/src/earn/EarnCollectScreen.test.tsx
@@ -10,6 +10,8 @@ import { prepareWithdrawAndClaimTransactions } from 'src/earn/prepareTransaction
 import { withdrawStart } from 'src/earn/slice'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
+import { getFeatureGate } from 'src/statsig'
+import { StatsigFeatureGates } from 'src/statsig/types'
 import { NetworkId } from 'src/transactions/types'
 import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
 import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
@@ -44,6 +46,7 @@ const mockStoreTokens = {
 const store = createMockStore({ tokens: mockStoreTokens })
 
 jest.mock('src/earn/poolInfo')
+jest.mock('src/statsig')
 jest.mock('src/earn/prepareTransactions')
 
 const mockPreparedTransaction: PreparedTransactionsPossible = {
@@ -84,6 +87,7 @@ describe('EarnCollectScreen', () => {
     jest.mocked(fetchAavePoolInfo).mockResolvedValue({ apy: 0.03 })
     jest.mocked(fetchAaveRewards).mockResolvedValue(mockRewards)
     jest.mocked(prepareWithdrawAndClaimTransactions).mockResolvedValue(mockPreparedTransaction)
+    jest.mocked(getFeatureGate).mockReturnValue(false)
     store.clearActions()
   })
 
@@ -129,6 +133,7 @@ describe('EarnCollectScreen', () => {
     })
     expect(getByTestId('EarnCollect/GasFeeCryptoAmount')).toHaveTextContent('0.06 ETH')
     expect(getByTestId('EarnCollect/GasFeeFiatAmount')).toHaveTextContent('₱119.70')
+    expect(queryByTestId('EarnCollect/GasSubsidized')).toBeFalsy()
     expect(getByTestId('EarnCollectScreen/CTA')).toBeEnabled()
     expect(prepareWithdrawAndClaimTransactions).toHaveBeenCalledWith({
       amount: '10.75',
@@ -424,4 +429,25 @@ describe('EarnCollectScreen', () => {
       gasTokenId: mockArbEthTokenId,
     })
   })
+
+  it('shows gas subsidized copy when feature gate is true', async () => {
+    jest
+      .mocked(getFeatureGate)
+      .mockImplementation(
+        (featureGateName) =>
+          featureGateName === StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES
+      )
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <MockedNavigator
+          component={EarnCollectScreen}
+          params={{
+            depositTokenId: mockArbUsdcTokenId,
+            poolTokenId: networkConfig.aaveArbUsdcTokenId,
+          }}
+        />
+      </Provider>
+    )
+    expect(getByTestId('EarnCollect/GasSubsidized')).toBeTruthy()
+  })
 })
diff --git a/src/earn/EarnCollectScreen.tsx b/src/earn/EarnCollectScreen.tsx
index 1f288dcbce..e313f41ec7 100644
--- a/src/earn/EarnCollectScreen.tsx
+++ b/src/earn/EarnCollectScreen.tsx
@@ -20,6 +20,8 @@ import { Screens } from 'src/navigator/Screens'
 import { StackParamList } from 'src/navigator/types'
 import { useDispatch, useSelector } from 'src/redux/hooks'
 import { NETWORK_NAMES } from 'src/shared/conts'
+import { getFeatureGate } from 'src/statsig'
+import { StatsigFeatureGates } from 'src/statsig/types'
 import Colors from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
 import { Spacing } from 'src/styles/styles'
@@ -44,6 +46,8 @@ export default function EarnCollectScreen({ route }: Props) {
     throw new Error('Deposit / pool token not found')
   }
 
+  const isGasSubsidized = getFeatureGate(StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES)
+
   const feeCurrencies = useSelector((state) => feeCurrenciesSelector(state, depositToken.networkId))
   const { asyncRewardsInfo, asyncPreparedTransactions } = useAaveRewardsInfoAndPrepareTransactions({
     poolTokenId,
@@ -93,7 +97,13 @@ export default function EarnCollectScreen({ route }: Props) {
   const { maxFeeAmount, feeCurrency } = getFeeCurrencyAndAmounts(asyncPreparedTransactions.result)
   let feeSection = <GasFeeLoading />
   if (maxFeeAmount && feeCurrency) {
-    feeSection = <GasFee maxFeeAmount={maxFeeAmount} feeCurrency={feeCurrency} />
+    feeSection = (
+      <GasFee
+        maxFeeAmount={maxFeeAmount}
+        feeCurrency={feeCurrency}
+        isGasSubsidized={isGasSubsidized}
+      />
+    )
   } else if (!asyncPreparedTransactions.loading) {
     feeSection = <GasFeeError />
   }
@@ -126,6 +136,11 @@ export default function EarnCollectScreen({ route }: Props) {
           <View>
             <Text style={styles.rateText}>{t('earnFlow.collect.fee')}</Text>
             {feeSection}
+            {isGasSubsidized && (
+              <Text style={styles.gasSubsidized} testID={'EarnCollect/GasSubsidized'}>
+                {t('earnFlow.gasSubsidized')}
+              </Text>
+            )}
           </View>
         </View>
         {error && (
@@ -270,26 +285,30 @@ function GasFeeLoading() {
 function GasFee({
   maxFeeAmount,
   feeCurrency,
+  isGasSubsidized = false,
 }: {
   maxFeeAmount: BigNumber
   feeCurrency: TokenBalance
+  isGasSubsidized: Boolean
 }) {
   return (
     <>
       <TokenDisplay
-        style={styles.apyText}
+        style={[styles.apyText, isGasSubsidized && { textDecorationLine: 'line-through' }]}
         tokenId={feeCurrency.tokenId}
         amount={maxFeeAmount}
         showLocalAmount={false}
         testID="EarnCollect/GasFeeCryptoAmount"
       />
-      <TokenDisplay
-        style={styles.gasFeeFiat}
-        tokenId={feeCurrency.tokenId}
-        amount={maxFeeAmount}
-        showLocalAmount={true}
-        testID="EarnCollect/GasFeeFiatAmount"
-      />
+      {!isGasSubsidized && (
+        <TokenDisplay
+          style={styles.gasFeeFiat}
+          tokenId={feeCurrency.tokenId}
+          amount={maxFeeAmount}
+          showLocalAmount={true}
+          testID="EarnCollect/GasFeeFiatAmount"
+        />
+      )}
     </>
   )
 }
@@ -378,4 +397,9 @@ const styles = StyleSheet.create({
     borderRadius: 100,
     ...typeScale.bodyXSmall,
   },
+  gasSubsidized: {
+    ...typeScale.labelXSmall,
+    color: Colors.primary,
+    marginTop: Spacing.Tiny4,
+  },
 })

From 9fb4d7ffb37fe710e4a56f80cc9a6afbb3f95b6e Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Wed, 22 May 2024 15:08:25 -0700
Subject: [PATCH 041/133] feat(earn): update cta to match new designs (#5455)

### Description

Just the EarnCta card in the Discover tab. The home screen changes will
be in a follow up


[Figma](https://www.figma.com/design/E1rC3MG74qEg5V4tvbeUnU/Stablecoin-Enablement?node-id=2906-9161&t=qHZ4KetHUCGCOedp-0)

### Test plan

Unit tests, manual

<img
src="https://github.com/valora-inc/wallet/assets/5062591/e0747631-4805-4fc1-8b3d-34676c5825d7"
width="250" />


### Related issues

- Part of ACT-1191

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 locales/base/translation.json          |  5 ++
 src/analytics/Properties.tsx           |  2 +-
 src/dappsExplorer/TabDiscover.test.tsx | 10 ++--
 src/earn/EarnCta.test.tsx              | 81 +++++++++++++++++++-------
 src/earn/EarnCta.tsx                   | 46 +++++++++++++--
 src/icons/EarnAave.tsx                 | 44 --------------
 6 files changed, 110 insertions(+), 78 deletions(-)
 delete mode 100644 src/icons/EarnAave.tsx

diff --git a/locales/base/translation.json b/locales/base/translation.json
index ea195fae88..241d24e909 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -2374,6 +2374,11 @@
       "subtitle": "Deposit today and earn returns",
       "description": "See how much you can earn when supplying a lending pool"
     },
+    "ctaV1_86": {
+      "title": "Maximize earnings on stablecoins",
+      "subtitle": "Buy {{symbol}}",
+      "description": "Earn approximately {{apy}}% per year when you add {{symbol}} to a pool"
+    },
     "enterAmount": {
       "earnUpToLabel": "You could earn up to:",
       "rateLabel": "Rate (est.)",
diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 11fd799052..3849a9c510 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -1608,7 +1608,7 @@ export type EarnDepositTxsReceiptProperties = Partial<ApproveTxReceiptProperties
   }>
 
 interface EarnEventsProperties {
-  [EarnEvents.earn_cta_press]: undefined
+  [EarnEvents.earn_cta_press]: EarnCommonProperties
   [EarnEvents.earn_add_crypto_action_press]: {
     action: TokenActionName
   } & TokenProperties
diff --git a/src/dappsExplorer/TabDiscover.test.tsx b/src/dappsExplorer/TabDiscover.test.tsx
index c05e599f0f..5f1a605e05 100644
--- a/src/dappsExplorer/TabDiscover.test.tsx
+++ b/src/dappsExplorer/TabDiscover.test.tsx
@@ -12,7 +12,7 @@ import { NetworkId } from 'src/transactions/types'
 import networkConfig from 'src/web3/networkConfig'
 import MockedNavigator from 'test/MockedNavigator'
 import { createMockStore } from 'test/utils'
-import { mockAaveArbUsdcAddress, mockDappListWithCategoryNames } from 'test/values'
+import { mockAaveArbUsdcAddress, mockDappListWithCategoryNames, mockUSDCAddress } from 'test/values'
 
 jest.mock('src/analytics/ValoraAnalytics')
 jest.mock('src/statsig', () => ({
@@ -751,11 +751,11 @@ describe('TabDiscover', () => {
         dapps: { dappListApiUrl: 'http://url.com', dappsList, dappsCategories },
         tokens: {
           tokenBalances: {
-            [networkConfig.aaveArbUsdcTokenId]: {
+            [networkConfig.arbUsdcTokenId]: {
               networkId: NetworkId['arbitrum-sepolia'],
-              address: mockAaveArbUsdcAddress,
-              tokenId: networkConfig.aaveArbUsdcTokenId,
-              symbol: 'aArbSepUSDC',
+              address: mockUSDCAddress,
+              tokenId: networkConfig.arbUsdcTokenId,
+              symbol: 'USDC',
               priceUsd: '1',
               balance: '0',
               priceFetchedAt: Date.now(),
diff --git a/src/earn/EarnCta.test.tsx b/src/earn/EarnCta.test.tsx
index f36ebdd727..c396729f1e 100644
--- a/src/earn/EarnCta.test.tsx
+++ b/src/earn/EarnCta.test.tsx
@@ -1,44 +1,81 @@
-import { fireEvent, render } from '@testing-library/react-native'
+import { act, fireEvent, render, waitFor } from '@testing-library/react-native'
 import React from 'react'
 import { Provider } from 'react-redux'
 import { EarnEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import EarnCta from 'src/earn/EarnCta'
+import { fetchAavePoolInfo } from 'src/earn/poolInfo'
+import { navigate } from 'src/navigator/NavigationService'
 import { NetworkId } from 'src/transactions/types'
-import networkConfig from 'src/web3/networkConfig'
 import { createMockStore } from 'test/utils'
+import { mockArbUsdcTokenId, mockTokenBalances } from 'test/values'
 
-const store = createMockStore({
-  tokens: {
-    tokenBalances: {
-      [networkConfig.arbUsdcTokenId]: {
-        tokenId: networkConfig.arbUsdcTokenId,
-        symbol: 'USDC',
-        priceUsd: '1',
-        priceFetchedAt: Date.now(),
-        networkId: NetworkId['arbitrum-sepolia'],
+const createStore = (balance: string = '0') =>
+  createMockStore({
+    tokens: {
+      tokenBalances: {
+        [mockArbUsdcTokenId]: {
+          ...mockTokenBalances[mockArbUsdcTokenId],
+          balance,
+        },
       },
     },
-  },
-})
+  })
+
+jest.mock('src/earn/poolInfo')
 
 describe('EarnCta', () => {
   beforeEach(() => {
     jest.clearAllMocks()
+    jest.mocked(fetchAavePoolInfo).mockResolvedValue({ apy: 0.02345 })
+  })
+
+  it('renders correctly with APY', async () => {
+    const { getByText } = render(
+      <Provider store={createStore()}>
+        <EarnCta depositTokenId={mockArbUsdcTokenId} />
+      </Provider>
+    )
+
+    expect(getByText('earnFlow.ctaV1_86.title')).toBeTruthy()
+    expect(getByText('earnFlow.ctaV1_86.subtitle, {"symbol":"USDC"}')).toBeTruthy()
+    expect(getByText('earnFlow.ctaV1_86.description, {"apy":"--","symbol":"USDC"}')).toBeTruthy()
+    await waitFor(() =>
+      expect(
+        getByText('earnFlow.ctaV1_86.description, {"apy":"2.35","symbol":"USDC"}')
+      ).toBeTruthy()
+    )
   })
 
-  it('should render correctly', () => {
-    const { getByText, getByTestId } = render(
-      <Provider store={store}>
-        <EarnCta depositTokenId={'arbitrum-sepolia:0x123'} />
+  it('renders description correctly when apy is not available', async () => {
+    jest.mocked(fetchAavePoolInfo).mockRejectedValue(new Error('error'))
+    const { getByText } = render(
+      <Provider store={createStore()}>
+        <EarnCta depositTokenId={mockArbUsdcTokenId} />
       </Provider>
     )
 
-    expect(getByText('earnFlow.cta.title')).toBeTruthy()
-    expect(getByText('earnFlow.cta.subtitle')).toBeTruthy()
-    expect(getByText('earnFlow.cta.subtitle')).toBeTruthy()
+    expect(getByText('earnFlow.ctaV1_86.description, {"apy":"--","symbol":"USDC"}')).toBeTruthy()
+    await waitFor(() =>
+      expect(getByText('earnFlow.ctaV1_86.description, {"apy":"--","symbol":"USDC"}')).toBeTruthy()
+    )
+  })
+
+  it('navigates to EarnEnterAmount when pressed', async () => {
+    const { getByTestId } = render(
+      <Provider store={createStore()}>
+        <EarnCta depositTokenId={mockArbUsdcTokenId} />
+      </Provider>
+    )
 
-    fireEvent.press(getByTestId('EarnCta'))
-    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_cta_press)
+    await act(() => fireEvent.press(getByTestId('EarnCta')))
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_cta_press, {
+      depositTokenId: mockArbUsdcTokenId,
+      providerId: 'aave-v3',
+      networkId: NetworkId['arbitrum-sepolia'],
+    })
+    expect(navigate).toHaveBeenCalledWith('EarnEnterAmount', {
+      tokenId: mockArbUsdcTokenId,
+    })
   })
 })
diff --git a/src/earn/EarnCta.tsx b/src/earn/EarnCta.tsx
index fa084ed4ed..b53edc63a7 100644
--- a/src/earn/EarnCta.tsx
+++ b/src/earn/EarnCta.tsx
@@ -1,36 +1,67 @@
+import BigNumber from 'bignumber.js'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { StyleSheet, Text, View } from 'react-native'
 import { EarnEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
+import TokenIcon, { IconSize } from 'src/components/TokenIcon'
 import Touchable from 'src/components/Touchable'
-import EarnAave from 'src/icons/EarnAave'
+import { PROVIDER_ID } from 'src/earn/constants'
+import { useAavePoolInfo } from 'src/earn/hooks'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import Colors from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
 import { Spacing } from 'src/styles/styles'
+import { useTokenInfo } from 'src/tokens/hooks'
+import Logger from 'src/utils/Logger'
+
+const TAG = 'earn/EarnCta'
 
 export default function EarnCta({ depositTokenId }: { depositTokenId: string }) {
   const { t } = useTranslation()
+  const depositToken = useTokenInfo(depositTokenId)
+  const asyncPoolInfo = useAavePoolInfo({ depositTokenId })
+
+  if (!depositToken) {
+    // should never happen
+    Logger.error(TAG, `No deposit token found: ${depositTokenId}`)
+    return null
+  }
+
+  const apyDisplay = asyncPoolInfo.result
+    ? new BigNumber(asyncPoolInfo.result.apy).multipliedBy(100).toFixed(2)
+    : '--'
+
   return (
     <View style={styles.container}>
       <Touchable
         borderRadius={8}
         style={styles.touchable}
         onPress={() => {
-          ValoraAnalytics.track(EarnEvents.earn_cta_press)
+          ValoraAnalytics.track(EarnEvents.earn_cta_press, {
+            depositTokenId,
+            providerId: PROVIDER_ID,
+            networkId: depositToken.networkId,
+          })
           navigate(Screens.EarnEnterAmount, { tokenId: depositTokenId })
         }}
         testID="EarnCta"
       >
         <>
-          <Text style={styles.title}>{t('earnFlow.cta.title')}</Text>
+          <Text style={styles.title}>{t('earnFlow.ctaV1_86.title')}</Text>
           <View style={styles.row}>
-            <EarnAave />
+            <TokenIcon token={depositToken} size={IconSize.SMALL} viewStyle={styles.icon} />
             <View style={styles.subtitleContainer}>
-              <Text style={styles.subtitle}>{t('earnFlow.cta.subtitle')}</Text>
-              <Text style={styles.description}>{t('earnFlow.cta.description')}</Text>
+              <Text style={styles.subtitle}>
+                {t('earnFlow.ctaV1_86.subtitle', { symbol: depositToken.symbol })}
+              </Text>
+              <Text style={styles.description}>
+                {t('earnFlow.ctaV1_86.description', {
+                  apy: apyDisplay,
+                  symbol: depositToken.symbol,
+                })}
+              </Text>
             </View>
           </View>
         </>
@@ -69,4 +100,7 @@ const styles = StyleSheet.create({
     ...typeScale.bodyXSmall,
     color: Colors.gray4,
   },
+  icon: {
+    marginTop: Spacing.Tiny4,
+  },
 })
diff --git a/src/icons/EarnAave.tsx b/src/icons/EarnAave.tsx
deleted file mode 100644
index 9328fbae0d..0000000000
--- a/src/icons/EarnAave.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import * as React from 'react'
-import Svg, { ClipPath, Defs, G, LinearGradient, Path, Rect, Stop } from 'react-native-svg'
-import Colors from 'src/styles/colors'
-
-const EarnAave = () => (
-  <Svg width={34} height={34} viewBox="0 0 34 34" fill="none">
-    <Rect width={32} height={32} rx={16} fill={Colors.successLight} />
-    <G clipPath="url(#clip0_2472_13704)">
-      <G>
-        <Path
-          d="M26 33.76C30.2857 33.76 33.76 30.2857 33.76 26C33.76 21.7143 30.2857 18.24 26 18.24C21.7143 18.24 18.24 21.7143 18.24 26C18.24 30.2857 21.7143 33.76 26 33.76Z"
-          fill="url(#paint0_linear_2472_13704)"
-        />
-        <Path
-          d="M29.3961 29.092L26.7721 22.748C26.6241 22.42 26.4041 22.26 26.1141 22.26H25.8821C25.5921 22.26 25.3721 22.42 25.2241 22.748L24.0821 25.512H23.2181C22.9601 25.514 22.7501 25.722 22.7481 25.982V25.988C22.7501 26.246 22.9601 26.456 23.2181 26.458H23.6821L22.5921 29.092C22.5721 29.15 22.5601 29.21 22.5601 29.272C22.5601 29.42 22.6061 29.536 22.6881 29.626C22.7701 29.716 22.8881 29.76 23.0361 29.76C23.1341 29.758 23.2281 29.728 23.3061 29.67C23.3901 29.612 23.4481 29.528 23.4941 29.432L24.6941 26.456H25.5261C25.7841 26.454 25.9941 26.246 25.9961 25.986V25.974C25.9941 25.716 25.7841 25.506 25.5261 25.504H25.0821L25.9981 23.222L28.4941 29.43C28.5401 29.526 28.5981 29.61 28.6821 29.668C28.7601 29.726 28.8561 29.756 28.9521 29.758C29.1001 29.758 29.2161 29.714 29.3001 29.624C29.3841 29.534 29.4281 29.418 29.4281 29.27C29.4301 29.21 29.4201 29.148 29.3961 29.092Z"
-          fill="white"
-        />
-      </G>
-    </G>
-    <Path
-      d="M13.3154 16.0464L8.269 21.0929L7.70687 20.5308L13.6692 14.5603L16.9154 17.8066L17.269 18.1601L17.6226 17.8066L22.0146 13.4146L22.3681 13.061L22.0146 12.7074L20.8071 11.5H24.5V15.1929L23.2926 13.9854L22.9393 13.6322L22.5857 13.9852L17.2693 19.2932L14.0226 16.0464L13.669 15.6929L13.3154 16.0464Z"
-      fill={Colors.successDark}
-      stroke={Colors.successDark}
-    />
-    <Defs>
-      <LinearGradient
-        id="paint0_linear_2472_13704"
-        x1={31.7857}
-        y1={21.1317}
-        x2={20.2389}
-        y2={30.8473}
-        gradientUnits="userSpaceOnUse"
-      >
-        <Stop stopColor="#B6509E" />
-        <Stop offset={1} stopColor="#2EBAC6" />
-      </LinearGradient>
-      <ClipPath id="clip0_2472_13704">
-        <Rect width={16} height={16} fill="white" transform="translate(18 18)" />
-      </ClipPath>
-    </Defs>
-  </Svg>
-)
-
-export default EarnAave

From d35a51b2a031055c105aa8f564457aa01d298781 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 22 May 2024 15:36:25 -0700
Subject: [PATCH 042/133] ci(renovate): turn off auto merge for major package
 version upgrades (#5388)

### Description

Prevents renovate from auto merging major upgrades to wallet
dependencies.

### Test plan

N/A

### Related issues

N/A

### Backwards compatibility

Yes

### Network scalability

N/A
---
 renovate.json5 | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/renovate.json5 b/renovate.json5
index 80bff894d0..294d39bbe1 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -77,6 +77,17 @@
       matchPackagePatterns: ['^prettier'],
       groupName: 'prettier',
     },
+    {
+      // Avoid auto merge of major updates on rn, auth0, firebase and walletconnect
+      matchPackagePatterns: [
+        '^@react-native-firebase/',
+        'react-native-auth0',
+        '^@walletconnect/',
+        '^react-native$',
+      ],
+      matchUpdateTypes: ['major'],
+      automerge: false,
+    },
   ],
   // A list of dependencies to be ignored by Renovate - "exact match" only
   ignoreDeps: [

From cb1b97b0e30ee3d0276d64f531b713679589b88a Mon Sep 17 00:00:00 2001
From: Kathy Luo <kathyluo18@gmail.com>
Date: Thu, 23 May 2024 10:21:50 +0200
Subject: [PATCH 043/133] chore(points): add track points event to transaction
 watcher (#5441)

### Description

In case the transaction is not settled within the same app session, we
should add the points tracking to the transaction watcher as well.

I added the network to the tracked event, in preparation for network
specific activities.

### Test plan

n/a

### Related issues

n/a

### Backwards compatibility

Y

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/points/slice.test.ts      |  3 +-
 src/points/types.ts           |  2 ++
 src/swap/saga.test.ts         |  8 +++++
 src/swap/saga.ts              |  1 +
 src/transactions/saga.test.ts | 57 +++++++++++++++++++++++++++++++++++
 src/transactions/saga.ts      | 12 ++++++--
 test/RootStateSchema.json     |  4 +++
 7 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/src/points/slice.test.ts b/src/points/slice.test.ts
index dc324a3bf8..8543dd172b 100644
--- a/src/points/slice.test.ts
+++ b/src/points/slice.test.ts
@@ -1,3 +1,4 @@
+import { NetworkId } from 'src/transactions/types'
 import reducer, {
   PendingPointsEvent,
   initialState,
@@ -14,7 +15,7 @@ const pendingCreateWalletEvent: PendingPointsEvent = {
 const pendingSwapEvent: PendingPointsEvent = {
   id: 'test-id-2',
   timestamp: '2024-04-22T12:00:00.000Z',
-  event: { activityId: 'swap', transactionHash: '0xTEST' },
+  event: { activityId: 'swap', transactionHash: '0xTEST', networkId: NetworkId['celo-alfajores'] },
 }
 
 describe('pending points events', () => {
diff --git a/src/points/types.ts b/src/points/types.ts
index f15fa4f6b4..0b3bd1eeb5 100644
--- a/src/points/types.ts
+++ b/src/points/types.ts
@@ -1,4 +1,5 @@
 import React from 'react'
+import { NetworkId } from 'src/transactions/types'
 
 const pointsActivities = ['create-wallet', 'swap', 'more-coming'] as const
 export type PointsActivityId = (typeof pointsActivities)[number]
@@ -84,6 +85,7 @@ interface PointsEventCreateWallet {
 interface PointsEventSwap {
   activityId: 'swap'
   transactionHash: string
+  networkId: NetworkId
 }
 
 export type PointsEvent = PointsEventCreateWallet | PointsEventSwap
diff --git a/src/swap/saga.test.ts b/src/swap/saga.test.ts
index 9941b3ca18..5866dcdec0 100644
--- a/src/swap/saga.test.ts
+++ b/src/swap/saga.test.ts
@@ -5,6 +5,7 @@ import { EffectProviders, StaticProvider, dynamic } from 'redux-saga-test-plan/p
 import { SwapEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import { navigate, navigateHome } from 'src/navigator/NavigationService'
+import { trackPointsEvent } from 'src/points/slice'
 import { getDynamicConfigParams } from 'src/statsig'
 import { swapSubmitSaga } from 'src/swap/saga'
 import { swapCancel, swapError, swapStart, swapSuccess } from 'src/swap/slice'
@@ -555,6 +556,13 @@ describe(swapSubmitSaga, () => {
         },
       })
       .call([publicClient.celo, 'waitForTransactionReceipt'], { hash: '0x1' })
+      .put(
+        trackPointsEvent({
+          activityId: 'swap',
+          transactionHash: '0x1',
+          networkId: NetworkId['celo-alfajores'],
+        })
+      )
       .run()
 
     expect(mockViemWallet.signTransaction).toHaveBeenCalledTimes(1)
diff --git a/src/swap/saga.ts b/src/swap/saga.ts
index f7e719f77a..b4ce38cb0a 100644
--- a/src/swap/saga.ts
+++ b/src/swap/saga.ts
@@ -276,6 +276,7 @@ export function* swapSubmitSaga(action: PayloadAction<SwapInfo>) {
       trackPointsEvent({
         activityId: 'swap',
         transactionHash: swapTxReceipt.transactionHash,
+        networkId,
       })
     )
     ValoraAnalytics.track(SwapEvents.swap_execute_success, {
diff --git a/src/transactions/saga.test.ts b/src/transactions/saga.test.ts
index 6dce01fb2d..d1dd8eb154 100644
--- a/src/transactions/saga.test.ts
+++ b/src/transactions/saga.test.ts
@@ -4,6 +4,7 @@ import { expectSaga } from 'redux-saga-test-plan'
 import * as matchers from 'redux-saga-test-plan/matchers'
 import { EffectProviders, StaticProvider } from 'redux-saga-test-plan/providers'
 import { call } from 'redux-saga/effects'
+import { trackPointsEvent } from 'src/points/slice'
 import { getSupportedNetworkIdsForSend, getSupportedNetworkIdsForSwap } from 'src/tokens/utils'
 import {
   transactionConfirmed,
@@ -30,6 +31,7 @@ import { getContractKit, getContractKitAsync } from 'src/web3/contracts'
 import { createMockStore } from 'test/utils'
 import {
   mockAccount,
+  mockCeurTokenId,
   mockCusdAddress,
   mockCusdTokenId,
   mockEthTokenId,
@@ -210,6 +212,59 @@ describe('watchPendingTransactions', () => {
           1701102971000
         )
       )
+      .not.put(trackPointsEvent(expect.any(Object))) // transaction reverted, no points
+      .run()
+  })
+
+  it('updates and tracks the pending swap transaction', async () => {
+    const standbySwaptransaction: StandbyTransaction = {
+      __typename: 'TokenExchangeV3',
+      context: {
+        id: transactionId,
+      },
+      status: TransactionStatus.Pending,
+      networkId: NetworkId['celo-alfajores'],
+      type: TokenTransactionTypeV2.SwapTransaction,
+      transactionHash,
+      timestamp: 1234,
+      inAmount: {
+        tokenId: mockCeurTokenId,
+        value: 2.93,
+      },
+      outAmount: {
+        tokenId: mockCusdTokenId,
+        value: 2.87,
+      },
+      metadata: {},
+    }
+    await expectSaga(internalWatchPendingTransactionsInNetwork, Network.Celo)
+      .withState(
+        createMockStore({
+          transactions: {
+            standbyTransactions: [standbySwaptransaction],
+          },
+        }).getState()
+      )
+      .provide(createDefaultProviders(Network.Celo))
+      .put(
+        transactionConfirmed(
+          transactionId,
+          {
+            transactionHash,
+            block: '123',
+            status: TransactionStatus.Complete,
+            fees: [],
+          },
+          1701102971000
+        )
+      )
+      .put(
+        trackPointsEvent({
+          activityId: 'swap',
+          transactionHash,
+          networkId: NetworkId['celo-alfajores'],
+        })
+      )
       .run()
   })
 
@@ -243,6 +298,7 @@ describe('watchPendingTransactions', () => {
           1701102971000
         )
       )
+      .not.put(trackPointsEvent(expect.any(Object))) // not a swap transaction
       .run()
   })
 
@@ -302,6 +358,7 @@ describe('watchPendingTransactions', () => {
         ...createDefaultProviders(Network.Celo),
       ])
       .not.put(transactionConfirmed(expect.any(String), expect.any(Object), expect.any(Number)))
+      .not.put(trackPointsEvent(expect.any(Object))) // no receipt, no points
       .run()
   })
 
diff --git a/src/transactions/saga.ts b/src/transactions/saga.ts
index 146d641bd0..ab18018984 100644
--- a/src/transactions/saga.ts
+++ b/src/transactions/saga.ts
@@ -7,6 +7,7 @@ import { ErrorMessages } from 'src/app/ErrorMessages'
 import { Actions as IdentityActions } from 'src/identity/actions'
 import { AddressToE164NumberType } from 'src/identity/reducer'
 import { addressToE164NumberSelector } from 'src/identity/selectors'
+import { trackPointsEvent } from 'src/points/slice'
 import { NumberToRecipient } from 'src/recipients/recipient'
 import { phoneRecipientCacheSelector } from 'src/recipients/reducer'
 import { tokensByIdSelector } from 'src/tokens/selectors'
@@ -255,7 +256,8 @@ export function* getTransactionReceipt(
   transaction: StandbyTransaction & { transactionHash: string },
   network: Network
 ) {
-  const { feeCurrencyId, transactionHash } = transaction
+  const { feeCurrencyId, transactionHash, __typename } = transaction
+  const networkId = networkConfig.networkToNetworkId[network]
 
   try {
     const receipt = yield* call([publicClient[network], 'waitForTransactionReceipt'], {
@@ -267,10 +269,16 @@ export function* getTransactionReceipt(
         handleTransactionReceiptReceived,
         transaction.context.id,
         receipt,
-        networkConfig.networkToNetworkId[network],
+        networkId,
         feeCurrencyId
       )
     }
+
+    if (receipt.status === 'success') {
+      if (__typename === 'TokenExchangeV3') {
+        yield* put(trackPointsEvent({ activityId: 'swap', transactionHash, networkId }))
+      }
+    }
   } catch (e) {
     Logger.warn(
       TAG,
diff --git a/test/RootStateSchema.json b/test/RootStateSchema.json
index 578e00ef16..8cbb082b24 100644
--- a/test/RootStateSchema.json
+++ b/test/RootStateSchema.json
@@ -2834,12 +2834,16 @@
                     "const": "swap",
                     "type": "string"
                 },
+                "networkId": {
+                    "$ref": "#/definitions/NetworkId"
+                },
                 "transactionHash": {
                     "type": "string"
                 }
             },
             "required": [
                 "activityId",
+                "networkId",
                 "transactionHash"
             ],
             "type": "object"

From ed44f1f93e6c1c9a3b1f642e73ff61145a7005a8 Mon Sep 17 00:00:00 2001
From: Kathy Luo <kathyluo18@gmail.com>
Date: Thu, 23 May 2024 18:50:40 +0200
Subject: [PATCH 044/133] fix(points): ensure balance is displayed timely and
 correctly (#5459)

### Description

This PR fixes:
1. the points balance was outdated on the discover tab because the
balance fetch was only triggered on the points home screen. now we also
trigger a balance fetch on app mount.
2. also fetch points config on app mount (consolidate logic, was
previously being fetched on home screen visit)
3. disable font scaling on the points balance because the font size is
large already, and font scaling messes with the animation.

### Test plan

n/a

### Related issues

n/a

### Backwards compatibility

Y

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/components/NumberTicker.tsx | 6 +++++-
 src/points/saga.test.ts         | 6 ++++++
 src/points/saga.ts              | 7 +++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/NumberTicker.tsx b/src/components/NumberTicker.tsx
index 97e8b3cdb9..b7d6657ee2 100644
--- a/src/components/NumberTicker.tsx
+++ b/src/components/NumberTicker.tsx
@@ -26,7 +26,11 @@ interface TickProps {
 const numberRange = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
 
 function TickText({ value, textStyle }: TickTextProps) {
-  return <Text style={[styles.tickerText, textStyle]}>{value}</Text>
+  return (
+    <Text allowFontScaling={false} style={[styles.tickerText, textStyle]}>
+      {value}
+    </Text>
+  )
 }
 
 function Tick({ startValue, endValue, textStyle, textHeight, animationDuration }: TickProps) {
diff --git a/src/points/saga.test.ts b/src/points/saga.test.ts
index 548bca7dd3..0edb4c9830 100644
--- a/src/points/saga.test.ts
+++ b/src/points/saga.test.ts
@@ -556,18 +556,24 @@ describe('watchAppMounted', () => {
 
   it('should call sendPendingPointsEvents only once even if multiple "app mounted" actions are dispatched', async () => {
     const mockSendPendingPointsEvents = jest.fn()
+    const mockGetPointsBalance = jest.fn()
+    const mockGetPointsConfig = jest.fn()
     const mockAction = { type: AppActions.APP_MOUNTED }
 
     await expectSaga(watchAppMounted)
       .withState(createMockStore().getState())
       .provide([
         [matchers.call.fn(pointsSaga.sendPendingPointsEvents), mockSendPendingPointsEvents()],
+        [matchers.call.fn(pointsSaga.getPointsBalance), mockGetPointsBalance()],
+        [matchers.call.fn(pointsSaga.getPointsConfig), mockGetPointsConfig()],
       ])
       .dispatch(mockAction)
       .dispatch(mockAction)
       .run()
 
     expect(mockSendPendingPointsEvents).toHaveBeenCalledTimes(1)
+    expect(mockGetPointsBalance).toHaveBeenCalledTimes(1)
+    expect(mockGetPointsConfig).toHaveBeenCalledTimes(1)
   })
 })
 
diff --git a/src/points/saga.ts b/src/points/saga.ts
index 05f0317c97..326d0f7b1d 100644
--- a/src/points/saga.ts
+++ b/src/points/saga.ts
@@ -1,6 +1,5 @@
 import { differenceInDays } from 'date-fns'
 import { Actions as AppActions } from 'src/app/actions'
-import { Actions as HomeActions } from 'src/home/actions'
 import { retrieveSignedMessage } from 'src/pincode/authentication'
 import {
   nextPageUrlSelector,
@@ -37,7 +36,7 @@ import { fetchWithTimeout } from 'src/utils/fetchWithTimeout'
 import { safely } from 'src/utils/safely'
 import networkConfig from 'src/web3/networkConfig'
 import { walletAddressSelector } from 'src/web3/selectors'
-import { call, put, select, spawn, take, takeEvery, takeLeading } from 'typed-redux-saga'
+import { all, call, put, select, spawn, take, takeEvery, takeLeading } from 'typed-redux-saga'
 import { v4 as uuidv4 } from 'uuid'
 
 const TAG = 'Points/saga'
@@ -255,7 +254,7 @@ function* watchGetHistory() {
 }
 
 function* watchGetConfig() {
-  yield* takeLeading([getPointsConfigRetry.type, HomeActions.VISIT_HOME], safely(getPointsConfig))
+  yield* takeLeading(getPointsConfigRetry.type, safely(getPointsConfig))
 }
 
 function* watchTrackPointsEvent() {
@@ -264,7 +263,7 @@ function* watchTrackPointsEvent() {
 
 export function* watchAppMounted() {
   yield* take(AppActions.APP_MOUNTED)
-  yield* call(safely, sendPendingPointsEvents)
+  yield* all([safely(getPointsConfig), safely(getPointsBalance), safely(sendPendingPointsEvents)])
 }
 
 export function* pointsSaga() {

From 48373ce959596331d6697e0cdee7e6f726c5c87e Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Fri, 24 May 2024 05:51:01 +1200
Subject: [PATCH 045/133] feat(earn): Review & Deposit updates - APY and earn
 up to amount (#5449)

### Description

Review and deposit fast follows
- Generalizes the APY and earn up to component
- Uses it in the Review and Deposit screen

### Test plan
Unit tests added/updated.

Enter amount (looks same as before):

![enter-amount](https://github.com/valora-inc/wallet/assets/140328381/7416db76-246c-486b-bc76-090d013b3873)

Deposit:

![deposit](https://github.com/valora-inc/wallet/assets/140328381/db121d61-a8e3-446b-83f8-fe6dd2fdceee)

### Related issues

- Fixes #ACT-1195

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [X] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/earn/EarnApyAndAmount.tsx            | 82 ++++++++++++++++++++++++
 src/earn/EarnDepositBottomSheet.test.tsx | 35 +++++-----
 src/earn/EarnDepositBottomSheet.tsx      | 32 ++++++---
 src/earn/EarnEnterAmount.test.tsx        |  4 +-
 src/earn/EarnEnterAmount.tsx             | 56 ++--------------
 5 files changed, 132 insertions(+), 77 deletions(-)
 create mode 100644 src/earn/EarnApyAndAmount.tsx

diff --git a/src/earn/EarnApyAndAmount.tsx b/src/earn/EarnApyAndAmount.tsx
new file mode 100644
index 0000000000..e800a71227
--- /dev/null
+++ b/src/earn/EarnApyAndAmount.tsx
@@ -0,0 +1,82 @@
+import BigNumber from 'bignumber.js'
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import { StyleSheet, Text, View } from 'react-native'
+import { Colors } from 'react-native/Libraries/NewAppScreen'
+import { useSelector } from 'react-redux'
+import TokenIcon, { IconSize } from 'src/components/TokenIcon'
+import { useAavePoolInfo } from 'src/earn/hooks'
+import { LocalCurrencySymbol } from 'src/localCurrency/consts'
+import { getLocalCurrencySymbol } from 'src/localCurrency/selectors'
+import { typeScale } from 'src/styles/fonts'
+import { Spacing } from 'src/styles/styles'
+import { TokenBalance } from 'src/tokens/slice'
+
+export function EarnApyAndAmount({
+  tokenAmount,
+  token,
+  testIDPrefix = 'Earn',
+}: {
+  tokenAmount: BigNumber | null
+  token: TokenBalance
+  testIDPrefix?: string
+}) {
+  const { t } = useTranslation()
+
+  const localCurrencySymbol = useSelector(getLocalCurrencySymbol) ?? LocalCurrencySymbol.USD
+
+  const asyncPoolInfo = useAavePoolInfo({ depositTokenId: token.tokenId })
+  const apy = asyncPoolInfo?.result?.apy
+
+  const apyString = apy ? (apy * 100).toFixed(2) : '--'
+  const earnUpTo =
+    apy && tokenAmount?.gt(0) ? tokenAmount.multipliedBy(new BigNumber(apy)).toFormat(2) : '--'
+
+  return (
+    <>
+      <View style={styles.line}>
+        <Text style={styles.label}>{t('earnFlow.enterAmount.earnUpToLabel')}</Text>
+        <Text style={styles.label}>{t('earnFlow.enterAmount.rateLabel')}</Text>
+      </View>
+      <View style={styles.line}>
+        <Text style={styles.valuesText} testID={`${testIDPrefix}/EarnApyAndAmount/EarnUpTo`}>
+          {t('earnFlow.enterAmount.earnUpTo', {
+            fiatSymbol: localCurrencySymbol,
+            amount: earnUpTo,
+          })}
+        </Text>
+        <View style={styles.apy}>
+          <TokenIcon token={token} size={IconSize.XSMALL} />
+          <Text style={styles.valuesText} testID={`${testIDPrefix}/EarnApyAndAmount/Apy`}>
+            {t('earnFlow.enterAmount.rate', {
+              rate: apyString,
+            })}
+          </Text>
+        </View>
+      </View>
+    </>
+  )
+}
+
+const styles = StyleSheet.create({
+  apy: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: Spacing.Tiny4,
+  },
+  label: {
+    ...typeScale.bodySmall,
+    color: Colors.gray4,
+  },
+  line: {
+    flexDirection: 'row',
+    alignSelf: 'flex-end',
+    justifyContent: 'space-between',
+    width: '100%',
+    gap: Spacing.Smallest8,
+  },
+  valuesText: {
+    ...typeScale.labelSemiBoldSmall,
+    marginVertical: Spacing.Tiny4,
+  },
+})
diff --git a/src/earn/EarnDepositBottomSheet.test.tsx b/src/earn/EarnDepositBottomSheet.test.tsx
index 749fe71e04..f17ce33d44 100644
--- a/src/earn/EarnDepositBottomSheet.test.tsx
+++ b/src/earn/EarnDepositBottomSheet.test.tsx
@@ -13,7 +13,7 @@ import { StatsigDynamicConfigs, StatsigFeatureGates } from 'src/statsig/types'
 import { NetworkId } from 'src/transactions/types'
 import { PreparedTransactionsPossible } from 'src/viem/prepareTransactions'
 import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
-import { createMockStore } from 'test/utils'
+import { createMockStore, mockStoreBalancesToTokenBalances } from 'test/utils'
 import { mockArbEthTokenId, mockTokenBalances } from 'test/values'
 
 jest.mock('src/statsig')
@@ -49,6 +49,8 @@ const mockPreparedTransaction: PreparedTransactionsPossible = {
   },
 }
 
+const mockToken = mockStoreBalancesToTokenBalances([mockTokenBalances[mockArbEthTokenId]])[0]
+
 describe('EarnDepositBottomSheet', () => {
   const expectedAnalyticsProperties = {
     depositTokenId: mockArbEthTokenId,
@@ -79,9 +81,9 @@ describe('EarnDepositBottomSheet', () => {
       <Provider store={createMockStore({ tokens: { tokenBalances: mockTokenBalances } })}>
         <EarnDepositBottomSheet
           forwardedRef={{ current: null }}
-          amount={'100'}
-          tokenId={mockArbEthTokenId}
+          amount={new BigNumber(100)}
           preparedTransaction={mockPreparedTransaction}
+          token={mockToken}
           networkId={NetworkId['arbitrum-sepolia']}
         />
       </Provider>
@@ -89,6 +91,9 @@ describe('EarnDepositBottomSheet', () => {
     expect(getByText('earnFlow.depositBottomSheet.title')).toBeTruthy()
     expect(getByText('earnFlow.depositBottomSheet.description')).toBeTruthy()
 
+    expect(getByTestId('EarnDepositBottomSheet/EarnApyAndAmount/Apy')).toBeTruthy()
+    expect(getByTestId('EarnDepositBottomSheet/EarnApyAndAmount/EarnUpTo')).toBeTruthy()
+
     expect(queryByTestId('EarnDeposit/GasSubsidized')).toBeFalsy()
 
     expect(getByText('earnFlow.depositBottomSheet.amount')).toBeTruthy()
@@ -116,9 +121,9 @@ describe('EarnDepositBottomSheet', () => {
       <Provider store={store}>
         <EarnDepositBottomSheet
           forwardedRef={{ current: null }}
-          amount={'100'}
-          tokenId={mockArbEthTokenId}
+          amount={new BigNumber(100)}
           preparedTransaction={mockPreparedTransaction}
+          token={mockToken}
           networkId={NetworkId['arbitrum-sepolia']}
         />
       </Provider>
@@ -148,9 +153,9 @@ describe('EarnDepositBottomSheet', () => {
       <Provider store={createMockStore({ tokens: { tokenBalances: mockTokenBalances } })}>
         <EarnDepositBottomSheet
           forwardedRef={{ current: null }}
-          amount={'100'}
-          tokenId={mockArbEthTokenId}
+          amount={new BigNumber(100)}
           preparedTransaction={mockPreparedTransaction}
+          token={mockToken}
           networkId={NetworkId['arbitrum-sepolia']}
         />
       </Provider>
@@ -168,9 +173,9 @@ describe('EarnDepositBottomSheet', () => {
       <Provider store={createMockStore({ tokens: { tokenBalances: mockTokenBalances } })}>
         <EarnDepositBottomSheet
           forwardedRef={{ current: null }}
-          amount={'100'}
-          tokenId={mockArbEthTokenId}
+          amount={new BigNumber(100)}
           preparedTransaction={mockPreparedTransaction}
+          token={mockToken}
           networkId={NetworkId['arbitrum-sepolia']}
         />
       </Provider>
@@ -189,9 +194,9 @@ describe('EarnDepositBottomSheet', () => {
       <Provider store={createMockStore({ tokens: { tokenBalances: mockTokenBalances } })}>
         <EarnDepositBottomSheet
           forwardedRef={{ current: null }}
-          amount={'100'}
-          tokenId={mockArbEthTokenId}
+          amount={new BigNumber(100)}
           preparedTransaction={mockPreparedTransaction}
+          token={mockToken}
           networkId={NetworkId['arbitrum-sepolia']}
         />
       </Provider>
@@ -214,9 +219,9 @@ describe('EarnDepositBottomSheet', () => {
       <Provider store={store}>
         <EarnDepositBottomSheet
           forwardedRef={{ current: null }}
-          amount={'100'}
-          tokenId={mockArbEthTokenId}
+          amount={new BigNumber(100)}
           preparedTransaction={mockPreparedTransaction}
+          token={mockToken}
           networkId={NetworkId['arbitrum-sepolia']}
         />
       </Provider>
@@ -238,9 +243,9 @@ describe('EarnDepositBottomSheet', () => {
       <Provider store={createMockStore({ tokens: { tokenBalances: mockTokenBalances } })}>
         <EarnDepositBottomSheet
           forwardedRef={{ current: null }}
-          amount={'100'}
-          tokenId={mockArbEthTokenId}
+          amount={new BigNumber(100)}
           preparedTransaction={mockPreparedTransaction}
+          token={mockToken}
           networkId={NetworkId['arbitrum-sepolia']}
         />
       </Provider>
diff --git a/src/earn/EarnDepositBottomSheet.tsx b/src/earn/EarnDepositBottomSheet.tsx
index 0bf028a138..95b83489e5 100644
--- a/src/earn/EarnDepositBottomSheet.tsx
+++ b/src/earn/EarnDepositBottomSheet.tsx
@@ -1,3 +1,4 @@
+import BigNumber from 'bignumber.js'
 import React, { RefObject } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
 import { StyleSheet, Text, View } from 'react-native'
@@ -10,6 +11,7 @@ import BottomSheet, { BottomSheetRefType } from 'src/components/BottomSheet'
 import Button, { BtnSizes, BtnTypes } from 'src/components/Button'
 import TokenDisplay from 'src/components/TokenDisplay'
 import Touchable from 'src/components/Touchable'
+import { EarnApyAndAmount } from 'src/earn/EarnApyAndAmount'
 import { PROVIDER_ID } from 'src/earn/constants'
 import { depositStatusSelector } from 'src/earn/selectors'
 import { depositStart } from 'src/earn/slice'
@@ -25,6 +27,7 @@ import { StatsigDynamicConfigs, StatsigFeatureGates } from 'src/statsig/types'
 import Colors from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
 import { Shadow, Spacing, getShadowStyle } from 'src/styles/styles'
+import { TokenBalance } from 'src/tokens/slice'
 import { NetworkId } from 'src/transactions/types'
 import {
   PreparedTransactionsPossible,
@@ -38,13 +41,13 @@ export default function EarnDepositBottomSheet({
   forwardedRef,
   preparedTransaction,
   amount,
-  tokenId,
+  token,
   networkId,
 }: {
   forwardedRef: RefObject<BottomSheetRefType>
   preparedTransaction: PreparedTransactionsPossible
-  amount: string
-  tokenId: string
+  amount: BigNumber
+  token: TokenBalance
   networkId: NetworkId
 }) {
   const { t } = useTranslation()
@@ -54,8 +57,8 @@ export default function EarnDepositBottomSheet({
 
   const commonAnalyticsProperties = {
     providerId: PROVIDER_ID,
-    depositTokenId: tokenId,
-    tokenAmount: amount,
+    depositTokenId: token.tokenId,
+    tokenAmount: amount.toString(),
     networkId,
   }
 
@@ -90,8 +93,8 @@ export default function EarnDepositBottomSheet({
   const onPressComplete = () => {
     dispatch(
       depositStart({
-        amount,
-        tokenId,
+        amount: amount.toString(),
+        tokenId: token.tokenId,
         preparedTransactions: getSerializablePreparedTransactions(preparedTransaction.transactions),
       })
     )
@@ -109,11 +112,18 @@ export default function EarnDepositBottomSheet({
         <Logos providerUrl={providerLogoUrl} />
         <Text style={styles.title}>{t('earnFlow.depositBottomSheet.title')}</Text>
         <Text style={styles.description}>{t('earnFlow.depositBottomSheet.description')}</Text>
+        <View style={styles.infoContainer}>
+          <EarnApyAndAmount
+            tokenAmount={amount}
+            token={token}
+            testIDPrefix={'EarnDepositBottomSheet'}
+          />
+        </View>
         <LabelledItem label={t('earnFlow.depositBottomSheet.amount')}>
           <TokenDisplay
             testID="EarnDeposit/Amount"
             amount={amount}
-            tokenId={tokenId}
+            tokenId={token.tokenId}
             style={styles.value}
             showLocalAmount={false}
           />
@@ -273,6 +283,12 @@ const styles = StyleSheet.create({
     flexGrow: 1,
     flexBasis: 0,
   },
+  infoContainer: {
+    padding: Spacing.Regular16,
+    borderRadius: 16,
+    borderWidth: 1,
+    borderColor: Colors.gray2,
+  },
   gasSubsidized: {
     ...typeScale.labelXSmall,
     color: Colors.primary,
diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index 07524495dd..5b096b388a 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -101,8 +101,8 @@ describe('EarnEnterAmount', () => {
         <MockedNavigator component={EarnEnterAmount} params={params} />
       </Provider>
     )
-    expect(getByTestId('EarnEnterAmount/Apy')).toBeTruthy()
-    expect(getByTestId('EarnEnterAmount/EarnUpTo')).toBeTruthy()
+    expect(getByTestId('EarnEnterAmount/EarnApyAndAmount/Apy')).toBeTruthy()
+    expect(getByTestId('EarnEnterAmount/EarnApyAndAmount/EarnUpTo')).toBeTruthy()
   })
 
   it('should be able to tap info icon', async () => {
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 0f428d92f7..69f0262f97 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -18,9 +18,9 @@ import TokenIcon, { IconSize } from 'src/components/TokenIcon'
 import Touchable from 'src/components/Touchable'
 import CustomHeader from 'src/components/header/CustomHeader'
 import EarnAddCryptoBottomSheet from 'src/earn/EarnAddCryptoBottomSheet'
+import { EarnApyAndAmount } from 'src/earn/EarnApyAndAmount'
 import EarnDepositBottomSheet from 'src/earn/EarnDepositBottomSheet'
 import { PROVIDER_ID } from 'src/earn/constants'
-import { useAavePoolInfo } from 'src/earn/hooks'
 import { usePrepareSupplyTransactions } from 'src/earn/prepareTransactions'
 import { CICOFlow } from 'src/fiatExchanges/utils'
 import InfoIcon from 'src/icons/InfoIcon'
@@ -376,8 +376,8 @@ function EarnEnterAmount({ route }: Props) {
         <EarnDepositBottomSheet
           forwardedRef={reviewBottomSheetRef}
           preparedTransaction={prepareTransactionsResult}
-          amount={tokenAmount.toString()}
-          tokenId={token.tokenId}
+          amount={tokenAmount}
+          token={token}
           networkId={token.networkId}
         />
       )}
@@ -395,38 +395,10 @@ function EarnProceed({
   onPressInfo,
 }: ProceedComponentProps) {
   const { t } = useTranslation()
-  const localCurrencySymbol = useSelector(getLocalCurrencySymbol)
-
-  const asyncPoolInfo = useAavePoolInfo({ depositTokenId: token.tokenId })
 
   return (
     <View style={styles.infoContainer}>
-      <View style={styles.line}>
-        <Text style={styles.label}>{t('earnFlow.enterAmount.earnUpToLabel')}</Text>
-        <Text style={styles.label}>{t('earnFlow.enterAmount.rateLabel')}</Text>
-      </View>
-      <View style={styles.line}>
-        <Text style={styles.valuesText} testID="EarnEnterAmount/EarnUpTo">
-          {t('earnFlow.enterAmount.earnUpTo', {
-            fiatSymbol: localCurrencySymbol,
-            amount:
-              asyncPoolInfo?.result && !!asyncPoolInfo.result.apy && tokenAmount?.gt(0)
-                ? tokenAmount.multipliedBy(new BigNumber(asyncPoolInfo.result.apy)).toFormat(2)
-                : '--',
-          })}
-        </Text>
-        <View style={styles.apy}>
-          <TokenIcon token={token} size={IconSize.XSMALL} />
-          <Text style={styles.valuesText} testID="EarnEnterAmount/Apy">
-            {t('earnFlow.enterAmount.rate', {
-              rate:
-                asyncPoolInfo?.result && !!asyncPoolInfo.result.apy
-                  ? (asyncPoolInfo.result.apy * 100).toFixed(2)
-                  : '--',
-            })}
-          </Text>
-        </View>
-      </View>
+      <EarnApyAndAmount tokenAmount={tokenAmount} token={token} testIDPrefix={'EarnEnterAmount'} />
       <Button
         onPress={() =>
           tokenAmount && onPressProceed({ tokenAmount, localAmount, token, amountEnteredIn })
@@ -502,13 +474,6 @@ const styles = StyleSheet.create({
     borderColor: Colors.gray2,
     marginTop: 20,
   },
-  line: {
-    flexDirection: 'row',
-    alignSelf: 'flex-end',
-    justifyContent: 'space-between',
-    width: '100%',
-    gap: Spacing.Smallest8,
-  },
   row: {
     flexDirection: 'row',
     alignItems: 'center',
@@ -516,22 +481,9 @@ const styles = StyleSheet.create({
     flex: 1,
     gap: Spacing.Tiny4,
   },
-  apy: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    gap: Spacing.Tiny4,
-  },
-  label: {
-    ...typeScale.bodySmall,
-    color: Colors.gray4,
-  },
   continueButton: {
     paddingVertical: Spacing.Thick24,
   },
-  valuesText: {
-    ...typeScale.labelSemiBoldSmall,
-    marginVertical: Spacing.Tiny4,
-  },
   infoText: {
     ...typeScale.bodyXSmall,
     color: Colors.gray4,

From 5b5a3eb8c0977fadcdb938327cb3a50fecf78015 Mon Sep 17 00:00:00 2001
From: Jacob Waterman <jacobrwaterman@gmail.com>
Date: Thu, 23 May 2024 12:36:37 -0700
Subject: [PATCH 046/133] feat(earn): add loading skeletons for apy driven info
 on earn amount screen (#5457)

### Description

Adds loading placeholders for apy driven info


[Figma](https://www.figma.com/design/E1rC3MG74qEg5V4tvbeUnU/Stablecoin-Enablement?node-id=2906-10866&m=dev)



https://github.com/valora-inc/wallet/assets/8432644/25c01073-b02a-4463-9af5-dc7de8197c3b


### Test plan

unit tests

### Related issues

https://linear.app/valora/issue/ACT-1193/new-enter-amount-screen
---
 src/earn/EarnApyAndAmount.tsx            | 52 +++++++++++++++++++-----
 src/earn/EarnDepositBottomSheet.test.tsx |  4 +-
 src/earn/EarnEnterAmount.test.tsx        | 10 +++--
 3 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/src/earn/EarnApyAndAmount.tsx b/src/earn/EarnApyAndAmount.tsx
index e800a71227..1983e39646 100644
--- a/src/earn/EarnApyAndAmount.tsx
+++ b/src/earn/EarnApyAndAmount.tsx
@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next'
 import { StyleSheet, Text, View } from 'react-native'
 import { Colors } from 'react-native/Libraries/NewAppScreen'
 import { useSelector } from 'react-redux'
+import SkeletonPlaceholder from 'src/components/SkeletonPlaceholder'
 import TokenIcon, { IconSize } from 'src/components/TokenIcon'
 import { useAavePoolInfo } from 'src/earn/hooks'
 import { LocalCurrencySymbol } from 'src/localCurrency/consts'
@@ -39,19 +40,42 @@ export function EarnApyAndAmount({
         <Text style={styles.label}>{t('earnFlow.enterAmount.rateLabel')}</Text>
       </View>
       <View style={styles.line}>
-        <Text style={styles.valuesText} testID={`${testIDPrefix}/EarnApyAndAmount/EarnUpTo`}>
-          {t('earnFlow.enterAmount.earnUpTo', {
-            fiatSymbol: localCurrencySymbol,
-            amount: earnUpTo,
-          })}
-        </Text>
-        <View style={styles.apy}>
-          <TokenIcon token={token} size={IconSize.XSMALL} />
-          <Text style={styles.valuesText} testID={`${testIDPrefix}/EarnApyAndAmount/Apy`}>
-            {t('earnFlow.enterAmount.rate', {
-              rate: apyString,
+        {asyncPoolInfo?.loading && (
+          <SkeletonPlaceholder
+            backgroundColor={Colors.gray2}
+            highlightColor={Colors.white}
+            testID={`${testIDPrefix}/EarnApyAndAmount/EarnUpTo/Loading`}
+          >
+            <View style={styles.loadingSkeleton} />
+          </SkeletonPlaceholder>
+        )}
+        {!asyncPoolInfo?.loading && (
+          <Text style={styles.valuesText} testID={`${testIDPrefix}/EarnApyAndAmount/EarnUpTo`}>
+            {t('earnFlow.enterAmount.earnUpTo', {
+              fiatSymbol: localCurrencySymbol,
+              amount: earnUpTo,
             })}
           </Text>
+        )}
+        <View style={styles.apy}>
+          <TokenIcon token={token} size={IconSize.XSMALL} />
+
+          {asyncPoolInfo?.loading && (
+            <SkeletonPlaceholder
+              backgroundColor={Colors.gray2}
+              highlightColor={Colors.white}
+              testID={`${testIDPrefix}/EarnApyAndAmount/Apy/Loading`}
+            >
+              <View style={styles.loadingSkeleton} />
+            </SkeletonPlaceholder>
+          )}
+          {!asyncPoolInfo?.loading && (
+            <Text style={styles.valuesText} testID={`${testIDPrefix}/EarnApyAndAmount/Apy`}>
+              {t('earnFlow.enterAmount.rate', {
+                rate: apyString,
+              })}
+            </Text>
+          )}
         </View>
       </View>
     </>
@@ -79,4 +103,10 @@ const styles = StyleSheet.create({
     ...typeScale.labelSemiBoldSmall,
     marginVertical: Spacing.Tiny4,
   },
+  loadingSkeleton: {
+    ...typeScale.labelSemiBoldSmall,
+    marginVertical: Spacing.Smallest8,
+    width: 100,
+    borderRadius: 100,
+  },
 })
diff --git a/src/earn/EarnDepositBottomSheet.test.tsx b/src/earn/EarnDepositBottomSheet.test.tsx
index f17ce33d44..8bfa0519e1 100644
--- a/src/earn/EarnDepositBottomSheet.test.tsx
+++ b/src/earn/EarnDepositBottomSheet.test.tsx
@@ -91,8 +91,8 @@ describe('EarnDepositBottomSheet', () => {
     expect(getByText('earnFlow.depositBottomSheet.title')).toBeTruthy()
     expect(getByText('earnFlow.depositBottomSheet.description')).toBeTruthy()
 
-    expect(getByTestId('EarnDepositBottomSheet/EarnApyAndAmount/Apy')).toBeTruthy()
-    expect(getByTestId('EarnDepositBottomSheet/EarnApyAndAmount/EarnUpTo')).toBeTruthy()
+    expect(getByTestId('EarnDepositBottomSheet/EarnApyAndAmount/Apy/Loading')).toBeTruthy()
+    expect(getByTestId('EarnDepositBottomSheet/EarnApyAndAmount/EarnUpTo/Loading')).toBeTruthy()
 
     expect(queryByTestId('EarnDeposit/GasSubsidized')).toBeFalsy()
 
diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index 5b096b388a..b0e0e830f7 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -5,6 +5,7 @@ import { Provider } from 'react-redux'
 import { EarnEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import EarnEnterAmount from 'src/earn/EarnEnterAmount'
+import { fetchAavePoolInfo } from 'src/earn/poolInfo'
 import { usePrepareSupplyTransactions } from 'src/earn/prepareTransactions'
 import { TokenBalance } from 'src/tokens/slice'
 import { NetworkId } from 'src/transactions/types'
@@ -15,6 +16,7 @@ import { createMockStore } from 'test/utils'
 import { mockAccount, mockArbEthTokenId, mockTokenBalances } from 'test/values'
 
 jest.mock('src/earn/prepareTransactions')
+jest.mock('src/earn/poolInfo')
 
 const mockPreparedTransaction: PreparedTransactionsPossible = {
   type: 'possible' as const,
@@ -93,16 +95,18 @@ const params = {
 describe('EarnEnterAmount', () => {
   beforeEach(() => {
     jest.clearAllMocks()
+    jest.mocked(fetchAavePoolInfo).mockResolvedValue({ apy: 0.1 })
   })
 
-  it('should render APY and EarnUpTo', () => {
+  it('should render APY and EarnUpTo', async () => {
     const { getByTestId } = render(
       <Provider store={store}>
         <MockedNavigator component={EarnEnterAmount} params={params} />
       </Provider>
     )
-    expect(getByTestId('EarnEnterAmount/EarnApyAndAmount/Apy')).toBeTruthy()
-    expect(getByTestId('EarnEnterAmount/EarnApyAndAmount/EarnUpTo')).toBeTruthy()
+    // Loading states
+    expect(getByTestId('EarnEnterAmount/EarnApyAndAmount/Apy/Loading')).toBeTruthy()
+    expect(getByTestId('EarnEnterAmount/EarnApyAndAmount/EarnUpTo/Loading')).toBeTruthy()
   })
 
   it('should be able to tap info icon', async () => {

From 37e365e1ee03cf40262da961ef5cc3e523395114 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Thu, 23 May 2024 12:47:08 -0700
Subject: [PATCH 047/133] feat(home): update get started component to include
 earn info (#5460)

### Description


[Figma](https://www.figma.com/design/E1rC3MG74qEg5V4tvbeUnU/Stablecoin-Enablement?node-id=2906-9161&t=44xLw4AYkbAsQgoq-0)

### Test plan

<img
src="https://github.com/valora-inc/wallet/assets/5062591/b8f90aeb-23c7-4067-b7d3-6aa7b2586eba"
width="250" />


### Related issues

- Fixes ACT-1191

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 locales/base/translation.json |   5 +-
 src/earn/EarnCta.tsx          |   8 +--
 src/home/GetStarted.test.tsx  |  35 ++++++++---
 src/home/GetStarted.tsx       | 114 ++++++++++++++++++++++++----------
 src/icons/Bird.tsx            |  23 -------
 src/icons/ExploreTokens.tsx   |  17 +++++
 6 files changed, 132 insertions(+), 70 deletions(-)
 delete mode 100644 src/icons/Bird.tsx
 create mode 100644 src/icons/ExploreTokens.tsx

diff --git a/locales/base/translation.json b/locales/base/translation.json
index 241d24e909..ca6686801f 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -2194,7 +2194,10 @@
   },
   "getStartedHome": {
     "title": "Buy crypto or transfer tokens",
-    "body": "Buy or transfer compatible tokens to send crypto and explore web3!"
+    "body": "Buy or transfer compatible tokens to send crypto and explore web3!",
+    "titleV1_86": "Add funds to your wallet",
+    "exploreTokens": "Explore all tokens",
+    "exploreTokensBody": "You can buy up to 10+ tokens in Valora. Check them out!"
   },
   "nftCelebration": {
     "bottomSheet": {
diff --git a/src/earn/EarnCta.tsx b/src/earn/EarnCta.tsx
index b53edc63a7..d7c26fdcfa 100644
--- a/src/earn/EarnCta.tsx
+++ b/src/earn/EarnCta.tsx
@@ -8,6 +8,7 @@ import TokenIcon, { IconSize } from 'src/components/TokenIcon'
 import Touchable from 'src/components/Touchable'
 import { PROVIDER_ID } from 'src/earn/constants'
 import { useAavePoolInfo } from 'src/earn/hooks'
+import CircledIcon from 'src/icons/CircledIcon'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import Colors from 'src/styles/colors'
@@ -51,7 +52,9 @@ export default function EarnCta({ depositTokenId }: { depositTokenId: string })
         <>
           <Text style={styles.title}>{t('earnFlow.ctaV1_86.title')}</Text>
           <View style={styles.row}>
-            <TokenIcon token={depositToken} size={IconSize.SMALL} viewStyle={styles.icon} />
+            <CircledIcon radius={32} backgroundColor={Colors.gray1}>
+              <TokenIcon token={depositToken} size={IconSize.SMALL} />
+            </CircledIcon>
             <View style={styles.subtitleContainer}>
               <Text style={styles.subtitle}>
                 {t('earnFlow.ctaV1_86.subtitle', { symbol: depositToken.symbol })}
@@ -100,7 +103,4 @@ const styles = StyleSheet.create({
     ...typeScale.bodyXSmall,
     color: Colors.gray4,
   },
-  icon: {
-    marginTop: Spacing.Tiny4,
-  },
 })
diff --git a/src/home/GetStarted.test.tsx b/src/home/GetStarted.test.tsx
index b06caac273..32d09f92f9 100644
--- a/src/home/GetStarted.test.tsx
+++ b/src/home/GetStarted.test.tsx
@@ -1,20 +1,29 @@
-import { fireEvent, render } from '@testing-library/react-native'
+import { fireEvent, render, waitFor } from '@testing-library/react-native'
 import React from 'react'
 import { Provider } from 'react-redux'
 import { FiatExchangeEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import GetStarted from 'src/home/GetStarted'
+import networkConfig from 'src/web3/networkConfig'
 import { createMockStore } from 'test/utils'
+import { mockArbUsdcTokenId, mockTokenBalances } from 'test/values'
 
-jest.mock('src/analytics/ValoraAnalytics')
+jest.mock('src/earn/poolInfo', () => ({
+  fetchAavePoolInfo: jest.fn().mockResolvedValue({ apy: 0.0135 }),
+}))
 
 describe('GetStarted', () => {
-  it('should display the correct text', () => {
+  it('should display the correct text', async () => {
     const { getByText } = render(
       <Provider
         store={createMockStore({
-          app: {
-            superchargeApy: 12,
+          tokens: {
+            tokenBalances: {
+              [networkConfig.arbUsdcTokenId]: {
+                ...mockTokenBalances[mockArbUsdcTokenId],
+                tokenId: networkConfig.arbUsdcTokenId,
+              },
+            },
           },
         })}
       >
@@ -23,8 +32,16 @@ describe('GetStarted', () => {
     )
 
     expect(getByText('getStarted')).toBeTruthy()
-    expect(getByText('getStartedHome.title')).toBeTruthy()
-    expect(getByText('getStartedHome.body, {"apy":12}')).toBeTruthy()
+    expect(getByText('getStartedHome.titleV1_86')).toBeTruthy()
+    expect(getByText('earnFlow.ctaV1_86.subtitle, {"symbol":"USDC"}')).toBeTruthy()
+    expect(getByText('earnFlow.ctaV1_86.description, {"apy":"--","symbol":"USDC"}')).toBeTruthy()
+    expect(getByText('getStartedHome.exploreTokens')).toBeTruthy()
+    expect(getByText('getStartedHome.exploreTokensBody')).toBeTruthy()
+    await waitFor(() =>
+      expect(
+        getByText('earnFlow.ctaV1_86.description, {"apy":"1.35","symbol":"USDC"}')
+      ).toBeTruthy()
+    )
   })
 
   it('should trigger impression analytics event', () => {
@@ -46,7 +63,7 @@ describe('GetStarted', () => {
   })
 
   it('should trigger button tap analytics event', () => {
-    const { getByText } = render(
+    const { getByTestId } = render(
       <Provider
         store={createMockStore({
           app: {
@@ -58,7 +75,7 @@ describe('GetStarted', () => {
       </Provider>
     )
 
-    fireEvent.press(getByText('addFunds'))
+    fireEvent.press(getByTestId('GetStarted/Touchable'))
     expect(ValoraAnalytics.track).toHaveBeenCalledWith(
       FiatExchangeEvents.cico_add_get_started_selected
     )
diff --git a/src/home/GetStarted.tsx b/src/home/GetStarted.tsx
index bde73a50b7..51e735dc2b 100644
--- a/src/home/GetStarted.tsx
+++ b/src/home/GetStarted.tsx
@@ -1,26 +1,37 @@
+import BigNumber from 'bignumber.js'
 import React, { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { StyleSheet, Text, View } from 'react-native'
 import { FiatExchangeEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
-import Button from 'src/components/Button'
+import TokenIcon, { IconSize } from 'src/components/TokenIcon'
+import Touchable from 'src/components/Touchable'
+import { useAavePoolInfo } from 'src/earn/hooks'
 import { FiatExchangeFlow } from 'src/fiatExchanges/utils'
-import Bird from 'src/icons/Bird'
+import CircledIcon from 'src/icons/CircledIcon'
+import ExploreTokens from 'src/icons/ExploreTokens'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
-import { useSelector } from 'src/redux/hooks'
 import colors from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
 import { Spacing } from 'src/styles/styles'
+import { useTokenInfo } from 'src/tokens/hooks'
+import networkConfig from 'src/web3/networkConfig'
 
 export default function GetStarted() {
   const { t } = useTranslation()
-  const { superchargeApy } = useSelector((state) => state.app)
   const goToAddFunds = () => {
     ValoraAnalytics.track(FiatExchangeEvents.cico_add_get_started_selected)
     navigate(Screens.FiatExchangeCurrencyBottomSheet, { flow: FiatExchangeFlow.CashIn })
   }
 
+  const earnToken = useTokenInfo(networkConfig.arbUsdcTokenId)
+  const asyncPoolInfo = useAavePoolInfo({ depositTokenId: networkConfig.arbUsdcTokenId })
+
+  const apyDisplay = asyncPoolInfo.result
+    ? new BigNumber(asyncPoolInfo.result.apy).multipliedBy(100).toFixed(2)
+    : '--'
+
   useEffect(() => {
     ValoraAnalytics.track(FiatExchangeEvents.cico_add_get_started_impression)
   }, [])
@@ -28,49 +39,86 @@ export default function GetStarted() {
   return (
     <View testID="GetStarted" style={styles.container}>
       <Text style={styles.title}>{t('getStarted')}</Text>
-      <View style={styles.card}>
-        <Bird viewStyle={styles.icon} />
-        <Text style={styles.cardTitle}>{t('getStartedHome.title')}</Text>
-        <Text style={styles.cardBody}>{t('getStartedHome.body', { apy: superchargeApy })}</Text>
-        <Button style={styles.button} text={t('addFunds')} onPress={goToAddFunds} />
+      <Touchable
+        borderRadius={8}
+        style={styles.touchable}
+        onPress={goToAddFunds}
+        testID="GetStarted/Touchable"
+      >
+        <View style={styles.touchableView}>
+          <Text style={styles.cardTitle}>{t('getStartedHome.titleV1_86')}</Text>
+          {earnToken && (
+            <Item
+              icon={
+                <CircledIcon radius={32} backgroundColor={colors.gray1}>
+                  <TokenIcon token={earnToken} size={IconSize.SMALL} />
+                </CircledIcon>
+              }
+              title={t('earnFlow.ctaV1_86.subtitle', { symbol: earnToken.symbol })}
+              body={t('earnFlow.ctaV1_86.description', {
+                apy: apyDisplay,
+                symbol: earnToken.symbol,
+              })}
+            />
+          )}
+          <Item
+            icon={<ExploreTokens />}
+            title={t('getStartedHome.exploreTokens')}
+            body={t('getStartedHome.exploreTokensBody')}
+          />
+        </View>
+      </Touchable>
+    </View>
+  )
+}
+
+function Item({ icon, title, body }: { icon: React.ReactNode; title: string; body: string }) {
+  return (
+    <View style={styles.row}>
+      {icon}
+      <View style={styles.itemTextContainer}>
+        <Text style={styles.itemTitle}>{title}</Text>
+        <Text style={styles.itemBody}>{body}</Text>
       </View>
     </View>
   )
 }
 
 const styles = StyleSheet.create({
-  button: {
-    flexDirection: 'column',
-    width: '100%',
-  },
-  card: {
-    alignItems: 'flex-start',
-    borderRadius: 10,
-    backgroundColor: colors.gray1,
-    flex: 1,
-    gap: Spacing.Regular16,
-    justifyContent: 'center',
-    padding: Spacing.Thick24,
-  },
   cardTitle: {
-    ...typeScale.labelMedium,
-    color: colors.gray5,
-  },
-  cardBody: {
-    ...typeScale.bodySmall,
-    color: colors.gray3,
+    ...typeScale.labelSemiBoldMedium,
+    color: colors.black,
   },
   container: {
     gap: 18,
     margin: Spacing.Regular16,
   },
-  icon: {
-    marginBottom: Spacing.Regular16,
-    marginLeft: Spacing.Thick24,
-    ...typeScale.labelSemiBoldMedium,
-  },
   title: {
     ...typeScale.labelSemiBoldSmall,
     color: colors.gray4,
   },
+  touchable: {
+    padding: Spacing.Regular16,
+    borderColor: colors.gray2,
+    borderWidth: 1,
+    borderRadius: 8,
+  },
+  row: {
+    flexDirection: 'row',
+    gap: Spacing.Smallest8,
+  },
+  itemTitle: {
+    ...typeScale.labelSemiBoldXSmall,
+    color: colors.black,
+  },
+  itemBody: {
+    ...typeScale.bodyXSmall,
+    color: colors.gray4,
+  },
+  touchableView: {
+    gap: Spacing.Thick24,
+  },
+  itemTextContainer: {
+    flex: 1,
+  },
 })
diff --git a/src/icons/Bird.tsx b/src/icons/Bird.tsx
deleted file mode 100644
index 56c29bc2e2..0000000000
--- a/src/icons/Bird.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as React from 'react'
-import { View, ViewStyle } from 'react-native'
-import Svg, { Path } from 'react-native-svg'
-
-interface Props {
-  color?: string
-  width?: number
-  height?: number
-  viewStyle?: ViewStyle
-}
-
-export default function Bird({ color = '#888FFE', width = 85, height = 83, viewStyle }: Props) {
-  return (
-    <View style={viewStyle}>
-      <Svg testID="bird" width={width} height={height} fill="none">
-        <Path
-          fill={color}
-          d="M18.66.202C16.125 67.928 48.287 65.87 48.287 65.87 35.873 34.96.305 46.298.305 46.298s33.04 22.55 35.037 19.572C37.34 62.892 13.724 47.453.305 79.59c17.734-9.495 26.64 14.14 84.154-3.029 0 0-29.106-8.122-65.798-76.358Z"
-        />
-      </Svg>
-    </View>
-  )
-}
diff --git a/src/icons/ExploreTokens.tsx b/src/icons/ExploreTokens.tsx
new file mode 100644
index 0000000000..cc81e4c9c4
--- /dev/null
+++ b/src/icons/ExploreTokens.tsx
@@ -0,0 +1,17 @@
+import * as React from 'react'
+import Svg, { Path, Rect } from 'react-native-svg'
+import Colors from 'src/styles/colors'
+
+function AllTokens() {
+  return (
+    <Svg width={32} height={32} viewBox="0 0 32 32" fill="none">
+      <Rect width={32} height={32} rx={16} fill={Colors.successLight} />
+      <Path
+        d="M19 8C21.1217 8 23.1566 8.84285 24.6569 10.3431C26.1571 11.8434 27 13.8783 27 16C27 18.1217 26.1571 20.1566 24.6569 21.6569C23.1566 23.1571 21.1217 24 19 24C16.8783 24 14.8434 23.1571 13.3431 21.6569C11.8429 20.1566 11 18.1217 11 16C11 13.8783 11.8429 11.8434 13.3431 10.3431C14.8434 8.84285 16.8783 8 19 8ZM19 22C20.5913 22 22.1174 21.3679 23.2426 20.2426C24.3679 19.1174 25 17.5913 25 16C25 14.4087 24.3679 12.8826 23.2426 11.7574C22.1174 10.6321 20.5913 10 19 10C17.4087 10 15.8826 10.6321 14.7574 11.7574C13.6321 12.8826 13 14.4087 13 16C13 17.5913 13.6321 19.1174 14.7574 20.2426C15.8826 21.3679 17.4087 22 19 22ZM7 16C6.99995 17.2399 7.3847 18.4493 8.10116 19.4613C8.81762 20.4733 9.83048 21.2381 11 21.65V23.74C7.55 22.85 5 19.73 5 16C5 12.27 7.55 9.15 11 8.26V10.35C8.67 11.17 7 13.39 7 16Z"
+        fill={Colors.successDark}
+      />
+    </Svg>
+  )
+}
+
+export default React.memo(AllTokens)

From cca5d3cd276ccb003a92963fa37123117bc72064 Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Fri, 24 May 2024 09:57:09 +1200
Subject: [PATCH 048/133] refactor(button): Make GRAY_WITH_BORDER the SECONDARY
 button type, remove unused styles (#5462)

### Description

SECONDARY updated to be GRAY_WITH_BORDER
GRAY_WITH_BORDER removed
SECONDARY_WHITE_BG removed

### Test plan
![Simulator Screenshot - iPhone 14 Pro - 2024-05-23 at 14 36
32](https://github.com/valora-inc/wallet/assets/140328381/49494ec9-354f-4fec-abbf-4e6ef478dc45)
![Simulator Screenshot - iPhone 14 Pro - 2024-05-23 at 14 29
33](https://github.com/valora-inc/wallet/assets/140328381/e7c1a2f5-947b-47d4-bdcd-9046fc5d348c)
![Simulator Screenshot - iPhone 14 Pro - 2024-05-23 at 14 29
47](https://github.com/valora-inc/wallet/assets/140328381/69f2b57c-7bc5-400f-8624-33d9a96bf7e9)
![Simulator Screenshot - iPhone 14 Pro - 2024-05-23 at 14 30
25](https://github.com/valora-inc/wallet/assets/140328381/3bc8bc10-b6eb-4ab1-8469-a2688d670e5a)
![Simulator Screenshot - iPhone 14 Pro - 2024-05-23 at 14 31
39](https://github.com/valora-inc/wallet/assets/140328381/cd44807e-f8a9-4887-bbdf-61220ee63f35)
![Simulator Screenshot - iPhone 14 Pro - 2024-05-23 at 14 35
48](https://github.com/valora-inc/wallet/assets/140328381/2a514c34-03e6-42f1-9b4e-82de149de057)



<!-- Demonstrate the change is solid, or why it doesn't need testing.
Example: add any manual testing steps or scenarios (if not obvious),
screenshots / videos if the pull request changes the user interface.
-->

### Related issues

- Fixes #ACT-1056

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [X] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 .../__snapshots__/AccountKeyEducation.test.tsx.snap    |  7 +++++--
 src/account/__snapshots__/GoldEducation.test.tsx.snap  |  7 +++++--
 src/app/MultichainBeta.tsx                             |  2 +-
 src/backup/__snapshots__/BackupPhrase.test.tsx.snap    |  9 ++++++---
 src/components/Button.tsx                              | 10 ----------
 src/components/__snapshots__/Button.test.tsx.snap      |  7 +++++--
 src/earn/EarnActivePool.tsx                            |  4 ++--
 src/earn/EarnDepositBottomSheet.tsx                    |  2 +-
 src/earn/EarnEnterAmount.tsx                           |  2 +-
 src/keylessBackup/KeylessBackupProgress.tsx            |  6 +++---
 src/keylessBackup/LinkPhoneNumber.tsx                  |  2 +-
 src/onboarding/welcome/Welcome.tsx                     |  2 +-
 src/points/PointsHistoryBottomSheet.tsx                |  4 ++--
 src/points/PointsHome.tsx                              |  4 ++--
 14 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap b/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap
index e53e3d6d0e..3ad8c1b07a 100644
--- a/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap
+++ b/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap
@@ -534,12 +534,15 @@ exports[`AccountKeyEducation renders correctly 1`] = `
             [
               {
                 "alignItems": "center",
-                "backgroundColor": "#F9F6F0",
+                "backgroundColor": "#F8F9F9",
+                "borderColor": "#E6E6E6",
+                "borderRadius": 100,
+                "borderWidth": 1,
                 "flexDirection": "row",
                 "height": 48,
                 "justifyContent": "center",
                 "minWidth": 120,
-                "opacity": undefined,
+                "opacity": 1,
                 "paddingHorizontal": 24,
                 "paddingVertical": 5,
               },
diff --git a/src/account/__snapshots__/GoldEducation.test.tsx.snap b/src/account/__snapshots__/GoldEducation.test.tsx.snap
index 3635d1b2f2..bdeb0927c9 100644
--- a/src/account/__snapshots__/GoldEducation.test.tsx.snap
+++ b/src/account/__snapshots__/GoldEducation.test.tsx.snap
@@ -534,12 +534,15 @@ exports[`renders correctly 1`] = `
             [
               {
                 "alignItems": "center",
-                "backgroundColor": "#F9F6F0",
+                "backgroundColor": "#F8F9F9",
+                "borderColor": "#E6E6E6",
+                "borderRadius": 100,
+                "borderWidth": 1,
                 "flexDirection": "row",
                 "height": 48,
                 "justifyContent": "center",
                 "minWidth": 120,
-                "opacity": undefined,
+                "opacity": 1,
                 "paddingHorizontal": 24,
                 "paddingVertical": 5,
               },
diff --git a/src/app/MultichainBeta.tsx b/src/app/MultichainBeta.tsx
index c016a017fb..e732dfb293 100644
--- a/src/app/MultichainBeta.tsx
+++ b/src/app/MultichainBeta.tsx
@@ -64,7 +64,7 @@ function MultichainBeta() {
           <Button
             style={styles.cta}
             touchableStyle={styles.ctaTouchable}
-            type={BtnTypes.SECONDARY_WHITE_BG}
+            type={BtnTypes.SECONDARY}
             size={BtnSizes.FULL}
             text={t('multichainBeta.secondaryCta')}
             onPress={() => onPressCta(false)}
diff --git a/src/backup/__snapshots__/BackupPhrase.test.tsx.snap b/src/backup/__snapshots__/BackupPhrase.test.tsx.snap
index dde682828d..95a8feed20 100644
--- a/src/backup/__snapshots__/BackupPhrase.test.tsx.snap
+++ b/src/backup/__snapshots__/BackupPhrase.test.tsx.snap
@@ -661,12 +661,15 @@ exports[`BackupPhrase renders correctly with backup not completed 1`] = `
           [
             {
               "alignItems": "center",
-              "backgroundColor": "#F9F6F0",
+              "backgroundColor": "#F8F9F9",
+              "borderColor": "#E6E6E6",
+              "borderRadius": 100,
+              "borderWidth": 1,
               "flexDirection": "row",
               "flexGrow": 1,
               "height": 48,
               "justifyContent": "center",
-              "opacity": undefined,
+              "opacity": 0.5,
               "paddingHorizontal": 24,
               "paddingVertical": 5,
             },
@@ -679,7 +682,7 @@ exports[`BackupPhrase renders correctly with backup not completed 1`] = `
           maxFontSizeMultiplier={1}
           style={
             {
-              "color": "#666666",
+              "color": "#2E3338",
               "fontFamily": "Inter-SemiBold",
               "fontSize": 16,
               "lineHeight": 24,
diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index 1a79353d23..f1d599a488 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -15,8 +15,6 @@ const DEBOUNCE_OPTIONS = {
 export enum BtnTypes {
   PRIMARY = 'Primary',
   SECONDARY = 'Secondary',
-  SECONDARY_WHITE_BG = 'SecondaryWhiteBg',
-  GRAY_WITH_BORDER = 'GrayWithBorder',
   ONBOARDING_SECONDARY = 'OnboardingSecondary',
 }
 
@@ -165,14 +163,6 @@ function getColors(type: BtnTypes, disabled: boolean | undefined) {
       opacity = disabled ? 0.25 : 1.0
       break
     case BtnTypes.SECONDARY:
-      textColor = disabled ? colors.gray4 : colors.black
-      backgroundColor = colors.onboardingBackground
-      break
-    case BtnTypes.SECONDARY_WHITE_BG:
-      textColor = colors.gray3
-      backgroundColor = colors.white
-      break
-    case BtnTypes.GRAY_WITH_BORDER:
       textColor = colors.black
       backgroundColor = colors.gray1
       borderColor = colors.gray2
diff --git a/src/components/__snapshots__/Button.test.tsx.snap b/src/components/__snapshots__/Button.test.tsx.snap
index 56a7fb86f4..da73822f0a 100644
--- a/src/components/__snapshots__/Button.test.tsx.snap
+++ b/src/components/__snapshots__/Button.test.tsx.snap
@@ -61,12 +61,15 @@ exports[`Button when type is SECONDARY renders 1`] = `
         [
           {
             "alignItems": "center",
-            "backgroundColor": "#F9F6F0",
+            "backgroundColor": "#F8F9F9",
+            "borderColor": "#E6E6E6",
+            "borderRadius": 100,
+            "borderWidth": 1,
             "flexDirection": "row",
             "height": 48,
             "justifyContent": "center",
             "minWidth": 120,
-            "opacity": undefined,
+            "opacity": 1,
             "paddingHorizontal": 24,
             "paddingVertical": 5,
           },
diff --git a/src/earn/EarnActivePool.tsx b/src/earn/EarnActivePool.tsx
index f7af550535..c1287f1baf 100644
--- a/src/earn/EarnActivePool.tsx
+++ b/src/earn/EarnActivePool.tsx
@@ -104,7 +104,7 @@ export default function EarnActivePool({ depositTokenId, poolTokenId, cta }: Pro
                 navigate(Screens.EarnCollectScreen, { depositTokenId, poolTokenId })
               }}
               text={t('earnFlow.activePools.exitPool')}
-              type={BtnTypes.GRAY_WITH_BORDER}
+              type={BtnTypes.SECONDARY}
               size={BtnSizes.FULL}
               style={styles.button}
             />
@@ -136,7 +136,7 @@ export default function EarnActivePool({ depositTokenId, poolTokenId, cta }: Pro
                 navigate(Screens.TabDiscover)
               }}
               text={t('earnFlow.activePools.viewPools')}
-              type={BtnTypes.GRAY_WITH_BORDER}
+              type={BtnTypes.SECONDARY}
               size={BtnSizes.FULL}
               style={styles.button}
             />
diff --git a/src/earn/EarnDepositBottomSheet.tsx b/src/earn/EarnDepositBottomSheet.tsx
index 95b83489e5..bd5a8286df 100644
--- a/src/earn/EarnDepositBottomSheet.tsx
+++ b/src/earn/EarnDepositBottomSheet.tsx
@@ -173,7 +173,7 @@ export default function EarnDepositBottomSheet({
             testID="EarnDeposit/SecondaryCta"
             size={BtnSizes.FULL}
             text={t('earnFlow.depositBottomSheet.secondaryCta')}
-            type={BtnTypes.GRAY_WITH_BORDER}
+            type={BtnTypes.SECONDARY}
             style={styles.cta}
             onPress={onPressCancel}
             disabled={transactionSubmitted}
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 69f0262f97..4cb1b843ef 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -460,7 +460,7 @@ function InfoBottomSheet({
         onPress={onPressDismiss}
         text={t('earnFlow.enterAmount.infoBottomSheet.dismiss')}
         size={BtnSizes.FULL}
-        type={BtnTypes.GRAY_WITH_BORDER}
+        type={BtnTypes.SECONDARY}
       />
     </BottomSheet>
   )
diff --git a/src/keylessBackup/KeylessBackupProgress.tsx b/src/keylessBackup/KeylessBackupProgress.tsx
index 5ebcbc3313..3bb2083b04 100644
--- a/src/keylessBackup/KeylessBackupProgress.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.tsx
@@ -206,7 +206,7 @@ function Restore() {
             onPress={onPressCreateNewWallet}
             text={t('keylessBackupStatus.restore.failed.createNewWallet')}
             size={BtnSizes.FULL}
-            type={BtnTypes.GRAY_WITH_BORDER}
+            type={BtnTypes.SECONDARY}
             style={styles.button}
             touchableStyle={styles.buttonTouchable}
           />
@@ -238,7 +238,7 @@ function Restore() {
             onPress={onPressCreateNewWallet}
             text={t('keylessBackupStatus.restore.notFound.createNewWallet')}
             size={BtnSizes.FULL}
-            type={BtnTypes.GRAY_WITH_BORDER}
+            type={BtnTypes.SECONDARY}
             style={styles.button}
             touchableStyle={styles.buttonTouchable}
           />
@@ -324,7 +324,7 @@ function Setup() {
             onPress={onPressManual}
             text={t('keylessBackupStatus.setup.failed.manual')}
             size={BtnSizes.FULL}
-            type={BtnTypes.GRAY_WITH_BORDER}
+            type={BtnTypes.SECONDARY}
             style={styles.button}
             touchableStyle={styles.buttonTouchable}
           />
diff --git a/src/keylessBackup/LinkPhoneNumber.tsx b/src/keylessBackup/LinkPhoneNumber.tsx
index 0bd7dde57a..d1fd3b7427 100644
--- a/src/keylessBackup/LinkPhoneNumber.tsx
+++ b/src/keylessBackup/LinkPhoneNumber.tsx
@@ -69,7 +69,7 @@ export default function LinkPhoneNumber({ navigation }: Props) {
             text={t('linkPhoneNumber.later')}
             onPress={laterButtonOnPress}
             style={styles.button}
-            type={BtnTypes.GRAY_WITH_BORDER}
+            type={BtnTypes.SECONDARY}
             size={BtnSizes.FULL}
             testID="LinkPhoneNumberLater"
           />
diff --git a/src/onboarding/welcome/Welcome.tsx b/src/onboarding/welcome/Welcome.tsx
index ecf654dea8..d8484f65e8 100644
--- a/src/onboarding/welcome/Welcome.tsx
+++ b/src/onboarding/welcome/Welcome.tsx
@@ -125,7 +125,7 @@ export default function Welcome() {
           onPress={onPressRestoreAccount}
           text={t('welcome.hasWallet')}
           size={BtnSizes.FULL}
-          type={BtnTypes.GRAY_WITH_BORDER}
+          type={BtnTypes.SECONDARY}
           testID={'RestoreAccountButton'}
           disabled={buttonsDisabled}
         />
diff --git a/src/points/PointsHistoryBottomSheet.tsx b/src/points/PointsHistoryBottomSheet.tsx
index 712265e2d1..a7ce6a0171 100644
--- a/src/points/PointsHistoryBottomSheet.tsx
+++ b/src/points/PointsHistoryBottomSheet.tsx
@@ -130,7 +130,7 @@ function PointsHistoryBottomSheet({ forwardedRef }: Props) {
           testID={'PointsHistoryBottomSheet/TryAgain'}
           onPress={() => onPressTryAgain(false)}
           text={t('points.history.error.tryAgain')}
-          type={BtnTypes.GRAY_WITH_BORDER}
+          type={BtnTypes.SECONDARY}
           size={BtnSizes.FULL}
           style={{ width: '100%' }}
         />
@@ -145,7 +145,7 @@ function PointsHistoryBottomSheet({ forwardedRef }: Props) {
           testID={'PointsHistoryBottomSheet/GotIt'}
           onPress={onPressLearnMore}
           text={t('points.history.empty.gotIt')}
-          type={BtnTypes.GRAY_WITH_BORDER}
+          type={BtnTypes.SECONDARY}
           size={BtnSizes.FULL}
           style={{ width: '100%' }}
         />
diff --git a/src/points/PointsHome.tsx b/src/points/PointsHome.tsx
index b264532cdf..eaa9cd0478 100644
--- a/src/points/PointsHome.tsx
+++ b/src/points/PointsHome.tsx
@@ -129,7 +129,7 @@ export default function PointsHome({ route, navigation }: Props) {
             <Button
               onPress={onRetryLoadConfig}
               text={t('points.error.retryCta')}
-              type={BtnTypes.GRAY_WITH_BORDER}
+              type={BtnTypes.SECONDARY}
               size={BtnSizes.FULL}
               style={styles.loadingRetryButton}
             />
@@ -144,7 +144,7 @@ export default function PointsHome({ route, navigation }: Props) {
                 testID={'PointsActivityButton'}
                 onPress={onPressActivity}
                 text={t('points.activity')}
-                type={BtnTypes.GRAY_WITH_BORDER}
+                type={BtnTypes.SECONDARY}
                 size={BtnSizes.FULL}
                 touchableStyle={styles.buttonStyle}
               />

From a41f5d614ba75b2c77c9f8476e0d00d5e51b5cfe Mon Sep 17 00:00:00 2001
From: Kathy Luo <kathyluo18@gmail.com>
Date: Fri, 24 May 2024 08:52:56 +0200
Subject: [PATCH 049/133] chore(points): send token ids with swap events
 (#5458)

### Description

The core points logic doesn't rely on the to and from tokens in a swap,
these are only used for display purposes. Since we already have them in
the wallet, it'd save a lot of work to just pass them to the backend
(rather than deriving them again using the transactions and adding logic
for creating the token id's on the backend)

### Test plan

n/a

### Related issues

- Related to RET-1034

### Backwards compatibility

Y

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/points/slice.test.ts      |  8 +++++++-
 src/points/types.ts           |  2 ++
 src/swap/saga.test.ts         |  2 ++
 src/swap/saga.ts              |  2 ++
 src/transactions/saga.test.ts |  2 ++
 src/transactions/saga.ts      | 10 +++++++++-
 test/RootStateSchema.json     |  8 ++++++++
 7 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/points/slice.test.ts b/src/points/slice.test.ts
index 8543dd172b..deecc87ee7 100644
--- a/src/points/slice.test.ts
+++ b/src/points/slice.test.ts
@@ -15,7 +15,13 @@ const pendingCreateWalletEvent: PendingPointsEvent = {
 const pendingSwapEvent: PendingPointsEvent = {
   id: 'test-id-2',
   timestamp: '2024-04-22T12:00:00.000Z',
-  event: { activityId: 'swap', transactionHash: '0xTEST', networkId: NetworkId['celo-alfajores'] },
+  event: {
+    activityId: 'swap',
+    transactionHash: '0xTEST',
+    networkId: NetworkId['celo-alfajores'],
+    toTokenId: 'mockToTokenId',
+    fromTokenId: 'mockFromTokenId',
+  },
 }
 
 describe('pending points events', () => {
diff --git a/src/points/types.ts b/src/points/types.ts
index 0b3bd1eeb5..32d0b4b82e 100644
--- a/src/points/types.ts
+++ b/src/points/types.ts
@@ -86,6 +86,8 @@ interface PointsEventSwap {
   activityId: 'swap'
   transactionHash: string
   networkId: NetworkId
+  toTokenId: string
+  fromTokenId: string
 }
 
 export type PointsEvent = PointsEventCreateWallet | PointsEventSwap
diff --git a/src/swap/saga.test.ts b/src/swap/saga.test.ts
index 5866dcdec0..1f1c8702f4 100644
--- a/src/swap/saga.test.ts
+++ b/src/swap/saga.test.ts
@@ -561,6 +561,8 @@ describe(swapSubmitSaga, () => {
           activityId: 'swap',
           transactionHash: '0x1',
           networkId: NetworkId['celo-alfajores'],
+          toTokenId: mockCeloTokenId,
+          fromTokenId: mockCeurTokenId,
         })
       )
       .run()
diff --git a/src/swap/saga.ts b/src/swap/saga.ts
index b4ce38cb0a..409557558e 100644
--- a/src/swap/saga.ts
+++ b/src/swap/saga.ts
@@ -277,6 +277,8 @@ export function* swapSubmitSaga(action: PayloadAction<SwapInfo>) {
         activityId: 'swap',
         transactionHash: swapTxReceipt.transactionHash,
         networkId,
+        toTokenId,
+        fromTokenId,
       })
     )
     ValoraAnalytics.track(SwapEvents.swap_execute_success, {
diff --git a/src/transactions/saga.test.ts b/src/transactions/saga.test.ts
index d1dd8eb154..d357b02580 100644
--- a/src/transactions/saga.test.ts
+++ b/src/transactions/saga.test.ts
@@ -263,6 +263,8 @@ describe('watchPendingTransactions', () => {
           activityId: 'swap',
           transactionHash,
           networkId: NetworkId['celo-alfajores'],
+          toTokenId: mockCeurTokenId,
+          fromTokenId: mockCusdTokenId,
         })
       )
       .run()
diff --git a/src/transactions/saga.ts b/src/transactions/saga.ts
index ab18018984..3d7def1a98 100644
--- a/src/transactions/saga.ts
+++ b/src/transactions/saga.ts
@@ -276,7 +276,15 @@ export function* getTransactionReceipt(
 
     if (receipt.status === 'success') {
       if (__typename === 'TokenExchangeV3') {
-        yield* put(trackPointsEvent({ activityId: 'swap', transactionHash, networkId }))
+        yield* put(
+          trackPointsEvent({
+            activityId: 'swap',
+            transactionHash,
+            networkId,
+            fromTokenId: transaction.outAmount.tokenId,
+            toTokenId: transaction.inAmount.tokenId,
+          })
+        )
       }
     }
   } catch (e) {
diff --git a/test/RootStateSchema.json b/test/RootStateSchema.json
index 8cbb082b24..4e1a2b00a9 100644
--- a/test/RootStateSchema.json
+++ b/test/RootStateSchema.json
@@ -2834,16 +2834,24 @@
                     "const": "swap",
                     "type": "string"
                 },
+                "fromTokenId": {
+                    "type": "string"
+                },
                 "networkId": {
                     "$ref": "#/definitions/NetworkId"
                 },
+                "toTokenId": {
+                    "type": "string"
+                },
                 "transactionHash": {
                     "type": "string"
                 }
             },
             "required": [
                 "activityId",
+                "fromTokenId",
                 "networkId",
+                "toTokenId",
                 "transactionHash"
             ],
             "type": "object"

From 2ddd0424f2978ab12f41a7ec5d92341480b45f5c Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Thu, 23 May 2024 23:53:01 -0700
Subject: [PATCH 050/133] chore: update branding sha (#5464)

### Description

As per the title updates the wallet branding sha.

Related PRs:
- https://github.com/valora-inc/valora-app-branding/pull/32
- https://github.com/valora-inc/valora-website/pull/568

### Test plan

N/A

### Related issues

- Part of ACT-1192

### Backwards compatibility

Yes

### Network scalability

N/A
---
 scripts/sync_branding.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/sync_branding.sh b/scripts/sync_branding.sh
index 64a01ee726..d18e281e6b 100755
--- a/scripts/sync_branding.sh
+++ b/scripts/sync_branding.sh
@@ -21,7 +21,7 @@ echo $mobile_root
 cd "$mobile_root"
 
 # Please update the sha when valora branding updates are needed
-valora_branding_sha=d55cad3a094165d124ada4d8c42a6401c5ec7f46
+valora_branding_sha=c02f48b2582f63b13ccfe74d7f61364835206791
 
 if [[ "$branding" == "valora" ]]; then
   # prevents git from asking credentials

From fe76daa70b5d38b5304895fdb186e9fd22a47b70 Mon Sep 17 00:00:00 2001
From: valora-bot-crowdin
 <80050969+valora-bot-crowdin@users.noreply.github.com>
Date: Fri, 24 May 2024 06:07:53 -0700
Subject: [PATCH 051/133] chore(l10n): update translations from Crowdin (#5453)

Co-authored-by: Valora Bot <89419329+valora-bot@users.noreply.github.com>
---
 locales/de/translation.json     |  11 +-
 locales/en-US/translation.json  |  11 +-
 locales/es-419/translation.json |  11 +-
 locales/fr-FR/translation.json  |  11 +-
 locales/it-IT/translation.json  |  11 +-
 locales/pl-PL/translation.json  |  11 +-
 locales/pt-BR/translation.json  |  11 +-
 locales/ru-RU/translation.json  |  11 +-
 locales/th-TH/translation.json  |  11 +-
 locales/tr-TR/translation.json  |  11 +-
 locales/uk-UA/translation.json  | 177 +++++++++++++++++---------------
 locales/vi-VN/translation.json  |  11 +-
 locales/zh-CN/translation.json  |  11 +-
 13 files changed, 213 insertions(+), 96 deletions(-)

diff --git a/locales/de/translation.json b/locales/de/translation.json
index 70f34fccac..fc2d679828 100644
--- a/locales/de/translation.json
+++ b/locales/de/translation.json
@@ -2192,7 +2192,10 @@
   },
   "getStartedHome": {
     "title": "Krypto kaufen oder Tokens überweisen",
-    "body": "Kaufe oder überweise kompatible Token, um Krypto zu senden und web3 zu erkunden!"
+    "body": "Kaufe oder überweise kompatible Token, um Krypto zu senden und web3 zu erkunden!",
+    "titleV1_86": "Guthaben zu deinem Geldbeutel hinzufügen",
+    "exploreTokens": "Alle Token erforschen",
+    "exploreTokensBody": "Du kannst bis zu 10+ Token in Valora kaufen. Schau sie dir an!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2352,6 +2355,7 @@
     }
   },
   "earnFlow": {
+    "gasSubsidized": "Valora übernimmt das Benzin für diese Transaktion!",
     "addCryptoBottomSheet": {
       "title": "Füge {{tokenSymbol}} auf {{tokenNetwork}}hinzu.",
       "description": "Sobald du Jetons hinzugefügt hast, musst du zurückkommen, um die Einzahlung in einen Pool zu beenden.",
@@ -2371,6 +2375,11 @@
       "subtitle": "Heute einzahlen und Rendite verdienen",
       "description": "Erfahre, wie viel du verdienen kannst, wenn du einen Kreditpool bereitstellst"
     },
+    "ctaV1_86": {
+      "title": "Maximiere den Ertrag von Stablecoins",
+      "subtitle": "Kaufen {{symbol}}",
+      "description": "Verdiene etwa {{apy}}% pro Jahr, wenn du {{symbol}} zu einem Pool hinzufügst"
+    },
     "enterAmount": {
       "earnUpToLabel": "Du könntest bis zu:",
       "rateLabel": "Rate (geschätzt)",
diff --git a/locales/en-US/translation.json b/locales/en-US/translation.json
index 5c775e0004..1620b36017 100644
--- a/locales/en-US/translation.json
+++ b/locales/en-US/translation.json
@@ -2192,7 +2192,10 @@
   },
   "getStartedHome": {
     "title": "Buy crypto or transfer tokens",
-    "body": "Buy or transfer compatible tokens to send crypto and explore web3!"
+    "body": "Buy or transfer compatible tokens to send crypto and explore web3!",
+    "titleV1_86": "Add funds to your wallet",
+    "exploreTokens": "Explore all tokens",
+    "exploreTokensBody": "You can buy up to 10+ tokens in Valora. Check them out!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2352,6 +2355,7 @@
     }
   },
   "earnFlow": {
+    "gasSubsidized": "Valora's covering gas for this transaction!",
     "addCryptoBottomSheet": {
       "title": "Add {{tokenSymbol}} on {{tokenNetwork}}",
       "description": "Once you add tokens you'll have to come back to finish depositing into a pool.",
@@ -2371,6 +2375,11 @@
       "subtitle": "Deposit today and earn returns",
       "description": "See how much you can earn when supplying a lending pool"
     },
+    "ctaV1_86": {
+      "title": "Maximize earnings on stablecoins",
+      "subtitle": "Buy {{symbol}}",
+      "description": "Earn approximately {{apy}}% per year when you add {{symbol}} to a pool"
+    },
     "enterAmount": {
       "earnUpToLabel": "You could earn up to:",
       "rateLabel": "Rate (est.)",
diff --git a/locales/es-419/translation.json b/locales/es-419/translation.json
index 55c76d5d0d..7cc20bf133 100644
--- a/locales/es-419/translation.json
+++ b/locales/es-419/translation.json
@@ -2192,7 +2192,10 @@
   },
   "getStartedHome": {
     "title": "Comprar cripto o transferir tokens",
-    "body": "Compra o transfiere tokens compatibles para enviar cripto y explora web3"
+    "body": "Compra o transfiere tokens compatibles para enviar cripto y explora web3",
+    "titleV1_86": "Agrega fondos a tu wallet",
+    "exploreTokens": "Explorar todas las fichas",
+    "exploreTokensBody": "Puedes comprar hasta más de 10 fichas en Valora. ¡Compruébalo!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2352,6 +2355,7 @@
     }
   },
   "earnFlow": {
+    "gasSubsidized": "¡Valora cubre la gasolina para esta transacción!",
     "addCryptoBottomSheet": {
       "title": "Añade {{tokenSymbol}} en {{tokenNetwork}}",
       "description": "Una vez que añadas fichas, tendrás que volver para terminar de depositarlas en un fondo común.",
@@ -2371,6 +2375,11 @@
       "subtitle": "Deposita hoy y obtén beneficios",
       "description": "Comprueba cuánto puedes ganar al abastecer un fondo común de préstamos"
     },
+    "ctaV1_86": {
+      "title": "Maximizar las ganancias en stablecoins",
+      "subtitle": "Comprar {{symbol}}",
+      "description": "Gana aproximadamente {{apy}}% al año cuando añades {{symbol}} a una piscina"
+    },
     "enterAmount": {
       "earnUpToLabel": "Podrías ganar hasta:",
       "rateLabel": "Tasa (est.)",
diff --git a/locales/fr-FR/translation.json b/locales/fr-FR/translation.json
index 40b37e0a63..bd1839a2df 100644
--- a/locales/fr-FR/translation.json
+++ b/locales/fr-FR/translation.json
@@ -2192,7 +2192,10 @@
   },
   "getStartedHome": {
     "title": "Acheter des cryptomonnaies ou des jetons de transfert",
-    "body": "Achetez ou transférez des jetons compatibles pour envoyer des cryptomonnaies et découvrir le web3 !"
+    "body": "Achetez ou transférez des jetons compatibles pour envoyer des cryptomonnaies et découvrir le web3 !",
+    "titleV1_86": "Ajoute des fonds à ton portefeuille",
+    "exploreTokens": "Explorer tous les jetons",
+    "exploreTokensBody": "Tu peux acheter jusqu'à plus de 10 jetons à Valora. Jette un coup d'œil !"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2352,6 +2355,7 @@
     }
   },
   "earnFlow": {
+    "gasSubsidized": "Valora couvre le gaz pour cette transaction !",
     "addCryptoBottomSheet": {
       "title": "Ajoute {{tokenSymbol}} sur {{tokenNetwork}}",
       "description": "Une fois que tu auras ajouté des jetons, tu devras revenir pour finir de déposer dans une cagnotte.",
@@ -2371,6 +2375,11 @@
       "subtitle": "Dépose aujourd'hui et gagne en rendement",
       "description": "Vois combien tu peux gagner en alimentant un pool de prêt."
     },
+    "ctaV1_86": {
+      "title": "Maximiser les gains sur les stablecoins",
+      "subtitle": "Acheter {{symbol}}",
+      "description": "Gagne environ {{apy}}% par an lorsque tu ajoutes {{symbol}} à une piscine."
+    },
     "enterAmount": {
       "earnUpToLabel": "Tu pourrais gagner jusqu'à :",
       "rateLabel": "Taux (est.)",
diff --git a/locales/it-IT/translation.json b/locales/it-IT/translation.json
index b89cfbda83..f607fea449 100644
--- a/locales/it-IT/translation.json
+++ b/locales/it-IT/translation.json
@@ -2192,7 +2192,10 @@
   },
   "getStartedHome": {
     "title": "Acquista criptovalute o trasferisci token",
-    "body": "Compra o trasferisci token compatibili per inviare criptovalute ed esplorare il Web3!"
+    "body": "Compra o trasferisci token compatibili per inviare criptovalute ed esplorare il Web3!",
+    "titleV1_86": "Aggiungi fondi al tuo portafoglio",
+    "exploreTokens": "Esplora tutti i gettoni",
+    "exploreTokensBody": "Puoi acquistare fino a 10+ gettoni a Valora. Dai un'occhiata!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2352,6 +2355,7 @@
     }
   },
   "earnFlow": {
+    "gasSubsidized": "Valora copre la benzina per questa transazione!",
     "addCryptoBottomSheet": {
       "title": "Aggiungi {{tokenSymbol}} su {{tokenNetwork}}",
       "description": "Una volta aggiunti i gettoni, dovrai tornare per terminare il deposito in una piscina.",
@@ -2371,6 +2375,11 @@
       "subtitle": "Deposita oggi stesso e guadagna",
       "description": "Scopri quanto puoi guadagnare fornendo un pool di prestiti"
     },
+    "ctaV1_86": {
+      "title": "Massimizza i guadagni con le stablecoins",
+      "subtitle": "Acquista {{symbol}}",
+      "description": "Guadagna circa {{apy}}% all'anno quando aggiungi {{symbol}} a una piscina."
+    },
     "enterAmount": {
       "earnUpToLabel": "Potresti guadagnare fino a:",
       "rateLabel": "Tasso (est.)",
diff --git a/locales/pl-PL/translation.json b/locales/pl-PL/translation.json
index 822d94a1aa..5b885bdec9 100644
--- a/locales/pl-PL/translation.json
+++ b/locales/pl-PL/translation.json
@@ -2196,7 +2196,10 @@
   },
   "getStartedHome": {
     "title": "Kup kryptowaluty lub prześlij tokeny",
-    "body": "Kupuj lub przesyłaj kompatybilne tokeny, aby wysyłać kryptowaluty i odkrywać web3!"
+    "body": "Kupuj lub przesyłaj kompatybilne tokeny, aby wysyłać kryptowaluty i odkrywać web3!",
+    "titleV1_86": "Dodaj środki do swojego portfela",
+    "exploreTokens": "Poznaj wszystkie tokeny",
+    "exploreTokensBody": "Możesz kupić do 10+ tokenów w Valora. Sprawdź je!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2356,6 +2359,7 @@
     }
   },
   "earnFlow": {
+    "gasSubsidized": "Valora pokrywa koszty gazu dla tej transakcji!",
     "addCryptoBottomSheet": {
       "title": "Dodaj {{tokenSymbol}} na {{tokenNetwork}}",
       "description": "Po dodaniu żetonów będziesz musiał wrócić, aby dokończyć wpłatę do puli.",
@@ -2375,6 +2379,11 @@
       "subtitle": "Dokonaj wpłaty już dziś i zarabiaj",
       "description": "Zobacz ile możesz zarobić zasilając pulę pożyczkową"
     },
+    "ctaV1_86": {
+      "title": "Maksymalizuj zarobki na stablecoinach",
+      "subtitle": "Kup {{symbol}}",
+      "description": "Zarabiaj około {{apy}}% rocznie, dodając {{symbol}} do puli."
+    },
     "enterAmount": {
       "earnUpToLabel": "Możesz zarobić do:",
       "rateLabel": "Stawka (szacunkowa)",
diff --git a/locales/pt-BR/translation.json b/locales/pt-BR/translation.json
index 679e9c666b..11ddbbcf3c 100644
--- a/locales/pt-BR/translation.json
+++ b/locales/pt-BR/translation.json
@@ -2192,7 +2192,10 @@
   },
   "getStartedHome": {
     "title": "Comprar cripto ou transferir tokens",
-    "body": "Compre ou transfira tokens compatíveis para enviar cripto e explorar a web3!"
+    "body": "Compre ou transfira tokens compatíveis para enviar cripto e explorar a web3!",
+    "titleV1_86": "Adicione fundos à sua carteira",
+    "exploreTokens": "Explore todos os tokens",
+    "exploreTokensBody": "Você pode comprar até 10+ tokens em Valora. Dê uma olhada neles!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2352,6 +2355,7 @@
     }
   },
   "earnFlow": {
+    "gasSubsidized": "Valora está cobrindo a gasolina para essa transação!",
     "addCryptoBottomSheet": {
       "title": "Adicionar {{tokenSymbol}} em {{tokenNetwork}}",
       "description": "Depois de adicionar tokens, você terá que voltar para terminar de depositar em um pool.",
@@ -2371,6 +2375,11 @@
       "subtitle": "Deposite hoje e ganhe retornos",
       "description": "Veja quanto você pode ganhar ao fornecer um pool de empréstimos"
     },
+    "ctaV1_86": {
+      "title": "Maximizar os ganhos com stablecoins",
+      "subtitle": "Compre {{symbol}}",
+      "description": "Ganhe aproximadamente {{apy}}% por ano quando você adiciona {{symbol}} a um pool"
+    },
     "enterAmount": {
       "earnUpToLabel": "Você pode ganhar até:",
       "rateLabel": "Taxa (est.)",
diff --git a/locales/ru-RU/translation.json b/locales/ru-RU/translation.json
index a9429dc615..42bb9ad23f 100644
--- a/locales/ru-RU/translation.json
+++ b/locales/ru-RU/translation.json
@@ -2196,7 +2196,10 @@
   },
   "getStartedHome": {
     "title": "Покупайте криптовалюту или переводите токены",
-    "body": "Покупайте или переводите совместимые токены, чтобы отправлять криптовалюту и исследовать web3!"
+    "body": "Покупайте или переводите совместимые токены, чтобы отправлять криптовалюту и исследовать web3!",
+    "titleV1_86": "Добавляй средства в свой кошелек",
+    "exploreTokens": "Изучи все жетоны",
+    "exploreTokensBody": "В Валоре ты можешь купить до 10+ жетонов. Проверь их!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2356,6 +2359,7 @@
     }
   },
   "earnFlow": {
+    "gasSubsidized": "Валора покрывает газ для этой сделки!",
     "addCryptoBottomSheet": {
       "title": "Добавь {{tokenSymbol}} на {{tokenNetwork}}",
       "description": "Как только ты добавишь жетоны, тебе придется вернуться, чтобы закончить пополнение счета в пуле.",
@@ -2375,6 +2379,11 @@
       "subtitle": "Сделай депозит сегодня и получи доход",
       "description": "Узнай, сколько ты сможешь заработать, предоставляя кредитный пул."
     },
+    "ctaV1_86": {
+      "title": "Максимальный заработок на стабильных монетах",
+      "subtitle": "Купить {{symbol}}",
+      "description": "Зарабатывай примерно {{apy}}% в год, когда добавляешь {{symbol}} в бассейн."
+    },
     "enterAmount": {
       "earnUpToLabel": "Ты можешь заработать до:",
       "rateLabel": "Ставка (эст.)",
diff --git a/locales/th-TH/translation.json b/locales/th-TH/translation.json
index a8c082e086..0b849f938f 100644
--- a/locales/th-TH/translation.json
+++ b/locales/th-TH/translation.json
@@ -2190,7 +2190,10 @@
   },
   "getStartedHome": {
     "title": "ซื้อคริปโตหรือโอนโทเค็น",
-    "body": "ซื้อหรือโอนโทเค็นที่เข้ากันได้เพื่อส่งคริปโตและสำรวจ web3!"
+    "body": "ซื้อหรือโอนโทเค็นที่เข้ากันได้เพื่อส่งคริปโตและสำรวจ web3!",
+    "titleV1_86": "Add funds to your wallet",
+    "exploreTokens": "Explore all tokens",
+    "exploreTokensBody": "You can buy up to 10+ tokens in Valora. Check them out!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2350,6 +2353,7 @@
     }
   },
   "earnFlow": {
+    "gasSubsidized": "Valora's covering gas for this transaction!",
     "addCryptoBottomSheet": {
       "title": "Add {{tokenSymbol}} on {{tokenNetwork}}",
       "description": "Once you add tokens you'll have to come back to finish depositing into a pool.",
@@ -2369,6 +2373,11 @@
       "subtitle": "Deposit today and earn returns",
       "description": "See how much you can earn when supplying a lending pool"
     },
+    "ctaV1_86": {
+      "title": "Maximize earnings on stablecoins",
+      "subtitle": "Buy {{symbol}}",
+      "description": "Earn approximately {{apy}}% per year when you add {{symbol}} to a pool"
+    },
     "enterAmount": {
       "earnUpToLabel": "You could earn up to:",
       "rateLabel": "Rate (est.)",
diff --git a/locales/tr-TR/translation.json b/locales/tr-TR/translation.json
index a07bec6e3b..250de01ebc 100644
--- a/locales/tr-TR/translation.json
+++ b/locales/tr-TR/translation.json
@@ -2192,7 +2192,10 @@
   },
   "getStartedHome": {
     "title": "Kripto satın alın veya token transfer edin",
-    "body": "Kripto göndermek ve web3'ü keşfetmek için uyumlu tokenları satın alın veya transfer edin!"
+    "body": "Kripto göndermek ve web3'ü keşfetmek için uyumlu tokenları satın alın veya transfer edin!",
+    "titleV1_86": "Cüzdanınıza para ekleyin",
+    "exploreTokens": "Tüm jetonları keşfedin",
+    "exploreTokensBody": "Valora'da 10'dan fazla jeton satın alabilirsiniz. Şunlara bir göz atın!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2352,6 +2355,7 @@
     }
   },
   "earnFlow": {
+    "gasSubsidized": "Valora bu işlem için benzini karşılıyor!",
     "addCryptoBottomSheet": {
       "title": "{{tokenSymbol}} adresini {{tokenNetwork}}adresine ekleyin",
       "description": "Jeton ekledikten sonra havuza para yatırma işlemini tamamlamak için geri gelmeniz gerekecektir.",
@@ -2371,6 +2375,11 @@
       "subtitle": "Bugün para yatırın ve getiri kazanın",
       "description": "Bir kredi havuzu sağlarken ne kadar kazanabileceğinizi görün"
     },
+    "ctaV1_86": {
+      "title": "Sabit coinlerde kazancı en üst düzeye çıkarın",
+      "subtitle": "Satın Al {{symbol}}",
+      "description": "Bir havuza {{symbol}} eklediğinizde yılda yaklaşık {{apy}}% kazanın"
+    },
     "enterAmount": {
       "earnUpToLabel": "Şu kadar kazanabilirsiniz:",
       "rateLabel": "Oran (tahmini)",
diff --git a/locales/uk-UA/translation.json b/locales/uk-UA/translation.json
index 3f2ee44635..6a2dcfea2d 100644
--- a/locales/uk-UA/translation.json
+++ b/locales/uk-UA/translation.json
@@ -255,8 +255,8 @@
       "text": "Будь-хто з вашою фразою матиме доступ до вашого облікового запису та всіх його коштів. Не повідомляйте її іншим."
     }
   ],
-  "consumerIncentivesTitle": "Суперзаряд закінчується",
-  "consumerIncentivesSummary": "Але на вас чекають ще більші винагороди. До 28 травня отримуйте {{percent}}% річної винагороди на свій найбільший баланс у стейблкоінах (cUSD, CEUR або cREAL). Ось як це працює:",
+  "consumerIncentivesTitle": "Суперзарядка закінчується",
+  "consumerIncentivesSummary": "Проте винагороди вас не оминуть! До 28 травня отримайте щорічну винагороду в {{percent}} % до вашого найбільшого балансу в стейблкоїнах (cUSD, cEUR, або cREAL). Ось як це працює:",
   "earnWeekly": {
     "header": "Під’єднайте ваш телефонний номер",
     "text": "Натисніть «Під’єднати», якщо ви ще не під’єдналися до мережі."
@@ -271,7 +271,7 @@
     "text": "Це гарантуватиме, що ваші винагороди безпечні та під вашим контролем."
   },
   "conclusion": "Це так просто. Отримуйте надбавку за криптовалюту сьогодні!",
-  "superchargeTitle": "Суперзаряд закінчується",
+  "superchargeTitle": "Суперощадність закінчується",
   "superchargeDescription": "Але на вас чекають ще більші винагороди. До 28 травня отримуйте {{apy}}% річних винагород на свій найбільший баланс {{token}} . Ось як це працює:",
   "superchargeConnectNumber": "Під’єднати свій телефонний номер",
   "superchargeReconnectNumber": "Повторно під’єднайте свій номер телефону\n<0>Ми випустили оновлення щодо винагород Supercharge. Повторно під’єднайте свій номер телефону, щоб і надалі отримувати винагороди на свій {{token}}.</0>",
@@ -677,8 +677,8 @@
     "body": "Щойно вони налаштують свій гаманець {{appName}} і під’єднають номер, кожен із вас отримає ексклюзивний NFT."
   },
   "inviteRewardsBannerCUSD": {
-    "title": "Запрошуйте друзів та отримуйте до 12 cUSD",
-    "body": "Після того, як вони підключать свій номер і поповнять рахунок на {{appName}}, ви обидва отримаєте по 0.50 cUSD."
+    "title": "Запрошуй друзів й отримуй до 12 cUSD",
+    "body": "Щойно вони під’єднають свій номер і покладуть кошти у {{appName}}, кожен із вас отримає по 0,50 cUSD."
   },
   "inviteWithUrl": {
     "title": "Запросити друга",
@@ -692,8 +692,8 @@
       "body": "Запрошуйте друзів і членів сім’ї завантажити {{appName}}, і кожен із вас отримає ексклюзивний NFT"
     },
     "rewardsActiveCUSD": {
-      "title": "ОТРИМАЙТЕ ДО 12 cUSD за запрошення друзів на Valora!",
-      "body": "Отримуйте 0.50 cUSD за кожного друга, якого ви запросите на {{appName}}. Після того, як вони підключать свій номер, поповнять рахунок і протримають його протягом 7 днів, ви обидва отримаєте по 0.50 cUSD. Поспішайте, кількість коштів обмежена! (Обмеження на 25 друзів)."
+      "title": "Запроси друзів до Valora й ОТРИМАЙ ДО 12 cUSD!",
+      "body": "Запрошуй друзів до {{appName}} й за кожного отримуй по 0,50 cUSD. Щойно вони під’єднають свій номер, покладуть кошти й триматимуть їх протягом 7 днів, кожен із вас отримає по 0,50 cUSD. Поспішай! Виплати діють обмежений час! (макс. 25 друзів)."
     }
   },
   "getReward": "Отримати винагороду ${{reward}}",
@@ -710,15 +710,15 @@
     "goldDisclaimer": "Коли ви створюєте «обліковий запис» у Valora, ви створюєте цифровий гаманець, ключі до якого є тільки у вас. Жодна інша особа чи організація, зокрема Valora, не можуть відновити ваш ключ, змінити чи скасувати транзакції або повернути втрачені кошти. Зауважте, що криптовалюти є частиною нового класу активів, і є ризик фінансових втрат. Ретельно обміркуйте ваші фінансові обставини та рівень прийняття фінансових ризиків, перш ніж купувати будь-які активи."
   },
   "termsColloquial": {
-    "title": "Почнемо зі створення гаманця",
-    "privacyHeading": "Ваша інформація та конфіденційність:",
-    "privacy1": "Ми збираємо дані про використання, які допомагають нам покращувати додаток та безпеку. Тип інформації, яку ми збираємо, як ми її використовуємо та ваші права, пов'язані з цією інформацією, можна знайти в нашій <0>Політиці конфіденційності</0>.",
-    "privacy2": "Якщо ви вирішите прив'язати свій номер телефону, ми збережемо його зашифровану копію.",
-    "privacy3": "Якщо ви вирішите підключити свої контакти, ми використовуємо їхні імена, номери та фотографії профілів, щоб їх було легше знайти.",
+    "title": "Почнімо зі створення гаманця",
+    "privacyHeading": "Ваші дані й конфіденційність:",
+    "privacy1": "Ми збираємо дані про використання, які допомагають нам поліпшувати застосунок і його безпеку. Інформацію, яку ми збираємо, спосіб, яким ми її використовуємо, й ваші права щодо цієї інформації зазначено в <0>Політиці конфіденційності</0>.",
+    "privacy2": "Якщо вирішите прив’язати свій номер телефону, він зберігатиметься у вигляді зашифрованої копії.",
+    "privacy3": "Якщо вирішите під’єднати свої контакти, то ми спрощуємо пошук їхніх імен, номерів і фото профілів.",
     "walletHeading": "Ваш цифровий гаманець з Valora:",
-    "wallet1": "Ви збираєтеся створити цифровий гаманець. Тільки ви маєте ключ до вашого гаманця. Ми не можемо відновити ваш ключ або ваші активи, якщо ви його втратите. Ми також не можемо скасувати дії, здійснені через Valora на блокчейні.",
-    "wallet2": "Цифрові активи, з якими ви будете взаємодіяти з Valora, несуть в собі унікальні ризики. Використовуючи Valora, ви приймаєте ці ризики і берете на себе відповідальність за них. Будь ласка, враховуйте свої фінансові можливості та толерантність до ризиків, перш ніж робити вибір.",
-    "fullTerms": "Ознайомтеся з нашими повними Загальними положеннями та <0>умовами</0>"
+    "wallet1": "Ви збираєтеся створити цифровий гаманець. Тільки у вас є ключ до вашого гаманця. У разі втрати ключа ми не зможемо відновити ні його, ні ваші активи. Ми також не можемо скасувати дії, виконані через Valora на блокчейні.",
+    "wallet2": "Цифрові активи, із якими ви взаємодіятимете у Valora, пов’язані з характерними ризиками. Якщо ви використовуєте Valora, то берете на себе такі ризики й відповідальність за них. Ураховуйте свої фінансові можливості та рівень прийняття ризиків, перш ніж робити вибір.",
+    "fullTerms": "Прочитайте повну версію <0>Умов надання послуг</0>"
   },
   "fullNameOrPsuedonym": "Повне ім’я або псевдонім",
   "namePlaceholder": "напр. ім’я",
@@ -827,7 +827,7 @@
     "hasWallet": "У мене вже є гаманець",
     "header": "Ласкаво просимо до {{appName}}! Створімо ваш криптогаманець.",
     "getStarted": "Почати роботу",
-    "agreeToTerms": "Створюючи гаманець, ви погоджуєтеся з нашими <0>Умовами</0> та положеннями"
+    "agreeToTerms": "Якщо ви створюєте гаманець, то погоджуєтеся з нашими <0>Умовами надання послуг</0>"
   },
   "accessContacts": {
     "disclosure": {
@@ -1015,7 +1015,7 @@
   "receivedFrom": "Отримано від",
   "commentLabel": "Повідомлення",
   "amountSent": "Відправлена сума",
-  "amountReceived": "Сума отриманих коштів",
+  "amountReceived": "Суму отримано",
   "amountCeloWithdrawn": "Сума (CELO)",
   "feeEducation": "Блокчейни збирають плату за транзакції для підтримки та нормального функціонування мережі.",
   "reviewPayment": "Переглянути платіж",
@@ -1038,7 +1038,7 @@
   "inviteWithoutPayment": "Привіт! Я використовую {{appName}}, щоб надсилати криптовалюту по всьому світові. Легко спробувати, я хочу ще раз запросити вас відвідати це посилання: {{link}}",
   "inviteWithEscrowedPayment": "Привіт! Я використовую {{appName}}, щоб надсилати криптовалюту по всьому світові. Я щойно відправив вам {{amount}} {{token}}. Прошу, завантажте застосунок {{appName}} і отримайте {{token}} за допомогою цього посилання: {{link}}",
   "inviteWithRewards": "Привіт! 👋 Я використовую {{appName}} як криптогаманець. Завантажити застосунок надзвичайно швидко, як і під’єднати свій номер телефону, до того ж у винагороду ми обоє отримаємо спеціальний випуск NFT. 💫 \n\nСкористайся цим посиланням: {{link}}",
-  "inviteWithRewardsCUSD": "Прямо зараз ми обидва можемо отримати безкоштовну винагороду в розмірі $0.50, якщо ви зареєструєтесь, підключите свій номер і поповните гаманець Valora. Я використовую його для збільшення своїх заощаджень в доларах США та криптовалюті, а ви можете налаштувати його за лічені секунди, маючи лише номер телефону. Не забудьте зареєструватися за моїм реферальним посиланням тут: \n\n{{link}} \n\n Поспішайте, реферальна акція скоро закінчується.",
+  "inviteWithRewardsCUSD": "Привіт! Прямо зараз кожен із нас може отримати винагороду в розмірі 0,50 дол. США, якщо зареєструєш гаманець у застосунку Valora, поповниш його й під’єднаєш свій номер. Я накопичую в ньому свої заощадження в доларах США та криптовалюті. Тобі знадобиться лише номер телефону й лічені секунди, щоб його налаштувати. Для реєстрації скористайся моїм реферальним посиланням: \n\n{{link}} \n\nПоспішай! Реферальна акція невдовзі закінчиться.",
   "loadingContacts": "Пошук контактів",
   "myCode": "Мій код",
   "scanCode": "Сканувати",
@@ -1328,7 +1328,7 @@
   "feedItemSwapPath": "{{token1}} до {{token2}}",
   "feedItemJumpstartTitle": "Пряме посилання",
   "feedItemJumpstartSentSubtitle": "Запрошення",
-  "feedItemJumpstartReceivedSubtitle": "Отримані кошти",
+  "feedItemJumpstartReceivedSubtitle": "Кошти отримано",
   "transactionHeaderVerificationFee": "Підтвердження",
   "transactionHeaderNetworkFee": "Мережа",
   "transactionHeaderFaucet": "Faucet",
@@ -1771,9 +1771,9 @@
     "swapToTokenSelection": "СВОП НА",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "Вибрані токени не підтримуються організаторами свопа.",
-    "selectTokenLabel": "Виберіть токен",
-    "tokenBottomSheetTitle": "Виберіть токен",
-    "onNetwork": "на {{networkName}}",
+    "selectTokenLabel": "Вибрати токен",
+    "tokenBottomSheetTitle": "Вибрати токен",
+    "onNetwork": "у мережі {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "Ви перейшли до мережі {{networkName}}",
       "body_swapFrom": "Щоб продовжити, виберіть, який токен ви хочете обміняти для свопу в мережі {{networkName}}.",
@@ -1827,9 +1827,9 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Безплатно",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Комісія\n\nКомісія {{appName}} у розмірі {{appFeePercentage}}% покликана покращити ваш досвід, забезпечуючи швидкі, надійні та безпечні обміни.",
-      "appFeeInfo_free": "{{appName}} Вартість\n\nЦей обмін безкоштовний.",
-      "appFeeInfo_placeholder": "{{appName}} Комісія\n\nКомісія розраховується на основі отриманої вами пропозиції.",
+      "appFeeInfo": "{{appName}} Комісія\n\nКомісія {{appName}} у розмірі {{appFeePercentage}} % покликана поліпшити ваш досвід, щоб обміни проходили швидко, надійно та безпечно.",
+      "appFeeInfo_free": "{{appName}} Комісія\n\nКомісія за цей своп не стягується.",
+      "appFeeInfo_placeholder": "{{appName}} Комісія\n\nКомісія розраховується на основі отриманої вами цінової пропозиції.",
       "appFeeInfoDismissButton": "Зрозуміло",
       "slippagePercentage": "Допуск прослизання",
       "networkFeeInfo": "Ви обмінюєтеся активами в мережі {{networkName}}.\n\nОрієнтовна комісія мережі потрібна, щоб виконати транзакцію в мережі {{networkName}}. Комісія допомагає убезпечити транзакцію і спрямована на підтримку роботи мережі.",
@@ -1837,8 +1837,8 @@
       "slippageToleranceInfo": "Допуск прослизання\n\nВаш своп виконується в межах допуску прослизання за відсотками. Якщо ціна зміниться й перевищуватиме допуск прослизання, під захистом {{appName}} угоду не буде дозволено.",
       "networkFeeInfoDismissButton": "Зрозуміло",
       "exchangeRate": "Валютний курс",
-      "exchangeRateInfo": "Курс обміну\n\nМи знайшли найкращий курс обміну для вас. Ваша угода буде завершена за ціною в межах {{slippagePercentage}}% від розрахункової, або транзакція буде скасована, а кошти повернуться на ваш гаманець.",
-      "exchangeRateInfo_withAppFee": "Курс обміну\n\nМи знайшли найкращий курс обміну для вас. Ваша операція буде завершена за ціною в межах {{slippagePercentage}}% від розрахункового курсу, або транзакція буде скасована, а кошти повернуться на ваш гаманець.\n\nРозрахунковий курс включає комісію {{appName}} у розмірі {{appFeePercentage}}%.",
+      "exchangeRateInfo": "Обмінний курс\n\nМи знайшли найкращий обмінний курс! Торгову операцію буде завершено за ціною в межах {{slippagePercentage}} % від орієнтовної, або ж транзакцію буде скасовано, і кошти повернуться до вашого гаманця.",
+      "exchangeRateInfo_withAppFee": "Обмінний курс\n\nМи знайшли найкращий обмінний курс! Торгову операцію буде завершено за ціною в межах {{slippagePercentage}} % від орієнтовної, або ж транзакцію буде скасовано, і кошти повернуться до вашого гаманця.\n\nОрієнтовний курс враховує комісію {{appName}}, що становить {{appFeePercentage}} %.",
       "exchangeRateInfoDismissButton": "Зрозуміло",
       "estimatedValue": "Орієнтовна вартість"
     },
@@ -2064,11 +2064,11 @@
     },
     "invite": {
       "title": "Надіслати криптовалюту друзям",
-      "subtitle": "Надішліть кошти або запрошення своїм контактам"
+      "subtitle": "Надіслати кошти або запрошення своїм контактам"
     },
     "jumpstart": {
-      "title": "Надсилайте за допомогою прямого посилання",
-      "subtitle": "Поділіться посиланням, щоб надіслати криптовалюту як текст"
+      "title": "Надіслати за прямим посиланням",
+      "subtitle": "Поділитися посиланням, щоб надіслати крипту як текстове повідомлення"
     },
     "getStarted": {
       "title": "Як надіслати кошти у Valora",
@@ -2149,7 +2149,7 @@
     }
   },
   "jumpstartSendConfirmationScreen": {
-    "title": "Створіть пряме посилання",
+    "title": "Створити пряме посилання",
     "sendAmountLabel": "Сума на прямому посиланні",
     "confirmButton": "Надіслати й створити посилання",
     "info": "Коли ви створюєте посилання, з гаманця знімаються кошти. Посилання можна відкликати будь-коли. Стежте за тим, як ділитеся посиланнями.",
@@ -2160,7 +2160,7 @@
     }
   },
   "jumpstartShareLinkScreen": {
-    "title": "Поділіться своїм прямим посиланням",
+    "title": "Поділитися прямим посиланням",
     "description": "Скопіюйте посилання, щоб надіслати {{tokenSymbol}} через застосунок для обміну повідомленнями, або скануйте QR-код.",
     "linkLabel": "Пряме посилання",
     "linkCopiedMessage": "Пряме посилання скопійовано",
@@ -2196,7 +2196,10 @@
   },
   "getStartedHome": {
     "title": "Придбайте криптовалюту чи переведіть токени",
-    "body": "Купуйте чи переводьте сумісні токени, щоб надсилати криптовалюту й досліджувати web3!"
+    "body": "Купуйте чи переводьте сумісні токени, щоб надсилати криптовалюту й досліджувати web3!",
+    "titleV1_86": "Поповнити гаманець",
+    "exploreTokens": "Ознайомтеся з усіма токенами",
+    "exploreTokensBody": "Ви можете купити до 10+ токенів у Valora. Перевірте їх!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2251,7 +2254,7 @@
     "error": {
       "title": "Неможливо забрати кошти",
       "description": "Це посилання не вдалося завантажити з невідомої причини",
-      "alreadyClaimedDescription": "Посилання вже було затребуване. Будь ласка, попросіть вашого друга надіслати нове посилання",
+      "alreadyClaimedDescription": "Посилання вже використано. Попросіть свого друга надіслати нове",
       "contactSupport": "Звернутися до служби підтримки",
       "dismiss": "Відхилити"
     }
@@ -2278,7 +2281,7 @@
     "history": {
       "cards": {
         "createWallet": {
-          "title": "Тримач для гаманця",
+          "title": "Власник гаманця",
           "subtitle": "Член {{appName}}"
         },
         "swap": {
@@ -2288,24 +2291,24 @@
       },
       "title": "Активність моїх балів",
       "error": {
-        "title": "Неможливо завантажити активність точок",
-        "subtitle": "Ой, щось пішло не так при спробі завантажити стрічку активності ваших балів. Будь ласка, спробуйте ще раз.",
+        "title": "Не вдалося завантажити активність за балами",
+        "subtitle": "На жаль, під час спроби завантажити вашу стрічку активності за балами сталася помилка. Спробуйте ще раз.",
         "tryAgain": "Спробувати ще раз"
       },
       "empty": {
-        "title": "Поки що немає активності в балах",
-        "subtitle": "Схоже, ви ще не заробили жодного балу. Використовуйте {{appName}} , щоб почати заробляти бали!",
+        "title": "Поки що жодної активності за балами немає",
+        "subtitle": "Схоже, ви ще не заробили жодного балу. Скористайтеся {{appName}}, щоб почати заробляти бали!",
         "gotIt": "Зрозуміло"
       },
       "pageError": {
-        "title": "Неможливо завантажити",
-        "subtitle": "Виникла помилка при спробі завершити завантаження. Будь ласка, спробуйте ще раз.",
+        "title": "Не вдалося завантажити",
+        "subtitle": "На жаль, під час спроби завершити завантаження сталася помилка. Спробуйте ще раз.",
         "refresh": "Оновити"
       }
     },
     "fetchBalanceError": {
-      "title": "Не вдається завантажити бали",
-      "description": "На жаль, щось пішло не так при спробі завантажити ваші бали. Інформація на цій сторінці може бути застарілою. Будь ласка, оновіть її.",
+      "title": "Не вдалося завантажити ваші бали",
+      "description": "На жаль, під час спроби завантажити ваші бали сталася помилка. Ця сторінка може містити застарілу інформацію. Оновіть її.",
       "retryCta": "Оновити"
     },
     "loading": {
@@ -2351,11 +2354,12 @@
     },
     "intro": {
       "title": "Заробляйте бали без зайвих зусиль",
-      "description": "Переходьте до нового способу заробітку! Ваші дії на сайті {{appName}} тепер приносять бали. Почніть заробляти вже сьогодні та отримайте чудові переваги.",
-      "cta": "Розпочніть свою подорож балами"
+      "description": "Переходьте до нового способу заробітку! Ваша активність у {{appName}} тепер приносить бали. Почніть заробляти вже сьогодні та відкрийте нечувані переваги.",
+      "cta": "Розпочніть гонитву за балами"
     }
   },
   "earnFlow": {
+    "gasSubsidized": "Валора покриває газ для цієї транзакції!",
     "addCryptoBottomSheet": {
       "title": "Додайте {{tokenSymbol}} на {{tokenNetwork}}",
       "description": "Після того, як ви додасте токени, вам доведеться повернутися, щоб завершити депонування в пул.",
@@ -2372,78 +2376,83 @@
     },
     "cta": {
       "title": "Заробляйте на своїх стейблкоїнах",
-      "subtitle": "Поповнюйте рахунок сьогодні та отримуйте прибуток",
+      "subtitle": "Внесіть кошти сьогодні й отримуйте прибуток",
       "description": "Дізнайтеся, скільки ви можете заробити, надаючи послуги кредитного пулу"
     },
+    "ctaV1_86": {
+      "title": "Максимізуйте заробіток на стейблкоінах",
+      "subtitle": "Купити {{symbol}}",
+      "description": "Заробляйте приблизно {{apy}}% на рік, додаючи {{symbol}} до пулу"
+    },
     "enterAmount": {
-      "earnUpToLabel": "Ти можеш заробити до..:",
-      "rateLabel": "Ставка (ест.)",
+      "earnUpToLabel": "Можна заробити до:",
+      "rateLabel": "Ставка (орієнт.)",
       "earnUpTo": "~{{fiatSymbol}}{{amount}} / yr",
       "rate": "{{rate}}% APY",
       "continue": "Продовжити",
-      "info": "Цей басейн працює від Aave",
+      "info": "Цей пул на платформі Aave",
       "infoBottomSheet": {
-        "title": "Чому саме цей басейн?",
-        "description": "Цей пул Aave має понад $150 млн ТВЛ і понад 6 000 учасників, що свідчить про високу ліквідність і надійність. Він також використовує USDC як токен і Abritrum як мережу, що знижує волатильність і гарантує користувачам недорогі тарифи на газ.\n\nВсе це робить його безпечним і привабливим варіантом з конкурентоспроможним APY, що забезпечує вигідні інвестиційні можливості для наших користувачів.\n\nВи можете ознайомитися з іншими пулами Aave <0>тут</0>.",
+        "title": "Чому цей пул?",
+        "description": "Цей пул Aave має понад 150 млн дол. США загальної заблокованої вартості і понад 6000 учасників, що свідчить про високу ліквідність і надійність. Також унаслідок того що як токен використовується USDC, а як мережа — Abritrum, то знижується волатильність і користувачам гарантовані недорогі тарифи за газ.\n\nУсе це разом надає цьому варіанту безпеки й привабливості з конкурентоспроможним APY, що передбачає вигідні інвестиційні можливості для наших користувачів.\n\nЗ іншими пулами Aave можна ознайомитися <0>тут</0>.",
         "dismiss": "Відхилити"
       },
       "notEnoughBalanceForGasWarning": {
-        "title": "Вам потрібно більше {{feeTokenSymbol}} для продовження",
-        "description": "Додайте {{feeTokenSymbol}} на {{network}} , щоб оплатити рахунки за газ",
-        "noGasCta": "Купуйте {{feeTokenSymbol}} на {{network}}"
+        "title": "Потрібно більше {{feeTokenSymbol}}, щоб продовжити",
+        "description": "Додати {{feeTokenSymbol}} у мережу {{network}}, щоб сплатити комісії за газ",
+        "noGasCta": "Купити {{feeTokenSymbol}} у мережі {{network}}"
       }
     },
     "activePools": {
       "title": "Активні пули",
       "totalValue": "Загальна вартість:",
       "apy": "~{{apy}}% APY",
-      "exitPool": "Вихідний пул",
-      "depositMore": "Поповнити рахунок Більше",
-      "viewPools": "Басейни з видом на море"
+      "exitPool": "Вийти з пулу",
+      "depositMore": "Внести більше",
+      "viewPools": "Переглянути пули"
     },
     "depositBottomSheet": {
       "title": "Перегляд та поповнення рахунку",
-      "description": "Перед тим, як внести кошти до пулу Aave, будь ласка, ознайомтеся з деталями транзакції нижче",
+      "description": "Перш ніж внести кошти до пулу Aave, ознайомтеся з деталями транзакції нижче",
       "amount": "Суму внесено",
-      "fee": "Орієнтовно. Плата за газ",
-      "provider": "Постачальник заробітку",
+      "fee": "Передбачувані комісії за газ",
+      "provider": "Надавач заробітку",
       "network": "Мережа",
-      "footer": "Вносячи криптовалюту в пул Aave, ви приймаєте ризики, пов'язані з використанням Aave. <0>Умови та положення</0>",
-      "primaryCta": "Завершено",
+      "footer": "Коли ви вносите криптовалюту в пул Aave, ви приймаєте ризики, пов'язані з використанням Aave. <0>Умови надання послуг</0>",
+      "primaryCta": "Завершити",
       "secondaryCta": "Скасувати"
     },
     "collect": {
-      "title": "Вітаємо! Перегляньте та отримайте свій заробіток",
-      "total": "ВСЬОГО",
+      "title": "Вітаємо! Перегляньте та зберіть свої заробітки",
+      "total": "УСЬОГО",
       "plus": "ПЛЮС",
-      "rate": "Ставка (ест.)",
+      "rate": "Ставка (орієнт.)",
       "apy": "{{apy}}% APY",
-      "fee": "Плата за газ",
-      "cta": "Збирайте заробіток",
+      "fee": "Комісія за газ",
+      "cta": "Зібрати заробітки",
       "errorTitle": "Щось пішло не так",
-      "errorDescription": "Не вдається отримати інформацію про депозит. Спробуйте ще раз.",
-      "noGasTitle": "Вам потрібно більше {{symbol}} для продовження",
-      "noGasDescription": "Додайте {{symbol}} на {{network}} , щоб оплатити рахунки за газ",
-      "noGasCta": "Купуйте {{symbol}} на {{network}}"
+      "errorDescription": "Не вдається отримати реквізити для депозиту. Спробуйте ще раз.",
+      "noGasTitle": "Потрібно більше {{symbol}}, щоб продовжити",
+      "noGasDescription": "Додати {{symbol}} у мережі {{network}}, щоб сплатити комісії за газ",
+      "noGasCta": "Купити {{symbol}} у мережі {{network}}"
     },
     "transactionFeed": {
-      "earnClaimTitle": "Зібрано",
-      "earnClaimSubtitle": "від {{providerName}} Пул",
-      "earnDepositTitle": "Депоновано",
-      "earnDepositSubtitle": "на {{providerName}} Пул",
-      "earnWithdrawTitle": "Вийшов з гри.",
-      "earnWithdrawSubtitle": "від {{providerName}} Пул"
+      "earnClaimTitle": "Стягнено",
+      "earnClaimSubtitle": "з пулу {{providerName}}",
+      "earnDepositTitle": "Внесено",
+      "earnDepositSubtitle": "до пула {{providerName}}",
+      "earnWithdrawTitle": "Знято",
+      "earnWithdrawSubtitle": "з пулу {{providerName}}"
     },
     "transactionDetails": {
       "descriptionLabel": "Подробиці",
-      "earnClaimTitle": "Зібрано",
-      "earnClaimSubtitle": "Зібрано {{tokenSymbol}} з пулу {{providerName}}",
-      "earnClaimDetails": "Сума зібраних коштів",
-      "earnDepositTitle": "Депоновано",
-      "earnDepositSubtitle": "Вніс {{tokenSymbol}} на рахунок {{providerName}} Пулу",
+      "earnClaimTitle": "Стягнуто",
+      "earnClaimSubtitle": "Стягнено {{tokenSymbol}} з пулу {{providerName}}",
+      "earnClaimDetails": "Стягнуто суму",
+      "earnDepositTitle": "Внесено",
+      "earnDepositSubtitle": "Внесено {{tokenSymbol}} до пулу {{providerName}}",
       "earnDepositDetails": "Суму внесено",
-      "earnWithdrawTitle": "Вийшов з гри.",
-      "earnWithdrawSubtitle": "Виведено {{tokenSymbol}} з пулу {{providerName}}",
+      "earnWithdrawTitle": "Знято",
+      "earnWithdrawSubtitle": "Знято {{tokenSymbol}} з пулу {{providerName}}",
       "earnWithdrawDetails": "Знята сума"
     }
   },
diff --git a/locales/vi-VN/translation.json b/locales/vi-VN/translation.json
index a5208494b6..9f422b3175 100644
--- a/locales/vi-VN/translation.json
+++ b/locales/vi-VN/translation.json
@@ -2190,7 +2190,10 @@
   },
   "getStartedHome": {
     "title": "Mua tiền kỹ thuật số hoặc chuyển token",
-    "body": "Mua hoặc chuyển token tương thích để gửi tiền điện tử và khám phá web3!"
+    "body": "Mua hoặc chuyển token tương thích để gửi tiền điện tử và khám phá web3!",
+    "titleV1_86": "Add funds to your wallet",
+    "exploreTokens": "Explore all tokens",
+    "exploreTokensBody": "You can buy up to 10+ tokens in Valora. Check them out!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2350,6 +2353,7 @@
     }
   },
   "earnFlow": {
+    "gasSubsidized": "Valora's covering gas for this transaction!",
     "addCryptoBottomSheet": {
       "title": "Add {{tokenSymbol}} on {{tokenNetwork}}",
       "description": "Once you add tokens you'll have to come back to finish depositing into a pool.",
@@ -2369,6 +2373,11 @@
       "subtitle": "Deposit today and earn returns",
       "description": "See how much you can earn when supplying a lending pool"
     },
+    "ctaV1_86": {
+      "title": "Maximize earnings on stablecoins",
+      "subtitle": "Buy {{symbol}}",
+      "description": "Earn approximately {{apy}}% per year when you add {{symbol}} to a pool"
+    },
     "enterAmount": {
       "earnUpToLabel": "You could earn up to:",
       "rateLabel": "Rate (est.)",
diff --git a/locales/zh-CN/translation.json b/locales/zh-CN/translation.json
index b6ffd77083..fe8d936889 100644
--- a/locales/zh-CN/translation.json
+++ b/locales/zh-CN/translation.json
@@ -2190,7 +2190,10 @@
   },
   "getStartedHome": {
     "title": "购买加密货币或转移代币。",
-    "body": "购买或转移兼容的代币，发送加密货币并探索 Web3！"
+    "body": "购买或转移兼容的代币，发送加密货币并探索 Web3！",
+    "titleV1_86": "为钱包添加资金",
+    "exploreTokens": "探索所有代币",
+    "exploreTokensBody": "您最多可以在瓦罗拉购买 10 多个代币。查看它们！"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2350,6 +2353,7 @@
     }
   },
   "earnFlow": {
+    "gasSubsidized": "Valora 公司为此次交易提供天然气！",
     "addCryptoBottomSheet": {
       "title": "在 {{tokenNetwork}}上添加 {{tokenSymbol}}",
       "description": "一旦您添加了代币，您就必须回来完成存入池的工作。",
@@ -2369,6 +2373,11 @@
       "subtitle": "立即存款，赚取回报",
       "description": "了解您在提供贷款池时能赚多少钱"
     },
+    "ctaV1_86": {
+      "title": "最大化稳定币收益",
+      "subtitle": "购买 {{symbol}}",
+      "description": "将 {{symbol}} 加入游泳池后，每年可获得约 {{apy}}% 的收益"
+    },
     "enterAmount": {
       "earnUpToLabel": "您最多可以获得",
       "rateLabel": "比率（估计值）",

From 9adf90ed82b4efc54f592ca736b1dd95b51752e8 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Fri, 24 May 2024 09:24:42 -0700
Subject: [PATCH 052/133] style: add jsx expressions linter (#5463)

### Description

ESLint rule that catches conditional rendering bugs. More context
[here](https://valora-app.slack.com/archives/C025V1D6F3J/p1714697074743779)

### Test plan

CI

### Related issues

N/A

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 .eslintrc.js                                  |   3 +-
 package.json                                  |   1 +
 src/RevokePhoneNumber.tsx                     |   2 +-
 src/account/AccountErrorScreen.tsx            |   2 +-
 src/account/Education.tsx                     |   2 +-
 src/components/Avatar.tsx                     |   4 +-
 src/components/BackButton.tsx                 |   1 +
 src/components/BottomSheet.tsx                |   6 +-
 src/components/Dialog.tsx                     |  12 +-
 src/components/IconWithNetworkBadge.tsx       |   2 +-
 src/components/InLineNotification.tsx         |   4 +-
 src/components/PercentageIndicator.tsx        |   2 +-
 src/components/ReviewHeader.tsx               |   2 +-
 src/components/SettingsItem.tsx               |   8 +-
 src/components/SimpleMessagingCard.tsx        |   2 +-
 src/components/SmartTopAlert.tsx              |   2 +-
 src/components/TokenIcon.tsx                  |   2 +-
 src/components/header/CustomHeader.tsx        |   6 +-
 src/dappsExplorer/NoResults.tsx               |   2 +-
 src/dappsExplorer/TabDiscover.tsx             |   2 +-
 src/fiatExchanges/BidaliScreen.tsx            |   2 +-
 src/fiatExchanges/SelectProvider.tsx          |   2 +-
 src/fiatExchanges/Spend.tsx                   |   2 +-
 src/fiatconnect/FiatDetailsScreen.tsx         |   4 +-
 src/home/HomeAction.tsx                       |   2 +-
 src/home/celebration/ConfettiCelebration.tsx  |   2 +-
 src/icons/BackChevron.tsx                     |  12 +-
 src/icons/ForwardChevron.tsx                  |   6 +-
 src/navigator/Headers.tsx                     |   4 +-
 src/navigator/ProfileMenu.tsx                 |   2 +-
 src/nfts/NftsInfoCarousel.tsx                 |   6 +-
 src/priceHistory/PriceHistoryChart.tsx        |   4 +-
 src/qrcode/QRCode.tsx                         |   2 +-
 src/qrcode/QRGen.tsx                          |   2 +-
 src/recipients/RecipientItemV2.tsx            |   4 +-
 src/recipients/RecipientPickerV2.tsx          |   2 +-
 src/tokens/AssetList.tsx                      |   2 +-
 src/tokens/TokenBalanceItem.tsx               |   2 +-
 src/tokens/TokenDetails.tsx                   |   2 +-
 src/transactions/UserSection.tsx              |   2 +-
 .../detailContent/TransferReceivedContent.tsx |   2 +-
 yarn.lock                                     | 106 +++++++++++++-----
 42 files changed, 142 insertions(+), 99 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index e462b9309c..d485a1ae50 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,6 +1,6 @@
 module.exports = {
   extends: ['@valora/eslint-config-typescript'],
-  plugins: ['@jambit/typed-redux-saga'],
+  plugins: ['@jambit/typed-redux-saga', 'jsx-expressions'],
   parserOptions: {
     project: './tsconfig.eslint.json',
   },
@@ -17,6 +17,7 @@ module.exports = {
       excludedFiles: ['./**/*.test.ts', './**/*.test.tsx'],
       rules: {
         '@jambit/typed-redux-saga/use-typed-effects': 'error',
+        'jsx-expressions/strict-logical-expressions': 'error',
       },
     },
   ],
diff --git a/package.json b/package.json
index 769304bf75..57d5c5a5ff 100644
--- a/package.json
+++ b/package.json
@@ -258,6 +258,7 @@
     "eslint": "^8.19.0",
     "eslint-plugin-import": "^2.28.0",
     "eslint-plugin-jest": "^26.1.1",
+    "eslint-plugin-jsx-expressions": "^1.3.2",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-native": "^4.0.0",
diff --git a/src/RevokePhoneNumber.tsx b/src/RevokePhoneNumber.tsx
index db5949ffe0..3e92d5f3a7 100644
--- a/src/RevokePhoneNumber.tsx
+++ b/src/RevokePhoneNumber.tsx
@@ -73,7 +73,7 @@ export const RevokePhoneNumber = ({ forwardedRef }: Props) => {
         title={t('revokePhoneNumber.bottomSheetTitle')}
         testId="RevokePhoneNumberBottomSheet"
       >
-        {e164PhoneNumber && (
+        {!!e164PhoneNumber && (
           <PhoneNumberWithFlag
             e164PhoneNumber={e164PhoneNumber}
             defaultCountryCode={defaultCountryCode ?? undefined}
diff --git a/src/account/AccountErrorScreen.tsx b/src/account/AccountErrorScreen.tsx
index d6fdc84e65..cc5c6c07d0 100644
--- a/src/account/AccountErrorScreen.tsx
+++ b/src/account/AccountErrorScreen.tsx
@@ -33,7 +33,7 @@ function AccountErrorScreen({
       <TextButton onPress={onPress} testID={`${testID}Button`}>
         {buttonLabel}
       </TextButton>
-      {secondaryButtonLabel && onPressSecondary && (
+      {!!secondaryButtonLabel && onPressSecondary && (
         <TextButton
           style={styles.secondaryButton}
           onPress={onPressSecondary}
diff --git a/src/account/Education.tsx b/src/account/Education.tsx
index 8b08db208a..70e522f010 100644
--- a/src/account/Education.tsx
+++ b/src/account/Education.tsx
@@ -144,7 +144,7 @@ const Education = (props: Props) => {
             >
               {step.isTopTitle && <Text style={styles.headingTop}>{step.title}</Text>}
               <View style={styles.swipedContentInner}>
-                {step.image && (
+                {!!step.image && (
                   <Image source={step.image} style={styles.bodyImage} resizeMode="contain" />
                 )}
                 {!step.isTopTitle && <Text style={styles.heading}>{step.title}</Text>}
diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
index 42c77aa2eb..82292e77c2 100644
--- a/src/components/Avatar.tsx
+++ b/src/components/Avatar.tsx
@@ -39,13 +39,13 @@ export function Avatar(props: Props) {
       >
         {name}
       </Text>
-      {e164NumberToShow && (
+      {!!e164NumberToShow && (
         <PhoneNumberWithFlag
           e164PhoneNumber={e164NumberToShow}
           defaultCountryCode={defaultCountryCode}
         />
       )}
-      {!e164NumberToShow && address && recipient.name && (
+      {!e164NumberToShow && !!address && !!recipient.name && (
         <Text style={[fontStyles.small, styles.contactName]} numberOfLines={1} ellipsizeMode="tail">
           {formatShortenedAddress(address)}
         </Text>
diff --git a/src/components/BackButton.tsx b/src/components/BackButton.tsx
index 88c37184bc..efad4a612b 100644
--- a/src/components/BackButton.tsx
+++ b/src/components/BackButton.tsx
@@ -21,6 +21,7 @@ function BackButton(props: Props) {
 
 BackButton.defaultProps = {
   onPress: navigateBack,
+  ...BackChevron.defaultProps,
 }
 
 const styles = StyleSheet.create({
diff --git a/src/components/BottomSheet.tsx b/src/components/BottomSheet.tsx
index c81efe91c8..eedeb25764 100644
--- a/src/components/BottomSheet.tsx
+++ b/src/components/BottomSheet.tsx
@@ -50,7 +50,7 @@ const BottomSheet = ({
       onOpen={onOpen}
       snapPoints={snapPoints}
     >
-      {hasStickyHeader && (
+      {!!hasStickyHeader && (
         <View style={[styles.stickyHeaderContainer, styles.headerContentSpacing]}>
           {stickyTitle && <Text style={titleStyle}>{title}</Text>}
           {stickyHeaderComponent}
@@ -61,10 +61,10 @@ const BottomSheet = ({
         containerStyle={hasStickyHeader ? { paddingTop: 0 } : undefined}
         testId={testId}
       >
-        {!stickyTitle && title && (
+        {!stickyTitle && !!title && (
           <Text style={[titleStyle, styles.headerContentSpacing]}>{title}</Text>
         )}
-        {description && <Text style={styles.description}>{description}</Text>}
+        {!!description && <Text style={styles.description}>{description}</Text>}
         {children}
       </BottomSheetScrollView>
     </BottomSheetBase>
diff --git a/src/components/Dialog.tsx b/src/components/Dialog.tsx
index 652dbcf688..aec9f2a643 100644
--- a/src/components/Dialog.tsx
+++ b/src/components/Dialog.tsx
@@ -54,17 +54,17 @@ export default function Dialog({
       onModalHide={onDialogHide}
     >
       <ScrollView contentContainerStyle={styles.root}>
-        {image && <Image style={styles.imageContainer} source={image} resizeMode="contain" />}
-        {title && <Text style={styles.title}>{title}</Text>}
+        {!!image && <Image style={styles.imageContainer} source={image} resizeMode="contain" />}
+        {!!title && <Text style={styles.title}>{title}</Text>}
         <Text style={styles.body}>{children}</Text>
       </ScrollView>
       <View style={styles.actions}>
-        {secondaryActionText && (
+        {!!secondaryActionText && (
           <TextButton
             style={styles.secondary}
             disabled={secondaryActionDisabled}
             onPress={secondaryActionPress}
-            testID={testID && `${testID}/SecondaryAction`}
+            testID={testID ? `${testID}/SecondaryAction` : undefined}
           >
             {secondaryActionText}
           </TextButton>
@@ -73,11 +73,11 @@ export default function Dialog({
           <ActivityIndicator style={styles.primary} size="small" color={colors.primary} />
         ) : (
           <>
-            {actionText && (
+            {!!actionText && (
               <TextButton
                 style={isActionHighlighted ? styles.primary : styles.secondary}
                 onPress={actionPress}
-                testID={testID && `${testID}/PrimaryAction`}
+                testID={testID ? `${testID}/PrimaryAction` : undefined}
               >
                 {actionText}
               </TextButton>
diff --git a/src/components/IconWithNetworkBadge.tsx b/src/components/IconWithNetworkBadge.tsx
index b717014f83..75586ba567 100644
--- a/src/components/IconWithNetworkBadge.tsx
+++ b/src/components/IconWithNetworkBadge.tsx
@@ -17,7 +17,7 @@ export default function IconWithNetworkBadge({ networkId, children }: Props) {
   return (
     <View>
       {children}
-      {networkImageUrl && (
+      {!!networkImageUrl && (
         <FastImage
           source={{
             uri: networkImageUrl,
diff --git a/src/components/InLineNotification.tsx b/src/components/InLineNotification.tsx
index 21e4ce6a61..0f2a1a56de 100644
--- a/src/components/InLineNotification.tsx
+++ b/src/components/InLineNotification.tsx
@@ -78,12 +78,12 @@ export function InLineNotification({
           </View>
         )}
         <View style={styles.contentContainer}>
-          {title && <Text style={styles.titleText}>{title}</Text>}
+          {!!title && <Text style={styles.titleText}>{title}</Text>}
           <Text style={[styles.bodyText]}>{description}</Text>
         </View>
       </View>
 
-      {(ctaLabel || ctaLabel2) && (
+      {(!!ctaLabel || !!ctaLabel2) && (
         <View style={[styles.row, styles.ctaRow]}>
           {renderCtaLabel(ctaLabel, onPressCta, variantColor.primary)}
           {renderCtaLabel(ctaLabel2, onPressCta2, variantColor.primary)}
diff --git a/src/components/PercentageIndicator.tsx b/src/components/PercentageIndicator.tsx
index 3cb79b56e8..d625aaf7db 100644
--- a/src/components/PercentageIndicator.tsx
+++ b/src/components/PercentageIndicator.tsx
@@ -58,7 +58,7 @@ function PercentageIndicator({
     <View style={styles.container} testID={testID}>
       <View style={styles.indicator}>{indicator}</View>
       <Text style={[percentageTextStyle, { color }]}>{percentageString}</Text>
-      {suffixText && <Text style={[suffixTextStyle, { color }]}>{suffixText}</Text>}
+      {!!suffixText && <Text style={[suffixTextStyle, { color }]}>{suffixText}</Text>}
     </View>
   )
 }
diff --git a/src/components/ReviewHeader.tsx b/src/components/ReviewHeader.tsx
index 6dc1a6ac45..44de679fc0 100644
--- a/src/components/ReviewHeader.tsx
+++ b/src/components/ReviewHeader.tsx
@@ -14,7 +14,7 @@ class ReviewHeader extends React.PureComponent<Props> {
     return (
       <View style={styles.container}>
         <Text style={[fontStyles.h1, styles.heading]}>{title}</Text>
-        {subtitle && subtitle.length > 0 && <Text style={fontStyles.regular}>{subtitle}</Text>}
+        {!!subtitle && subtitle.length > 0 && <Text style={fontStyles.regular}>{subtitle}</Text>}
       </View>
     )
   }
diff --git a/src/components/SettingsItem.tsx b/src/components/SettingsItem.tsx
index 441b92b841..5b2e2a91f4 100644
--- a/src/components/SettingsItem.tsx
+++ b/src/components/SettingsItem.tsx
@@ -47,7 +47,7 @@ export function SettingsItemTextValue({
       <View style={styles.container}>
         <Title value={title} />
         <View style={styles.right}>
-          {value && (
+          {!!value && (
             <Text
               testID={testID ? `${testID}/value` : `${title}/value`}
               style={isValueActionable ? styles.valueActionable : styles.value}
@@ -55,7 +55,7 @@ export function SettingsItemTextValue({
               {value}
             </Text>
           )}
-          {(value || showChevron) && (
+          {(!!value || showChevron) && (
             <ForwardChevron color={isValueActionable ? colors.primary : undefined} />
           )}
         </View>
@@ -83,7 +83,7 @@ export function SettingsItemSwitch({
         <Title value={title} />
         <Switch testID={testID} value={value} onValueChange={onValueChange} />
       </View>
-      {details && (
+      {!!details && (
         <View>
           <Text style={styles.details}>{details}</Text>
         </View>
@@ -107,7 +107,7 @@ export function SettingsExpandedItem({
       <View style={styles.container}>
         <Title value={title} />
       </View>
-      {details && (
+      {!!details && (
         <View>
           <Text style={styles.details}>{details}</Text>
         </View>
diff --git a/src/components/SimpleMessagingCard.tsx b/src/components/SimpleMessagingCard.tsx
index dfef81c917..e013e188eb 100644
--- a/src/components/SimpleMessagingCard.tsx
+++ b/src/components/SimpleMessagingCard.tsx
@@ -42,7 +42,7 @@ export default function SimpleMessagingCard({
       <View style={styles.innerContainer}>
         <View style={styles.content}>
           <View>
-            {header && <Text style={styles.header}>{header}</Text>}
+            {!!header && <Text style={styles.header}>{header}</Text>}
             <Text style={styles.text} testID={`${testID}/Text`}>
               {text}
             </Text>
diff --git a/src/components/SmartTopAlert.tsx b/src/components/SmartTopAlert.tsx
index b09c30e802..0dc51e7969 100644
--- a/src/components/SmartTopAlert.tsx
+++ b/src/components/SmartTopAlert.tsx
@@ -125,7 +125,7 @@ function SmartTopAlert({ alert }: Props) {
             {!!title && <Text style={[fontStyles.small500, styles.text]}> {title} </Text>}
             {message}
           </Text>
-          {buttonMessage && (
+          {!!buttonMessage && (
             <SmallButton
               onPress={onPress}
               text={buttonMessage}
diff --git a/src/components/TokenIcon.tsx b/src/components/TokenIcon.tsx
index 82fec73f35..333081aa9b 100644
--- a/src/components/TokenIcon.tsx
+++ b/src/components/TokenIcon.tsx
@@ -91,7 +91,7 @@ export default function TokenIcon({ token, viewStyle, testID, size = IconSize.ME
         </View>
       )}
 
-      {token.networkIconUrl && (
+      {!!token.networkIconUrl && (
         <FastImage
           source={{ uri: token.networkIconUrl }}
           style={[
diff --git a/src/components/header/CustomHeader.tsx b/src/components/header/CustomHeader.tsx
index 5af320a5db..372c7e77b6 100644
--- a/src/components/header/CustomHeader.tsx
+++ b/src/components/header/CustomHeader.tsx
@@ -14,9 +14,9 @@ function CustomHeader({ left, right, title, style }: Props) {
     typeof title === 'string' ? <Text style={headerStyles.headerTitle}>{title}</Text> : title
   return (
     <View style={style ? [styles.container, style] : styles.container}>
-      {title && <View style={styles.titleContainer}>{titleComponent}</View>}
-      {left && <View style={styles.buttonContainer}>{left}</View>}
-      {right && <View style={styles.buttonContainer}>{right}</View>}
+      {!!title && <View style={styles.titleContainer}>{titleComponent}</View>}
+      {!!left && <View style={styles.buttonContainer}>{left}</View>}
+      {!!right && <View style={styles.buttonContainer}>{right}</View>}
     </View>
   )
 }
diff --git a/src/dappsExplorer/NoResults.tsx b/src/dappsExplorer/NoResults.tsx
index 7dd7e8d847..856ba3023e 100644
--- a/src/dappsExplorer/NoResults.tsx
+++ b/src/dappsExplorer/NoResults.tsx
@@ -45,7 +45,7 @@ function NoResults({ selectedFilter, removeFilter, testID, searchTerm }: Props)
           </View>
         </View>
       )}
-      {selectedFilter?.id && (
+      {!!selectedFilter?.id && (
         <View style={styles.filterContainer}>
           <Text style={styles.filterAppliedText}>
             <Trans
diff --git a/src/dappsExplorer/TabDiscover.tsx b/src/dappsExplorer/TabDiscover.tsx
index 97a77aadb9..a9150a56aa 100644
--- a/src/dappsExplorer/TabDiscover.tsx
+++ b/src/dappsExplorer/TabDiscover.tsx
@@ -206,7 +206,7 @@ function TabDiscover({ navigation }: Props) {
   return (
     <SafeAreaView testID="DAppsExplorerScreen" style={styles.safeAreaContainer} edges={[]}>
       <>
-        {!loading && error && (
+        {!loading && !!error && (
           <View style={styles.centerContainer}>
             <Text style={fontStyles.regular}>{t('dappsScreen.errorMessage')}</Text>
           </View>
diff --git a/src/fiatExchanges/BidaliScreen.tsx b/src/fiatExchanges/BidaliScreen.tsx
index 96a0dc26a4..b9839935b6 100644
--- a/src/fiatExchanges/BidaliScreen.tsx
+++ b/src/fiatExchanges/BidaliScreen.tsx
@@ -141,7 +141,7 @@ function BidaliScreen({ route, navigation }: Props) {
 
   return (
     <SafeAreaView style={styles.container} edges={['bottom']}>
-      {initialJavaScript && (
+      {!!initialJavaScript && (
         <WebView
           ref={webViewRef}
           source={{ uri: networkConfig.bidaliUrl }}
diff --git a/src/fiatExchanges/SelectProvider.tsx b/src/fiatExchanges/SelectProvider.tsx
index d04b4e8e1d..b509879dcd 100644
--- a/src/fiatExchanges/SelectProvider.tsx
+++ b/src/fiatExchanges/SelectProvider.tsx
@@ -479,7 +479,7 @@ function ExchangesSection({
             <Text style={styles.categoryText}>{text}</Text>
           </View>
 
-          {rightText && (
+          {!!rightText && (
             <View style={styles.right}>
               <Text style={styles.linkToOtherScreen}>{rightText}</Text>
             </View>
diff --git a/src/fiatExchanges/Spend.tsx b/src/fiatExchanges/Spend.tsx
index 8ca736ca96..cdee117bd0 100644
--- a/src/fiatExchanges/Spend.tsx
+++ b/src/fiatExchanges/Spend.tsx
@@ -66,7 +66,7 @@ function Spend(props: Props) {
                     <Text style={styles.optionTitle}>{merchant.name}</Text>
                     <LinkArrow />
                   </View>
-                  {merchant.subtitleKey && (
+                  {!!merchant.subtitleKey && (
                     <Text style={styles.optionSubtitle}>{t(merchant.subtitleKey)}</Text>
                   )}
                 </ListItem>
diff --git a/src/fiatconnect/FiatDetailsScreen.tsx b/src/fiatconnect/FiatDetailsScreen.tsx
index ffc52fefe5..7f6d6745ca 100644
--- a/src/fiatconnect/FiatDetailsScreen.tsx
+++ b/src/fiatconnect/FiatDetailsScreen.tsx
@@ -296,7 +296,7 @@ function FormField({
   return (
     <View style={styles.inputView} key={`inputField-${field.name}`}>
       <View style={styles.row}>
-        {field.label && <Text style={styles.inputLabel}>{field.label}</Text>}
+        {!!field.label && <Text style={styles.inputLabel}>{field.label}</Text>}
         {field.infoDialog && (
           <TouchableOpacity
             testID={`infoIcon-${field.name}`}
@@ -355,7 +355,7 @@ function FormField({
           }}
         />
       )}
-      {errorMessage && showError && (
+      {!!errorMessage && showError && (
         <Text testID={`errorMessage-${field.name}`} style={styles.error}>
           {errorMessage}
         </Text>
diff --git a/src/home/HomeAction.tsx b/src/home/HomeAction.tsx
index 5cc898a576..18441baa8b 100644
--- a/src/home/HomeAction.tsx
+++ b/src/home/HomeAction.tsx
@@ -22,7 +22,7 @@ export class HomeAction extends React.Component<HomeActionProps> {
         <View style={styles.textContainer}>
           <Text style={[fonts.small600, styles.title]}>{title}</Text>
           <Text style={[fonts.small, styles.subtitle]}>{subtitle}</Text>
-          {cta && ctaOnPress && <SmallButton solid={true} text={cta} onPress={ctaOnPress} />}
+          {!!cta && ctaOnPress && <SmallButton solid={true} text={cta} onPress={ctaOnPress} />}
         </View>
       </View>
     )
diff --git a/src/home/celebration/ConfettiCelebration.tsx b/src/home/celebration/ConfettiCelebration.tsx
index 59b9e1b496..d6696f83cc 100644
--- a/src/home/celebration/ConfettiCelebration.tsx
+++ b/src/home/celebration/ConfettiCelebration.tsx
@@ -128,7 +128,7 @@ const ConfettiCelebration = ({
           onLayout={handleLayout}
         >
           <View style={styles.notification}>
-            {title && <Text style={styles.titleText}>{title}</Text>}
+            {!!title && <Text style={styles.titleText}>{title}</Text>}
             <Text style={styles.descriptionText}>{description}</Text>
           </View>
         </Animated.View>
diff --git a/src/icons/BackChevron.tsx b/src/icons/BackChevron.tsx
index e1c25e227e..591b628555 100644
--- a/src/icons/BackChevron.tsx
+++ b/src/icons/BackChevron.tsx
@@ -5,20 +5,14 @@ import Svg, { Path } from 'react-native-svg'
 import Colors from 'src/styles/colors'
 
 export interface Props {
-  height?: number
-  color?: ColorValue | Animated.Node<ColorValue | undefined>
+  height: number
+  color: ColorValue | Animated.Node<ColorValue | undefined>
 }
 const AnimatedPath = Animated.createAnimatedComponent(Path)
 
 function BackChevron({ color, height }: Props) {
   return (
-    <Svg
-      height={height}
-      width={height && height / 2}
-      viewBox="0 0 8 16"
-      fill="none"
-      testID="BackChevron"
-    >
+    <Svg height={height} width={height / 2} viewBox="0 0 8 16" fill="none" testID="BackChevron">
       <AnimatedPath
         fillRule="evenodd"
         clipRule="evenodd"
diff --git a/src/icons/ForwardChevron.tsx b/src/icons/ForwardChevron.tsx
index 2aed7cfb0e..58db5e3103 100644
--- a/src/icons/ForwardChevron.tsx
+++ b/src/icons/ForwardChevron.tsx
@@ -3,15 +3,15 @@ import colors from 'src/styles/colors'
 import Svg, { Path } from 'svgs'
 
 interface Props {
-  height?: number
-  color?: string
+  height: number
+  color: string
 }
 
 function ForwardChevron({ color, height }: Props) {
   return (
     <Svg
       height={height}
-      width={height && height / 2}
+      width={height / 2}
       viewBox="0 0 8 16"
       fill="none"
       xmlns="http://www.w3.org/2000/svg"
diff --git a/src/navigator/Headers.tsx b/src/navigator/Headers.tsx
index 547b1dd0de..668c76f22f 100644
--- a/src/navigator/Headers.tsx
+++ b/src/navigator/Headers.tsx
@@ -256,7 +256,7 @@ export function HeaderTitleWithSubtitle({
 }) {
   return (
     <View style={styles.header} testID={testID}>
-      {title && (
+      {!!title && (
         <Text
           testID="HeaderTitle"
           style={styles.headerTitle}
@@ -266,7 +266,7 @@ export function HeaderTitleWithSubtitle({
           {title}
         </Text>
       )}
-      {subTitle && (
+      {!!subTitle && (
         <Text
           testID="HeaderSubTitle"
           style={styles.headerSubTitle}
diff --git a/src/navigator/ProfileMenu.tsx b/src/navigator/ProfileMenu.tsx
index c7077cbbba..a1fd668b81 100644
--- a/src/navigator/ProfileMenu.tsx
+++ b/src/navigator/ProfileMenu.tsx
@@ -49,7 +49,7 @@ export default function ProfileMenu({ route }: Props) {
                 {displayName}
               </Text>
             )}
-            {phoneNumberVerified && e164PhoneNumber && (
+            {phoneNumberVerified && !!e164PhoneNumber && (
               <PhoneNumberWithFlag
                 e164PhoneNumber={e164PhoneNumber}
                 defaultCountryCode={defaultCountryCode ? defaultCountryCode : undefined}
diff --git a/src/nfts/NftsInfoCarousel.tsx b/src/nfts/NftsInfoCarousel.tsx
index 846296d8c5..7141888474 100644
--- a/src/nfts/NftsInfoCarousel.tsx
+++ b/src/nfts/NftsInfoCarousel.tsx
@@ -193,12 +193,12 @@ export default function NftsInfoCarousel({ route }: Props) {
         {/* Nft Details */}
         {activeNft.metadata && (
           <>
-            {activeNft.metadata?.name && (
+            {!!activeNft.metadata?.name && (
               <View style={styles.sectionContainer}>
                 <Text style={styles.title}>{activeNft.metadata?.name}</Text>
               </View>
             )}
-            {activeNft.metadata?.description && (
+            {!!activeNft.metadata?.description && (
               <View style={styles.sectionContainer}>
                 <Text style={styles.subSectionTitle}>{t('nftInfoCarousel.description')}</Text>
                 <Text style={styles.text}>{activeNft.metadata?.description}</Text>
@@ -218,7 +218,7 @@ export default function NftsInfoCarousel({ route }: Props) {
           </>
         )}
         {/* Nft Explorer Link */}
-        {blockExplorerUri && (
+        {!!blockExplorerUri && (
           <View style={[styles.sectionContainer, styles.sectionContainerLast]}>
             <Touchable onPress={pressExplorerLink} testID="ViewOnExplorer">
               <View style={styles.explorerLinkContainer}>
diff --git a/src/priceHistory/PriceHistoryChart.tsx b/src/priceHistory/PriceHistoryChart.tsx
index 1e0a619e24..ff91d00df1 100644
--- a/src/priceHistory/PriceHistoryChart.tsx
+++ b/src/priceHistory/PriceHistoryChart.tsx
@@ -294,12 +294,12 @@ export default function PriceHistoryChart({
         />
       </VictoryGroup>
       <View style={[styles.range, { paddingHorizontal: chartPadding }]}>
-        {earliestTimestamp && (
+        {!!earliestTimestamp && (
           <Text style={[styles.timeframe, { textAlign: 'left' }]}>
             {formatFeedDate(earliestTimestamp, i18n)}
           </Text>
         )}
-        {latestTimestamp && (
+        {!!latestTimestamp && (
           <Text style={[styles.timeframe, { textAlign: 'right' }]}>
             {formatFeedDate(latestTimestamp, i18n)}
           </Text>
diff --git a/src/qrcode/QRCode.tsx b/src/qrcode/QRCode.tsx
index 5c6140939d..b4ccb406f5 100644
--- a/src/qrcode/QRCode.tsx
+++ b/src/qrcode/QRCode.tsx
@@ -88,7 +88,7 @@ export default function QRCodeDisplay(props: Props) {
         <StyledQRCode qrSvgRef={qrSvgRef} />
       </View>
 
-      {displayName && (
+      {!!displayName && (
         <Text
           style={[styles.name, fontStyles.displayName]}
           numberOfLines={1}
diff --git a/src/qrcode/QRGen.tsx b/src/qrcode/QRGen.tsx
index c6999eff53..e0b8698c48 100644
--- a/src/qrcode/QRGen.tsx
+++ b/src/qrcode/QRGen.tsx
@@ -98,7 +98,7 @@ function QRCode({
   return (
     <Svg ref={svgRef} width={size} height={size}>
       <Rect width={size} height={size} fill={backgroundColor} />
-      {path && cellSize && <Path d={path} stroke={color} strokeWidth={cellSize} />}
+      {!!path && !!cellSize && <Path d={path} stroke={color} strokeWidth={cellSize} />}
     </Svg>
   )
 }
diff --git a/src/recipients/RecipientItemV2.tsx b/src/recipients/RecipientItemV2.tsx
index d74997044b..aeb61337d4 100644
--- a/src/recipients/RecipientItemV2.tsx
+++ b/src/recipients/RecipientItemV2.tsx
@@ -60,7 +60,7 @@ function RecipientItem({ recipient, onSelectRecipient, loading, selected }: Prop
             borderColor={Colors.gray2}
             DefaultIcon={() => <QuestionIcon />} // no need to honor color props here since the color we need match the defaults
           />
-          {showValoraIcon && (
+          {!!showValoraIcon && (
             <Logo
               color={colors.white}
               style={styles.valoraIcon}
@@ -73,7 +73,7 @@ function RecipientItem({ recipient, onSelectRecipient, loading, selected }: Prop
           <Text numberOfLines={1} ellipsizeMode={'tail'} style={styles.name}>
             {getDisplayName(recipient, t)}
           </Text>
-          {recipient.name && <Text style={styles.phone}>{getDisplayDetail(recipient)}</Text>}
+          {!!recipient.name && <Text style={styles.phone}>{getDisplayDetail(recipient)}</Text>}
         </View>
         {loading && (
           <View style={styles.rightIconContainer}>
diff --git a/src/recipients/RecipientPickerV2.tsx b/src/recipients/RecipientPickerV2.tsx
index b4dabd3c5a..6267c60872 100644
--- a/src/recipients/RecipientPickerV2.tsx
+++ b/src/recipients/RecipientPickerV2.tsx
@@ -28,7 +28,7 @@ function RecipientPicker({
 }: Props) {
   return (
     <View style={[styles.body, style]} testID={testID}>
-      {title && <Text style={styles.title}>{title}</Text>}
+      {!!title && <Text style={styles.title}>{title}</Text>}
       <FlatList
         keyboardShouldPersistTaps={'always'}
         scrollEnabled={false}
diff --git a/src/tokens/AssetList.tsx b/src/tokens/AssetList.tsx
index e16a22ec2c..fde8a1c856 100644
--- a/src/tokens/AssetList.tsx
+++ b/src/tokens/AssetList.tsx
@@ -187,7 +187,7 @@ export default function AssetList({
             ErrorComponent={
               <View style={styles.nftsErrorView}>
                 <ImageErrorIcon />
-                {item.metadata?.name && (
+                {!!item.metadata?.name && (
                   <Text numberOfLines={2} style={styles.nftsNoMetadataText}>
                     {item.metadata.name}
                   </Text>
diff --git a/src/tokens/TokenBalanceItem.tsx b/src/tokens/TokenBalanceItem.tsx
index a276949ec6..1917783a6a 100644
--- a/src/tokens/TokenBalanceItem.tsx
+++ b/src/tokens/TokenBalanceItem.tsx
@@ -72,7 +72,7 @@ export const TokenBalanceItem = ({
             />
           )}
         </View>
-        {token.bridge && (
+        {!!token.bridge && (
           <Text
             testID="BridgeLabel"
             numberOfLines={1}
diff --git a/src/tokens/TokenDetails.tsx b/src/tokens/TokenDetails.tsx
index 0cf63fbdb4..1fb7f760df 100644
--- a/src/tokens/TokenDetails.tsx
+++ b/src/tokens/TokenDetails.tsx
@@ -108,7 +108,7 @@ export default function TokenDetailsScreen({ route }: Props) {
         />
         <Text style={styles.yourBalance}>{t('tokenDetails.yourBalance')}</Text>
         <TokenBalanceItem token={token} />
-        {token.infoUrl && (
+        {!!token.infoUrl && (
           <LearnMore
             tokenName={token.name}
             infoUrl={token.infoUrl}
diff --git a/src/transactions/UserSection.tsx b/src/transactions/UserSection.tsx
index bdb201b9c7..86308ef480 100644
--- a/src/transactions/UserSection.tsx
+++ b/src/transactions/UserSection.tsx
@@ -59,7 +59,7 @@ export default function UserSection({
                   {displayName}
                 </Text>
               </Expandable>
-              {displayNumber && (
+              {!!displayNumber && (
                 <Expandable isExpandable={expandable && !!displayNumber} isExpanded={expanded}>
                   <Text style={styles.phoneNumber} testID={`${testID}/number`}>
                     {displayNumber}
diff --git a/src/transactions/feed/detailContent/TransferReceivedContent.tsx b/src/transactions/feed/detailContent/TransferReceivedContent.tsx
index 42ee0e5588..24ef325ba5 100644
--- a/src/transactions/feed/detailContent/TransferReceivedContent.tsx
+++ b/src/transactions/feed/detailContent/TransferReceivedContent.tsx
@@ -45,7 +45,7 @@ function TransferReceivedContent({ transfer }: { transfer: TokenTransfer }) {
         testID="TransferReceived"
       />
       <CommentSection comment={metadata.comment} isSend={false} />
-      {isCeloTx && celoEducationUri && (
+      {isCeloTx && !!celoEducationUri && (
         <TouchableOpacity onPress={openLearnMore} testID={'celoTxReceived/learnMore'}>
           <Text style={styles.learnMore}>{t('learnMore')}</Text>
         </TouchableOpacity>
diff --git a/yarn.lock b/yarn.lock
index 390e2b7305..55921177b2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1471,7 +1471,7 @@
     to-pascal-case "^1.0.0"
     unescape-js "^1.0.5"
 
-"@eslint-community/eslint-utils@^4.2.0":
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
   integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
@@ -4912,6 +4912,11 @@
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
+"@types/json-schema@^7.0.12":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
+
 "@types/json-schema@^7.0.9":
   version "7.0.9"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
@@ -5096,6 +5101,11 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
   integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
 
+"@types/semver@^7.5.0":
+  version "7.5.8"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
+  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
+
 "@types/shelljs@^0.8.11":
   version "0.8.11"
   resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.11.tgz#17a5696c825974e96828e96e89585d685646fcb8"
@@ -5196,6 +5206,14 @@
     "@typescript-eslint/types" "5.62.0"
     "@typescript-eslint/visitor-keys" "5.62.0"
 
+"@typescript-eslint/scope-manager@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1"
+  integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==
+  dependencies:
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
+
 "@typescript-eslint/type-utils@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"
@@ -5211,6 +5229,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
   integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
 
+"@typescript-eslint/types@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
+  integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
+
 "@typescript-eslint/typescript-estree@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
@@ -5224,6 +5247,20 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46"
+  integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==
+  dependencies:
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    minimatch "9.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
 "@typescript-eslint/utils@5.62.0", "@typescript-eslint/utils@^5.10.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
@@ -5238,6 +5275,19 @@
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
+"@typescript-eslint/utils@^6.10.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134"
+  integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@types/json-schema" "^7.0.12"
+    "@types/semver" "^7.5.0"
+    "@typescript-eslint/scope-manager" "6.21.0"
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/typescript-estree" "6.21.0"
+    semver "^7.5.4"
+
 "@typescript-eslint/visitor-keys@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
@@ -5246,6 +5296,14 @@
     "@typescript-eslint/types" "5.62.0"
     eslint-visitor-keys "^3.3.0"
 
+"@typescript-eslint/visitor-keys@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47"
+  integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==
+  dependencies:
+    "@typescript-eslint/types" "6.21.0"
+    eslint-visitor-keys "^3.4.1"
+
 "@valora/eslint-config-typescript@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@valora/eslint-config-typescript/-/eslint-config-typescript-1.0.2.tgz#31d19d41009335ae3858851c3970d38577d81ab6"
@@ -8759,6 +8817,14 @@ eslint-plugin-jest@^26.1.1:
   dependencies:
     "@typescript-eslint/utils" "^5.10.0"
 
+eslint-plugin-jsx-expressions@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-expressions/-/eslint-plugin-jsx-expressions-1.3.2.tgz#dc3becaa85e0a351e2c5f041ed35483968010a16"
+  integrity sha512-HqwrnsbSNoYC7LkfiCoaP1IX/N6BrcjHMpwhTSSZimD0mGm37R8fyuJaAZlg8B7ld7B0Yhv53GXz9RUo662Knw==
+  dependencies:
+    "@typescript-eslint/utils" "^6.10.0"
+    tsutils "^3.21.0"
+
 eslint-plugin-react-hooks@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
@@ -13275,7 +13341,7 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
 
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.2, minimatch@^5.0.1, minimatch@^9.0.0, minimatch@^9.0.1:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@9.0.3, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.2, minimatch@^5.0.1, minimatch@^9.0.0, minimatch@^9.0.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -17013,7 +17079,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0":
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -17048,15 +17114,6 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
 string-width@^5.0.1, string-width@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -17128,14 +17185,7 @@ string_decoder@^1.0.0, string_decoder@^1.0.3, string_decoder@^1.1.1, string_deco
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -17604,6 +17654,11 @@ truncate-utf8-bytes@^1.0.0:
   dependencies:
     utf8-byte-length "^1.0.1"
 
+ts-api-utils@^1.0.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
+  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
+
 ts-jest@^29.1.1:
   version "29.1.1"
   resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.1.tgz#f58fe62c63caf7bfcc5cc6472082f79180f0815b"
@@ -19249,7 +19304,7 @@ wordwrap@0.0.2:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
   integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -19284,15 +19339,6 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From 96c9e13f125d455b5c13a86f23fa3934ccfb5904 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 24 May 2024 12:35:45 -0700
Subject: [PATCH 053/133] feat(earn): add earn info screen (#5456)

### Description

Adds the earn info screen in a stable coin agnostic way and passes the
tokenId to `EarnEnterAmount.tsx`.

#### Screenshots

| iOS | Android |
| ----- | ----- |
|
![](https://github.com/valora-inc/wallet/assets/26950305/82fbbaf6-10ee-4341-86a0-7f3b3046cb71)
|
![](https://github.com/valora-inc/wallet/assets/26950305/bc1fea45-2754-4106-9cda-7247b42da117)
|

### Test plan

For easy testing I hooked it up the screen in
`src/home/NotificationBell.tsx`

```TypeScript
   const onPress = () => {
     ValoraAnalytics.track(HomeEvents.notification_bell_pressed, { hasNotifications })
-    navigate(Screens.NotificationCenter)
+    navigate(Screens.EarnInfoScreen, { tokenId: networkConfig.arbUsdcTokenId })
   }

```

- [x] Tested locally on iOS
- [x] Tested locally on Android
- [x] Unit tests added

### Related issues

- Fixed ACT-1192

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 branding/celo/src/brandingConfig.ts |   1 +
 locales/base/translation.json       |  23 ++++
 src/analytics/Events.tsx            |   2 +
 src/analytics/Properties.tsx        |   4 +
 src/analytics/docs.ts               |   2 +
 src/earn/EarnInfoScreen.test.tsx    |  97 +++++++++++++++
 src/earn/EarnInfoScreen.tsx         | 185 ++++++++++++++++++++++++++++
 src/icons/ArrowDown.tsx             |  20 +++
 src/icons/Blob.tsx                  |  21 ++++
 src/icons/Palm.tsx                  |  21 ++++
 src/navigator/Navigator.tsx         |   6 +
 src/navigator/Screens.tsx           |   1 +
 src/navigator/types.tsx             |   3 +
 test/RootStateSchema.json           |   1 +
 14 files changed, 387 insertions(+)
 create mode 100644 src/earn/EarnInfoScreen.test.tsx
 create mode 100644 src/earn/EarnInfoScreen.tsx
 create mode 100644 src/icons/ArrowDown.tsx
 create mode 100644 src/icons/Blob.tsx
 create mode 100644 src/icons/Palm.tsx

diff --git a/branding/celo/src/brandingConfig.ts b/branding/celo/src/brandingConfig.ts
index 5e008c5b1a..75f8ff8412 100644
--- a/branding/celo/src/brandingConfig.ts
+++ b/branding/celo/src/brandingConfig.ts
@@ -20,3 +20,4 @@ export const INVITE_REWARDS_NFTS_LEARN_MORE =
   'https://valoraapp.com/support/invite-rewards-nfts-learn-more'
 export const INVITE_REWARDS_STABLETOKEN_LEARN_MORE =
   'https://valoraapp.com/support/invite-rewards-stabletoken-learn-more'
+export const EARN_STABLECOINS_LEARN_MORE = 'https://valoraapp.com/support/earn-on-your-stablecoins'
diff --git a/locales/base/translation.json b/locales/base/translation.json
index ca6686801f..3a639d7747 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -2377,6 +2377,29 @@
       "subtitle": "Deposit today and earn returns",
       "description": "See how much you can earn when supplying a lending pool"
     },
+    "earnInfo": {
+      "title": "Earn on your\nstablecoins",
+      "details": {
+        "earn": {
+          "titleGasSubsidy": "Maximize Earnings without Gas Fees*",
+          "title": "Maximize Earnings",
+          "subtitle": "Earn on your stablecoins and get rewards when you supply a pool.",
+          "footnoteSubsidy": "*Gas fees are temporarily covered by Valora"
+        },
+        "manage": {
+          "title": "Manage Directly from Valora",
+          "subtitle": "We’ll take care of the setup so you can manage your position directly from Valora."
+        },
+        "access": {
+          "title": "Easily Access your Funds",
+          "subtitle": "Collect your funds effortlessly with a single tap. Enjoy the same instant access as you would directly through your favorite protocols."
+        }
+      },
+      "action": {
+        "learn": "Learn More",
+        "earn": "Start Earning"
+      }
+    },
     "ctaV1_86": {
       "title": "Maximize earnings on stablecoins",
       "subtitle": "Buy {{symbol}}",
diff --git a/src/analytics/Events.tsx b/src/analytics/Events.tsx
index 157d42ccf9..82e710a80c 100644
--- a/src/analytics/Events.tsx
+++ b/src/analytics/Events.tsx
@@ -703,4 +703,6 @@ export enum EarnEvents {
   earn_withdraw_submit_error = 'earn_withdraw_submit_error',
   earn_withdraw_submit_cancel = 'earn_withdraw_submit_cancel',
   earn_withdraw_add_gas_press = 'earn_withdraw_add_gas_press',
+  earn_info_learn_press = 'earn_info_learn_press',
+  earn_info_earn_press = 'earn_info_earn_press',
 }
diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 3849a9c510..7b22f7d793 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -1651,6 +1651,10 @@ interface EarnEventsProperties {
   }
   [EarnEvents.earn_withdraw_submit_cancel]: EarnWithdrawProperties
   [EarnEvents.earn_withdraw_add_gas_press]: { gasTokenId: string }
+  [EarnEvents.earn_info_learn_press]: undefined
+  [EarnEvents.earn_info_earn_press]: {
+    tokenId: string
+  }
 }
 
 export type AnalyticsPropertiesList = AppEventsProperties &
diff --git a/src/analytics/docs.ts b/src/analytics/docs.ts
index 870d12546e..2e3039957c 100644
--- a/src/analytics/docs.ts
+++ b/src/analytics/docs.ts
@@ -618,6 +618,8 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [EarnEvents.earn_withdraw_submit_error]: `When the withdraw and claim transactions fail`,
   [EarnEvents.earn_withdraw_submit_cancel]: `When the user cancels the withdraw and claim transactions after submitting by cancelling PIN input`,
   [EarnEvents.earn_withdraw_add_gas_press]: `When the user doesn't have enough for gas and clicks on the button to add gas token`,
+  [EarnEvents.earn_info_learn_press]: `When the user taps 'Learn More' on the earn info page`,
+  [EarnEvents.earn_info_earn_press]: `When the user taps 'Start Earning' on the earn info page `,
 
   // Legacy event docs
   //  The below events had docs, but are no longer produced by the latest app version.
diff --git a/src/earn/EarnInfoScreen.test.tsx b/src/earn/EarnInfoScreen.test.tsx
new file mode 100644
index 0000000000..f93644e3f0
--- /dev/null
+++ b/src/earn/EarnInfoScreen.test.tsx
@@ -0,0 +1,97 @@
+import { fireEvent, render } from '@testing-library/react-native'
+import React from 'react'
+import { Provider } from 'react-redux'
+import { EarnEvents } from 'src/analytics/Events'
+import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
+import { EARN_STABLECOINS_LEARN_MORE } from 'src/config'
+import EarnInfoScreen from 'src/earn/EarnInfoScreen'
+import { navigate } from 'src/navigator/NavigationService'
+import { Screens } from 'src/navigator/Screens'
+import { getFeatureGate } from 'src/statsig'
+import { StatsigFeatureGates } from 'src/statsig/types'
+import networkConfig from 'src/web3/networkConfig'
+import MockedNavigator from 'test/MockedNavigator'
+import { createMockStore } from 'test/utils'
+
+jest.mock('src/statsig', () => ({
+  getFeatureGate: jest.fn(),
+}))
+
+const store = createMockStore({})
+const tokenId = networkConfig.arbUsdcTokenId
+
+describe('EarnInfoScreen', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('should render correctly when no gas subsidy', async () => {
+    const { getByText, queryByText } = render(
+      <Provider store={store}>
+        <MockedNavigator component={EarnInfoScreen} params={{ tokenId }} />
+      </Provider>
+    )
+
+    // First details item - includes subsidy code
+    expect(getByText('earnFlow.earnInfo.title')).toBeTruthy()
+    expect(getByText('earnFlow.earnInfo.details.earn.title')).toBeTruthy()
+    expect(queryByText('earnFlow.earnInfo.details.earn.titleGasSubsidy')).toBeFalsy()
+    expect(queryByText('earnFlow.earnInfo.details.earn.footnoteSubsidy')).toBeFalsy()
+
+    // Second details item
+    expect(getByText('earnFlow.earnInfo.details.manage.title')).toBeTruthy()
+    expect(getByText('earnFlow.earnInfo.details.manage.subtitle')).toBeTruthy()
+
+    // Third details item
+    expect(getByText('earnFlow.earnInfo.details.access.title')).toBeTruthy()
+    expect(getByText('earnFlow.earnInfo.details.access.subtitle')).toBeTruthy()
+
+    // Buttons
+    expect(getByText('earnFlow.earnInfo.action.learn')).toBeTruthy()
+    expect(getByText('earnFlow.earnInfo.action.earn')).toBeTruthy()
+  })
+
+  it('should render correctly when gas subsidy enabled', () => {
+    jest
+      .mocked(getFeatureGate)
+      .mockImplementation((gate) => gate === StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES)
+
+    const { getByText, queryByText } = render(
+      <Provider store={store}>
+        <MockedNavigator component={EarnInfoScreen} params={{ tokenId }} />
+      </Provider>
+    )
+
+    expect(getByText('earnFlow.earnInfo.details.earn.titleGasSubsidy')).toBeTruthy()
+    expect(getByText('earnFlow.earnInfo.details.earn.footnoteSubsidy')).toBeTruthy()
+    expect(queryByText('earnFlow.earnInfo.details.earn.title')).toBeFalsy()
+  })
+
+  it('should navigate and fire analytics correctly on Learn More button press', () => {
+    const { getByText } = render(
+      <Provider store={store}>
+        <MockedNavigator component={EarnInfoScreen} params={{ tokenId }} />
+      </Provider>
+    )
+
+    fireEvent.press(getByText('earnFlow.earnInfo.action.learn'))
+    expect(navigate).toHaveBeenCalledWith(Screens.WebViewScreen, {
+      uri: EARN_STABLECOINS_LEARN_MORE,
+    })
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_info_learn_press)
+  })
+
+  it('should navigate and fire analytics correctly on Start Earning button press', () => {
+    const { getByText } = render(
+      <Provider store={store}>
+        <MockedNavigator component={EarnInfoScreen} params={{ tokenId }} />
+      </Provider>
+    )
+
+    fireEvent.press(getByText('earnFlow.earnInfo.action.earn'))
+    expect(navigate).toHaveBeenCalledWith(Screens.EarnEnterAmount, {
+      tokenId,
+    })
+    expect(ValoraAnalytics.track).toHaveBeenCalledWith(EarnEvents.earn_info_earn_press, { tokenId })
+  })
+})
diff --git a/src/earn/EarnInfoScreen.tsx b/src/earn/EarnInfoScreen.tsx
new file mode 100644
index 0000000000..71cb3d7806
--- /dev/null
+++ b/src/earn/EarnInfoScreen.tsx
@@ -0,0 +1,185 @@
+import { useHeaderHeight } from '@react-navigation/elements'
+import { NativeStackScreenProps } from '@react-navigation/native-stack'
+import React, { ReactElement } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Platform, ScrollView, StyleSheet, Text, View } from 'react-native'
+import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context'
+import { EarnEvents } from 'src/analytics/Events'
+import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
+import Button, { BtnSizes, BtnTypes } from 'src/components/Button'
+import { EARN_STABLECOINS_LEARN_MORE } from 'src/config'
+import ArrowDown from 'src/icons/ArrowDown'
+import Blob from 'src/icons/Blob'
+import CircledIcon from 'src/icons/CircledIcon'
+import Logo from 'src/icons/Logo'
+import Palm from 'src/icons/Palm'
+import UpwardGraph from 'src/icons/UpwardGraph'
+import { headerWithCloseButton } from 'src/navigator/Headers'
+import { navigate } from 'src/navigator/NavigationService'
+import { Screens } from 'src/navigator/Screens'
+import { StackParamList } from 'src/navigator/types'
+import { getFeatureGate } from 'src/statsig'
+import { StatsigFeatureGates } from 'src/statsig/types'
+import Colors from 'src/styles/colors'
+import { typeScale } from 'src/styles/fonts'
+import { Spacing } from 'src/styles/styles'
+
+const ICON_SIZE = 24
+const ICON_BACKGROUND_CIRCLE_SIZE = 36
+
+function DetailsItem({
+  icon,
+  title,
+  subtitle,
+  footnote,
+}: {
+  icon: ReactElement
+  title: string
+  subtitle: string
+  footnote?: string
+}) {
+  return (
+    <View style={styles.detailsItemContainer}>
+      <CircledIcon backgroundColor={Colors.gray2} radius={ICON_BACKGROUND_CIRCLE_SIZE}>
+        {icon}
+      </CircledIcon>
+      <View style={styles.flex}>
+        <Text style={styles.detailsItemTitle}>{title}</Text>
+        <Text style={styles.detailsItemSubtitle}>{subtitle}</Text>
+        {!!footnote && <Text style={styles.detailsItemFootnote}>{footnote}</Text>}
+      </View>
+    </View>
+  )
+}
+
+type Props = NativeStackScreenProps<StackParamList, Screens.EarnInfoScreen>
+
+export default function EarnInfoScreen({ route }: Props) {
+  const { t } = useTranslation()
+  const { tokenId } = route.params
+  const isGasSubsidized = getFeatureGate(StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES)
+
+  const headerHeight = useHeaderHeight()
+  const { bottom } = useSafeAreaInsets()
+  const insetsStyle = Platform.OS === 'android' && {
+    paddingBottom: Math.max(bottom, Spacing.Regular16),
+  }
+
+  return (
+    <SafeAreaView
+      style={[styles.safeAreaContainer, { paddingTop: headerHeight }]}
+      edges={['bottom']}
+    >
+      <ScrollView>
+        <Text style={styles.title}>{t('earnFlow.earnInfo.title')}</Text>
+        <View style={styles.detailsContainer}>
+          <DetailsItem
+            icon={<UpwardGraph size={ICON_SIZE} color={Colors.black} />}
+            title={
+              isGasSubsidized
+                ? t('earnFlow.earnInfo.details.earn.titleGasSubsidy')
+                : t('earnFlow.earnInfo.details.earn.title')
+            }
+            subtitle={t('earnFlow.earnInfo.details.earn.subtitle')}
+            footnote={
+              isGasSubsidized ? t('earnFlow.earnInfo.details.earn.footnoteSubsidy') : undefined
+            }
+          />
+          <DetailsItem
+            icon={<Logo size={ICON_SIZE} color={Colors.black} />}
+            title={t('earnFlow.earnInfo.details.manage.title')}
+            subtitle={t('earnFlow.earnInfo.details.manage.subtitle')}
+          />
+          <DetailsItem
+            icon={<ArrowDown size={ICON_SIZE} color={Colors.black} />}
+            title={t('earnFlow.earnInfo.details.access.title')}
+            subtitle={t('earnFlow.earnInfo.details.access.subtitle')}
+          />
+        </View>
+      </ScrollView>
+      <View style={[styles.buttonContainer, insetsStyle]}>
+        <Button
+          onPress={() => {
+            ValoraAnalytics.track(EarnEvents.earn_info_learn_press)
+            navigate(Screens.WebViewScreen, { uri: EARN_STABLECOINS_LEARN_MORE })
+          }}
+          text={t('earnFlow.earnInfo.action.learn')}
+          type={BtnTypes.SECONDARY}
+          size={BtnSizes.FULL}
+        />
+        <Button
+          onPress={() => {
+            ValoraAnalytics.track(EarnEvents.earn_info_earn_press, { tokenId })
+            navigate(Screens.EarnEnterAmount, { tokenId })
+          }}
+          text={t('earnFlow.earnInfo.action.earn')}
+          type={BtnTypes.PRIMARY}
+          size={BtnSizes.FULL}
+        />
+      </View>
+      <Blob
+        style={{
+          position: 'absolute',
+          left: 53,
+          zIndex: -1,
+        }}
+      />
+      <Palm
+        style={{
+          position: 'absolute',
+          bottom: 0,
+          zIndex: -1,
+        }}
+      />
+    </SafeAreaView>
+  )
+}
+
+EarnInfoScreen.navigationOptions = () => ({
+  ...headerWithCloseButton,
+  headerTransparent: true,
+  headerShown: true,
+  headerStyle: {
+    backgroundColor: 'transparent',
+  },
+})
+
+const styles = StyleSheet.create({
+  safeAreaContainer: {
+    flex: 1,
+    paddingHorizontal: Spacing.Regular16,
+  },
+  flex: {
+    flex: 1,
+  },
+  title: {
+    color: Colors.black,
+    textAlign: 'center',
+    marginBottom: Spacing.Thick24,
+    ...typeScale.titleLarge,
+  },
+  detailsContainer: {
+    gap: Spacing.Large32,
+  },
+  detailsItemContainer: {
+    flexDirection: 'row',
+    gap: Spacing.Regular16,
+  },
+  detailsItemTitle: {
+    color: Colors.black,
+    ...typeScale.labelSemiBoldSmall,
+  },
+  detailsItemSubtitle: {
+    color: Colors.black,
+    ...typeScale.bodyXSmall,
+  },
+  detailsItemFootnote: {
+    color: Colors.black,
+    marginTop: Spacing.Smallest8,
+    ...typeScale.bodyXXSmall,
+  },
+  buttonContainer: {
+    gap: Spacing.Smallest8,
+    marginHorizontal: Spacing.Smallest8,
+  },
+})
diff --git a/src/icons/ArrowDown.tsx b/src/icons/ArrowDown.tsx
new file mode 100644
index 0000000000..b5821753d5
--- /dev/null
+++ b/src/icons/ArrowDown.tsx
@@ -0,0 +1,20 @@
+import * as React from 'react'
+import Svg, { Path } from 'react-native-svg'
+import { Colors } from 'src/styles/colors'
+
+interface Props {
+  color?: Colors
+  size?: number
+}
+
+const ArrowDown = ({ color = Colors.black, size = 24 }: Props) => (
+  <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
+    <Path
+      id="Vector"
+      d="M11.053 4.5L12.947 4.5L12.947 15.8636L18.1553 10.6553L19.5 12L12 19.5L4.5 12L5.8447 10.6553L11.053 15.8636L11.053 4.5Z"
+      fill={color}
+    />
+  </Svg>
+)
+
+export default React.memo(ArrowDown)
diff --git a/src/icons/Blob.tsx b/src/icons/Blob.tsx
new file mode 100644
index 0000000000..62f5bcb2ba
--- /dev/null
+++ b/src/icons/Blob.tsx
@@ -0,0 +1,21 @@
+import React from 'react'
+import { ViewStyle } from 'react-native'
+import Svg, { Path } from 'react-native-svg'
+
+interface Props {
+  width?: number
+  height?: number
+  color?: string
+  style?: ViewStyle
+}
+
+export default function Blob({ width = 210, height = 212.5, color = '#FFD62C', style }: Props) {
+  return (
+    <Svg width={width} height={height} viewBox={`0 0 ${width} ${height}`} fill="none" style={style}>
+      <Path
+        d="M102.846 -29.5006C109.785 -29.5006 116.724 -29.8502 123.638 -29.3508C126.971 -29.1261 130.652 -28.0025 133.388 -26.13C144.53 -18.4399 155.398 -10.3254 166.292 -2.26089C171.167 1.35942 175.693 5.4291 180.593 8.99948C193.277 18.2625 201.832 30.5965 207.776 44.928C210.661 51.894 210.189 59.2594 209.393 66.4501C206.632 91.3429 200.439 115.287 187.979 137.233C179.598 151.989 167.486 163.35 153.608 172.737C149.504 175.509 144.232 177.007 139.282 178.006C129.483 180.003 119.51 182.525 109.636 182.5C96.181 182.475 82.4771 181.276 69.8676 175.709C44.6237 164.548 24.0059 147.945 10.2772 123.451C0.428372 105.924 -2.38205 87.5228 2.02009 67.8233C9.48134 34.5414 27.1396 7.90092 54.3483 -12.0482C67.6044 -21.7607 82.3776 -29.0013 99.3893 -29.7503C100.558 -29.8002 101.727 -29.9251 102.871 -30C102.871 -29.8252 102.871 -29.6504 102.871 -29.4756L102.846 -29.5006Z"
+        fill={color}
+      />
+    </Svg>
+  )
+}
diff --git a/src/icons/Palm.tsx b/src/icons/Palm.tsx
new file mode 100644
index 0000000000..e383198706
--- /dev/null
+++ b/src/icons/Palm.tsx
@@ -0,0 +1,21 @@
+import React from 'react'
+import { ViewStyle } from 'react-native'
+import Svg, { Path } from 'react-native-svg'
+
+interface Props {
+  width?: number
+  height?: number
+  color?: string
+  style?: ViewStyle
+}
+
+export default function Palm({ width = 570.88, height = 319.77, color = '#CAF27A', style }: Props) {
+  return (
+    <Svg width={width} height={height} viewBox={`0 0 ${width} ${height}`} fill="none" style={style}>
+      <Path
+        d="M249.974 110.885C333.589 66.3268 394.615 61.4001 407.204 94.7831C418.859 138.325 262.485 201.055 258.486 189.292C247.74 179.622 384.096 219.752 398.143 260.649C331.777 257.203 235.235 215.141 151.197 256.863C49.0167 307.49 15.9102 423.612 0.495358 473.186C24.2145 84.5169 348.775 -149.449 249.974 110.885Z"
+        fill={color}
+      />
+    </Svg>
+  )
+}
diff --git a/src/navigator/Navigator.tsx b/src/navigator/Navigator.tsx
index c2f5e1d306..c3de18206c 100644
--- a/src/navigator/Navigator.tsx
+++ b/src/navigator/Navigator.tsx
@@ -33,6 +33,7 @@ import DappShortcutTransactionRequest from 'src/dapps/DappShortcutTransactionReq
 import DappShortcutsRewards from 'src/dapps/DappShortcutsRewards'
 import EarnCollectScreen from 'src/earn/EarnCollectScreen'
 import EarnEnterAmount from 'src/earn/EarnEnterAmount'
+import EarnInfoScreen from 'src/earn/EarnInfoScreen'
 import EscrowedPaymentListScreen from 'src/escrow/EscrowedPaymentListScreen'
 import ReclaimPaymentConfirmationScreen from 'src/escrow/ReclaimPaymentConfirmationScreen'
 import BidaliScreen from 'src/fiatExchanges/BidaliScreen'
@@ -548,6 +549,11 @@ const earnScreens = (Navigator: typeof Stack) => (
       component={EarnEnterAmount}
       options={noHeader}
     />
+    <Navigator.Screen
+      name={Screens.EarnInfoScreen}
+      component={EarnInfoScreen}
+      options={EarnInfoScreen.navigationOptions}
+    />
   </>
 )
 
diff --git a/src/navigator/Screens.tsx b/src/navigator/Screens.tsx
index 64f16043f3..76ceaddb9f 100644
--- a/src/navigator/Screens.tsx
+++ b/src/navigator/Screens.tsx
@@ -16,6 +16,7 @@ export enum Screens {
   DappShortcutsRewards = 'DappShortcutsRewards',
   DappShortcutTransactionRequest = 'DappShortcutTransactionRequest',
   Debug = 'Debug',
+  EarnInfoScreen = 'EarnInfoScreen',
   EarnEnterAmount = 'EarnEnterAmount',
   EarnCollectScreen = 'EarnCollectScreen',
   EnableBiometry = 'EnableBiometry',
diff --git a/src/navigator/types.tsx b/src/navigator/types.tsx
index 7ebe19c54c..bc64f309e0 100644
--- a/src/navigator/types.tsx
+++ b/src/navigator/types.tsx
@@ -81,6 +81,9 @@ export type StackParamList = {
     rewardId: string
   }
   [Screens.Debug]: undefined
+  [Screens.EarnInfoScreen]: {
+    tokenId: string
+  }
   [Screens.EarnEnterAmount]: {
     tokenId: string
   }
diff --git a/test/RootStateSchema.json b/test/RootStateSchema.json
index 4e1a2b00a9..cf4b8cf24e 100644
--- a/test/RootStateSchema.json
+++ b/test/RootStateSchema.json
@@ -3133,6 +3133,7 @@
                 "Debug",
                 "EarnCollectScreen",
                 "EarnEnterAmount",
+                "EarnInfoScreen",
                 "EnableBiometry",
                 "ErrorScreen",
                 "EscrowedPaymentListScreen",

From 76082c3e39b81ce5bc3b4495bd90c661b2535f95 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Fri, 24 May 2024 15:15:09 -0700
Subject: [PATCH 054/133] refactor(token-bottom-sheet): remove deprecated
 option (#5468)

### Description

All usages of token bottom sheet (Swap screen, send enter amount) uses
the token balance item option.

### Test plan

Unit tests, manually checking both Swap and Send flows

### Related issues

- Part of ACT-1170

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/components/TokenBottomSheet.test.tsx |  76 +++++------------
 src/components/TokenBottomSheet.tsx      | 101 ++---------------------
 src/send/EnterAmount.tsx                 |   6 +-
 src/swap/SwapScreen.tsx                  |  12 +--
 4 files changed, 31 insertions(+), 164 deletions(-)

diff --git a/src/components/TokenBottomSheet.test.tsx b/src/components/TokenBottomSheet.test.tsx
index 9ec228aec4..9ffdd61813 100644
--- a/src/components/TokenBottomSheet.test.tsx
+++ b/src/components/TokenBottomSheet.test.tsx
@@ -5,8 +5,7 @@ import { Provider } from 'react-redux'
 import { TokenBottomSheetEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import TokenBottomSheet, {
-  DEBOUCE_WAIT_TIME,
-  TokenBalanceItemOption,
+  DEBOUNCE_WAIT_TIME,
   TokenBottomSheetProps,
   TokenPickerOrigin,
 } from 'src/components/TokenBottomSheet'
@@ -131,17 +130,7 @@ describe('TokenBottomSheet', () => {
   }
 
   it('renders correctly', () => {
-    const { getByTestId } = renderBottomSheet()
-
-    expect(getByTestId('cUSDBalance')).toHaveTextContent('10.00 cUSD')
-    expect(getByTestId('LocalcUSDBalance')).toHaveTextContent('₱13.30')
-    expect(getByTestId('cEURBalance')).toHaveTextContent('20.00 cEUR')
-    expect(getByTestId('LocalcEURBalance')).toHaveTextContent('₱31.92') // 20 * 1.2 (cEUR price) * 1.33 (PHP price)
-    expect(getByTestId('TTBalance')).toHaveTextContent('10.00 TT')
-  })
-
-  it('renders correctly with TokenBalanceItem', () => {
-    const { getAllByTestId } = renderBottomSheet({ TokenOptionComponent: TokenBalanceItemOption })
+    const { getAllByTestId } = renderBottomSheet()
 
     expect(getAllByTestId('TokenBalanceItem')).toHaveLength(3)
     expect(getAllByTestId('TokenBalanceItem')[0]).toHaveTextContent('10.00 cUSD')
@@ -152,28 +141,6 @@ describe('TokenBottomSheet', () => {
   })
 
   it('handles the choosing of a token correctly', () => {
-    const { getByTestId } = renderBottomSheet()
-
-    fireEvent.press(getByTestId('cUSDTouchable'))
-    expect(onTokenSelectedMock).toHaveBeenLastCalledWith(
-      tokens.find((token) => token.tokenId === mockCusdTokenId),
-      0
-    )
-
-    fireEvent.press(getByTestId('cEURTouchable'))
-    expect(onTokenSelectedMock).toHaveBeenLastCalledWith(
-      tokens.find((token) => token.tokenId === mockCeurTokenId),
-      1
-    )
-
-    fireEvent.press(getByTestId('TTTouchable'))
-    expect(onTokenSelectedMock).toHaveBeenLastCalledWith(
-      tokens.find((token) => token.tokenId === mockTestTokenTokenId),
-      2
-    )
-  })
-
-  it('handles the choosing of a token correctly with TokenBalanceItem', () => {
     const commonAnalyticsProps = {
       areSwapTokensShuffled: undefined,
       networkId: 'celo-alfajores',
@@ -181,7 +148,7 @@ describe('TokenBottomSheet', () => {
       selectedFilters: [],
       usedSearchTerm: false,
     }
-    const { getAllByTestId } = renderBottomSheet({ TokenOptionComponent: TokenBalanceItemOption })
+    const { getAllByTestId } = renderBottomSheet()
 
     fireEvent.press(getAllByTestId('TokenBalanceItem')[0])
     expect(onTokenSelectedMock).toHaveBeenLastCalledWith(
@@ -227,13 +194,13 @@ describe('TokenBottomSheet', () => {
     const searchInput = getByPlaceholderText('tokenBottomSheet.searchAssets')
     expect(searchInput).toBeTruthy()
 
-    expect(getByTestId('cUSDTouchable')).toBeTruthy()
-    expect(getByTestId('cEURTouchable')).toBeTruthy()
-    expect(getByTestId('TTTouchable')).toBeTruthy()
+    expect(getByTestId(`TokenBalanceItemTouchable/${mockCusdTokenId}`)).toBeTruthy()
+    expect(getByTestId(`TokenBalanceItemTouchable/${mockCeurTokenId}`)).toBeTruthy()
+    expect(getByTestId(`TokenBalanceItemTouchable/${mockTestTokenTokenId}`)).toBeTruthy()
 
     fireEvent.changeText(searchInput, 'Celo')
     // Wait for the analytics debounce
-    jest.advanceTimersByTime(DEBOUCE_WAIT_TIME)
+    jest.advanceTimersByTime(DEBOUNCE_WAIT_TIME)
 
     expect(ValoraAnalytics.track).toBeCalledTimes(1)
     expect(ValoraAnalytics.track).toHaveBeenCalledWith(TokenBottomSheetEvents.search_token, {
@@ -241,13 +208,13 @@ describe('TokenBottomSheet', () => {
       searchInput: 'Celo',
     })
 
-    expect(getByTestId('cUSDTouchable')).toBeTruthy()
-    expect(getByTestId('cEURTouchable')).toBeTruthy()
-    expect(queryByTestId('TTTouchable')).toBeNull()
+    expect(getByTestId(`TokenBalanceItemTouchable/${mockCusdTokenId}`)).toBeTruthy()
+    expect(getByTestId(`TokenBalanceItemTouchable/${mockCeurTokenId}`)).toBeTruthy()
+    expect(queryByTestId(`TokenBalanceItemTouchable/${mockTestTokenTokenId}`)).toBeNull()
 
     fireEvent.changeText(searchInput, 'Test')
     // Wait for the analytics debounce
-    jest.advanceTimersByTime(DEBOUCE_WAIT_TIME)
+    jest.advanceTimersByTime(DEBOUNCE_WAIT_TIME)
 
     expect(ValoraAnalytics.track).toBeCalledTimes(2)
     expect(ValoraAnalytics.track).toHaveBeenCalledWith(TokenBottomSheetEvents.search_token, {
@@ -255,13 +222,13 @@ describe('TokenBottomSheet', () => {
       searchInput: 'Test',
     })
 
-    expect(queryByTestId('cUSDTouchable')).toBeNull()
-    expect(queryByTestId('cEURTouchable')).toBeNull()
-    expect(getByTestId('TTTouchable')).toBeTruthy()
+    expect(queryByTestId(`TokenBalanceItemTouchable/${mockCusdTokenId}`)).toBeNull()
+    expect(queryByTestId(`TokenBalanceItemTouchable/${mockCeurTokenId}`)).toBeNull()
+    expect(getByTestId(`TokenBalanceItemTouchable/${mockTestTokenTokenId}`)).toBeTruthy()
 
     fireEvent.changeText(searchInput, 'Usd')
     // Wait for the analytics debounce
-    jest.advanceTimersByTime(DEBOUCE_WAIT_TIME)
+    jest.advanceTimersByTime(DEBOUNCE_WAIT_TIME)
 
     expect(ValoraAnalytics.track).toBeCalledTimes(3)
     expect(ValoraAnalytics.track).toHaveBeenCalledWith(TokenBottomSheetEvents.search_token, {
@@ -269,9 +236,9 @@ describe('TokenBottomSheet', () => {
       searchInput: 'Usd',
     })
 
-    expect(getByTestId('cUSDTouchable')).toBeTruthy()
-    expect(queryByTestId('cEURTouchable')).toBeNull()
-    expect(queryByTestId('TTTouchable')).toBeNull()
+    expect(getByTestId(`TokenBalanceItemTouchable/${mockCusdTokenId}`)).toBeTruthy()
+    expect(queryByTestId(`TokenBalanceItemTouchable/${mockCeurTokenId}`)).toBeNull()
+    expect(queryByTestId(`TokenBalanceItemTouchable/${mockTestTokenTokenId}`)).toBeNull()
   })
 
   it('renders and applies a filter', () => {
@@ -284,7 +251,6 @@ describe('TokenBottomSheet', () => {
           isSelected: false,
         },
       ],
-      TokenOptionComponent: TokenBalanceItemOption,
       tokens,
     })
 
@@ -305,7 +271,6 @@ describe('TokenBottomSheet', () => {
     }
     const { getByText, getAllByTestId } = renderBottomSheet({
       filterChips: [fitler],
-      TokenOptionComponent: TokenBalanceItemOption,
       tokens,
     })
 
@@ -328,7 +293,6 @@ describe('TokenBottomSheet', () => {
     const { getByPlaceholderText, getAllByTestId } = renderBottomSheet({
       filterChips: [fitler],
       searchEnabled: true,
-      TokenOptionComponent: TokenBalanceItemOption,
       tokens,
       areSwapTokensShuffled: true,
       origin: TokenPickerOrigin.SwapFrom,
@@ -342,7 +306,7 @@ describe('TokenBottomSheet', () => {
     fireEvent.changeText(getByPlaceholderText('tokenBottomSheet.searchAssets'), 'Celo')
 
     // Wait for the analytics debounce
-    jest.advanceTimersByTime(DEBOUCE_WAIT_TIME)
+    jest.advanceTimersByTime(DEBOUNCE_WAIT_TIME)
 
     expect(getAllByTestId('TokenBalanceItem')).toHaveLength(1)
     expect(getAllByTestId('TokenBalanceItem')[0]).toHaveTextContent('Celo Dollar')
@@ -367,7 +331,7 @@ describe('TokenBottomSheet', () => {
     fireEvent.changeText(searchInput, 'TemporaryInput')
     fireEvent.changeText(searchInput, 'FinalInput')
     // Wait for the analytics debounce
-    jest.advanceTimersByTime(DEBOUCE_WAIT_TIME)
+    jest.advanceTimersByTime(DEBOUNCE_WAIT_TIME)
 
     expect(ValoraAnalytics.track).toBeCalledTimes(1)
     // We don't send events for intermediate search inputs
diff --git a/src/components/TokenBottomSheet.tsx b/src/components/TokenBottomSheet.tsx
index b8ab41dd8e..08346d93cf 100644
--- a/src/components/TokenBottomSheet.tsx
+++ b/src/components/TokenBottomSheet.tsx
@@ -15,9 +15,6 @@ import FilterChipsCarousel, {
   isNetworkChip,
 } from 'src/components/FilterChipsCarousel'
 import SearchInput from 'src/components/SearchInput'
-import TokenDisplay from 'src/components/TokenDisplay'
-import TokenIcon, { IconSize } from 'src/components/TokenIcon'
-import Touchable from 'src/components/Touchable'
 import NetworkMultiSelectBottomSheet from 'src/components/multiSelect/NetworkMultiSelectBottomSheet'
 import InfoIcon from 'src/icons/InfoIcon'
 import colors, { Colors } from 'src/styles/colors'
@@ -35,7 +32,7 @@ export enum TokenPickerOrigin {
   SwapTo = 'Swap/To',
 }
 
-export const DEBOUCE_WAIT_TIME = 200
+export const DEBOUNCE_WAIT_TIME = 200
 
 export interface TokenBottomSheetProps<T extends TokenBalance> {
   forwardedRef: RefObject<BottomSheetRefType>
@@ -59,57 +56,6 @@ interface TokenOptionProps {
   showPriceUsdUnavailableWarning?: boolean
 }
 
-/**
- * @deprecated new bottom sheets should use TokenBalanceItemOption
- */
-const TokenOption = React.memo(({ tokenInfo, onPress, index }: TokenOptionProps) => {
-  return (
-    <>
-      {index > 0 && <View style={styles.separator} />}
-      <Touchable onPress={onPress} testID={`${tokenInfo.symbol}Touchable`}>
-        <View style={styles.tokenOptionContainer}>
-          <TokenIcon token={tokenInfo} viewStyle={styles.tokenImage} size={IconSize.LARGE} />
-          <View style={styles.tokenNameContainer}>
-            <Text style={styles.localBalance}>{tokenInfo.symbol}</Text>
-            <Text style={styles.currencyBalance}>{tokenInfo.name}</Text>
-          </View>
-          <View style={styles.tokenBalanceContainer}>
-            <TokenDisplay
-              style={styles.localBalance}
-              amount={tokenInfo.balance}
-              tokenId={tokenInfo.tokenId}
-              showLocalAmount={true}
-              testID={`Local${tokenInfo.symbol}Balance`}
-            />
-            <TokenDisplay
-              style={styles.currencyBalance}
-              amount={tokenInfo.balance}
-              tokenId={tokenInfo.tokenId}
-              showLocalAmount={false}
-              testID={`${tokenInfo.symbol}Balance`}
-            />
-          </View>
-        </View>
-      </Touchable>
-    </>
-  )
-})
-
-export const TokenBalanceItemOption = React.memo(
-  ({ tokenInfo, onPress, showPriceUsdUnavailableWarning }: TokenOptionProps) => {
-    const { t } = useTranslation()
-    return (
-      <TokenBalanceItem
-        token={tokenInfo}
-        balanceUsdErrorFallback={t('tokenDetails.priceUnavailable') ?? undefined}
-        onPress={onPress}
-        containerStyle={styles.tokenBalanceItemContainer}
-        showPriceUsdUnavailableWarning={showPriceUsdUnavailableWarning}
-      />
-    )
-  }
-)
-
 function NoResults({
   testID = 'TokenBottomSheet/NoResult',
   searchTerm,
@@ -150,7 +96,6 @@ function TokenBottomSheet<T extends TokenBalance>({
   searchEnabled,
   title,
   titleStyle,
-  TokenOptionComponent = TokenOption,
   showPriceUsdUnavailableWarning,
   filterChips = [],
   areSwapTokensShuffled,
@@ -232,7 +177,7 @@ function TokenBottomSheet<T extends TokenBalance>({
         origin,
         searchInput,
       })
-    }, DEBOUCE_WAIT_TIME),
+    }, DEBOUNCE_WAIT_TIME),
     []
   )
 
@@ -298,10 +243,11 @@ function TokenBottomSheet<T extends TokenBalance>({
             scrollIndicatorInsets={{ top: headerHeight }}
             renderItem={({ item, index }) => {
               return (
-                <TokenOptionComponent
-                  tokenInfo={item}
+                <TokenBalanceItem
+                  token={item}
+                  balanceUsdErrorFallback={t('tokenDetails.priceUnavailable') ?? undefined}
                   onPress={onTokenPressed(item, index)}
-                  index={index}
+                  containerStyle={styles.tokenBalanceItemContainer}
                   showPriceUsdUnavailableWarning={showPriceUsdUnavailableWarning}
                 />
               )
@@ -373,41 +319,6 @@ const styles = StyleSheet.create({
   container: {
     flex: 1,
   },
-  tokenOptionContainer: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    paddingVertical: Spacing.Regular16,
-  },
-  tokenImage: {
-    width: 40,
-    height: 40,
-    borderRadius: 20,
-    marginRight: Spacing.Small12,
-  },
-  tokenNameContainer: {
-    flex: 3,
-    alignItems: 'flex-start',
-    flexShrink: 1,
-  },
-  tokenBalanceContainer: {
-    flex: 2,
-    flexShrink: 1,
-    alignItems: 'flex-end',
-  },
-  localBalance: {
-    flexShrink: 1,
-    ...typeScale.labelMedium,
-  },
-  currencyBalance: {
-    flexShrink: 1,
-    ...typeScale.bodySmall,
-    color: colors.gray4,
-  },
-  separator: {
-    width: '100%',
-    height: 1,
-    backgroundColor: colors.gray2,
-  },
   searchInput: {
     marginTop: Spacing.Regular16,
   },
diff --git a/src/send/EnterAmount.tsx b/src/send/EnterAmount.tsx
index dcf76c8630..bbc841add5 100644
--- a/src/send/EnterAmount.tsx
+++ b/src/send/EnterAmount.tsx
@@ -23,10 +23,7 @@ import KeyboardAwareScrollView from 'src/components/KeyboardAwareScrollView'
 import KeyboardSpacer from 'src/components/KeyboardSpacer'
 import SkeletonPlaceholder from 'src/components/SkeletonPlaceholder'
 import TextInput from 'src/components/TextInput'
-import TokenBottomSheet, {
-  TokenBalanceItemOption,
-  TokenPickerOrigin,
-} from 'src/components/TokenBottomSheet'
+import TokenBottomSheet, { TokenPickerOrigin } from 'src/components/TokenBottomSheet'
 import TokenDisplay from 'src/components/TokenDisplay'
 import TokenIcon, { IconSize } from 'src/components/TokenIcon'
 import Touchable from 'src/components/Touchable'
@@ -459,7 +456,6 @@ function EnterAmount({
         onTokenSelected={onSelectToken}
         tokens={tokens}
         title={t('sendEnterAmountScreen.selectToken')}
-        TokenOptionComponent={TokenBalanceItemOption}
         titleStyle={styles.title}
       />
     </SafeAreaView>
diff --git a/src/swap/SwapScreen.tsx b/src/swap/SwapScreen.tsx
index e00d7122ff..915b77174c 100644
--- a/src/swap/SwapScreen.tsx
+++ b/src/swap/SwapScreen.tsx
@@ -18,13 +18,13 @@ import BottomSheet, { BottomSheetRefType } from 'src/components/BottomSheet'
 import Button, { BtnSizes, BtnTypes } from 'src/components/Button'
 import InLineNotification, { NotificationVariant } from 'src/components/InLineNotification'
 import Toast from 'src/components/Toast'
-import TokenBottomSheet, {
-  TokenBalanceItemOption,
-  TokenPickerOrigin,
-} from 'src/components/TokenBottomSheet'
+import TokenBottomSheet, { TokenPickerOrigin } from 'src/components/TokenBottomSheet'
+import Touchable from 'src/components/Touchable'
 import CustomHeader from 'src/components/header/CustomHeader'
 import { SWAP_LEARN_MORE } from 'src/config'
 import { FiatExchangeFlow } from 'src/fiatExchanges/utils'
+import CircledIcon from 'src/icons/CircledIcon'
+import DownIndicator from 'src/icons/DownIndicator'
 import { getLocalCurrencyCode } from 'src/localCurrency/selectors'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -57,9 +57,6 @@ import { getFeeCurrencyAndAmounts } from 'src/viem/prepareTransactions'
 import { getSerializablePreparedTransactions } from 'src/viem/preparedTransactionSerialization'
 import networkConfig from 'src/web3/networkConfig'
 import { v4 as uuidv4 } from 'uuid'
-import DownIndicator from 'src/icons/DownIndicator'
-import CircledIcon from 'src/icons/CircledIcon'
-import Touchable from 'src/components/Touchable'
 
 const TAG = 'SwapScreen'
 
@@ -868,7 +865,6 @@ export function SwapScreen({ route }: Props) {
           snapPoints={['90%']}
           onTokenSelected={handleSelectToken}
           searchEnabled={true}
-          TokenOptionComponent={TokenBalanceItemOption}
           showPriceUsdUnavailableWarning={true}
           areSwapTokensShuffled={areSwapTokensShuffled}
         />

From ea9e3702b0f31a55ebdbb5eb4ee3dcfab05d3ed2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 25 May 2024 02:13:56 +0000
Subject: [PATCH 055/133] fix(deps): update dependency
 @react-native-picker/picker to ^2.7.6 (#5469)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[@react-native-picker/picker](https://togithub.com/react-native-picker/picker)
| [`^2.7.5` ->
`^2.7.6`](https://renovatebot.com/diffs/npm/@react-native-picker%2fpicker/2.7.5/2.7.6)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/@react-native-picker%2fpicker/2.7.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@react-native-picker%2fpicker/2.7.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@react-native-picker%2fpicker/2.7.5/2.7.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@react-native-picker%2fpicker/2.7.5/2.7.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>react-native-picker/picker
(@&#8203;react-native-picker/picker)</summary>

###
[`v2.7.6`](https://togithub.com/react-native-picker/picker/releases/tag/v2.7.6)

[Compare
Source](https://togithub.com/react-native-picker/picker/compare/v2.7.5...v2.7.6)

##### Bug Fixes

- Change method of detecting the new arch
([#&#8203;569](https://togithub.com/react-native-picker/picker/issues/569))
([ec354fb](https://togithub.com/react-native-picker/picker/commit/ec354fb1a765a01f01af8e58fbf211f786e4a587))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ1cGRhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbIm5wbSIsInJlbm92YXRlIl19-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: valora-bot <valorabot@valoraapp.com>
---
 ios/Podfile.lock |  4 ++--
 package.json     |  2 +-
 yarn.lock        | 53 +++++++++++++++++++++++++++++++-----------------
 3 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 9254e76f2d..efd15d6254 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -658,7 +658,7 @@ PODS:
     - React-Core
   - RNCMaskedView (0.3.1):
     - React-Core
-  - RNCPicker (2.7.5):
+  - RNCPicker (2.7.6):
     - React-Core
   - RNDeviceInfo (10.13.2):
     - React-Core
@@ -1234,7 +1234,7 @@ SPEC CHECKSUMS:
   RNCAsyncStorage: 826b603ae9c0f88b5ac4e956801f755109fa4d5c
   RNCClipboard: 0a720adef5ec193aa0e3de24c3977222c7e52a37
   RNCMaskedView: 090213d32d8b3bb83a4dcb7d12c18f0152591906
-  RNCPicker: 3e2c37a8328f368ce14da050cdc8231deb5fc9f9
+  RNCPicker: f58e790450cb0a74c09dd1c677bd1de41a5741b9
   RNDeviceInfo: 42aadf1282ffa0a88dc38a504a7be145eb010dfa
   RNExitApp: 00036cabe7bacbb413d276d5520bf74ba39afa6a
   RNFastImage: 5c9c9fed9c076e521b3f509fe79e790418a544e8
diff --git a/package.json b/package.json
index 57d5c5a5ff..3adbaf48b2 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "@react-native-firebase/messaging": "19.1.0",
     "@react-native-firebase/remote-config": "19.1.0",
     "@react-native-masked-view/masked-view": "^0.3.1",
-    "@react-native-picker/picker": "^2.7.5",
+    "@react-native-picker/picker": "^2.7.6",
     "@react-navigation/bottom-tabs": "^6.5.20",
     "@react-navigation/devtools": "^6.0.26",
     "@react-navigation/elements": "^1.3.30",
diff --git a/yarn.lock b/yarn.lock
index 55921177b2..a07ac81550 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3044,10 +3044,10 @@
   resolved "https://registry.yarnpkg.com/@react-native-masked-view/masked-view/-/masked-view-0.3.1.tgz#5bd76f17004a6ccbcec03856893777ee91f23d29"
   integrity sha512-uVm8U6nwFIlUd1iDIB5cS+lDadApKR+l8k4k84d9hn+GN4lzAIJhUZ9syYX7c022MxNgAlbxoFLt0pqKoyaAGg==
 
-"@react-native-picker/picker@^2.7.5":
-  version "2.7.5"
-  resolved "https://registry.yarnpkg.com/@react-native-picker/picker/-/picker-2.7.5.tgz#e43fcd65f260fa4f23e974ccb9fb7c1f7a9ff94a"
-  integrity sha512-vhMaOLkXSUb+YKVbukMJToU4g+89VMhBG2U9+cLYF8X8HtFRidrHjohGqT8/OyesDuKIXeLIP+UFYI9Q9CRA9Q==
+"@react-native-picker/picker@^2.7.6":
+  version "2.7.6"
+  resolved "https://registry.yarnpkg.com/@react-native-picker/picker/-/picker-2.7.6.tgz#fda996742f6878660277b995e878711641e778f4"
+  integrity sha512-Cs3PxRmE2vu6TofM9vt9TV8ZYFOtEPSupNxwoorH9lpkKM9HGG8QwK2i29KOEoODpUbtudKHUTtqhMZSuX9pgA==
 
 "@react-native/assets@1.0.0":
   version "1.0.0"
@@ -4912,16 +4912,11 @@
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
-"@types/json-schema@^7.0.12":
+"@types/json-schema@^7.0.12", "@types/json-schema@^7.0.9":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
-"@types/json-schema@^7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
-  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
-
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
@@ -5096,12 +5091,7 @@
   resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-3.0.5.tgz#31fb257427742a9cc33fcf0c25dacca92e8f45a1"
   integrity sha512-kopEpYpFQvQdYsZkZVwht/0THHmTFFYXDaqV/lM45eweJ8kcGVDgZHs0RVTolSq55UPZNmjhKc9r7UvLu/mQQg==
 
-"@types/semver@^7.3.12":
-  version "7.3.13"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
-  integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
-
-"@types/semver@^7.5.0":
+"@types/semver@^7.3.12", "@types/semver@^7.5.0":
   version "7.5.8"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
   integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
@@ -17079,7 +17069,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -17114,6 +17104,15 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^5.0.1, string-width@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -17185,7 +17184,14 @@ string_decoder@^1.0.0, string_decoder@^1.0.3, string_decoder@^1.1.1, string_deco
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -19304,7 +19310,7 @@ wordwrap@0.0.2:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
   integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -19339,6 +19345,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From de75e244ee34a52ea052324242d96033814568c4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 25 May 2024 02:58:39 +0000
Subject: [PATCH 056/133] fix(deps): update dependency react-native-video to
 ^6.0.0 (#5471)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[react-native-video](https://togithub.com/TheWidlarzGroup/react-native-video)
| [`^6.0.0-rc.0` ->
`^6.0.0`](https://renovatebot.com/diffs/npm/react-native-video/6.0.0-rc.0/6.0.0)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/react-native-video/6.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/react-native-video/6.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/react-native-video/6.0.0-rc.0/6.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/react-native-video/6.0.0-rc.0/6.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>TheWidlarzGroup/react-native-video
(react-native-video)</summary>

###
[`v6.0.0`](https://togithub.com/TheWidlarzGroup/react-native-video/blob/HEAD/CHANGELOG.md#600-2024-05-14)

[Compare
Source](https://togithub.com/TheWidlarzGroup/react-native-video/compare/v6.0.0-rc.2...v6.0.0)

##### Bug Fixes

- **android:** poster hidding
([#&#8203;3768](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3768))
([98b4a75](https://togithub.com/TheWidlarzGroup/react-native-video/commit/98b4a75a90c6bc97cde267ea1c6a4a68d0bfdf45))
- **android:** video tracks crash and clean
([#&#8203;3767](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3767))
([219496f](https://togithub.com/TheWidlarzGroup/react-native-video/commit/219496ff3abf6d7362ae01fb66c0bf28dfb00510))

###
[`v6.0.0-rc.2`](https://togithub.com/TheWidlarzGroup/react-native-video/blob/HEAD/CHANGELOG.md#600-rc2-2024-05-13)

[Compare
Source](https://togithub.com/TheWidlarzGroup/react-native-video/compare/v6.0.0-rc.1...v6.0.0-rc.2)

##### Bug Fixes

- **avoid:** avoid early return in setSrc
([#&#8203;3759](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3759))
([2e623ca](https://togithub.com/TheWidlarzGroup/react-native-video/commit/2e623ca0fb074e64a6125994effb8723f5c4ce59))
- **ios:** call `onLoadStart` earlier
([#&#8203;3750](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3750))
([b3f08f6](https://togithub.com/TheWidlarzGroup/react-native-video/commit/b3f08f6c990f4670311e6d918aea191e72673057))
- **js:** fix onPlaybackStateChanged callback
([#&#8203;3753](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3753))
([f87a793](https://togithub.com/TheWidlarzGroup/react-native-video/commit/f87a7938c6941c69915477fcf5f08c54a2635597))
- **ts:** add missing type
([#&#8203;3757](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3757))
([2d94844](https://togithub.com/TheWidlarzGroup/react-native-video/commit/2d9484499cfb58d86b0aa82872d494a03fe67bba))

##### Features

- **android:** make buffering strategy dynamic
([#&#8203;3756](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3756))
([e420418](https://togithub.com/TheWidlarzGroup/react-native-video/commit/e420418e8f74894c443bd232e99f9b860e1d0b93))

##### Reverts

- Revert "fix(android): video flickering add playback start
([#&#8203;3746](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3746))"
([#&#8203;3748](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3748))
([d25629b](https://togithub.com/TheWidlarzGroup/react-native-video/commit/d25629bb62cb9a7772ec2704f678e0fdf4927d12)),
closes
[#&#8203;3746](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3746)
[#&#8203;3748](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3748)

###
[`v6.0.0-rc.1`](https://togithub.com/TheWidlarzGroup/react-native-video/blob/HEAD/CHANGELOG.md#600-rc1-2024-05-08)

[Compare
Source](https://togithub.com/TheWidlarzGroup/react-native-video/compare/v6.0.0-rc.0...v6.0.0-rc.1)

##### Bug Fixes

- **android:** prevent changing video track when video load
([#&#8203;3683](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3683))
([6f61d7f](https://togithub.com/TheWidlarzGroup/react-native-video/commit/6f61d7f6e6969d05e4cee9bdb2e4cbc80d356e7f))
- **android:** video flickering add playback start
([#&#8203;3746](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3746))
([b1cd52b](https://togithub.com/TheWidlarzGroup/react-native-video/commit/b1cd52bc58b3dfd02dab4784ea423ebddae874c4))
- avoid crash when setting index to 0 to tracks selection
([#&#8203;3721](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3721))
([518a9a9](https://togithub.com/TheWidlarzGroup/react-native-video/commit/518a9a93e06686ba707427078a1770dc3d803b2b))
- **ios:** destroy adsManager when player detach from super view
([#&#8203;3716](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3716))
([#&#8203;3722](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3722))
([e96c173](https://togithub.com/TheWidlarzGroup/react-native-video/commit/e96c17321f1347818c1f5a38628d65b5b4bd5e7b))
- **ios:** ensure duration available when playing live
([#&#8203;3710](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3710))
([d56b251](https://togithub.com/TheWidlarzGroup/react-native-video/commit/d56b251aef6d4ca1708c7bbada15016efbf12caf))
- **ios:** ensure orientation is correct on iOS
([#&#8203;3719](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3719))
([1a8295c](https://togithub.com/TheWidlarzGroup/react-native-video/commit/1a8295c8bf30d53135d723fc9aface1a812be78a))
- **ios:** fix text track selection by index
([#&#8203;3728](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3728))
([51e22ab](https://togithub.com/TheWidlarzGroup/react-native-video/commit/51e22abfe35978ee3fd1a7b3dc6f6c769d1b24bc))

##### Features

- add notification controls
([#&#8203;3723](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3723))
([8ad4be4](https://togithub.com/TheWidlarzGroup/react-native-video/commit/8ad4be459b935e30077e38cce696875ea9d6b21f))
- **android:** cache
([#&#8203;3514](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3514))
([ecc946d](https://togithub.com/TheWidlarzGroup/react-native-video/commit/ecc946d1c1f9870c3f0a40fa426fa088017bd7cd))
- **android:** implement asset folder playback
([#&#8203;3733](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3733))
([e05da4e](https://togithub.com/TheWidlarzGroup/react-native-video/commit/e05da4e9fe82b63cb1cebf70f6d11930b01124e0))

##### Performance Improvements

- ensure we do not provide callback to native if no callback provided
from app
([#&#8203;3735](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3735))
([c59d00a](https://togithub.com/TheWidlarzGroup/react-native-video/commit/c59d00a0f0a0b63b6bbe931f1a9b4fef03667cb2))
- **ios:** add early returns
([#&#8203;3741](https://togithub.com/TheWidlarzGroup/react-native-video/issues/3741))
([1d235a1](https://togithub.com/TheWidlarzGroup/react-native-video/commit/1d235a1fea948b7b37ef20e75d953fcbd8c550c6))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ1cGRhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbIm5wbSIsInJlbm92YXRlIl19-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: valora-bot <valorabot@valoraapp.com>
---
 ios/Podfile.lock | 6 +++---
 package.json     | 2 +-
 yarn.lock        | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index efd15d6254..b510d338e3 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -560,10 +560,10 @@ PODS:
     - Toast (~> 4)
   - react-native-splash-screen (3.3.0):
     - React-Core
-  - react-native-video (6.0.0-rc.0):
+  - react-native-video (6.1.2):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
-    - react-native-video/Video (= 6.0.0-rc.0)
+    - react-native-video/Video (= 6.1.2)
   - react-native-webview (13.8.6):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
@@ -1215,7 +1215,7 @@ SPEC CHECKSUMS:
   react-native-shake: 8036ba95a1953c9b10821bdc33f5814c5d0bcef6
   react-native-simple-toast: 1f1cc551d419bc0ab05dcb0136554006c274789d
   react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
-  react-native-video: e820b3ba1ad07e5b2bae137aa92966ea26086d21
+  react-native-video: 120b5403dabb33bee00e121216230a3a7aeb5594
   react-native-webview: a987704e6cd3f5a21d372ef316e43f7b442d59ca
   React-perflogger: 2588b59d386dbbc1df392da9493a8baa690bc89c
   React-RCTActionSheet: 057d6c6fc29e2a6d183d323ef35d9f6aedae936b
diff --git a/package.json b/package.json
index 3adbaf48b2..c1159f3942 100644
--- a/package.json
+++ b/package.json
@@ -187,7 +187,7 @@
     "react-native-svg": "^15.2.0",
     "react-native-tab-view": "^2.16.0",
     "react-native-url-polyfill": "^2.0.0",
-    "react-native-video": "^6.0.0-rc.0",
+    "react-native-video": "^6.0.0",
     "react-native-webview": "^13.8.6",
     "react-redux": "^9.1.1",
     "redux": "^5.0.1",
diff --git a/yarn.lock b/yarn.lock
index a07ac81550..814b46fe49 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15553,10 +15553,10 @@ react-native-version@^3.1.0:
     resolve-from "^5.0.0"
     semver "^6.0.0"
 
-react-native-video@^6.0.0-rc.0:
-  version "6.0.0-rc.0"
-  resolved "https://registry.yarnpkg.com/react-native-video/-/react-native-video-6.0.0-rc.0.tgz#b21f2776178b099d44a008c604ed0cd83e9b3daa"
-  integrity sha512-X8x3dJZYAhYR7dpg8RciHJXawhVkqrhwFWMrHGagFV6+pRLVfkErOShf4jzPt9i/fIBJjdKtFgeJY2jgqnCjgA==
+react-native-video@^6.0.0:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/react-native-video/-/react-native-video-6.1.2.tgz#84580458e0d0ebbf6ca395cc15cd2f76c337bbda"
+  integrity sha512-oKk4hLhcWiL+k5CRgqs+/Bvp23QrHFGx3ylawrF4OWjKRekGeHNCf2mSf7+er66ZmktMtJC0ofBTgEPq4rRG6A==
 
 react-native-webview@^13.8.6:
   version "13.8.6"

From e78081729ae091994cdb317566a1e544e307c69e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 25 May 2024 03:43:28 +0000
Subject: [PATCH 057/133] fix(deps): update dependency react-native-video to
 ^6.1.2 (#5472)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[react-native-video](https://togithub.com/TheWidlarzGroup/react-native-video)
| [`^6.0.0` ->
`^6.1.2`](https://renovatebot.com/diffs/npm/react-native-video/6.1.2/6.1.2)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/react-native-video/6.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/react-native-video/6.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/react-native-video/6.1.2/6.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/react-native-video/6.1.2/6.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ1cGRhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbIm5wbSIsInJlbm92YXRlIl19-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c1159f3942..93593bd0a1 100644
--- a/package.json
+++ b/package.json
@@ -187,7 +187,7 @@
     "react-native-svg": "^15.2.0",
     "react-native-tab-view": "^2.16.0",
     "react-native-url-polyfill": "^2.0.0",
-    "react-native-video": "^6.0.0",
+    "react-native-video": "^6.1.2",
     "react-native-webview": "^13.8.6",
     "react-redux": "^9.1.1",
     "redux": "^5.0.1",
diff --git a/yarn.lock b/yarn.lock
index 814b46fe49..0e9b0af765 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15553,7 +15553,7 @@ react-native-version@^3.1.0:
     resolve-from "^5.0.0"
     semver "^6.0.0"
 
-react-native-video@^6.0.0:
+react-native-video@^6.1.2:
   version "6.1.2"
   resolved "https://registry.yarnpkg.com/react-native-video/-/react-native-video-6.1.2.tgz#84580458e0d0ebbf6ca395cc15cd2f76c337bbda"
   integrity sha512-oKk4hLhcWiL+k5CRgqs+/Bvp23QrHFGx3ylawrF4OWjKRekGeHNCf2mSf7+er66ZmktMtJC0ofBTgEPq4rRG6A==

From 85974be3cba802b3a9b00174b82e72db6b882943 Mon Sep 17 00:00:00 2001
From: Valora Bot <89419329+valora-bot@users.noreply.github.com>
Date: Fri, 24 May 2024 20:47:05 -0700
Subject: [PATCH 058/133] chore: update licenses and disclaimer (#5473)

Co-authored-by: valora-bot <valorabot@valoraapp.com>
---
 src/account/LicenseDisclaimer.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/account/LicenseDisclaimer.txt b/src/account/LicenseDisclaimer.txt
index 32f1abd612..290e0c62c1 100644
--- a/src/account/LicenseDisclaimer.txt
+++ b/src/account/LicenseDisclaimer.txt
@@ -23256,7 +23256,7 @@ SOFTWARE.
 
 -----
 
-The following software may be included in this product: react-native-video. A copy of the source code may be downloaded from git@github.com:react-native-video/react-native-video.git. This software contains the following license and notice below:
+The following software may be included in this product: react-native-video. A copy of the source code may be downloaded from git@github.com:TheWidlarzGroup/react-native-video.git. This software contains the following license and notice below:
 
 MIT License
 

From d21ce25797b45ef36f69d5e41ae1bd4d2ae656d3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 25 May 2024 05:56:01 +0000
Subject: [PATCH 059/133] fix(deps): update dependency react-native-svg to
 ^15.3.0 (#5474)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[react-native-svg](https://togithub.com/react-native-community/react-native-svg)
| [`^15.2.0` ->
`^15.3.0`](https://renovatebot.com/diffs/npm/react-native-svg/15.2.0/15.3.0)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/react-native-svg/15.3.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/react-native-svg/15.3.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/react-native-svg/15.2.0/15.3.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/react-native-svg/15.2.0/15.3.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>react-native-community/react-native-svg
(react-native-svg)</summary>

###
[`v15.3.0`](https://togithub.com/software-mansion/react-native-svg/releases/tag/v15.3.0)

[Compare
Source](https://togithub.com/react-native-community/react-native-svg/compare/v15.2.0...v15.3.0)

Minor release fixing some long-standing bugs. Thank you for your
contributions! 🎉

#### What's Changed

- Add dxguid.lib to release action by
[@&#8203;Arthurmtro](https://togithub.com/Arthurmtro) in
[https://github.com/software-mansion/react-native-svg/pull/2243](https://togithub.com/software-mansion/react-native-svg/pull/2243)
- fix: set default strokeWidth to 1 on android by
[@&#8203;jakex7](https://togithub.com/jakex7) in
[https://github.com/software-mansion/react-native-svg/pull/2269](https://togithub.com/software-mansion/react-native-svg/pull/2269)
- fix: remove `err` export by
[@&#8203;jakex7](https://togithub.com/jakex7) in
[https://github.com/software-mansion/react-native-svg/pull/2270](https://togithub.com/software-mansion/react-native-svg/pull/2270)
- fix: Fix pod install not working with lower version of Cocoapods due
to visionOS by [@&#8203;jihoon416](https://togithub.com/jihoon416) in
[https://github.com/software-mansion/react-native-svg/pull/2240](https://togithub.com/software-mansion/react-native-svg/pull/2240)
- fix: Fix static view config validation for RNSVGSvgViewAndroid by
[@&#8203;fabriziocucci](https://togithub.com/fabriziocucci) in
[https://github.com/software-mansion/react-native-svg/pull/2274](https://togithub.com/software-mansion/react-native-svg/pull/2274)
- fix: radialGradient `r={0}` by
[@&#8203;jakex7](https://togithub.com/jakex7) in
[https://github.com/software-mansion/react-native-svg/pull/2271](https://togithub.com/software-mansion/react-native-svg/pull/2271)
- fix: toDataUrl line breaks by
[@&#8203;jakex7](https://togithub.com/jakex7) in
[https://github.com/software-mansion/react-native-svg/pull/2272](https://togithub.com/software-mansion/react-native-svg/pull/2272)
- fix: change android package name by
[@&#8203;jakex7](https://togithub.com/jakex7) in
[https://github.com/software-mansion/react-native-svg/pull/2275](https://togithub.com/software-mansion/react-native-svg/pull/2275)
- fix: parsing `<` inside comments by
[@&#8203;jakex7](https://togithub.com/jakex7) in
[https://github.com/software-mansion/react-native-svg/pull/2277](https://togithub.com/software-mansion/react-native-svg/pull/2277)

#### New Contributors

- [@&#8203;Arthurmtro](https://togithub.com/Arthurmtro) made their first
contribution in
[https://github.com/software-mansion/react-native-svg/pull/2243](https://togithub.com/software-mansion/react-native-svg/pull/2243)
- [@&#8203;jakex7](https://togithub.com/jakex7) made their first
contribution in
[https://github.com/software-mansion/react-native-svg/pull/2269](https://togithub.com/software-mansion/react-native-svg/pull/2269)
- [@&#8203;jihoon416](https://togithub.com/jihoon416) made their first
contribution in
[https://github.com/software-mansion/react-native-svg/pull/2240](https://togithub.com/software-mansion/react-native-svg/pull/2240)
- [@&#8203;fabriziocucci](https://togithub.com/fabriziocucci) made their
first contribution in
[https://github.com/software-mansion/react-native-svg/pull/2274](https://togithub.com/software-mansion/react-native-svg/pull/2274)

**Full Changelog**:
https://github.com/software-mansion/react-native-svg/compare/v15.2.0...v15.3.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ1cGRhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbIm5wbSIsInJlbm92YXRlIl19-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: valora-bot <valorabot@valoraapp.com>
---
 ios/Podfile.lock | 4 ++--
 package.json     | 2 +-
 yarn.lock        | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index b510d338e3..390354acab 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -762,7 +762,7 @@ PODS:
     - Sentry/HybridSDK (= 8.24.0)
   - RNShare (10.2.0):
     - React-Core
-  - RNSVG (15.2.0):
+  - RNSVG (15.3.0):
     - React-Core
   - SDWebImage (5.11.1):
     - SDWebImage/Core (= 5.11.1)
@@ -1258,7 +1258,7 @@ SPEC CHECKSUMS:
   RNSecureRandom: ff25041dd065a945810ca01a2bcd06f8d141b81d
   RNSentry: 7ae2a06a5563de39ec09dcb1e751ac0c67f1883c
   RNShare: 554a91f5cfbe4adac4cfe3654826ee8b299fe365
-  RNSVG: 43b64ed39c14ce830d840903774154ca0c1f27ec
+  RNSVG: a48668fd382115bc89761ce291a81c4ca5f2fd2e
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
   segment-analytics-react-native: 1c36d83c0a735795e304178241331e7701dc5d2a
diff --git a/package.json b/package.json
index 93593bd0a1..5e7869c441 100644
--- a/package.json
+++ b/package.json
@@ -184,7 +184,7 @@
     "react-native-skeleton-placeholder": "^5.2.4",
     "react-native-sms-retriever": "^1.1.1",
     "react-native-splash-screen": "^3.3.0",
-    "react-native-svg": "^15.2.0",
+    "react-native-svg": "^15.3.0",
     "react-native-tab-view": "^2.16.0",
     "react-native-url-polyfill": "^2.0.0",
     "react-native-video": "^6.1.2",
diff --git a/yarn.lock b/yarn.lock
index 0e9b0af765..5d4328537c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15514,10 +15514,10 @@ react-native-svg-mock@^2.0.0:
   resolved "https://registry.yarnpkg.com/react-native-svg-mock/-/react-native-svg-mock-2.0.0.tgz#27f4793e860ec6cae783930e6afb54869f0a2ea9"
   integrity sha512-+Op91zndXy+fUHZlcYo2YU3RzW5yXvKXE/mqMgYOdJLLS2kWwZBjAGt+CiKGl/+ZKnJ8/h0TWiiT0vCSv2NxEA==
 
-react-native-svg@^15.2.0:
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-15.2.0.tgz#9561a6b3bd6b44689f437ba13182afee33bd5557"
-  integrity sha512-R0E6IhcJfVLsL0lRmnUSm72QO+mTqcAOM5Jb8FVGxJqX3NfJMlMP0YyvcajZiaRR8CqQUpEoqrY25eyZb006kw==
+react-native-svg@^15.3.0:
+  version "15.3.0"
+  resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-15.3.0.tgz#e24b833fe330714c99f1dd894bb0da52ad859a4c"
+  integrity sha512-mBHu/fdlzUbpGX8SZFxgbKvK/sgqLfDLP8uh8G7Us+zJgdjO8OSEeqHQs+kPRdQmdLJQiqPJX2WXgCl7ToTWqw==
   dependencies:
     css-select "^5.1.0"
     css-tree "^1.1.3"

From 58c4de705fcd82af6ac1abde95f85d88d8c87e6f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 25 May 2024 09:36:04 +0000
Subject: [PATCH 060/133] fix(deps): update dependency @gorhom/bottom-sheet to
 ^4.6.3 (#5475)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [@gorhom/bottom-sheet](https://ui.gorhom.dev/components/bottom-sheet)
([source](https://togithub.com/gorhom/react-native-bottom-sheet)) |
[`^4.6.1` ->
`^4.6.3`](https://renovatebot.com/diffs/npm/@gorhom%2fbottom-sheet/4.6.1/4.6.3)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/@gorhom%2fbottom-sheet/4.6.3?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@gorhom%2fbottom-sheet/4.6.3?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@gorhom%2fbottom-sheet/4.6.1/4.6.3?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@gorhom%2fbottom-sheet/4.6.1/4.6.3?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>gorhom/react-native-bottom-sheet
(@&#8203;gorhom/bottom-sheet)</summary>

###
[`v4.6.3`](https://togithub.com/gorhom/react-native-bottom-sheet/blob/HEAD/CHANGELOG.md#463-2024-05-19)

[Compare
Source](https://togithub.com/gorhom/react-native-bottom-sheet/compare/v4.6.2...v4.6.3)

##### Bug Fixes

- bottom sheet not appearing for users that have reduced motion turned
on
([#&#8203;1743](https://togithub.com/gorhom/react-native-bottom-sheet/issues/1743))(by
[@&#8203;fobos531](https://togithub.com/fobos531))
([ab1cce2](https://togithub.com/gorhom/react-native-bottom-sheet/commit/ab1cce20389d3a678ff108d6e175128e272fa7c2))

###
[`v4.6.2`](https://togithub.com/gorhom/react-native-bottom-sheet/blob/HEAD/CHANGELOG.md#462-2024-05-19)

[Compare
Source](https://togithub.com/gorhom/react-native-bottom-sheet/compare/v4.6.1...v4.6.2)

##### Bug Fixes

- **BottomSheetContainer:** cannot add new property 'value'
([#&#8203;1808](https://togithub.com/gorhom/react-native-bottom-sheet/issues/1808))(by
[@&#8203;MoritzCooks](https://togithub.com/MoritzCooks))
([e294d1c](https://togithub.com/gorhom/react-native-bottom-sheet/commit/e294d1ca59ff14f8b990cc52389151c131a95510))
- use function instead of component for BottomSheetModal
([#&#8203;1750](https://togithub.com/gorhom/react-native-bottom-sheet/issues/1750))(by
[@&#8203;Kerumen](https://togithub.com/Kerumen))
([6cfc99f](https://togithub.com/gorhom/react-native-bottom-sheet/commit/6cfc99ffa89339364b206b942486a7995d7ed8ab))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ1cGRhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbIm5wbSIsInJlbm92YXRlIl19-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 5e7869c441..a02ba98249 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "@crowdin/ota-client": "^0.7.0",
     "@fiatconnect/fiatconnect-sdk": "^0.5.42",
     "@fiatconnect/fiatconnect-types": "^13.3.4",
-    "@gorhom/bottom-sheet": "^4.6.1",
+    "@gorhom/bottom-sheet": "^4.6.3",
     "@json-rpc-tools/utils": "^1.7.6",
     "@noble/secp256k1": "^1.7.1",
     "@react-native-async-storage/async-storage": "^1.23.1",
diff --git a/yarn.lock b/yarn.lock
index 5d4328537c..a11e0d4ef2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1971,10 +1971,10 @@
   resolved "https://registry.yarnpkg.com/@flatten-js/interval-tree/-/interval-tree-1.1.3.tgz#7d9b4bb92042c6bbcefae5bbb822b5ec3c073e88"
   integrity sha512-xhFWUBoHJFF77cJO1D6REjdgJEMRf2Y2Z+eKEPav8evGKcLSnj1ud5pLXQSbGuxF3VSvT1rWhMfVpXEKJLTL+A==
 
-"@gorhom/bottom-sheet@^4.6.1":
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-4.6.1.tgz#e45e2183246e338cf732fe4f8f2c91875b22ddce"
-  integrity sha512-sXqsYqX1/rAbmCC5fb9o6hwSF3KXriC0EGUGvLlhFvjaEEMBrRKFTNndiluRK1HmpUzazVaYdTm/lLkSiA2ooQ==
+"@gorhom/bottom-sheet@^4.6.3":
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-4.6.3.tgz#0e16999de7468efc6b730f680692f6d53f0abd8e"
+  integrity sha512-fSuSfbtoKsjmSeyz+tG2C0GtcEL7PS63iEXI23c9M+HeCT1IFK6ffmIa2pqyqB43L1jtkR+BWkpZwqXnN4H8xA==
   dependencies:
     "@gorhom/portal" "1.0.14"
     invariant "^2.2.4"

From 2d67174aa9759f32be29625c4ed9f5a9f1249fcb Mon Sep 17 00:00:00 2001
From: valora-bot-crowdin
 <80050969+valora-bot-crowdin@users.noreply.github.com>
Date: Sat, 25 May 2024 19:39:43 -0700
Subject: [PATCH 061/133] chore(l10n): update translations from Crowdin (#5465)

Co-authored-by: Valora Bot <89419329+valora-bot@users.noreply.github.com>
---
 locales/de/translation.json     | 247 +++++++++++++-----------
 locales/en-US/translation.json  |  23 +++
 locales/es-419/translation.json |  23 +++
 locales/fr-FR/translation.json  | 235 ++++++++++++-----------
 locales/it-IT/translation.json  | 253 +++++++++++++------------
 locales/pl-PL/translation.json  | 199 +++++++++++---------
 locales/pt-BR/translation.json  | 235 ++++++++++++-----------
 locales/ru-RU/translation.json  | 297 +++++++++++++++--------------
 locales/th-TH/translation.json  | 319 ++++++++++++++++---------------
 locales/tr-TR/translation.json  | 195 ++++++++++---------
 locales/uk-UA/translation.json  | 145 ++++++++------
 locales/vi-VN/translation.json  | 323 +++++++++++++++++---------------
 locales/zh-CN/translation.json  | 237 ++++++++++++-----------
 13 files changed, 1515 insertions(+), 1216 deletions(-)

diff --git a/locales/de/translation.json b/locales/de/translation.json
index fc2d679828..155186e023 100644
--- a/locales/de/translation.json
+++ b/locales/de/translation.json
@@ -256,7 +256,7 @@
     }
   ],
   "consumerIncentivesTitle": "Supercharge wird beendet",
-  "consumerIncentivesSummary": "Aber es warten noch mehr Belohnungen auf dich. Bis zum 28. Mai bekommst du {{percent}}% jährliche Rewards auf dein höchstes Stablecoin-Guthaben (cUSD, cEUR, oder cREAL). Und so funktioniert's:",
+  "consumerIncentivesSummary": "Aber es warten noch weitere Rewards auf dich. Bis zum 28. Mai bekommst du jährlich {{percent}} % Rewards auf dein höchstes Stablecoin-Guthaben (cUSD, cEUR, oder cREAL). Und so funktioniert's:",
   "earnWeekly": {
     "header": "Verbinde deine Telefonnummer",
     "text": "Tippe auf Nummer verbinden, wenn du sie noch nicht verbunden hast."
@@ -272,13 +272,13 @@
   },
   "conclusion": "Es ist ganz einfach. Lade dein Guthaben noch heute auf!",
   "superchargeTitle": "Supercharge wird beendet",
-  "superchargeDescription": "Aber es kommen noch mehr Prämien auf dich zu. Bis zum 28. Mai bekommst du {{apy}}% Jahresprämie auf dein höchstes {{token}} Guthaben. Und so funktioniert's:",
+  "superchargeDescription": "Aber es warten noch weitere Rewards auf dich. Bis zum 28. Mai bekommst du jährlich {{apy}} % Rewards auf dein höchstes {{token}}-Guthaben. Und so funktioniert's:",
   "superchargeConnectNumber": "Verbinde deine Telefonnummer",
   "superchargeReconnectNumber": "Verbinde deine Telefonnummer erneut. \n<0>Wir haben das Supercharge-Erlebnis eingeführt und verbessert. Verbinde deine Telefonnummer erneut, um weiterhin Rewards auf deinem {{token}} zu verdienen.</0>",
   "superchargeMinimumBalance": "Füge einen Mindestsaldo von {{amount}} {{token}} hinzu",
-  "superchargeDisclaimer": "Dies hat keine Auswirkungen auf dein Guthaben oder deine bisherigen Einnahmen.",
-  "superchargeDisclaimerMaxRewards": "Dies hat keine Auswirkungen auf dein Guthaben oder deine bisherigen Einnahmen.",
-  "superchargeDisclaimerDayLimit": "Dies hat keine Auswirkungen auf dein Guthaben oder deine bisherigen Einnahmen. <0>Mehr erfahren</0>",
+  "superchargeDisclaimer": "Das hat keine Auswirkungen auf dein Guthaben oder deine bisherigen Verdienste.",
+  "superchargeDisclaimerMaxRewards": "Das hat keine Auswirkungen auf dein Guthaben oder deine bisherigen Verdienste.",
+  "superchargeDisclaimerDayLimit": "Das hat keine Auswirkungen auf dein Guthaben oder deine bisherigen Verdienste. <0>Mehr erfahren</0>",
   "superchargeTokenDetailsDialog": {
     "title": "Welche Vermögen kann ich aufladen?",
     "body": "Du wirst wöchentlich für deinen Celo-Stablecoin mit dem höchsten Guthaben (cEUR, cUSD, cREAL) belohnt.",
@@ -287,10 +287,10 @@
   "superchargingTitle": "Aktualisierung der App erforderlich",
   "superchargingDescription": "Aktualisiere die Valora-App, um weiterhin deine wöchentlichen Supercharge-Rewards zu erhalten.",
   "superchargingTitleV1_54": "Supercharge wird beendet",
-  "superchargingDescriptionV1_54": "Die wöchentlichen Belohnungen kannst du bis Dienstag, den 28. Mai, um 23:59 Uhr UTC einfordern. Ab dem 29. Mai kannst du keine Supercharge-Belohnungen mehr einfordern.",
+  "superchargingDescriptionV1_54": "Die wöchentlichen Rewards sind bis Dienstag, den 28. Mai, um 23:59 Uhr UTC einforderbar. Ab dem 29. Mai kannst du keine Supercharge-Rewards mehr einfordern.",
   "superchargeRewardsAvailable": "Du hast {{amount}} {{token}} verfügbar zum Abholen!",
   "superchargeRewardsAvailableMultipleTokens": "Du hast {{amounts}} verfügbar zum Abholen!",
-  "superchargeClaimText": "Fordere deine Rewards bis Dienstag, 28. Mai, um 23:59 Uhr UTC an. Ab dem 29. Mai kannst du keine Supercharge-Belohnungen mehr einfordern.",
+  "superchargeClaimText": "Fordere deine Rewards bis Dienstag, den 28. Mai, um 23:59 Uhr UTC ein. Ab dem 29. Mai kannst du keine Supercharge-Rewards mehr einfordern.",
   "superchargeClaimButton": "Rewards beanspruchen",
   "superchargeFetchRewardsFailed": "Fehler beim Abrufen ausstehender Supercharge-Rewards. Bitte versuche es später erneut.",
   "superchargeClaimSuccess": "Deine Supercharge-Rewards wurden deinem Gesamtguthaben hinzugefügt.",
@@ -677,8 +677,8 @@
     "body": "Ihr erhaltet ein exklusives NFT, sobald dein Freund seine {{appName}}-Wallet eingerichtet hat und seine Nummer damit verknüpft hat."
   },
   "inviteRewardsBannerCUSD": {
-    "title": "Lade Freunde ein und erhalte bis zu 12 cUSD",
-    "body": "Sobald sie ihre Nummer verbinden und Geld auf {{appName}}einzahlen, erhaltet ihr beide 0,50 cUSD."
+    "title": "Lade deine Freunde ein und erhalte bis zu 12 cUSD",
+    "body": "Sobald sie ihre Nummer verknüpfen und Guthaben zu {{appName}} hinzufügen, erhaltet ihr beide 0,50 cUSD."
   },
   "inviteWithUrl": {
     "title": "Lade deine Freunde ein",
@@ -692,8 +692,8 @@
       "body": "Lade deine Freunde und Familien ein, {{appName}} herunterzuladen. Jeder von euch erhält somit ein exklusives NFT"
     },
     "rewardsActiveCUSD": {
-      "title": "Erhalte bis zu 12 cUSD, wenn du deine Freunde zu Valora einlädst!",
-      "body": "Du bekommst 0,50 cUSD für jeden Freund, den du auf {{appName}}einlädst. Sobald sie ihre Nummer verbinden, Guthaben hinzufügen und dieses 7 Tage lang halten, erhaltet ihr beide 0,50 cUSD. Beeil dich, das Guthaben ist begrenzt! (Limit 25 Freunde)."
+      "title": "ERHALTE BIS ZU 12 cUSD, wenn du deine Freunde zu Valora einlädst!",
+      "body": "Du bekommst 0,50 cUSD für jeden Freund, den du zu {{appName}} einlädst. Sobald deine Freunde ihre Telefonnummer verknüpfen, Guthaben hinzufügen und dieses über einen Zeitraum von sieben Tagen behalten, erhaltet ihr beide 0,50 cUSD. Aber beeil dich, das Guthaben ist begrenzt! (25 Freunde)."
     }
   },
   "getReward": "Erhalte ${{reward}}",
@@ -710,15 +710,15 @@
     "goldDisclaimer": "Wenn du ein „Konto“ bei Valora anlegst, erstellst du ein digitales Wallet, dessen Schlüssel nur du besitzt. Keine andere Person oder Organisation, einschließlich Valora, kann deinen Schlüssel wiederherstellen, Transaktionen ändern oder rückgängig machen oder verlorenes Guthaben wiedererlangen. Sei dir bewusst, dass Kryptowährungen Teil einer neuen Vermögensklasse sind und ein Risiko für finanzielle Verluste darstellen. Überlege dir deine finanzielle Situation und deine Risikobereitschaft genau, bevor du einen Vermögenswert kaufst."
   },
   "termsColloquial": {
-    "title": "Beginnen wir mit der Erstellung deines Portemonnaies",
-    "privacyHeading": "Deine Infos & Privatsphäre:",
-    "privacy1": "Wir sammeln Nutzungsdaten, die uns helfen, die App und die Sicherheit zu verbessern. Welche Art von Daten wir sammeln, wie wir sie verwenden und welche Rechte du in Bezug auf diese Daten hast, kannst du in unserer <0>Datenschutzerklärung</0> nachlesen.",
-    "privacy2": "Wenn du dich entscheidest, deine Telefonnummer zu verknüpfen, speichern wir eine verschlüsselte Kopie davon.",
-    "privacy3": "Wenn du dich entscheidest, deine Kontakte zu verbinden, verwenden wir ihre Namen, Nummern und Profilbilder, um sie leichter zu finden.",
-    "walletHeading": "Dein digitales Portemonnaie mit Valora:",
-    "wallet1": "Du bist dabei, eine digitale Brieftasche zu erstellen. Nur du hast den Schlüssel für deine Brieftasche. Wir können deinen Schlüssel oder dein Vermögen nicht wiederherstellen, wenn du ihn verlierst. Wir können auch keine Aktionen rückgängig machen, die über Valora auf Blockchains durchgeführt wurden.",
-    "wallet2": "Digitale Vermögenswerte, die Vermögenswerte, mit denen du bei Valora interagierst, sind mit einzigartigen Risiken verbunden. Wenn du Valora nutzt, akzeptierst du diese Risiken und übernimmst die Verantwortung dafür. Bitte bedenke deine Finanzen und deine Risikobereitschaft, bevor du Entscheidungen triffst.",
-    "fullTerms": "Lies unsere vollständigen <0>Geschäftsbedingungen</0>"
+    "title": "Starten wir mit der Erstellung deiner Wallet",
+    "privacyHeading": "Deine Daten und Privatsphäre:",
+    "privacy1": "Wir erfassen Nutzungsdaten, die uns dabei helfen, die App und die Sicherheit zu verbessern. Welche Art von Daten wir erfassen, wie wir diese verwenden und welche Rechte du in Bezug auf diese Daten hast, kannst du in unserer <0>Datenschutzrichtlinie</0> nachlesen.",
+    "privacy2": "Wenn du dich dazu entscheidest, deine Telefonnummer zu verknüpfen, speichern wir eine verschlüsselte Kopie davon.",
+    "privacy3": "Wenn du dich entscheidest, deine Kontakte zu verbinden, verwenden wir ihre Namen, Telefonnummern und Profilbilder, damit wir sie leichter finden können.",
+    "walletHeading": "Deine digitale Wallet bei Valora:",
+    "wallet1": "Du bist dabei, eine digitale Wallet zu erstellen. Nur du hast den Schlüssel für deine Wallet. Wir können deinen Schlüssel oder dein Vermögen nicht wiederherstellen, wenn du deinen Schlüssel verlierst. Wir können auch keine Aktionen rückgängig machen, die über Valora auf Blockchains durchgeführt wurden.",
+    "wallet2": "Digitales Vermögen, die Vermögenswerte, mit denen du bei Valora interagierst, sind mit einzigartigen Risiken verbunden. Wenn du Valora benutzt, akzeptierst du diese Risiken und übernimmst die Verantwortung dafür. Bitte achte bei deinen Entscheidungen auf die dir zur Verfügung stehenden finanziellen Mittel und deine Risikobereitschaft.",
+    "fullTerms": "Lies bitte unsere <0>Allgemeinen Nutzungsbedingungen</0> vollständig durch"
   },
   "fullNameOrPsuedonym": "Vollständiger Name oder Alias",
   "namePlaceholder": "z.B. Name",
@@ -827,7 +827,7 @@
     "hasWallet": "Ich habe bereits eine Wallet",
     "header": "Willkommen bei {{appName}}! Lass uns deine Wallet erstellen.",
     "getStarted": "Erste Schritte",
-    "agreeToTerms": "Wenn du ein Wallet erstellst, stimmst du unseren <0>Allgemeinen Geschäftsbedingungen</0> zu"
+    "agreeToTerms": "Wenn du eine Wallet erstellst, stimmst du unseren <0>Allgemeinen Nutzungsbedingungen</0> zu"
   },
   "accessContacts": {
     "disclosure": {
@@ -1034,7 +1034,7 @@
   "inviteWithoutPayment": "Hallo! Ich habe {{appName}} benutzt, um Krypto weltweit zu überweisen. Es ist einfach zu versuchen und ich möchte dich einladen, es mit diesem Link zu sehen: {{link}}",
   "inviteWithEscrowedPayment": "Hallo! Ich habe {{appName}} benutzt, um Krypto weltweit zu überweisen. Ich habe dir gerade {{amount}} {{token}} geschickt. Bitte lade die {{appName}} App herunter und löse dein {{token}} mit diesem Link ein: {{link}}",
   "inviteWithRewards": "Hallo! 👋 Ich nutze {{appName}} als Krypto-Wallet. Du kannst die App super schnell herunterladen und deine Telefonnummer verbinden. Außerdem erhalten wir beide ein exklusives NFT als Reward. 💫 \n\nLade die App mit diesem Link herunter: {{link}}",
-  "inviteWithRewardsCUSD": "Hey! Im Moment können wir beide eine kostenlose $0,50-Belohnung erhalten, wenn du dich anmeldest, deine Nummer verbindest und dein Valora-Wallet auflädst. Ich verwende es, um meine Ersparnisse in USD und Kryptowährungen zu vermehren, und du kannst es in Sekundenschnelle einrichten, wenn du nur deine Telefonnummer angibst. Melde dich mit meinem Empfehlungslink hier an: \n\n{{link}} \n\n Beeil dich, die Empfehlungsaktion endet bald.",
+  "inviteWithRewardsCUSD": "Hallo! Wenn du dich bei Valora anmeldest, deine Telefonnummer verknüpfst und Geld in deine Wallet einzahlst, können wir beide eine kostenlose Reward in Höhe von 0,50 Dollar erhalten. Ich verwende es, um meine Ersparnisse in USD und Krypto zu vermehren. Wenn du deine Telefonnummer angibst, kannst du deine Wallet in Sekundenschnelle einrichten. Melde dich mit meinem Empfehlungslink hier an: \n\n{{link}} \n\n Aber beeil dich, denn die Empfehlungsaktion endet bald.",
   "loadingContacts": "Deine Kontakte finden",
   "myCode": "Mein Code",
   "scanCode": "Scannen",
@@ -1823,9 +1823,9 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Kostenlos",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Gebühr\n\nDie {{appName}} Gebühr von {{appFeePercentage}}% wurde entwickelt, um dein Erlebnis zu verbessern, indem wir schnelle, zuverlässige und sichere Swaps gewährleisten.",
+      "appFeeInfo": "{{appName}} Gebühr\n\nDie {{appName}} Gebühr in Höhe von {{appFeePercentage}} % soll deine Erfahrung verbessern, indem wir schnelle, zuverlässige und sichere Tauschvorgänge gewährleisten.",
       "appFeeInfo_free": "{{appName}} Gebühr\n\nDieser Tausch ist kostenlos.",
-      "appFeeInfo_placeholder": "{{appName}} Gebühr\n\nDie Gebühr wird auf der Grundlage des Angebots berechnet, das du erhältst.",
+      "appFeeInfo_placeholder": "{{appName}} Gebühr\n\nDie Gebühr wird auf Grundlage des Angebots berechnet, das du erhältst.",
       "appFeeInfoDismissButton": "Verstanden",
       "slippagePercentage": "Slippage-Toleranz",
       "networkFeeInfo": "Du tauschst über das {{networkName}}-Netzwerk.\n\nUm eine Transaktion über das {{networkName}}-Netzwerk durchzuführen, musst du diese geschätzte Netzwerkgebühr bezahlen. Diese Gebühr sichert deine Transaktion und trägt dazu bei, das Netzwerk aufrechtzuerhalten.",
@@ -1833,8 +1833,8 @@
       "slippageToleranceInfo": "Slippage-Toleranz\n\nDein Tausch wird innerhalb der Slippage-Toleranz in Prozent ausgeführt. Wenn sich der Preis stärker als die Slippage-Toleranz verändert, schützt dich {{appName}}, indem die Ausführung des Handels verhindert wird.",
       "networkFeeInfoDismissButton": "Verstanden",
       "exchangeRate": "Umtauschkurs",
-      "exchangeRateInfo": "Wechselkurs\n\nWir haben den besten Wechselkurs für dich gefunden. Dein Handel wird zu einem Preis abgeschlossen, der innerhalb {{slippagePercentage}}% der Schätzung liegt, oder die Transaktion wird storniert und das Geld wird an deine Brieftasche zurückgegeben.",
-      "exchangeRateInfo_withAppFee": "Wechselkurs\n\nWir haben den besten Wechselkurs für dich gefunden. Dein Handel wird zu einem Kurs innerhalb von {{slippagePercentage}}% des geschätzten Kurses abgewickelt oder die Transaktion wird storniert und das Geld wird an dein Portemonnaie zurückgegeben.\n\nDer geschätzte Kurs beinhaltet eine {{appName}} Gebühr von {{appFeePercentage}}%.",
+      "exchangeRateInfo": "Umtauschkurs\n\nWir haben den besten Umtauschkurs für dich gefunden. Dein Trade wird zu einem Preis abgeschlossen, der innerhalb von {{slippagePercentage}} % der Prognose liegt, oder die Transaktion wird storniert und das Geld wird in deine Wallet zurückgebucht.",
+      "exchangeRateInfo_withAppFee": "Umtauschkurs\n\nWir haben den besten Umtauschkurs für dich gefunden. Dein Trade wird zu einem Preis abgeschlossen, der innerhalb von {{slippagePercentage}} % der Prognose liegt, oder die Transaktion wird storniert und das Geld wird in deine Wallet zurückgebucht.\n\nDer geschätzte Kurs enthält eine {{appName}} Gebühr in Höhe von {{appFeePercentage}} %.",
       "exchangeRateInfoDismissButton": "Verstanden",
       "estimatedValue": "Geschätzter Wert"
     },
@@ -2060,11 +2060,11 @@
     },
     "invite": {
       "title": "Sende Krypto an deine Freunde.",
-      "subtitle": "Sende Geldmittel oder eine Einladung an deine Kontakte"
+      "subtitle": "Sende Guthaben oder eine Einladung an deine Kontakte"
     },
     "jumpstart": {
-      "title": "Senden mit einem Live-Link",
-      "subtitle": "Einen Link teilen, um Krypto wie einen Text zu versenden"
+      "title": "Mit einem Live-Link senden",
+      "subtitle": "Teile einen Link, um Krypto wie einen Text zu senden"
     },
     "getStarted": {
       "title": "So kannst du Guthaben auf Valora senden.",
@@ -2118,8 +2118,8 @@
   "viewOnArbiscan": "Auf Arbiscan anzeigen",
   "viewOnOPMainnetExplorer": "Auf OP Mainnet Explorer ansehen",
   "viewOnOPSepoliaExplorer": "Auf OP Sepolia Explorer ansehen",
-  "viewOnPolygonPoSScan": "Ansicht auf PolygonScan",
-  "viewOnBaseScan": "Ansicht auf BaseScan",
+  "viewOnPolygonPoSScan": "Auf PolygonScan anzeigen",
+  "viewOnBaseScan": "Auf BaseScan anzeigen",
   "sendEnterAmountScreen": {
     "title": "Betrag eingeben",
     "selectToken": "Token auswählen",
@@ -2156,7 +2156,7 @@
     }
   },
   "jumpstartShareLinkScreen": {
-    "title": "Teile deinen Live Link",
+    "title": "Teile deinen Live-Link",
     "description": "Kopiere den Link, um {{tokenSymbol}} über die Messaging-App deiner Wahl zu senden, oder verwende den QR-Code.",
     "linkLabel": "Live-Link",
     "linkCopiedMessage": "Live-Link kopiert",
@@ -2208,14 +2208,14 @@
       "description": "Du findest dein neues NFT {{rewardName}} unter deinen „Sammlerstücken“"
     },
     "rewardBottomSheet": {
-      "title": "Verdiene $5 ETH",
-      "description": "Wenn du deine Wallet bis zum 4. April 2024 um 12:00 Uhr PDT mit einem beliebigen Ethereum-Token füllst, bekommst du am 5. April 2024 um 23:59 Uhr PDT $5 ETH von uns.\n\nDies ist ein exklusives Angebot, wenn du ein Early Ethereum Explorer bist.",
+      "title": "Verdiene 5 USD von ETH",
+      "description": "Wenn du deine Wallet bis zum 4. April 2024 (12:00 Uhr PDT) mit einem beliebigen Ethereum-Token auflädst, bekommst du am 5. April 2024 um 23:59 Uhr PDT 5 USD von ETH von uns.\n\nDies ist ein exklusives Angebot für alle Early Ethereum Explorer.",
       "expirationLabel": "Läuft ab {{expirationLabelText}}",
       "cta": "Belohnung verwenden"
     },
     "rewardReminderBottomSheet": {
-      "title": "Verpasse es nicht, verdiene $5 ETH",
-      "description": "Wenn du deine Wallet bis zum 4. April 2024 um 12:00 Uhr PDT mit einem beliebigen Ethereum-Token füllst, bekommst du am 5. April 2024 um 23:59 Uhr PDT $5 ETH von uns.\n\nDies ist ein exklusives Angebot, wenn du ein Early Ethereum Explorer bist.",
+      "title": "Nicht verpassen und 5 USD von ETH verdienen",
+      "description": "Wenn du deine Wallet bis zum 4. April 2024 (12:00 Uhr PDT) mit einem beliebigen Ethereum-Token auflädst, bekommst du am 5. April 2024 um 23:59 Uhr PDT 5 USD von ETH von uns.\n\nDies ist ein exklusives Angebot für alle Early Ethereum Explorer.",
       "expirationLabel": "Läuft ab {{expirationLabelText}}",
       "cta": "Belohnung verwenden"
     }
@@ -2244,27 +2244,27 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Kontrolle über dein Geld",
-      "description": "Bitte warte, während wir deinen Live Link überprüfen. Anspruchsberechtigte Gelder werden in Kürze eintreffen."
+      "title": "Dein Guthaben wird geprüft",
+      "description": "Bitte warte, während wir deinen Live-Link überprüfen. Beanspruchbares Guthaben erreicht dich in Kürze."
     },
     "error": {
       "title": "Guthaben kann nicht in Anspruch genommen werden",
       "description": "Dieser Link konnte aus einem unbekannten Grund nicht beansprucht werden",
-      "alreadyClaimedDescription": "Der Link wurde bereits beansprucht. Bitte deinen Freund, einen neuen Link zu senden.",
+      "alreadyClaimedDescription": "Der Link wurde bereits in Anspruch genommen. Bitte deinen Freund, einen neuen Link zu senden",
       "contactSupport": "Support kontaktieren",
       "dismiss": "Verwerfen"
     }
   },
   "jumpstartReclaim": {
-    "description": "Für die Rückforderung deines Links fällt eine Netzgasgebühr an. Möchtest du fortfahren?",
+    "description": "Für das Zurückfordern deines Links fällt eine Netzwerk-Gasgebühr an. Möchtest du fortfahren?",
     "fetchStatusError": {
-      "title": "Ups, da ist etwas schief gelaufen",
-      "description": "Wir konnten den Forderungsstatus dieser Einladung nicht ermitteln. Bitte versuche es später noch einmal oder kontaktiere den Support.",
+      "title": "Ups, etwas ist schiefgelaufen",
+      "description": "Wir konnten den Forderungsstatus dieser Einladung nicht ermitteln. Bitte versuche es später erneut oder kontaktiere das Support-Team",
       "retryCta": "Erneut versuchen"
     },
     "reclaimError": {
-      "title": "Nicht in der Lage, Gelder zurückzufordern",
-      "description": "Versuche, erneut zu reklamieren, oder kontaktiere den Support"
+      "title": "Guthaben kann nicht zurückgefordert werden",
+      "description": "Versuche eine erneute Rückforderung oder kontaktiere das Support-Team"
     }
   },
   "multiSelect": {
@@ -2272,12 +2272,12 @@
     "allNetworks": "Alle Netzwerke"
   },
   "points": {
-    "title": "Valora Punkte",
+    "title": "Valora-Punkte",
     "activity": "Aktivität",
     "history": {
       "cards": {
         "createWallet": {
-          "title": "Brieftaschenhalter",
+          "title": "Wallet-Inhaber",
           "subtitle": "Mitglied von {{appName}}"
         },
         "swap": {
@@ -2285,58 +2285,58 @@
           "subtitle": "{{fromToken}} zu {{toToken}}"
         }
       },
-      "title": "Meine Punkte Aktivität",
+      "title": "Meine Punkteaktivität",
       "error": {
-        "title": "Aktivität kann keine Punkte laden",
-        "subtitle": "Ups, beim Laden deines Punkte-Aktivitäten-Feeds ist etwas schief gelaufen. Bitte versuche es noch einmal.",
+        "title": "Punkteaktivität konnte nicht geladen werden",
+        "subtitle": "Ups, beim Laden deines Punkteaktivitäts-Feeds ist etwas schiefgelaufen. Bitte versuche es erneut.",
         "tryAgain": "Erneut versuchen"
       },
       "empty": {
         "title": "Noch keine Punkteaktivität",
-        "subtitle": "Es sieht so aus, als hättest du noch keine Punkte gesammelt. Nutze {{appName}} , um Punkte zu sammeln!",
+        "subtitle": "Es sieht so aus, als hättest du noch keine Punkte verdient. Nutze {{appName}}, um Punkte zu verdienen!",
         "gotIt": "Verstanden"
       },
       "pageError": {
-        "title": "Kann nicht geladen werden",
-        "subtitle": "Ups, beim Beenden des Ladevorgangs ist etwas schief gelaufen. Bitte versuche es noch einmal.",
+        "title": "Laden nicht möglich",
+        "subtitle": "Ups, beim Beenden des Ladevorgangs ist etwas schiefgelaufen. Bitte versuche es erneut.",
         "refresh": "Aktualisieren"
       }
     },
     "fetchBalanceError": {
-      "title": "Du kannst deine Punkte nicht laden",
+      "title": "Punkte konnten nicht geladen werden",
       "description": "Ups, beim Versuch, deine Punkte zu laden, ist etwas schiefgegangen. Die Informationen auf dieser Seite sind möglicherweise nicht mehr aktuell. Bitte aktualisiere sie.",
       "retryCta": "Aktualisieren"
     },
     "loading": {
-      "title": "Sammeln deiner Punkte",
-      "description": "Wir sind dabei, deine Punkte zusammenzuzählen, warte ab"
+      "title": "Sammle deine Punkte",
+      "description": "Wir zählen gerade deine Punkte. Bitte warte einen Moment"
     },
     "error": {
-      "title": "Punkte können nicht geladen werden",
-      "description": "Ups, beim Laden deiner Punkte ist etwas schiefgegangen. Bitte versuche es noch einmal.",
+      "title": "Punkte konnten nicht geladen werden",
+      "description": "Ups, beim Laden deiner Punkte ist etwas schiefgegangen. Bitte versuche es erneut.",
       "retryCta": "Erneut versuchen"
     },
     "infoCard": {
-      "title": "Bald gibt es mehr Möglichkeiten, Punkte zu sammeln 🚀.",
-      "body": "Wir arbeiten daran, weitere Möglichkeiten zum Sammeln von Punkten mit der App zu schaffen. Halte dich für Updates auf dem Laufenden."
+      "title": "Bald hast du noch mehr Möglichkeiten, Punkte zu verdienen 🚀",
+      "body": "Wir arbeiten daran, weitere Möglichkeiten zum Verdienen von Punkten mit der App hinzuzufügen. Wir halten dich auf dem Laufenden!"
     },
     "activitySection": {
-      "title": "Wie kann ich Punkte sammeln?",
-      "body": "Es ist ganz einfach! Sammle Punkte, indem du einfach die App benutzt."
+      "title": "Wie erhalte ich Punkte?",
+      "body": "Das ist ganz einfach! Verdiene Punkte, indem du die App benutzt."
     },
     "noActivities": {
-      "title": "Update zum Freischalten von mehr Punkten 🔓.",
-      "body": "Ups! Es scheint, dass du eine ältere Version von {{appName}}verwendest. Aktualisiere jetzt und entdecke all die spannenden neuen Möglichkeiten, wie du Punkte sammeln kannst."
+      "title": "Zum Freischalten von mehr Punkten aktualisieren 🔓",
+      "body": "Ups! Es scheint, dass du eine ältere Version von {{appName}} nutzt. Führe jetzt eine Aktualisierung durch und entdecke die spannenden neuen Möglichkeiten zum Verdienen von Punkten."
     },
     "activityCards": {
       "createWallet": {
-        "title": "Erstelle eine {{appName}}  Brieftasche"
+        "title": "Erstelle eine {{appName}} Wallet"
       },
       "swap": {
-        "title": "Swap-Vermögenswerte",
+        "title": "Vermögen tauschen",
         "bottomSheet": {
-          "title": "Swap-Vermögenswerte",
-          "body": "Hier kannst du alle Details angeben, die du dafür brauchst. Vielleicht ein Mindestbetrag zum Tauschen. \n\nVerdiene {{pointsValue}} Punkte, wenn du einen Vermögenswert mit {{appName}}tauschst.",
+          "title": "Vermögen tauschen",
+          "body": "Hier kannst du alle Details angeben, die du dafür brauchst. Vielleicht ein Mindestbetrag zum Tauschen? \n\nVerdiene {{pointsValue}} Punkte, wenn du Vermögen über {{appName}} tauschst.",
           "cta": "Zum Tausch gehen"
         }
       },
@@ -2346,34 +2346,57 @@
     },
     "discoverCard": {
       "title": "{{appName}} Punkte",
-      "description": "Sammle ganz einfach Punkte mit {{appName}}. Die Nutzung der App, einschließlich des Tauschens, führt zu Punkten!"
+      "description": "Sammle ganz einfach Punkte mit {{appName}}. Mit der Nutzung der App, einschließlich des Tauschens, erhältst du Punkte!"
     },
     "intro": {
-      "title": "Mühelos Punkte sammeln",
-      "description": "Erlebe eine neue Art zu verdienen! Für deine {{appName}} Aktionen gibt es jetzt Punkte. Fang noch heute an zu verdienen und schalte tolle Vorteile frei.",
-      "cta": "Beginne deine Punkte-Reise"
+      "title": "Verdiene mühelos Punkte",
+      "description": "Entdecke neue Möglichkeiten! Für deine {{appName}} Aktionen gibt es jetzt Punkte. Fange noch heute an und schalte tolle Vorteile frei.",
+      "cta": "Starte deine Punkte-Reise"
     }
   },
   "earnFlow": {
     "gasSubsidized": "Valora übernimmt das Benzin für diese Transaktion!",
     "addCryptoBottomSheet": {
-      "title": "Füge {{tokenSymbol}} auf {{tokenNetwork}}hinzu.",
-      "description": "Sobald du Jetons hinzugefügt hast, musst du zurückkommen, um die Einzahlung in einen Pool zu beenden.",
+      "title": "Füge {{tokenSymbol}} auf {{tokenNetwork}} hinzu",
+      "description": "Sobald du Tokens hinzugefügt hast, musst du zurückkommen, um die Einzahlung in einen Pool zu beenden.",
       "actions": {
         "add": "Kaufen",
-        "transfer": "Übertragung",
+        "transfer": "Überweisung",
         "swap": "Tauschen"
       },
       "actionDescriptions": {
         "add": "Kaufe {{tokenSymbol}} auf {{tokenNetwork}} über einen unserer vertrauenswürdigen Anbieter",
-        "transfer": "Verwende jede {{tokenNetwork}} kompatible Brieftasche oder Börse, um {{tokenSymbol}}einzuzahlen.",
+        "transfer": "Verwende jede {{tokenNetwork}} kompatible Wallet oder Börse, um {{tokenSymbol}} einzuzahlen",
         "swap": "Tausche in {{tokenSymbol}} von einem anderen {{tokenNetwork}} Token"
       }
     },
     "cta": {
-      "title": "Verdiene mit deinen Stablecoins",
-      "subtitle": "Heute einzahlen und Rendite verdienen",
-      "description": "Erfahre, wie viel du verdienen kannst, wenn du einen Kreditpool bereitstellst"
+      "title": "Verdiene an deinen Stablecoins",
+      "subtitle": "Zahle heute ein und verdiene Rendite",
+      "description": "Erfahre, wie viel du an der Bereitstellung eines Kreditpools verdienen kannst"
+    },
+    "earnInfo": {
+      "title": "Verdiene mit deinen\nstablecoins",
+      "details": {
+        "earn": {
+          "titleGasSubsidy": "Maximiere deine Einnahmen ohne Gasgebühren*",
+          "title": "Gewinne maximieren",
+          "subtitle": "Verdiene an deinen Stablecoins und erhalte Belohnungen, wenn du einen Pool belieferst.",
+          "footnoteSubsidy": "*Gasgebühren werden vorübergehend von Valora übernommen"
+        },
+        "manage": {
+          "title": "Direkt von Valora aus verwalten",
+          "subtitle": "Wir kümmern uns um die Einrichtung, damit du deine Position direkt von Valora aus verwalten kannst."
+        },
+        "access": {
+          "title": "Einfacher Zugriff auf dein Geld",
+          "subtitle": "Sammle dein Geld mühelos mit einem einzigen Tap. Genieße den gleichen sofortigen Zugang wie direkt über deine Lieblingsprotokolle."
+        }
+      },
+      "action": {
+        "learn": "Weitere Info",
+        "earn": "Beginne zu verdienen"
+      }
     },
     "ctaV1_86": {
       "title": "Maximiere den Ertrag von Stablecoins",
@@ -2381,74 +2404,74 @@
       "description": "Verdiene etwa {{apy}}% pro Jahr, wenn du {{symbol}} zu einem Pool hinzufügst"
     },
     "enterAmount": {
-      "earnUpToLabel": "Du könntest bis zu:",
+      "earnUpToLabel": "Verdienst von bis zu:",
       "rateLabel": "Rate (geschätzt)",
-      "earnUpTo": "~{{fiatSymbol}}{{amount}} / yr",
-      "rate": "{{rate}}% APY",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / Jahr",
+      "rate": "{{rate}} % jährliche prozentuale Rendite",
       "continue": "Weiter",
-      "info": "Dieser Pool wird von Aave betrieben",
+      "info": "Dieser Pool wird von Aave unterstützt",
       "infoBottomSheet": {
         "title": "Warum dieser Pool?",
-        "description": "Dieser Aave-Pool hat über 150 Mio. USD TVL und mehr als 6.000 Beitragszahler, was für eine hohe Liquidität und Vertrauenswürdigkeit spricht. Außerdem verwendet er USDC als Token und Abritrum als Netzwerk, was die Volatilität reduziert und sicherstellt, dass die Nutzer günstige Gasraten erhalten.\n\nAlles zusammen macht es zu einer sicheren und attraktiven Option mit wettbewerbsfähigen APY, die eine vorteilhafte Investitionsmöglichkeit für unsere Nutzer/innen darstellt.\n\nAndere Aave-Pools kannst du <0>hier</0> entdecken.",
+        "description": "Dieser Aave-Pool hat über 150 Millionen Dollar TVL und mehr als 6.000 Beitragszahler, was für eine hohe Liquidität und Vertrauenswürdigkeit spricht. Außerdem verwendet er USDC als Token und Abritrum als Netzwerk, was die Volatilität reduziert und sicherstellt, dass die Nutzer günstige Gasgebühren erhalten.\n\nDas alles macht den Aave-Pool zu einer sicheren und attraktiven Option mit wettbewerbsfähiger jährlicher prozentualer Rendite, die eine vorteilhafte Investitionsmöglichkeit für unsere Nutzer darstellt.\n\nWeitere Aave-Pools findest du <0>hier</0>.",
         "dismiss": "Verwerfen"
       },
       "notEnoughBalanceForGasWarning": {
-        "title": "Du brauchst mehr {{feeTokenSymbol}} um weiterzumachen",
-        "description": "Füge {{feeTokenSymbol}} auf {{network}} hinzu, um deine Gaskosten zu decken.",
-        "noGasCta": "Kaufen Sie {{feeTokenSymbol}} auf {{network}}"
+        "title": "Du benötigst mehr {{feeTokenSymbol}} zum Fortfahren",
+        "description": "Füge {{feeTokenSymbol}} auf {{network}} hinzu, um deine Gasgebühren zu decken",
+        "noGasCta": "Kaufe {{feeTokenSymbol}} auf {{network}}"
       }
     },
     "activePools": {
       "title": "Aktive Pools",
       "totalValue": "Gesamtwert:",
-      "apy": "~{{apy}}% APY",
-      "exitPool": "Exit Pool",
-      "depositMore": "Pfand Mehr",
-      "viewPools": "Ansicht Pools"
+      "apy": "~{{apy}} % jährliche prozentuale Rendite",
+      "exitPool": "Pool verlassen",
+      "depositMore": "Mehr einzahlen",
+      "viewPools": "Pools anzeigen"
     },
     "depositBottomSheet": {
-      "title": "Überprüfung & Einzahlung",
-      "description": "Bevor du in einen Aave-Pool einzahlst, solltest du die folgenden Transaktionsdetails überprüfen",
+      "title": "Überprüfen und einzahlen",
+      "description": "Bevor du eine Einzahlung in einen Aave-Pool vornimmst, solltest du die folgenden Transaktionsdetails überprüfen",
       "amount": "Eingezahlter Betrag",
-      "fee": "Est. Gas-Gebühren",
-      "provider": "Einkommensanbieter",
+      "fee": "Geschätzte Gasgebühren",
+      "provider": "Verdienstanbieter",
       "network": "Netzwerk",
-      "footer": "Wenn du Kryptowährungen in einen Aave-Pool einzahlst, akzeptierst du die mit der Nutzung von Aave verbundenen Risiken. <0>Bedingungen & Konditionen</0>",
-      "primaryCta": "Vollständig",
+      "footer": "Wenn du Kryptowährungen in einen Aave-Pool einzahlst, akzeptierst du die mit der Nutzung von Aave verbundenen Risiken. <0>Allgemeine Nutzungsbedingungen</0>",
+      "primaryCta": "Abschließen",
       "secondaryCta": "Abbrechen"
     },
     "collect": {
-      "title": "Herzlichen Glückwunsch! Überprüfe und sammle deinen Verdienst",
+      "title": "Herzlichen Glückwunsch! Überprüfe und sammle deinen Verdienst ein",
       "total": "GESAMT",
       "plus": "PLUS",
       "rate": "Rate (geschätzt)",
-      "apy": "{{apy}}% APY",
+      "apy": "{{apy}} % jährliche prozentuale Rendite",
       "fee": "Gasgebühr",
-      "cta": "Verdienste sammeln",
+      "cta": "Verdienste einsammeln",
       "errorTitle": "Etwas ist schief gelaufen",
-      "errorDescription": "Die Einzahlungsdetails können nicht abgerufen werden. Bitte versuche es erneut.",
-      "noGasTitle": "Du brauchst mehr {{symbol}} um weiterzumachen",
-      "noGasDescription": "Füge {{symbol}} auf {{network}} hinzu, um deine Gaskosten zu decken.",
-      "noGasCta": "Kaufen Sie {{symbol}} auf {{network}}"
+      "errorDescription": "Einzahlungsdetails konnten nicht abgerufen werden. Bitte versuche es erneut.",
+      "noGasTitle": "Du benötigst mehr {{symbol}}, um fortzufahren",
+      "noGasDescription": "Füge {{symbol}} auf {{network}} hinzu, um deine Gaskosten zu decken",
+      "noGasCta": "Kaufe {{symbol}} auf {{network}}"
     },
     "transactionFeed": {
       "earnClaimTitle": "Gesammelt",
-      "earnClaimSubtitle": "von {{providerName}} Pool",
-      "earnDepositTitle": "Hinterlegt",
-      "earnDepositSubtitle": "zu {{providerName}} Pool",
-      "earnWithdrawTitle": "Zurückgezogen",
+      "earnClaimSubtitle": "aus {{providerName}} Pool",
+      "earnDepositTitle": "Eingezahlt",
+      "earnDepositSubtitle": "in {{providerName}} Pool",
+      "earnWithdrawTitle": "Abgehoben",
       "earnWithdrawSubtitle": "von {{providerName}} Pool"
     },
     "transactionDetails": {
       "descriptionLabel": "Details",
       "earnClaimTitle": "Gesammelt",
-      "earnClaimSubtitle": "Gesammelt {{tokenSymbol}} von {{providerName}} Pool",
+      "earnClaimSubtitle": "{{tokenSymbol}} aus {{providerName}} Pool eingesammelt",
       "earnClaimDetails": "Eingesammelter Betrag",
-      "earnDepositTitle": "Hinterlegt",
-      "earnDepositSubtitle": "Hinterlegt {{tokenSymbol}} auf {{providerName}} Pool",
+      "earnDepositTitle": "Eingezahlt",
+      "earnDepositSubtitle": "{{tokenSymbol}} in {{providerName}} Pool eingezahlt",
       "earnDepositDetails": "Eingezahlter Betrag",
-      "earnWithdrawTitle": "Zurückgezogen",
-      "earnWithdrawSubtitle": "Ziehe {{tokenSymbol}} aus dem {{providerName}} Pool zurück",
+      "earnWithdrawTitle": "Abgehoben",
+      "earnWithdrawSubtitle": "{{tokenSymbol}} aus dem {{providerName}} Pool abgehoben",
       "earnWithdrawDetails": "Betrag abgehoben"
     }
   },
diff --git a/locales/en-US/translation.json b/locales/en-US/translation.json
index 1620b36017..e1c3471e18 100644
--- a/locales/en-US/translation.json
+++ b/locales/en-US/translation.json
@@ -2375,6 +2375,29 @@
       "subtitle": "Deposit today and earn returns",
       "description": "See how much you can earn when supplying a lending pool"
     },
+    "earnInfo": {
+      "title": "Earn on your\nstablecoins",
+      "details": {
+        "earn": {
+          "titleGasSubsidy": "Maximize Earnings without Gas Fees*",
+          "title": "Maximize Earnings",
+          "subtitle": "Earn on your stablecoins and get rewards when you supply a pool.",
+          "footnoteSubsidy": "*Gas fees are temporarily covered by Valora"
+        },
+        "manage": {
+          "title": "Manage Directly from Valora",
+          "subtitle": "We’ll take care of the setup so you can manage your position directly from Valora."
+        },
+        "access": {
+          "title": "Easily Access your Funds",
+          "subtitle": "Collect your funds effortlessly with a single tap. Enjoy the same instant access as you would directly through your favorite protocols."
+        }
+      },
+      "action": {
+        "learn": "Learn More",
+        "earn": "Start Earning"
+      }
+    },
     "ctaV1_86": {
       "title": "Maximize earnings on stablecoins",
       "subtitle": "Buy {{symbol}}",
diff --git a/locales/es-419/translation.json b/locales/es-419/translation.json
index 7cc20bf133..ce01b63796 100644
--- a/locales/es-419/translation.json
+++ b/locales/es-419/translation.json
@@ -2375,6 +2375,29 @@
       "subtitle": "Deposita hoy y obtén beneficios",
       "description": "Comprueba cuánto puedes ganar al abastecer un fondo común de préstamos"
     },
+    "earnInfo": {
+      "title": "Gana con tus stablecoins\n",
+      "details": {
+        "earn": {
+          "titleGasSubsidy": "Maximiza las ganancias sin tasas de gas*.",
+          "title": "Maximizar las ganancias",
+          "subtitle": "Gana con tus stablecoins y obtén recompensas cuando suministres un pool.",
+          "footnoteSubsidy": "*Las tasas de gas las cubre temporalmente Valora"
+        },
+        "manage": {
+          "title": "Gestiona directamente desde Valora",
+          "subtitle": "Nosotros nos encargamos de la configuración para que puedas gestionar tu posición directamente desde Valora."
+        },
+        "access": {
+          "title": "Accede fácilmente a tus fondos",
+          "subtitle": "Recoge tus fondos sin esfuerzo con un solo toque. Disfruta del mismo acceso instantáneo que tendrías directamente a través de tus protocolos favoritos."
+        }
+      },
+      "action": {
+        "learn": "Más información",
+        "earn": "Comienza a ganar"
+      }
+    },
     "ctaV1_86": {
       "title": "Maximizar las ganancias en stablecoins",
       "subtitle": "Comprar {{symbol}}",
diff --git a/locales/fr-FR/translation.json b/locales/fr-FR/translation.json
index bd1839a2df..36a2d40a57 100644
--- a/locales/fr-FR/translation.json
+++ b/locales/fr-FR/translation.json
@@ -255,8 +255,8 @@
       "text": "Quiconque possède votre phrase pourra accéder à votre compte et à tous les fonds qui s'y trouvent. Ne la partagez avec personne."
     }
   ],
-  "consumerIncentivesTitle": "La supercharge se termine",
-  "consumerIncentivesSummary": "Mais d'autres récompenses t'attendent. Jusqu'au 28 mai, obtiens {{percent}}% de récompenses annuelles sur ton solde stablecoin le plus élevé (cUSD, cEUR ou cREAL). Voici comment cela fonctionne :",
+  "consumerIncentivesTitle": "Supercharge touche à sa fin",
+  "consumerIncentivesSummary": "Mais d'autres récompenses vous attendent. Jusqu'au 28 mai, obtenez des récompenses annuelles de {{percent}}% sur votre solde le plus élevé de stablecoin (cUSD, cEUR, ou cREAL). Voici comment ça marche :",
   "earnWeekly": {
     "header": "Connectez votre numéro de téléphone",
     "text": "Appuyez sur Connecter le numéro si vous ne l'avez pas encore connecté."
@@ -271,14 +271,14 @@
     "text": "Cela vous assurera que vos récompenses sont sécurisées et sous votre contrôle."
   },
   "conclusion": "C'est aussi simple que ça. Superchargez votre compte crypto sans attendre !",
-  "superchargeTitle": "La supercharge se termine",
-  "superchargeDescription": "Mais d'autres récompenses t'attendent. Jusqu'au 28 mai, obtiens {{apy}}% de récompenses annuelles sur ton solde {{token}} le plus élevé. Voici comment cela fonctionne :",
+  "superchargeTitle": "Supercharge touche à sa fin",
+  "superchargeDescription": "Mais d'autres récompenses vous attendent. Jusqu'au 28 mai, obtenez des récompenses annuelles de {{apy}}% sur votre solde le plus élevé de stablecoin (cUSD, cEUR, ou cREAL). Voici comment ça marche :",
   "superchargeConnectNumber": "Connectez votre numéro de téléphone",
   "superchargeReconnectNumber": "Reconnectez votre numéro de téléphone\n<0>Nous vous proposons un programme Supercharge amélioré. Reconnectez votre numéro de téléphone pour continuer à gagner des récompenses en {{token}}.</0>",
   "superchargeMinimumBalance": "Ajoutez un minimum de {{amount}} {{token}}",
-  "superchargeDisclaimer": "Cela n'affectera pas ton solde ou tes gains antérieurs.",
-  "superchargeDisclaimerMaxRewards": "Cela n'affectera pas ton solde ou tes gains antérieurs.",
-  "superchargeDisclaimerDayLimit": "Cela n'affectera pas ton solde ou tes gains antérieurs. <0>En savoir plus</0>",
+  "superchargeDisclaimer": "Cela n'affectera pas votre solde ou vos gains précédents.",
+  "superchargeDisclaimerMaxRewards": "Cela n'affectera pas votre solde ou vos gains précédents.",
+  "superchargeDisclaimerDayLimit": "Cela n'affectera pas votre solde ou vos gains précédents. <0>En savoir plus</0>",
   "superchargeTokenDetailsDialog": {
     "title": "Quels actifs puis-je Supercharger ?",
     "body": "Vous serez récompensé chaque semaine sur votre stablecoin Celo avec le solde la plus élevée (cEUR, cUSD, cREAL).",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "Mise à jour nécessaire",
   "superchargingDescription": "Mettez à jour l'appli pour continuer à recevoir vos récompenses Supercharge hebdomadaires.",
-  "superchargingTitleV1_54": "La supercharge se termine",
-  "superchargingDescriptionV1_54": "Les récompenses hebdomadaires pourront être réclamées jusqu'au mardi 28 mai à 23h59 UTC. À partir du 29 mai, tu ne pourras plus réclamer de récompenses Supercharge.",
+  "superchargingTitleV1_54": "Supercharge touche à sa fin",
+  "superchargingDescriptionV1_54": "Les récompenses hebdomadaires pourront être demandées jusqu'au mardi 28 mai, à 23h59 UTC. À partir du 29 mai, vous ne pourrez plus réclamer de récompenses Supercharge.",
   "superchargeRewardsAvailable": "Vous avez {{amount}} {{token}} à réclamer !",
   "superchargeRewardsAvailableMultipleTokens": "Vous avez {{amounts}} à réclamer !",
-  "superchargeClaimText": "Réclame tes récompenses jusqu'au mardi 28 mai à 23h59 UTC. À partir du 29 mai, tu ne pourras plus réclamer de récompenses Supercharge.",
+  "superchargeClaimText": "Demandez vos récompenses jusqu'au mardi 28 mai, à 23h59 UTC. À partir du 29 mai, vous ne pourrez plus réclamer de récompenses Supercharge.",
   "superchargeClaimButton": "Réclamer des récompenses",
   "superchargeFetchRewardsFailed": "Une erreur s'est produite lors de la récupération des récompenses. Veuillez réessayer plus tard.",
   "superchargeClaimSuccess": "Vos récompenses Supercharge ont été ajoutées à votre solde total.",
@@ -677,8 +677,8 @@
     "body": "Vous recevrez tous les deux un NFT exclusif une fois que votre ami aura configuré son wallet {{appName}} et connecté son numéro."
   },
   "inviteRewardsBannerCUSD": {
-    "title": "Invite des amis et reçois jusqu'à 12 cUSD",
-    "body": "Une fois qu'ils auront connecté leur numéro et ajouté des fonds sur {{appName}}, vous recevrez tous les deux 0,50 cUSD."
+    "title": "Invitez des amis et obtenez jusqu'à 12 cUSD",
+    "body": "Une fois que votre contact aura relié son numéro et ajouté des fonds à {{appName}}, vous recevrez tous les deux 0,50 cUSD."
   },
   "inviteWithUrl": {
     "title": "Invitez des amis",
@@ -692,8 +692,8 @@
       "body": "Invitez vos amis et votre famille à télécharger {{appName}} et chacun d'entre vous recevra un NFT exclusif"
     },
     "rewardsActiveCUSD": {
-      "title": "GAGNE JUSQU'À 12 cUSD pour avoir invité tes amis à Valora !",
-      "body": "Obtiens 0,50 cUSD pour chaque ami que tu invites sur {{appName}}. Une fois qu'il aura connecté son numéro, ajouté des fonds et les aura conservés pendant 7 jours, vous recevrez tous les deux 0,50 cUSD. Dépêche-toi, les fonds sont limités ! (Limite de 25 amis)."
+      "title": "GAGNEZ JUSQU'À 12 cUSD pour avoir invité vos amis sur Valora !",
+      "body": "Recevez 0,50 cUSD pour chaque ami que vous invitez sur {{appName}}. Une fois que votre ami aura ajouté des fonds et conservé 5 cUSD pendant 7 jours, vous recevrez tous les deux 0,50 cUSD. Dépêchez-vous, les fonds sont limités ! (Limite de 25 amis)."
     }
   },
   "getReward": "Obtenez {{reward}}$",
@@ -710,15 +710,15 @@
     "goldDisclaimer": "Lorsque vous créez un \"compte\" chez Valora, vous créez un portefeuille numérique dont vous seul détenez la clé. Aucune autre personne ni entité, y compris Valora, ne peut récupérer votre clé, modifier ou annuler des transactions, ou récupérer des fonds perdus. Sachez que les cryptomonnaies sont une nouvelle catégorie d'actifs et présentent un risque de perte financière. Réfléhissez soigneusement à votre situation financière et pesez le risque financier que vous prenez avant d'acheter un actif."
   },
   "termsColloquial": {
-    "title": "Commençons par créer ton portefeuille",
-    "privacyHeading": "Tes informations et ta vie privée :",
-    "privacy1": "Nous recueillons des données d'utilisation qui nous aident à améliorer l'appli et la sécurité. Le type d'informations que nous recueillons, la façon dont nous les utilisons et tes droits liés à ces informations peuvent tous être consultés dans notre <0>Politique de confidentialité</0>.",
-    "privacy2": "Si tu décides de lier ton numéro de téléphone, nous en stockerons une copie cryptée.",
-    "privacy3": "Si tu décides de connecter tes contacts, nous utilisons leurs noms, leurs numéros et leurs photos de profil pour les retrouver plus facilement.",
-    "walletHeading": "Ton portefeuille numérique avec Valora :",
-    "wallet1": "Tu es sur le point de créer un portefeuille numérique. Tu es le seul à posséder la clé de ton portefeuille. Nous ne pouvons pas récupérer ta clé ou tes actifs si tu perds ta clé. Nous ne pouvons pas non plus annuler les actions effectuées par l'intermédiaire de Valora sur les blockchains.",
-    "wallet2": "Les actifs numériques, ceux avec lesquels tu interagiras avec Valora, comportent des risques uniques. En utilisant Valora, tu acceptes ces risques et en assumes la responsabilité. Prends en compte tes finances et ta tolérance au risque avant de faire des choix.",
-    "fullTerms": "Lire l'intégralité de nos <0>conditions générales</0>"
+    "title": "Commençons par créer votre portefeuille",
+    "privacyHeading": "Vos informations et section confidentialité :",
+    "privacy1": "Nous recueillons certaines données d'utilisation qui nous aident à améliorer l'application et la sécurité. Le type d'informations que nous recueillons, la façon dont nous les utilisons et vos droits relatifs à ces informations sont disponibles dans notre <0>Politique de confidentialité</0>.",
+    "privacy2": "Si vous décidez de relier votre numéro de téléphone, nous en conserverons une copie chiffrée.",
+    "privacy3": "Si vous décidez de connecter vos contacts, nous pourrons utiliser leurs noms, numéros et photos de profil pour faciliter leur recherche.",
+    "walletHeading": "Votre portefeuille numérique Valora :",
+    "wallet1": "Vous êtes sur le point de créer un portefeuille numérique. Vous seul en avez la clé. Nous ne pourrons pas récupérer votre clé ou vos actifs si vous perdez votre clé. Nous ne pourrons pas non plus inverser les actions entreprises par Valora sur les blockchains.",
+    "wallet2": "Les actifs numériques, les actifs avec lesquels vous allez interagir avec Valora présentent certains risques. En utilisant Valora, vous acceptez ces risques et en assumez la pleine responsabilité. Veuillez réfléchir à ces risques pour vos finances avant de vous engager.",
+    "fullTerms": "Lisez nos <0>Conditions Générales</0>"
   },
   "fullNameOrPsuedonym": "Prénom et nom ou pseudonyme",
   "namePlaceholder": "p. ex. nom",
@@ -827,7 +827,7 @@
     "hasWallet": "J'ai déjà un wallet",
     "header": "Bienvenue sur {{appName}} ! Créons votre wallet crypto.",
     "getStarted": "Commencer",
-    "agreeToTerms": "En créant un portefeuille, tu acceptes nos <0>conditions générales d'utilisation</0>."
+    "agreeToTerms": "En créant un portefeuille, vous acceptez nos <0>Conditions Générales</0>"
   },
   "accessContacts": {
     "disclosure": {
@@ -1034,7 +1034,7 @@
   "inviteWithoutPayment": "Bonjour ! J'utilise {{appName}} pour envoyer des cryptomonnaies dans le monde entier. C'est facile, et je vous invite à découvrir également ce service en utilisant ce lien : {{link}}",
   "inviteWithEscrowedPayment": "Bonjour ! J'utilise {{appName}} pour envoyer des cryptomonnaies dans le monde entier. Je viens juste de vous envoyer {{amount}} {{token}}. Vous pouvez télécharger l'appli {{appName}} et échanger votre {{token}} en utilisant ce lien : {{link}}",
   "inviteWithRewards": "Bonjour ! 👋 J'utilise {{appName}} comme portefeuille de cryptomonnaies. Télécharger l'application est très rapide, tout comme connecter ton numéro de téléphone. En plus, si tu t'inscris, nous recevrons tous les deux un NFT en édition spéciale comme récompense. 💫 \n\nUtilisez ce lien pour télécharger : {{link}}",
-  "inviteWithRewardsCUSD": "Hé ! En ce moment, nous pouvons tous les deux obtenir une récompense gratuite de 0,50 $ si tu t'inscris, connectes ton numéro et alimentes ton portefeuille Valora. Je l'utilise pour faire fructifier mes économies en USD et en crypto, et tu peux le configurer en quelques secondes avec juste un numéro de téléphone. Assure-toi de t'inscrire avec mon lien de parrainage ici : \n\n{{link}} \n\n Dépêche-toi, la promotion de parrainage se termine bientôt.",
+  "inviteWithRewardsCUSD": "Salut ! En ce moment, nous pouvons tous les deux recevoir une récompense de 0,50 USD si tu t'inscris, que tu relies ton numéro de téléphone et que tu déposes des fonds sur ton portefeuille Valora. Je l'utilise pour faire fructifier mes économies en USD et en crypto, et tu peux le configurer en quelques secondes avec un simple numéro de téléphone. Utilise mon lien de parrainage pour t'inscrire ici : \n\n{{link}} \n\nDépêche-toi car cete offre de parrainage se termine bientôt.",
   "loadingContacts": "Trouver vos contacts",
   "myCode": "Mon code",
   "scanCode": "Scanner",
@@ -1767,7 +1767,7 @@
     "swapToTokenSelection": "ÉCHANGER CONTRE",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "Les jetons sélectionnés ne sont pas pris en charge par nos fournisseurs.",
-    "selectTokenLabel": "Sélectionne le jeton",
+    "selectTokenLabel": "Sélectionner un jeton",
     "tokenBottomSheetTitle": "Sélectionner un jeton",
     "onNetwork": "sur {{networkName}}",
     "switchedToNetworkWarning": {
@@ -1823,9 +1823,9 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Gratuit",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Frais\n\nLes frais {{appName}} de {{appFeePercentage}}% sont conçus pour améliorer ton expérience en garantissant des échanges rapides, fiables et sécurisés.",
+      "appFeeInfo": "Les frais {{appName}}\n\nLes frais {{appName}} de {{appFeePercentage}}% sont utilisés pour améliorer votre expérience des swaps et les rendre rapides, fiables et sécurisés.",
       "appFeeInfo_free": "{{appName}} Frais\n\nCet échange est gratuit.",
-      "appFeeInfo_placeholder": "{{appName}} Frais\n\nLes frais sont calculés en fonction du devis que tu reçois.",
+      "appFeeInfo_placeholder": "Frais {{appName}}\n\nLes frais sont calculés en fonction du devis que vous recevez.",
       "appFeeInfoDismissButton": "J'ai compris",
       "slippagePercentage": "Tolérance de glissement",
       "networkFeeInfo": "Vous échangez sur le réseau {{networkName}} .\n\nCes frais de réseau estimés sont nécessaires pour effectuer une transaction sur le réseau {{networkName}}. Ces frais sécurisent votre transaction et permettent le bon fonctionnement du réseau.",
@@ -1833,8 +1833,8 @@
       "slippageToleranceInfo": "Tolérance sur le slippage\n\nVotre échange s'exécutera dans le cadre du pourcentage de tolérance au slippage. Si le prix évolue au-delà de la tolérance au slippage, {{appName}} vous protège en empêchant la négociation.",
       "networkFeeInfoDismissButton": "J'ai compris",
       "exchangeRate": "Taux de change",
-      "exchangeRateInfo": "Taux de change\n\nNous avons trouvé le meilleur taux de change pour toi. Ton échange sera effectué à un prix se situant dans les {{slippagePercentage}}% de l'estimation ou la transaction sera annulée et les fonds retournés dans ton porte-monnaie.",
-      "exchangeRateInfo_withAppFee": "Taux de change\n\nNous avons trouvé le meilleur taux de change pour toi. Ton échange sera effectué à un prix se situant dans les {{slippagePercentage}}% de l'estimation ou la transaction sera annulée et les fonds seront renvoyés dans ton portefeuille.\n\nLe taux estimé comprend des frais de {{appName}} de {{appFeePercentage}}%.",
+      "exchangeRateInfo": "Taux de change\n\nNous avons trouvé le meilleur taux de change pour vous. Votre échange sera effectué à un prix se situant dans les {{slippagePercentage}}% de l'estimation ou la transaction sera annulée et les fonds seront renvoyés dans votre portefeuille.",
+      "exchangeRateInfo_withAppFee": "Taux de change\n\nNous avons trouvé le meilleur taux de change pour vous. Votre échange sera effectué à un prix se situant dans les {{slippagePercentage}}% de l'estimation ou la transaction sera annulée et les fonds seront renvoyés dans votre portefeuille.\n\nLe taux estimé comprend des frais de {{appName}} de {{appFeePercentage}}%.",
       "exchangeRateInfoDismissButton": "J'ai compris",
       "estimatedValue": "Valeur estimée"
     },
@@ -2060,7 +2060,7 @@
     },
     "invite": {
       "title": "Envoyez des crypto à vos amis",
-      "subtitle": "Envoie des fonds ou une invitation à tes contacts"
+      "subtitle": "Envoyez des fonds ou une invitation à vos contacts"
     },
     "jumpstart": {
       "title": "Envoyer avec un lien direct",
@@ -2145,7 +2145,7 @@
     }
   },
   "jumpstartSendConfirmationScreen": {
-    "title": "Créer un lien en direct",
+    "title": "Créer un lien direct",
     "sendAmountLabel": "Montant du lien direct",
     "confirmButton": "Envoyer et créer un lien",
     "info": "Lorsque vous créez un lien, les fonds sont retirés de votre portefeuille. Vous pouvez récupérer le lien à tout moment. Partagez les liens avec précaution.",
@@ -2156,7 +2156,7 @@
     }
   },
   "jumpstartShareLinkScreen": {
-    "title": "Partage ton lien en direct",
+    "title": "Partager votre lien direct",
     "description": "Copiez le lien pour envoyer {{tokenSymbol}} via l'application de messagerie de votre choix, ou utilisez le QR code.",
     "linkLabel": "Lien direct",
     "linkCopiedMessage": "Lien direct copié",
@@ -2244,31 +2244,31 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Vérifier tes fonds",
-      "description": "Merci de patienter pendant que nous vérifions ton Live Link. Les fonds à réclamer arriveront sous peu."
+      "title": "Vérification de vos fonds",
+      "description": "Veuillez patienter pendant que nous vérifions votre lien direct. Les fonds échangeables vous parviendront rapidement."
     },
     "error": {
       "title": "Impossible de récupérer les fonds",
-      "description": "Ce lien n'a pas pu être réclamé pour une raison inconnue.",
-      "alreadyClaimedDescription": "Le lien a déjà été réclamé. Demande à ton ami de t'envoyer un nouveau lien",
+      "description": "Ce lien n'a pas pu être échangé pour une raison inconnue",
+      "alreadyClaimedDescription": "Le lien a déjà été échangé. Veuillez demander à votre ami d'envoyer un nouveau lien",
       "contactSupport": "Contacter le Support",
       "dismiss": "Refuser"
     }
   },
   "jumpstartReclaim": {
-    "description": "La récupération de ton lien entraîne des frais de gaz de réseau, veux-tu continuer ?",
+    "description": "Demander votre lien entraîne des frais de gaz de réseau, voulez-vous continuer ?",
     "fetchStatusError": {
-      "title": "Oups, quelque chose s'est mal passé",
-      "description": "Nous n'avons pas pu obtenir le statut de réclamation de cette invitation, essaie à nouveau plus tard ou contacte l'assistance.",
+      "title": "Une erreur s'est produite",
+      "description": "Nous n'avons pas pu trouver le statut de cette invitation, réessayez plus tard ou contactez l'assistance.",
       "retryCta": "Réessayer"
     },
     "reclaimError": {
       "title": "Impossible de récupérer les fonds",
-      "description": "Essaie de réclamer à nouveau, ou contacte l'assistance."
+      "description": "Réessayez de faire un échange ou contactez le support"
     }
   },
   "multiSelect": {
-    "switchNetwork": "Réseau de commutation",
+    "switchNetwork": "Changer de réseau",
     "allNetworks": "Tous les réseaux"
   },
   "points": {
@@ -2277,7 +2277,7 @@
     "history": {
       "cards": {
         "createWallet": {
-          "title": "Portefeuille",
+          "title": "Titulaire du portefeuille",
           "subtitle": "Membre de {{appName}}"
         },
         "swap": {
@@ -2285,58 +2285,58 @@
           "subtitle": "{{fromToken}} > {{toToken}}"
         }
       },
-      "title": "Mon activité de points",
+      "title": "L'activité de mes points",
       "error": {
         "title": "Impossible de charger l'activité des points",
-        "subtitle": "Oups, quelque chose n'a pas fonctionné lorsque nous avons essayé de charger le flux d'activité de tes points. Essaie à nouveau.",
+        "subtitle": "Oups, une erreur s'est produite lors du chargement de l'activité de vos points. Veuillez réessayer.",
         "tryAgain": "Veuillez réessayer"
       },
       "empty": {
-        "title": "Pas encore d'activité de points",
-        "subtitle": "Il semble que tu n'aies pas encore gagné de points. Utilise {{appName}} pour commencer à gagner des points !",
+        "title": "Encore aucune activité de points",
+        "subtitle": "Il semble que vous n'ayez pas encore gagné de points. Utilisez {{appName}} pour commencer à en gagner !",
         "gotIt": "J'ai compris"
       },
       "pageError": {
-        "title": "Impossible de charger",
-        "subtitle": "Oups, quelque chose s'est mal passé en essayant de terminer le chargement. Essaie à nouveau.",
+        "title": "Chargement impossible",
+        "subtitle": "Oups, une erreur s'est produite à la fin du chargement. Veuillez réessayer.",
         "refresh": "Actualiser"
       }
     },
     "fetchBalanceError": {
-      "title": "Impossible de charger tes points",
-      "description": "Oups, quelque chose s'est mal passé en essayant de charger tes points. Il se peut que les informations de cette page soient obsolètes. Actualise-les s'il te plaît.",
+      "title": "Chargement de vos points impossible ",
+      "description": "Oups, une erreur s'est produite lors de la tentative de chargement de vos points. Les informations sur cette page peuvent être obsolètes. Veuillez la rafraîchir.",
       "retryCta": "Actualiser"
     },
     "loading": {
-      "title": "Rassembler tes points de vue",
-      "description": "Nous sommes en train de comptabiliser tes points, accroche-toi bien."
+      "title": "Collecter vos points",
+      "description": "Nous comptabilisons vos points en ce moment même, merci de votre patience"
     },
     "error": {
-      "title": "Impossible de charger des points",
-      "description": "Oups, quelque chose n'a pas fonctionné lors de la tentative de chargement de tes points. Essaie à nouveau.",
+      "title": "Impossible de charger les points",
+      "description": "Oups, une erreur s'est produite lors du chargement de vos points. Veuillez réessayer.",
       "retryCta": "Veuillez réessayer"
     },
     "infoCard": {
-      "title": "Plus de façons de gagner des points bientôt 🚀",
-      "body": "Nous travaillons à ajouter d'autres façons de gagner des points en utilisant l'application. Continue de vérifier pour les mises à jour."
+      "title": "Plus de façons de gagner des points seront bientôt disponibles 🚀",
+      "body": "Nous ajouterons bientôt d'autres façons de gagner des points en utilisant l'application. Restez connecté pour connaître les dernières mises à jour."
     },
     "activitySection": {
       "title": "Comment gagner des points ?",
-      "body": "C'est très simple ! Gagne des points en utilisant simplement l'application."
+      "body": "C'est facile ! Gagnez des points simplement en utilisant l'application."
     },
     "noActivities": {
-      "title": "Mets-toi à jour pour débloquer plus de points 🔓",
-      "body": "Oups ! Il semble que tu utilises une ancienne version de {{appName}}. Mets-la à jour maintenant pour découvrir toutes les nouvelles façons passionnantes de gagner des points."
+      "title": "Mettez à jour pour obtenir plus de points 🔓",
+      "body": "Oups ! Il semble que vous utilisiez une ancienne version de {{appName}}. Mettez-la à jour pour découvrir les dernières manières de gagner des points."
     },
     "activityCards": {
       "createWallet": {
         "title": "Créer un portefeuille {{appName}}"
       },
       "swap": {
-        "title": "Actifs de swap",
+        "title": "Échanger des actifs",
         "bottomSheet": {
-          "title": "Actifs de swap",
-          "body": "Cet espace sera utilisé pour donner tous les détails nécessaires pour cela. Peut-être le montant minimum à échanger. \n\nGagne des points {{pointsValue}} chaque fois que tu échanges un actif en utilisant {{appName}}.",
+          "title": "Échanger des actifs",
+          "body": "Cet espace vous présentera tous les détails nécessaires. Il s'agira peut-être d'un montant minimum à échanger. \n\nGagnez {{pointsValue}} points chaque fois que vous échangez un actif avec {{appName}}.",
           "cta": "Aller à l'échange"
         }
       },
@@ -2346,34 +2346,57 @@
     },
     "discoverCard": {
       "title": "{{appName}} Points",
-      "description": "Gagne facilement des points avec {{appName}}. L'utilisation de l'application, y compris l'échange, permet de gagner des points !"
+      "description": "Gagnez facilement des points avec {{appName}}. Utilisez l'application, notamment en faisant du swapping et à vous les points !"
     },
     "intro": {
-      "title": "Gagne des points sans effort",
-      "description": "Saute dans une nouvelle façon de gagner de l'argent ! Tes actions sur {{appName}} te permettent désormais de gagner des points. Commence à gagner des points dès aujourd'hui et débloque des avantages impressionnants.",
-      "cta": "Commence ton voyage de points"
+      "title": "Gagnez des points en toute simplicité",
+      "description": "Découvrez une nouvelle façon de gagner ! Vos actions {{appName}} vous permettent maintenant de gagner des points. Collectez-en sans attendre et profitez d'avantages incroyables.",
+      "cta": "Lancez-vous dans une course aux points"
     }
   },
   "earnFlow": {
     "gasSubsidized": "Valora couvre le gaz pour cette transaction !",
     "addCryptoBottomSheet": {
-      "title": "Ajoute {{tokenSymbol}} sur {{tokenNetwork}}",
-      "description": "Une fois que tu auras ajouté des jetons, tu devras revenir pour finir de déposer dans une cagnotte.",
+      "title": "Ajouter {{tokenSymbol}} sur {{tokenNetwork}}",
+      "description": "Une fois que vous ajoutez des jetons, vous devrez revenir pour finaliser votre dépôt dans un pool.",
       "actions": {
         "add": "Acheter",
-        "transfer": "Transfert",
+        "transfer": "Transférer",
         "swap": "Échanger"
       },
       "actionDescriptions": {
-        "add": "Achète {{tokenSymbol}} sur {{tokenNetwork}} en utilisant l'un de nos fournisseurs de confiance",
-        "transfer": "Utilise n'importe quel portefeuille ou échange compatible avec {{tokenNetwork}} pour déposer {{tokenSymbol}}.",
-        "swap": "Swap dans {{tokenSymbol}} à partir d'un autre jeton {{tokenNetwork}}"
+        "add": "Achetez des {{tokenSymbol}} sur {{tokenNetwork}} en utilisant un de nos fournisseurs de confiance",
+        "transfer": "Utilisez n'importe quel portefeuille compatible {{tokenNetwork}} ou échangez pour déposer des {{tokenSymbol}}",
+        "swap": "Échangez un jeton de {{tokenNetwork}} contre des {{tokenSymbol}}"
       }
     },
     "cta": {
-      "title": "Gagne sur tes stablecoins",
-      "subtitle": "Dépose aujourd'hui et gagne en rendement",
-      "description": "Vois combien tu peux gagner en alimentant un pool de prêt."
+      "title": "Gagnez de l'argent sur vos stablecoins",
+      "subtitle": "Déposez des fonds et obtenez un retour sur investissement",
+      "description": "Voyez combien vous pouvez gagner en participant à un pool de prêt"
+    },
+    "earnInfo": {
+      "title": "Gagne sur tes\nstablecoins",
+      "details": {
+        "earn": {
+          "titleGasSubsidy": "Maximiser les gains sans frais d'essence*",
+          "title": "Maximiser les gains",
+          "subtitle": "Gagne sur tes stablecoins et obtiens des récompenses lorsque tu alimentes un pool.",
+          "footnoteSubsidy": "*Les frais de gaz sont temporairement couverts par Valora."
+        },
+        "manage": {
+          "title": "Gérer directement à partir de Valora",
+          "subtitle": "Nous nous occupons de la mise en place pour que tu puisses gérer ta position directement depuis Valora."
+        },
+        "access": {
+          "title": "Accède facilement à tes fonds",
+          "subtitle": "Collecte tes fonds sans effort, d'une simple pression. Profite du même accès instantané que si tu passais directement par tes protocoles préférés."
+        }
+      },
+      "action": {
+        "learn": "En savoir plus",
+        "earn": "Commencer à gagner"
+      }
     },
     "ctaV1_86": {
       "title": "Maximiser les gains sur les stablecoins",
@@ -2381,44 +2404,44 @@
       "description": "Gagne environ {{apy}}% par an lorsque tu ajoutes {{symbol}} à une piscine."
     },
     "enterAmount": {
-      "earnUpToLabel": "Tu pourrais gagner jusqu'à :",
+      "earnUpToLabel": "Vous pourriez gagner jusqu'à :",
       "rateLabel": "Taux (est.)",
       "earnUpTo": "~{{fiatSymbol}}{{amount}} / an",
       "rate": "{{rate}}% APY",
       "continue": "Continuer",
-      "info": "Cette piscine est alimentée par Aave",
+      "info": "Ce pool est alimenté par Aave",
       "infoBottomSheet": {
-        "title": "Pourquoi cette piscine ?",
-        "description": "Ce pool Aave dispose de plus de 150 millions de dollars de TVL et de plus de 6 000 contributeurs, ce qui indique une forte liquidité et une grande fiabilité. Il utilise également USDC comme jeton et Abritrum comme réseau, ce qui réduit la volatilité et garantit que les utilisateurs recevront des taux de gaz peu coûteux.\n\nTout cela en fait une option sûre et attrayante avec un APY compétitif, garantissant une opportunité d'investissement bénéfique pour nos utilisateurs.\n\nTu peux explorer d'autres pools Aave <0>ici</0>.",
+        "title": "Pourquoi ce pool ?",
+        "description": "Ce pool Aave dispose de plus de 150 millions de dollars de TVL et de plus de 6 000 contributeurs, ce qui indique une forte liquidité et une grande fiabilité. Il utilise également USDC comme jeton et Abritrum comme réseau, ce qui réduit la volatilité et garantit que les utilisateurs seront soumis à des taux de gaz faibles.\n\nTout cela en fait une option sûre et attrayante avec un APY compétitif, garantissant une opportunité d'investissement bénéfique pour nos utilisateurs.\n\nVous pouvez découvrir d'autres pools Aave <0>ici</0>.",
         "dismiss": "Refuser"
       },
       "notEnoughBalanceForGasWarning": {
-        "title": "Tu as besoin de plus de {{feeTokenSymbol}} pour continuer",
-        "description": "Ajoute {{feeTokenSymbol}} sur {{network}} pour couvrir tes frais d'essence.",
-        "noGasCta": "Acheter {{feeTokenSymbol}} sur {{network}}"
+        "title": "Vous avez besoin de plus de {{feeTokenSymbol}} pour continuer",
+        "description": "Ajoutez {{feeTokenSymbol}} sur {{network}} pour couvrir vos frais de gaz",
+        "noGasCta": "Acheter des {{feeTokenSymbol}} sur {{network}}"
       }
     },
     "activePools": {
-      "title": "Piscines actives",
+      "title": "Pools actifs",
       "totalValue": "Valeur totale :",
       "apy": "~{{apy}}% APY",
-      "exitPool": "Exit Pool",
-      "depositMore": "Dépôt Plus",
-      "viewPools": "Voir les piscines"
+      "exitPool": "Quitter le pool",
+      "depositMore": "Déposer plus",
+      "viewPools": "Voir les pools"
     },
     "depositBottomSheet": {
-      "title": "Révision et dépôt",
-      "description": "Avant de déposer dans un pool Aave, tu dois examiner les détails de la transaction ci-dessous.",
+      "title": "Vérifier et déposer",
+      "description": "Avant de faire un dépôt dans un pool Aave, consultez les détails de la transaction ci-dessous",
       "amount": "Montant déposé",
-      "fee": "Est. Frais de gaz",
+      "fee": "Frais de gaz estimés",
       "provider": "Fournisseur de revenus",
       "network": "Réseau",
-      "footer": "En déposant des crypto dans un pool Aave, tu acceptes les risques liés à l'utilisation d'Aave. <0>Conditions générales d'utilisation</0>",
-      "primaryCta": "Complète",
+      "footer": "En déposant des crypto-monnaies dans un pool Aave, vous acceptez les risques associés à l'utilisation d'Aave. <0>Conditions Générales</0>",
+      "primaryCta": "Valider",
       "secondaryCta": "Annuler"
     },
     "collect": {
-      "title": "Félicitations ! Vérifier et collecter tes gains",
+      "title": "Bravo ! Consultez et accumulez vos gains",
       "total": "TOTAL",
       "plus": "PLUS",
       "rate": "Taux (est.)",
@@ -2426,29 +2449,29 @@
       "fee": "Frais de gaz",
       "cta": "Collecter les gains",
       "errorTitle": "Une erreur s'est produite",
-      "errorDescription": "Impossible de récupérer les détails du dépôt. Essaie à nouveau.",
-      "noGasTitle": "Tu as besoin de plus de {{symbol}} pour continuer",
-      "noGasDescription": "Ajoute {{symbol}} sur {{network}} pour couvrir tes frais d'essence.",
+      "errorDescription": "Impossible de récupérer les détails du dépôt. Veuillez réessayer.",
+      "noGasTitle": "Vous avez besoin de plus de {{symbol}} pour continuer",
+      "noGasDescription": "Ajoutez {{symbol}} sur {{network}} pour couvrir vos frais de gaz",
       "noGasCta": "Acheter {{symbol}} sur {{network}}"
     },
     "transactionFeed": {
-      "earnClaimTitle": "Recueilli",
-      "earnClaimSubtitle": "de {{providerName}} Pool",
+      "earnClaimTitle": "Collecté",
+      "earnClaimSubtitle": "du pool {{providerName}}",
       "earnDepositTitle": "Déposé",
-      "earnDepositSubtitle": "à {{providerName}} Pool",
-      "earnWithdrawTitle": "Retire-toi",
-      "earnWithdrawSubtitle": "de {{providerName}} Pool"
+      "earnDepositSubtitle": "vers le pool {{providerName}}",
+      "earnWithdrawTitle": "Retiré",
+      "earnWithdrawSubtitle": "du pool {{providerName}}"
     },
     "transactionDetails": {
       "descriptionLabel": "Détails",
-      "earnClaimTitle": "Recueilli",
-      "earnClaimSubtitle": "Recueille {{tokenSymbol}} à partir de {{providerName}} Pool",
+      "earnClaimTitle": "Collecté",
+      "earnClaimSubtitle": "{{tokenSymbol}} collectés du Pool {{providerName}}",
       "earnClaimDetails": "Montant perçu",
       "earnDepositTitle": "Déposé",
-      "earnDepositSubtitle": "Dépôt {{tokenSymbol}} à {{providerName}} Pool",
+      "earnDepositSubtitle": "Dépôt de {{tokenSymbol}} au Pool {{providerName}}",
       "earnDepositDetails": "Montant déposé",
-      "earnWithdrawTitle": "Retire-toi",
-      "earnWithdrawSubtitle": "Retire {{tokenSymbol}} de la cagnotte {{providerName}}",
+      "earnWithdrawTitle": "Retiré",
+      "earnWithdrawSubtitle": "Retirer {{tokenSymbol}} du Pool {{providerName}}",
       "earnWithdrawDetails": "Montant du retrait"
     }
   },
diff --git a/locales/it-IT/translation.json b/locales/it-IT/translation.json
index f607fea449..da856e285e 100644
--- a/locales/it-IT/translation.json
+++ b/locales/it-IT/translation.json
@@ -255,8 +255,8 @@
       "text": "Chiunque conosca la tua Frase di recupero avrà accesso al tuo conto e a tutti i fondi che contiene. Non condividerla."
     }
   ],
-  "consumerIncentivesTitle": "Supercharge sta per finire",
-  "consumerIncentivesSummary": "Ma altri premi sono in arrivo per te. Fino al 28 maggio, ottieni {{percent}}% di premi annuali sul tuo saldo in stablecoin più alto (cUSD, cEUR o cREAL). Ecco come funziona:",
+  "consumerIncentivesTitle": "Il Supercharge sta per finire",
+  "consumerIncentivesSummary": "Ma altre ricompense sono in arrivo per te. Fino al 28 maggio, ottieni ricompense pari al {{percent}}% del tuo maggiore saldo in stablecoin (cUSD, cEUR o cREAL). Ecco come funziona:",
   "earnWeekly": {
     "header": "Collega il tuo numero telefonico",
     "text": "Tocca Collega numero se non lo hai ancora collegato."
@@ -271,14 +271,14 @@
     "text": "Questo assicurerà che le tue ricompense siano al sicuro e sotto il tuo controllo."
   },
   "conclusion": "Non potrebbe essere più semplice. Ottieni oggi stesso bonus dalla tua criptovaluta.",
-  "superchargeTitle": "Supercharge sta per finire",
-  "superchargeDescription": "Ma altri premi sono in arrivo per te. Fino al 28 maggio, ottieni {{apy}}% di premi annuali sul tuo saldo più alto {{token}} . Ecco come funziona:",
+  "superchargeTitle": "Il Supercharge sta per finire",
+  "superchargeDescription": "Ma altre ricompense sono in arrivo per te. Fino al 28 maggio, ottieni ricompense pari al {{apy}}% del tuo maggiore saldo in {{token}}. Ecco come funziona:",
   "superchargeConnectNumber": "Collega il tuo numero telefonico",
   "superchargeReconnectNumber": "Ricollega il tuo numero telefonico\n<0>Abbiamo avviato un’esperienza Supercharge migliorata. Ricollega il tuo numero telefonico per continuare a ricevere ricompense in {{token}}.</0>",
   "superchargeMinimumBalance": "Aggiungi un saldo minimo di {{amount}} {{token}}",
-  "superchargeDisclaimer": "Questo non influirà sul tuo saldo o sui tuoi guadagni precedenti.",
-  "superchargeDisclaimerMaxRewards": "Questo non influirà sul tuo saldo o sui tuoi guadagni precedenti.",
-  "superchargeDisclaimerDayLimit": "Questo non influirà sul tuo saldo o sui tuoi precedenti guadagni. <0>Per saperne di più</0>",
+  "superchargeDisclaimer": "Questo non influenzerà il tuo saldo o i tuoi guadagni precedenti.",
+  "superchargeDisclaimerMaxRewards": "Questo non influenzerà il tuo saldo o i tuoi guadagni precedenti.",
+  "superchargeDisclaimerDayLimit": "Questo non influenzerà il tuo saldo o i tuoi guadagni precedenti. <0>Ulteriori informazioni</0>",
   "superchargeTokenDetailsDialog": {
     "title": "A quali asset posso applicare i Supercharge?",
     "body": "Sarai ricompensato settimanalmente sulla tua stablecoin Celo con il saldo più alto (cEUR, cUSD, cREAL).",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "È necessario aggiornare l’app",
   "superchargingDescription": "Aggiorna l’app Valora per continuare a ricevere le ricompense Supercharge settimanali.",
-  "superchargingTitleV1_54": "Supercharge sta per finire",
-  "superchargingDescriptionV1_54": "Le ricompense settimanali potranno essere richieste fino a martedì 28 maggio alle 23:59 UTC. A partire dal 29 maggio, non sarà più possibile richiedere le ricompense Supercharge.",
+  "superchargingTitleV1_54": "Il Supercharge sta per finire",
+  "superchargingDescriptionV1_54": "Le ricompense settimanali potranno essere richieste fino a martedì 28 maggio, alle ore 23:59 UTC. A partire dal 29 maggio, non potrai più richiedere le ricompense Supercharge.",
   "superchargeRewardsAvailable": "Hai {{amount}} {{token}} disponibili per reclamare!",
   "superchargeRewardsAvailableMultipleTokens": "Hai {{amounts}} disponibili per reclamare!",
-  "superchargeClaimText": "Richiedi i tuoi premi fino a martedì 28 maggio alle 23:59 UTC. A partire dal 29 maggio, non potrai più richiedere i premi Supercharge.",
+  "superchargeClaimText": "Le ricompense settimanali potranno essere richieste fino a martedì 28 maggio, alle ore 23:59 UTC. A partire dal 29 maggio, non potrai più richiedere le ricompense Supercharge.",
   "superchargeClaimButton": "Richiedi ricompense",
   "superchargeFetchRewardsFailed": "Si è verificato un errore durante il recupero delle ricompense Supercharge. Riprova più tardi.",
   "superchargeClaimSuccess": "Le tue ricompense Supercharge sono state aggiunte al tuo saldo totale.",
@@ -677,8 +677,8 @@
     "body": "Riceverete entrambi un NFT dopo che avrà configurato il wallet collegato il numero telefonico."
   },
   "inviteRewardsBannerCUSD": {
-    "title": "Invita gli amici e ricevi fino a 12 cUSD",
-    "body": "Una volta che avranno collegato il loro numero e aggiunto fondi a {{appName}}, riceverete entrambi 0,50 cUSD."
+    "title": "Invita gli amici e guadagni fino a 12 cUSD",
+    "body": "Dopo che avranno collegato il loro numero e avranno depositato dei fondi su {{appName}}, riceverete entrambi 0,50 cUSD."
   },
   "inviteWithUrl": {
     "title": "Invita un amico",
@@ -692,8 +692,8 @@
       "body": "Invita gli amici e i familiari a scaricare {{appName}} e ciascuno di voi riceverà un NFT esclusivo"
     },
     "rewardsActiveCUSD": {
-      "title": "OTTIENI FINO A 12 cUSD invitando i tuoi amici a Valora!",
-      "body": "Ricevi 0,50 cUSD per ogni amico che inviti su {{appName}}. Una volta che avranno collegato il loro numero, aggiunto fondi e mantenuti per 7 giorni, riceverete entrambi 0,50 cUSD. Affrettati, i fondi sono limitati! (Limite di 25 amici)."
+      "title": "GUADAGNO fino a 12 cUSD per invitare i tuoi amici su Valora!",
+      "body": "Ricevi 0,50 cUSD per ogni amico che inviti su {{appName}}. Dopo che avrà aggiunto fondi e li avrà mantenuti sul conto per almeno 7 giorni, riceverete entrambi 0,50 cUSD. Affrettati, i fondi sono limitati! (Limite di 25 amici)."
     }
   },
   "getReward": "Ricevi ${{reward}}",
@@ -710,15 +710,15 @@
     "goldDisclaimer": "Quando crei un \"account\" con Valora, crei un portafoglio digitale di cui solo tu possiedi le chiavi. Nessun'altra persona o entità, inclusa Valora, può recuperare la tua chiave, modificare o annullare le transazioni o recuperare fondi perduti. Considera che le criptovalute fanno parte di una nuova classe di asset e comportano un rischio di perdita finanziaria. Prima di acquistare qualsiasi asset, valuta attentamente la tua situazione finanziaria e la tua tolleranza al rischio finanziario."
   },
   "termsColloquial": {
-    "title": "Iniziamo creando il tuo portafoglio",
-    "privacyHeading": "Le tue informazioni e la tua privacy:",
-    "privacy1": "Raccogliamo dati di utilizzo che ci aiutano a migliorare l'applicazione e la sicurezza. Il tipo di informazioni che raccogliamo, il modo in cui le utilizziamo e i tuoi diritti relativi a tali informazioni sono riportati nella nostra <0>Informativa sulla privacy</0>.",
-    "privacy2": "Se decidi di collegare il tuo numero di telefono, ne conserveremo una copia criptata.",
-    "privacy3": "Se decidi di collegare i tuoi contatti, usiamo i loro nomi, numeri e immagini del profilo per renderli più facili da trovare.",
-    "walletHeading": "Il tuo portafoglio digitale con Valora:",
-    "wallet1": "Stai per creare un portafoglio digitale. Solo tu hai la chiave del tuo portafoglio. Non possiamo recuperare la tua chiave o i tuoi beni se la perdi. Non possiamo nemmeno annullare le azioni intraprese da Valora sulle blockchain.",
-    "wallet2": "Gli asset digitali, con i quali interagisci con Valora, comportano rischi unici. Utilizzando Valora, accetti questi rischi e te ne assumi la responsabilità. Ti invitiamo a considerare le tue finanze e la tua tolleranza al rischio prima di fare delle scelte.",
-    "fullTerms": "Leggi i nostri <0>Termini e Condizioni</0> completi"
+    "title": "Per cominciare, crea il tuo wallet",
+    "privacyHeading": "Informazioni personale e privacy:",
+    "privacy1": "Raccogliamo dati di utilizzo che ci aiutano a migliorare l'applicazione e la sicurezza. Puoi avere ulteriori informazioni sul tipo di informazioni che raccogliamo, sul modo in cui le utilizziamo e sui tuoi diritti relativi a tali informazioni leggendo la nostra <0>Informativa sulla privacy</0>.",
+    "privacy2": "Se decidi di collegare il tuo numero di telefono, lo memorizzeremo in modalità crittografata.",
+    "privacy3": "Se decidi di collegare i tuoi contatti, useremo i loro nomi, numeri e immagini del profilo per permetterti di trovarli più facilmente.",
+    "walletHeading": "Il tuo wallet digitale con Valora:",
+    "wallet1": "Stai per creare un wallet digitale. Solo tu hai la chiave del tuo wallet. Se perdi la chiave, non possiamo recuperare la tua chiave o i tuoi asset. Ricorda, inoltre, che tramite Valora non è possibile invertire le azioni avviate sulle blockchain.",
+    "wallet2": "Gli asset digitali, ovvero gli asset tramite i quali interagisci con Valora, portano con sé una serie di rischi. Utilizzando Valora, accetti questi rischi e ti assumi interamente la responsabilità per tali rischi. Prima di fare qualsiasi scelta, valuta la tua situazione finanziaria e la tua tolleranza al rischio.",
+    "fullTerms": "Leggi interamente i nostri <0>Termini e Condizioni</0>"
   },
   "fullNameOrPsuedonym": "Nome e cognome o alias",
   "namePlaceholder": "p. es. nome",
@@ -827,7 +827,7 @@
     "hasWallet": "Ho già un wallet",
     "header": "Ti diamo il benvenuto in {{appName}}! Creiamo il tuo wallet cripto.",
     "getStarted": "Inizia",
-    "agreeToTerms": "Creando un portafoglio accetti i nostri <0>Termini e Condizioni</0>."
+    "agreeToTerms": "Creando un wallet accetti i nostri <0>Termini e Condizioni</0>"
   },
   "accessContacts": {
     "disclosure": {
@@ -1034,7 +1034,7 @@
   "inviteWithoutPayment": "Ciao. Uso {{appName}} per inviare criptovalute in tutto il mondo. Provare l'app è facile e desidero invitarti a scoprirla con questo collegamento: {{link}}",
   "inviteWithEscrowedPayment": "Ciao. Uso {{appName}} per inviare criptovalute in tutto il mondo. Ti ho appena inviato {{amount}} {{token}}. Scarica l’app {{appName}} e riscatta {{token}} tramite questo collegamento: {{link}}",
   "inviteWithRewards": "Ciao! 👋 Sto usando {{appName}} come portafoglio per criptovalute. Scaricare l'app e collegare il numero telefonico richiede pochissimo tempo e come ricompensa riceveremo entrambi un NFT in edizione speciale. 💫 \n\nUsa questo link per il download: {{link}}",
-  "inviteWithRewardsCUSD": "Ehi! In questo momento possiamo entrambi ricevere una ricompensa gratuita di 0,50 dollari se ti iscrivi, colleghi il tuo numero e finanzi il tuo portafoglio Valora. Io lo uso per far crescere i miei risparmi in USD e criptovalute e tu puoi configurarlo in pochi secondi con un semplice numero di telefono. Assicurati di iscriverti con il mio link di riferimento qui: \n\n{{link}} \n\n Affrettati, la promozione per i referral termina presto.",
+  "inviteWithRewardsCUSD": "Ciao! Se ti iscrivi e aggiungi fondi al tuo wallet Valora, riceveremo entrambi una ricompensa di 0,50 $. Io lo uso per far crescere i miei risparmi in USD e criptovalute; impostalo anche tu in pochi secondi: basta il tuo numero di telefono. Per iscriverti, usa il mio link di riferimento riportato in basso: \n\n{{link}} \n\n Affrettati, la promozione terminerà presto.",
   "loadingContacts": "Ricerca dei contatti in corso",
   "myCode": "Il mio codice",
   "scanCode": "Inquadra",
@@ -1767,7 +1767,7 @@
     "swapToTokenSelection": "SCAMBIA CON",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "I token selezionati non sono supportati dai nostri provider di scambio.",
-    "selectTokenLabel": "Seleziona il token",
+    "selectTokenLabel": "Seleziona token",
     "tokenBottomSheetTitle": "Seleziona token",
     "onNetwork": "su {{networkName}}",
     "switchedToNetworkWarning": {
@@ -1823,9 +1823,9 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Gratuito",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Commissione\n\nLa commissione {{appName}} del {{appFeePercentage}}% è pensata per migliorare la tua esperienza garantendoti scambi veloci, affidabili e sicuri.",
-      "appFeeInfo_free": "{{appName}} Costo\n\nQuesto scambio è gratuito.",
-      "appFeeInfo_placeholder": "{{appName}} Tariffa\n\nLa tariffa viene calcolata in base al preventivo ricevuto.",
+      "appFeeInfo": "Commissione {{appName}}\n\nLa commissione {{appName}} del {{appFeePercentage}}% è stata ideata per migliorare la tua esperienza e garantirti scambi veloci, affidabili e sicuri.",
+      "appFeeInfo_free": "Commissione {{appName}}\n\nQuesto scambio verrà effettuato gratuitamente.",
+      "appFeeInfo_placeholder": "Commissione {{appName}}\n\nLa commissione viene calcolata in base al preventivo che ti abbiamo inviato.",
       "appFeeInfoDismissButton": "Ho capito",
       "slippagePercentage": "Tolleranza slippage",
       "networkFeeInfo": "Stai effettuando uno scambio sulla rete {{networkName}}.\n\nQuesta commissione di rete stimata è necessaria per eseguire una transazione sulla rete {{networkName}}. Questa commissione protegge la tua transazione e serve a mantenere operativa la rete.",
@@ -1833,8 +1833,8 @@
       "slippageToleranceInfo": "Tolleranza slippage\n\nIl tuo scambio verrà eseguito entro la percentuale di tolleranza allo slippage. Se il prezzo cambia oltre la tolleranza allo slippage, {{appName}} ti protegge impedendo l'esecuzione della transazione.",
       "networkFeeInfoDismissButton": "Ho capito",
       "exchangeRate": "Tasso di cambio",
-      "exchangeRateInfo": "Tasso di cambio\n\nAbbiamo trovato il miglior tasso di cambio per te. La tua transazione sarà completata a un prezzo compreso tra {{slippagePercentage}}% della stima o la transazione sarà annullata e i fondi saranno restituiti al tuo portafoglio.",
-      "exchangeRateInfo_withAppFee": "Tasso di cambio\n\nAbbiamo trovato il miglior tasso di cambio per te. La tua transazione sarà completata a un prezzo che rientra nel {{slippagePercentage}}% della stima o la transazione sarà annullata e i fondi saranno restituiti al tuo portafoglio.\n\nIl tasso stimato include una {{appName}} commissione del {{appFeePercentage}}%.",
+      "exchangeRateInfo": "Tasso di cambio\n\nAbbiamo trovato il miglior tasso di cambio. La tua transazione sarà completata a un prezzo che potrebbe oscillare al massimo del {{slippagePercentage}}% rispetto alla stima; se non sarà possibile concluderla a tale prezzo, la transazione sarà annullata e i fondi torneranno nel tuo wallet.",
+      "exchangeRateInfo_withAppFee": "Tasso di cambio\n\nAbbiamo trovato il miglior tasso di cambio. La tua transazione sarà completata a un prezzo che potrebbe oscillare al massimo del {{slippagePercentage}}% rispetto alla stima; se non sarà possibile concluderla a tale prezzo, la transazione sarà annullata e i fondi torneranno nel tuo wallet.\n\nIl tasso stimato include la commissione {{appName}} pari al {{appFeePercentage}}%.",
       "exchangeRateInfoDismissButton": "Ho capito",
       "estimatedValue": "Valore stimato"
     },
@@ -2063,8 +2063,8 @@
       "subtitle": "Invia fondi o un invito ai tuoi contatti"
     },
     "jumpstart": {
-      "title": "Invia con un link in diretta",
-      "subtitle": "Condividi un link per inviare criptovalute come un testo"
+      "title": "Invia con un Live Link",
+      "subtitle": "Condividi un link per inviare criptovalute in formato testo"
     },
     "getStarted": {
       "title": "Come inviare fondi su Valora",
@@ -2145,7 +2145,7 @@
     }
   },
   "jumpstartSendConfirmationScreen": {
-    "title": "Crea un collegamento in tempo reale",
+    "title": "Crea un Live Link",
     "sendAmountLabel": "Importo del link diretto",
     "confirmButton": "Invia e crea un link",
     "info": "Quando crei un link, i fondi vengono prelevati dal tuo portafoglio. Puoi recuperare il link in qualsiasi momento. Condividi i link con attenzione.",
@@ -2156,7 +2156,7 @@
     }
   },
   "jumpstartShareLinkScreen": {
-    "title": "Condividi il tuo link in diretta",
+    "title": "Condividi il Live Link",
     "description": "Copia il link per inviare {{tokenSymbol}} tramite la tua app di messaggistica preferita, oppure utilizza il codice QR.",
     "linkLabel": "Link diretto",
     "linkCopiedMessage": "Link live copiato",
@@ -2166,7 +2166,7 @@
       "ctaNavigate": "Vai alla schermata iniziale"
     },
     "ctaShare": "Condividi link",
-    "ctaScanQRCode": "Mostra codice QR",
+    "ctaScanQRCode": "Mostra il codice QR",
     "shareMessage": "Ciao! Ti invio un link finanziato con {{tokenAmount}} {{tokenSymbol}} su {{appName}}. Utilizza questo link per scaricare l'app e i fondi saranno attivi. Ti aspetto. {{link}}",
     "qrCodeBottomSheet": {
       "title": "Scansiona il codice per ricevere i fondi",
@@ -2194,8 +2194,8 @@
     "title": "Acquista criptovalute o trasferisci token",
     "body": "Compra o trasferisci token compatibili per inviare criptovalute ed esplorare il Web3!",
     "titleV1_86": "Aggiungi fondi al tuo portafoglio",
-    "exploreTokens": "Esplora tutti i gettoni",
-    "exploreTokensBody": "Puoi acquistare fino a 10+ gettoni a Valora. Dai un'occhiata!"
+    "exploreTokens": "Esplora tutti i token",
+    "exploreTokensBody": "Con Valora, puoi acquistare più di 10 token. Vieni a scoprirli!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2208,14 +2208,14 @@
       "description": "Puoi trovare il tuo nuovo {{rewardName}} NFT nella sezione \"Collezionabili\""
     },
     "rewardBottomSheet": {
-      "title": "Guadagna 5 dollari di ETH",
-      "description": "Finanzia il tuo portafoglio con un qualsiasi token Ethereum entro il 4 aprile 2024 alle 12:00 PM PDT e ti regaleremo 5 dollari di ETH il 5 aprile 2024 entro le 23:59 PDT.\n\nQuesta è un'offerta esclusiva per essere un Early Ethereum Explorer.",
+      "title": "Guadagna $5 in ETH",
+      "description": "Aggiungi al tuo wallet un qualsiasi importo in token Ethereum entro il 4 aprile 2024 alle 12:00 PM PDT, e riceverai $5 in ETH il 5 aprile 2024 entro le 23:59 PM PDT.\n\nQuesta offerta esclusiva è dedicata ai primi esploratori di Ethereum.",
       "expirationLabel": "Scade {{expirationLabelText}}",
       "cta": "Usa la ricompensa"
     },
     "rewardReminderBottomSheet": {
-      "title": "Non perdere l'occasione, guadagna 5 dollari di ETH",
-      "description": "Finanzia il tuo portafoglio con un qualsiasi token Ethereum entro il 4 aprile 2024 alle 12:00 PM PDT e ti regaleremo 5 dollari di ETH il 5 aprile 2024 entro le 23:59 PDT.\n\nQuesta è un'offerta esclusiva per essere un Early Ethereum Explorer.",
+      "title": "Non perdere l'occasione, guadagna $5 in ETH",
+      "description": "Aggiungi al tuo wallet un qualsiasi importo in token Ethereum entro il 4 aprile 2024 alle 12:00 PM PDT, e riceverai $5 in ETH il 5 aprile 2024 entro le 23:59 PM PDT.\n\nQuesta offerta esclusiva è dedicata ai primi esploratori di Ethereum.",
       "expirationLabel": "Scade {{expirationLabelText}}",
       "cta": "Usa la ricompensa"
     }
@@ -2244,31 +2244,31 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Controllo dei tuoi fondi",
-      "description": "Attendi che controlliamo il tuo Live Link. I fondi richiedibili arriveranno a breve."
+      "title": "Controllo fondi in corso",
+      "description": "Ti preghiamo di attendere mentre controlliamo il tuo Live Link. I fondi richiesti arriveranno a breve."
     },
     "error": {
       "title": "Impossibile reclamare i fondi",
-      "description": "Per un motivo sconosciuto non è stato possibile richiedere questo link.",
+      "description": "Per un motivo sconosciuto non è stato possibile richiedere questo link",
       "alreadyClaimedDescription": "Il link è già stato richiesto. Chiedi al tuo amico di inviare un nuovo link",
       "contactSupport": "Contatta il supporto tecnico",
       "dismiss": "Ignora"
     }
   },
   "jumpstartReclaim": {
-    "description": "Il recupero del tuo link comporta una tassa sul gas di rete, vuoi procedere?",
+    "description": "Il recupero del link comporta una commissione sulla transazione, vuoi procedere comunque?",
     "fetchStatusError": {
-      "title": "Oops, qualcosa è andato storto",
-      "description": "Non è stato possibile ottenere lo stato di richiesta di questo invito, ti preghiamo di riprovare più tardi o di contattare l'assistenza.",
+      "title": "Ops. Si è verificato un errore",
+      "description": "Non è stato possibile recuperare lo stato di richiesta per questo invito. Riprova più tardi o contatta l'assistenza",
       "retryCta": "Riprova"
     },
     "reclaimError": {
-      "title": "Impossibile recuperare i fondi",
-      "description": "Prova a reclamare di nuovo, oppure contatta l'assistenza"
+      "title": "Impossibile richiedere i fondi",
+      "description": "Prova a effettuare nuovamente la richiesta o contatta l'assistenza"
     }
   },
   "multiSelect": {
-    "switchNetwork": "Rete di interruttori",
+    "switchNetwork": "Cambia rete",
     "allNetworks": "Tutte le reti"
   },
   "points": {
@@ -2277,7 +2277,7 @@
     "history": {
       "cards": {
         "createWallet": {
-          "title": "Portafoglio",
+          "title": "Possessore di wallet",
           "subtitle": "Membro di {{appName}}"
         },
         "swap": {
@@ -2285,10 +2285,10 @@
           "subtitle": "{{fromToken}} > {{toToken}}"
         }
       },
-      "title": "La mia attività a punti",
+      "title": "I miei punti attività",
       "error": {
         "title": "Impossibile caricare i punti attività",
-        "subtitle": "Ops, qualcosa è andato storto durante il tentativo di caricare il tuo feed di attività dei punti. Riprova.",
+        "subtitle": "Ops. Qualcosa non ha funzionato durante il tentativo di caricare il feed dei tuoi punti attività. Riprova.",
         "tryAgain": "Riprova"
       },
       "empty": {
@@ -2298,119 +2298,142 @@
       },
       "pageError": {
         "title": "Impossibile caricare",
-        "subtitle": "Ops, qualcosa è andato storto durante il caricamento. Riprova.",
+        "subtitle": "Ops. Qualcosa è andato storto durante il caricamento. Riprova.",
         "refresh": "Aggiornare"
       }
     },
     "fetchBalanceError": {
       "title": "Impossibile caricare i punti",
-      "description": "Ops, qualcosa è andato storto nel tentativo di caricare i tuoi punti. Le informazioni contenute in questa pagina potrebbero non essere aggiornate. Ti preghiamo di aggiornare.",
+      "description": "Ops. Qualcosa è andato storto nel tentativo di caricare i tuoi punti. Le informazioni contenute in questa pagina potrebbero non essere aggiornate. Aggiorna la pagina.",
       "retryCta": "Aggiornare"
     },
     "loading": {
-      "title": "Raccogliere i punti",
-      "description": "Stiamo per fare il conteggio dei tuoi punti, tieniti forte."
+      "title": "Raccolta punti in corso",
+      "description": "Stiamo calcolando i tuoi punti, ti preghiamo di attendere."
     },
     "error": {
       "title": "Impossibile caricare i punti",
-      "description": "Ops, qualcosa è andato storto durante il tentativo di caricare i tuoi punti. Riprova.",
+      "description": "Ops. Qualcosa è andato storto durante il caricamento dei punti. Riprova.",
       "retryCta": "Riprova"
     },
     "infoCard": {
-      "title": "Altri modi per guadagnare punti in arrivo 🚀",
-      "body": "Stiamo lavorando per aggiungere altri modi per guadagnare punti utilizzando l'app. Continuate a seguirci per gli aggiornamenti."
+      "title": "A breve potrai scoprire altri modi per guadagnare punti 🚀",
+      "body": "Aggiungiamo continuamente nuovi modi per guadagnare punti utilizzando l'app. Continua a seguirci."
     },
     "activitySection": {
-      "title": "Come si guadagnano i punti?",
-      "body": "È facile! Guadagna punti semplicemente usando l'app."
+      "title": "Come faccio a guadagnare punti?",
+      "body": "Guadagnare punti è facile! Ti basta usare l'app."
     },
     "noActivities": {
-      "title": "Aggiornamento per sbloccare più punti 🔓",
+      "title": "Per sbloccare più punti, esegui l'aggiornamento 🔓",
       "body": "Ops! Sembra che tu stia utilizzando una versione precedente di {{appName}}. Aggiorna ora per scoprire tutti i nuovi ed entusiasmanti modi in cui puoi guadagnare punti."
     },
     "activityCards": {
       "createWallet": {
-        "title": "Crea un portafoglio {{appName}}"
+        "title": "Crea un wallet {{appName}}"
       },
       "swap": {
-        "title": "Attività di swap",
+        "title": "Scambia asset",
         "bottomSheet": {
-          "title": "Attività di swap",
-          "body": "Questo spazio sarà utilizzato per fornire tutti i dettagli necessari. Forse l'importo minimo da scambiare. \n\nGuadagna {{pointsValue}} punti ogni volta che scambi un'attività utilizzando {{appName}}.",
+          "title": "Scambia asset",
+          "body": "In questo spazio troverai tutte le informazioni relative a questa attività. Verranno indicate anche le quantità minima da scambiare. \n\nGuadagna {{pointsValue}} punti ogni volta che scambii un asset usando {{appName}}.",
           "cta": "Vai allo scambio"
         }
       },
       "moreComing": {
-        "title": "Prossimamente ne arriveranno altri!"
+        "title": "Altre novità in arrivo!"
       }
     },
     "discoverCard": {
-      "title": "{{appName}} Punti",
-      "description": "Guadagna punti facilmente con {{appName}}. L'utilizzo dell'app, compreso lo scambio, porta a guadagnare punti!"
+      "title": "Punti {{appName}}",
+      "description": "Guadagna punti facilmente con {{appName}}. Usa l'app, che permette anche lo scambio, e guadagna punti!"
     },
     "intro": {
-      "title": "Accumula punti senza fatica",
-      "description": "Scopri un nuovo modo di guadagnare! Le tue azioni su {{appName}} ora fanno guadagnare punti. Inizia a guadagnare oggi stesso e sblocca fantastici vantaggi.",
-      "cta": "Inizia il tuo viaggio a punti"
+      "title": "Guadagna punti senza fatica",
+      "description": "Scopri un nuovo modo di guadagnare! Ora, le tue azioni su {{appName}} ti fanno guadagnare punti. Inizia a guadagnare oggi stesso e accedi a fantastici vantaggi.",
+      "cta": "Inizia ad accumulare punti"
     }
   },
   "earnFlow": {
-    "gasSubsidized": "Valora copre la benzina per questa transazione!",
+    "gasSubsidized": "La commissione per questa transazione verrà pagata da Valora!",
     "addCryptoBottomSheet": {
       "title": "Aggiungi {{tokenSymbol}} su {{tokenNetwork}}",
-      "description": "Una volta aggiunti i gettoni, dovrai tornare per terminare il deposito in una piscina.",
+      "description": "Dopo aver aggiunto i token, torna su questa pagina per terminare il deposito in un pool.",
       "actions": {
         "add": "Acquista",
-        "transfer": "Trasferimento",
+        "transfer": "Trasferisci",
         "swap": "Scambia"
       },
       "actionDescriptions": {
         "add": "Acquista {{tokenSymbol}} su {{tokenNetwork}} utilizzando uno dei nostri fornitori di fiducia",
-        "transfer": "Utilizza qualsiasi portafoglio o exchange compatibile con {{tokenNetwork}} per depositare {{tokenSymbol}}",
-        "swap": "Scambia in {{tokenSymbol}} da un altro token {{tokenNetwork}}"
+        "transfer": "Utilizza qualsiasi wallet o exchange compatibile con {{tokenNetwork}} per depositare {{tokenSymbol}}",
+        "swap": "Fai uno scambio per acquisire {{tokenSymbol}} cedendo token {{tokenNetwork}}"
       }
     },
     "cta": {
       "title": "Guadagna sui tuoi stablecoin",
       "subtitle": "Deposita oggi stesso e guadagna",
-      "description": "Scopri quanto puoi guadagnare fornendo un pool di prestiti"
+      "description": "Scopri quanto puoi guadagnare mettendo a disposizione un lending pool"
+    },
+    "earnInfo": {
+      "title": "Guadagna sulle stablecoin di\n",
+      "details": {
+        "earn": {
+          "titleGasSubsidy": "Massimizza i guadagni senza le tasse sul gas*",
+          "title": "Massimizzare i guadagni",
+          "subtitle": "Guadagna sulle tue stablecoin e ottieni ricompense quando rifornisci un pool.",
+          "footnoteSubsidy": "*Le spese per il gas sono temporaneamente coperte da Valora."
+        },
+        "manage": {
+          "title": "Gestisci direttamente da Valora",
+          "subtitle": "Ci occuperemo noi della configurazione in modo che tu possa gestire la tua posizione direttamente da Valora."
+        },
+        "access": {
+          "title": "Accedi facilmente ai tuoi fondi",
+          "subtitle": "Raccogli i tuoi fondi senza sforzo con un solo tocco. Goditi lo stesso accesso istantaneo che otterresti direttamente attraverso i tuoi protocolli preferiti."
+        }
+      },
+      "action": {
+        "learn": "Scopri di più",
+        "earn": "Inizia a guadagnare"
+      }
     },
     "ctaV1_86": {
-      "title": "Massimizza i guadagni con le stablecoins",
+      "title": "Massimizza i guadagni sulle stablecoin",
       "subtitle": "Acquista {{symbol}}",
-      "description": "Guadagna circa {{apy}}% all'anno quando aggiungi {{symbol}} a una piscina."
+      "description": "Guadagna circa {{apy}}% all'anno quando aggiungi {{symbol}} a un pool."
     },
     "enterAmount": {
-      "earnUpToLabel": "Potresti guadagnare fino a:",
-      "rateLabel": "Tasso (est.)",
+      "earnUpToLabel": "Puoi guadagnare fino a:",
+      "rateLabel": "Tasso (stima)",
       "earnUpTo": "~{{fiatSymbol}}{{amount}} / anno",
       "rate": "{{rate}}% APY",
       "continue": "Continua",
-      "info": "Questa piscina è alimentata da Aave",
+      "info": "Questo pool è supportato da Aave",
       "infoBottomSheet": {
-        "title": "Perché questa piscina?",
-        "description": "Questo pool di Aave ha oltre 150 milioni di dollari di TVL e più di 6.000 contributori, il che indica una forte liquidità e affidabilità. Inoltre, utilizza USDC come token e Abritrum come rete, il che riduce la volatilità e garantisce agli utenti tariffe economiche.\n\nTutto ciò la rende un'opzione sicura e attraente con un APY competitivo, garantendo un'opportunità di investimento vantaggiosa per i nostri utenti.\n\nPuoi esplorare gli altri pool di Aave <0>qui</0>.",
+        "title": "Qual è lo scopo di questo pool?",
+        "description": "Questo pool Aave ha oltre 150 milioni di dollari di TVL e oltre 6.000 contributori: questo indica una forte liquidità e affidabilità. Inoltre utilizza USDC come token e Abritrum come rete: questo riduce la volatilità e permette agli utenti di pagare basse commissioni sulle transazioni.\n\nPer questi motivi è un'opzione sicura e interessante con un rendimento APY competitivo e rappresenta una vantaggiosa opportunità di investimento per i nostri utenti.\n\nPuoi esplorare altri pool Aave <0>qui</0>.",
         "dismiss": "Ignorare"
       },
       "notEnoughBalanceForGasWarning": {
-        "title": "Hai bisogno di più {{feeTokenSymbol}} per continuare",
-        "description": "Aggiungi {{feeTokenSymbol}} su {{network}} per coprire le spese del gas.",
+        "title": "Per continuare, devi avere più {{feeTokenSymbol}}",
+        "description": "Aggiungi {{feeTokenSymbol}} su {{network}} per coprire il costo delle commissioni sulle transazioni",
         "noGasCta": "Acquista {{feeTokenSymbol}} su {{network}}"
       }
     },
     "activePools": {
-      "title": "Piscine attive",
+      "title": "Pool attivi",
       "totalValue": "Valore totale:",
       "apy": "~{{apy}}% APY",
-      "exitPool": "Piscina di uscita",
-      "depositMore": "Deposita di più",
-      "viewPools": "Visualizza le piscine"
+      "exitPool": "Abbandona il pool",
+      "depositMore": "Deposita altro",
+      "viewPools": "Visualizza i pool"
     },
     "depositBottomSheet": {
-      "title": "Revisione e deposito",
-      "description": "Prima di depositare in un pool Aave, consulta i dettagli della transazione qui sotto.",
+      "title": "Rivedi e deposita",
+      "description": "Prima di effettuare depositi in un pool Aave, consulta i dettagli della transazione in basso",
       "amount": "Somma depositata",
-      "fee": "Est. Tariffe del gas",
+      "fee": "Commissioni sulle transazioni stimate",
       "provider": "Fornitore di guadagni",
       "network": "Rete",
       "footer": "Depositando criptovalute in un pool Aave, accetti i rischi associati all'utilizzo di Aave. <0>Termini e condizioni</0>",
@@ -2418,37 +2441,37 @@
       "secondaryCta": "Annulla"
     },
     "collect": {
-      "title": "Congratulazioni! Controlla e riscuoti i tuoi guadagni",
+      "title": "Congratulazioni! Rivedi e riscuoti i tuoi guadagni",
       "total": "TOTALE",
       "plus": "PIÙ",
-      "rate": "Tasso (est.)",
+      "rate": "Tasso (stima)",
       "apy": "{{apy}}% APY",
-      "fee": "Tassa sul gas",
-      "cta": "Raccogli i guadagni",
+      "fee": "Commissione sulla transazione",
+      "cta": "Raccogli guadagni",
       "errorTitle": "Si è verificato un errore",
       "errorDescription": "Impossibile recuperare i dettagli del deposito. Riprova.",
-      "noGasTitle": "Hai bisogno di più {{symbol}} per continuare",
-      "noGasDescription": "Aggiungi {{symbol}} su {{network}} per coprire le spese del gas.",
+      "noGasTitle": "Per continuare, devi avere più {{symbol}}",
+      "noGasDescription": "Aggiungi {{symbol}} su {{network}} per coprire il costo delle commissioni sulle transazioni",
       "noGasCta": "Acquista {{symbol}} su {{network}}"
     },
     "transactionFeed": {
-      "earnClaimTitle": "Raccolta",
-      "earnClaimSubtitle": "da {{providerName}} Pool",
-      "earnDepositTitle": "Depositato",
-      "earnDepositSubtitle": "a {{providerName}} Pool",
-      "earnWithdrawTitle": "Ritirata",
-      "earnWithdrawSubtitle": "da {{providerName}} Pool"
+      "earnClaimTitle": "Raccolti",
+      "earnClaimSubtitle": "dal pool {{providerName}}",
+      "earnDepositTitle": "Depositati",
+      "earnDepositSubtitle": "sul pool {{providerName}}",
+      "earnWithdrawTitle": "Prelevati",
+      "earnWithdrawSubtitle": "dal pool {{providerName}}"
     },
     "transactionDetails": {
       "descriptionLabel": "Dettagli",
-      "earnClaimTitle": "Raccolta",
-      "earnClaimSubtitle": "Raccolta {{tokenSymbol}} da {{providerName}} Pool",
-      "earnClaimDetails": "Importo riscosso",
-      "earnDepositTitle": "Depositato",
-      "earnDepositSubtitle": "Depositato {{tokenSymbol}} al pool {{providerName}}",
+      "earnClaimTitle": "Raccolti",
+      "earnClaimSubtitle": "Raccolti {{tokenSymbol}} dal pool {{providerName}}",
+      "earnClaimDetails": "Importo raccolto",
+      "earnDepositTitle": "Depositati",
+      "earnDepositSubtitle": "Depositati {{tokenSymbol}} sul pool {{providerName}}",
       "earnDepositDetails": "Somma depositata",
-      "earnWithdrawTitle": "Ritirata",
-      "earnWithdrawSubtitle": "Ha ritirato {{tokenSymbol}} dal pool {{providerName}}",
+      "earnWithdrawTitle": "Preleva",
+      "earnWithdrawSubtitle": "Prelevati {{tokenSymbol}} dal pool {{providerName}}",
       "earnWithdrawDetails": "Importo prelevato"
     }
   },
diff --git a/locales/pl-PL/translation.json b/locales/pl-PL/translation.json
index 5b885bdec9..7c8f37582d 100644
--- a/locales/pl-PL/translation.json
+++ b/locales/pl-PL/translation.json
@@ -255,8 +255,8 @@
       "text": "Każdy, kto pozna Twoją frazę, będzie mieć dostęp do Twojego konta i wszystkich jego środków. Nie udostępniaj jej nikomu."
     }
   ],
-  "consumerIncentivesTitle": "Supercharge dobiega końca",
-  "consumerIncentivesSummary": "Ale jeszcze więcej nagród czeka na Ciebie. Do 28 maja otrzymuj {{percent}}% rocznych nagród od najwyższego salda stablecoinów (cUSD, cEUR lub cREAL). Oto jak to działa:",
+  "consumerIncentivesTitle": "Program Supercharge dobiega końca",
+  "consumerIncentivesSummary": "Jednak czeka na Ciebie jeszcze więcej nagród. Do 28 maja zyskaj {{percent}}% rocznych nagród od najwyższego salda stablecoinów (cUSD, cEUR lub cREAL). Oto jak to działa:",
   "earnWeekly": {
     "header": "Podłącz swój numer telefonu",
     "text": "Jeśli nie masz jeszcze podłączonego numeru telefonu, naciśnij polecenie Podłącz numer."
@@ -271,8 +271,8 @@
     "text": "Dzięki temu Twoje nagrody będą bezpieczne i zawsze pod Twoją kontrolą."
   },
   "conclusion": "To takie proste. Doładuj swoją kryptowalutę już dziś!",
-  "superchargeTitle": "Supercharge dobiega końca",
-  "superchargeDescription": "Ale jeszcze więcej nagród czeka na Ciebie. Do 28 maja zdobądź {{apy}}% rocznych nagród za najwyższe saldo {{token}} . Oto jak to działa:",
+  "superchargeTitle": "Program Supercharge dobiega końca",
+  "superchargeDescription": "Jednak czeka na Ciebie jeszcze więcej nagród. Do 28 maja zyskaj {{apy}}% rocznych nagród za najwyższe saldo {{token}}. Oto jak to działa:",
   "superchargeConnectNumber": "Podłącz swój numer telefonu",
   "superchargeReconnectNumber": "Podłącz ponownie swój numer telefonu\n<0>Uruchomiliśmy ulepszoną obsługę programu Supercharge. Podłącz ponownie swój numer telefonu, aby zdobywać nagrody na {{token}}.</0>",
   "superchargeMinimumBalance": "Dodaj minimalne saldo {{amount}} {{token}}",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "Wymagana aktualizacja aplikacji",
   "superchargingDescription": "Zaktualizuj aplikację Valora, aby kontynuować otrzymywanie cotygodniowych nagród w programie Supercharge.",
-  "superchargingTitleV1_54": "Supercharge dobiega końca",
-  "superchargingDescriptionV1_54": "Nagrody tygodniowe będzie można odbierać do wtorku, 28 maja, do godziny 23:59 UTC. Od 29 maja nie będziesz już mógł odbierać nagród Supercharge.",
+  "superchargingTitleV1_54": "Program Supercharge dobiega końca",
+  "superchargingDescriptionV1_54": "Nagrody tygodniowe będzie można odbierać do wtorku, 28 maja, do godziny 23:59 UTC. Od 29 maja nie będzie już można odbierać nagród w ramach programu Supercharge.",
   "superchargeRewardsAvailable": "Masz {{amount}} {{token}} dostępne do odbioru!",
   "superchargeRewardsAvailableMultipleTokens": "Masz {{amounts}} dostępne do odbioru!",
-  "superchargeClaimText": "Odbierz swoje nagrody do wtorku, 28 maja, do godziny 23:59 UTC. Od 29 maja nie będziesz już mógł odbierać nagród Supercharge.",
+  "superchargeClaimText": "Odbierz swoje nagrody do wtorku, 28 maja, do godziny 23:59 UTC. Od 29 maja nie będzie już można odbierać nagród w ramach programu Supercharge.",
   "superchargeClaimButton": "Odbierz nagrody",
   "superchargeFetchRewardsFailed": "Wystąpił błąd podczas pobierania oczekujących nagród w ramach programu Supercharge. Spróbuj ponownie później.",
   "superchargeClaimSuccess": "Twoje nagrody Supercharge zostały dodane do Twojego salda całkowitego.",
@@ -677,8 +677,8 @@
     "body": "Po założeniu portfela w aplikacji {{appName}} i podłączeniu numeru oboje otrzymacie ekskluzywne NFT."
   },
   "inviteRewardsBannerCUSD": {
-    "title": "Zaproś znajomych i zdobądź do 12 USD",
-    "body": "Gdy połączą swój numer i dodadzą środki do {{appName}}, oboje otrzymacie 0,50 cUSD."
+    "title": "Zaproś znajomych i zdobądź do 12 cUSD",
+    "body": "Gdy połączą swój numer i dodadzą środki do {{appName}}, otrzymacie po 0,50 cUSD."
   },
   "inviteWithUrl": {
     "title": "Zaproś znajomego",
@@ -693,7 +693,7 @@
     },
     "rewardsActiveCUSD": {
       "title": "ZYSKAJ DO 12 cUSD za zaproszenie znajomych do Valory!",
-      "body": "Zdobądź 0,50 cUSD za każdego znajomego, którego zaprosisz na {{appName}}. Gdy połączą swój numer, dodadzą środki i utrzymają je przez 7 dni, oboje otrzymacie 0,50 cUSD. Pospiesz się, środki są ograniczone! (Limit 25 znajomych)."
+      "body": "Zyskaj 0,50 cUSD za każdego znajomego, którego zaprosisz do {{appName}}. Gdy połączą swój numer, dodadzą środki i utrzymają je przez 7 dni, otrzymacie po 0,50 cUSD. Pospiesz się, środki są ograniczone! (Ograniczenie do 25 znajomych)."
     }
   },
   "getReward": "Otrzymaj ${{reward}}",
@@ -710,15 +710,15 @@
     "goldDisclaimer": "Tworząc „konto” w Valora, tworzysz cyfrowy portfel, do którego klucze posiadasz tylko Ty. Żadna inna osoba ani podmiot, w tym Valora, nie może odzyskać Twojego klucza, zmienić ani cofnąć transakcji ani odzyskać utraconych środków. Pamiętaj, że kryptowaluty są częścią nowej klasy aktywów i wiążą się z ryzykiem strat finansowych. Przed zakupem jakichkolwiek aktywów dokładnie rozważ swoją sytuację finansową i tolerancję na ryzyko finansowe."
   },
   "termsColloquial": {
-    "title": "Zacznijmy od stworzenia twojego portfela",
+    "title": "Zacznijmy od stworzenia Twojego portfela",
     "privacyHeading": "Twoje informacje i prywatność:",
     "privacy1": "Gromadzimy dane dotyczące użytkowania, które pomagają nam ulepszać aplikację i bezpieczeństwo. Rodzaj gromadzonych przez nas informacji, sposób ich wykorzystania oraz Twoje prawa związane z tymi informacjami można znaleźć w naszej <0>Polityce prywatności</0>.",
     "privacy2": "Jeśli zdecydujesz się połączyć swój numer telefonu, będziemy przechowywać jego zaszyfrowaną kopię.",
     "privacy3": "Jeśli zdecydujesz się połączyć swoje kontakty, użyjemy ich nazw, numerów i zdjęć profilowych, aby ułatwić ich znalezienie.",
-    "walletHeading": "Twój cyfrowy portfel z Valora:",
-    "wallet1": "Zamierzasz utworzyć cyfrowy portfel. Tylko Ty masz klucz do swojego portfela. Nie możemy odzyskać Twojego klucza ani Twoich aktywów, jeśli go zgubisz. Nie możemy również cofnąć działań podjętych przez Valora na blockchainach.",
-    "wallet2": "Zasoby cyfrowe, z którymi będziesz wchodzić w interakcje z Valora, wiążą się z wyjątkowym ryzykiem. Korzystając z Valora, akceptujesz to ryzyko i bierzesz za nie odpowiedzialność. Przed dokonaniem wyboru weź pod uwagę swoje finanse i tolerancję na ryzyko.",
-    "fullTerms": "Przeczytaj nasz pełny <0>Regulamin</0>"
+    "walletHeading": "Twój cyfrowy portfel w ramach Valory:",
+    "wallet1": "Zamierzasz utworzyć cyfrowy portfel. Tylko Ty masz klucz do swojego portfela. Nie możemy odzyskać Twojego klucza ani Twoich aktywów, jeśli go zgubisz. Nie możemy również cofnąć działań podjętych przez Valorę na blockchainach.",
+    "wallet2": "Zasoby cyfrowe, z którymi będziesz wchodzić w interakcje z Valorą, wiążą się z ryzykiem. Korzystając z Valory, akceptujesz to ryzyko i bierzesz za nie odpowiedzialność. Przed dokonaniem wyboru weź pod uwagę swoje finanse i tolerancję na ryzyko.",
+    "fullTerms": "Przeczytaj nasze pełne <0>Warunki</0>"
   },
   "fullNameOrPsuedonym": "Imię i nazwisko lub pseudonim",
   "namePlaceholder": "np. imię",
@@ -827,7 +827,7 @@
     "hasWallet": "Mam już portfel",
     "header": "Witamy w {{appName}}! Stwórzmy Twój portfel kryptowalutowy.",
     "getStarted": "Rozpocznij",
-    "agreeToTerms": "Tworząc portfel, zgadzasz się na nasze <0>Warunki</0> korzystania z usługi"
+    "agreeToTerms": "Tworząc portfel, zgadzasz się na nasze <0>Warunki</0>"
   },
   "accessContacts": {
     "disclosure": {
@@ -1038,7 +1038,7 @@
   "inviteWithoutPayment": "Cześć! Korzystam z aplikacji {{appName}} do przesyłania kryptowalut z dowolnego miejsca na świecie. To bardzo proste. Może Ty też spróbujesz? Skorzystaj z tego linku: {{link}}",
   "inviteWithEscrowedPayment": "Cześć! Korzystam z aplikacji {{appName}} do przesyłania kryptowalut z dowolnego miejsca na świecie. Przesyłam Ci właśnie {{amount}} {{token}}. Pobierz aplikację {{appName}} i odbierz {{token}}, korzystając z tego linku: {{link}}",
   "inviteWithRewards": "Cześć! 👋 Używam {{appName}} jako mojego portfela kryptowalut. Aplikację możesz szybko pobrać i połączyć z Twoim numerem telefonu. Do tego w nagrodę otrzymamy specjalną edycję NFT. 💫 \n\nUżyj tego linku, aby pobrać: {{link}}",
-  "inviteWithRewardsCUSD": "Hej! W tej chwili oboje możemy otrzymać darmową nagrodę w wysokości 0,50 USD, jeśli zarejestrujesz się, podłączysz swój numer i zasilisz portfel Valora. Używam go do powiększania moich oszczędności w USD i kryptowalutach, a możesz go skonfigurować w kilka sekund, podając tylko numer telefonu. Zarejestruj się za pomocą mojego linku polecającego tutaj: \n\n{{link}} \n\n Pospiesz się, promocja kończy się wkrótce.",
+  "inviteWithRewardsCUSD": "Hej! W tej chwili oboje możemy otrzymać darmową nagrodę w wysokości 0,50 USD, jeśli zarejestrujesz się, połączysz swój numer i zasilisz portfel Valora. Używam go do powiększania moich oszczędności w USD i kryptowalutach, a Ty możesz go skonfigurować w kilka sekund, podając tylko numer telefonu. Zarejestruj się za pomocą mojego linku polecającego tutaj: \n\n{{link}} \n\n Pospiesz się, promocja kończy się wkrótce.",
   "loadingContacts": "Wyszukiwanie kontaktów",
   "myCode": "Mój kod",
   "scanCode": "Skanuj",
@@ -1328,7 +1328,7 @@
   "feedItemSwapPath": "{{token1}} na {{token2}}",
   "feedItemJumpstartTitle": "Aktywny link",
   "feedItemJumpstartSentSubtitle": "Zaproszenie",
-  "feedItemJumpstartReceivedSubtitle": "Otrzymane fundusze",
+  "feedItemJumpstartReceivedSubtitle": "Otrzymane środki",
   "transactionHeaderVerificationFee": "Potwierdzenie",
   "transactionHeaderNetworkFee": "Sieć",
   "transactionHeaderFaucet": "Faucet",
@@ -1773,7 +1773,7 @@
     "unsupportedSwapTokens": "Wybrane tokeny nie są obsługiwane przez naszych dostawców swapów.",
     "selectTokenLabel": "Wybierz token",
     "tokenBottomSheetTitle": "Wybierz token",
-    "onNetwork": "na {{networkName}}",
+    "onNetwork": "w {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "Przełączono do sieci {{networkName}}",
       "body_swapFrom": "Aby kontynuować, wybierz token do wymiany w sieci {{networkName}}.",
@@ -1826,10 +1826,10 @@
       "appFeeValue": "<0></0> <1>(<0></0>)</1>",
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Bezpłatnie",
-      "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Opłata\n\nOpłata {{appName}} w wysokości {{appFeePercentage}}% ma na celu zwiększenie Twojego doświadczenia poprzez zapewnienie szybkich, niezawodnych i bezpiecznych swapów.",
-      "appFeeInfo_free": "{{appName}} Opłata\n\nTa wymiana jest bezpłatna.",
-      "appFeeInfo_placeholder": "{{appName}} Opłata\n\nOpłata jest obliczana na podstawie otrzymanej wyceny.",
+      "appFeeValue_placeholder": "–",
+      "appFeeInfo": "Opłata {{appName}}\n\nOpłata {{appName}} w wysokości {{appFeePercentage}}% ma na celu poprawę obsługi poprzez zapewnienie szybkich, niezawodnych i bezpiecznych swapów.",
+      "appFeeInfo_free": "Opłata {{appName}}\n\nTen swap jest bezpłatny.",
+      "appFeeInfo_placeholder": "Opłata {{appName}}\n\nOpłata jest obliczana na podstawie otrzymanej wyceny.",
       "appFeeInfoDismissButton": "Rozumiem",
       "slippagePercentage": "Tolerancja poślizgu",
       "networkFeeInfo": "Dokonujesz wymiany w sieci {{networkName}}.\n\nTa szacunkowa opłata sieciowa jest wymagana do przeprowadzenia transakcji w sieci {{networkName}}. Opłata ta zabezpiecza Twoją transakcję i przeznaczana jest na utrzymanie działania sieci.",
@@ -1837,8 +1837,8 @@
       "slippageToleranceInfo": "Tolerancja poślizgu\n\nTwój swap zostanie zrealizowany w ramach procentowej tolerancji poślizgu. Jeśli cena zmieni się bardziej niż tolerancja poślizgu, {{appName}} chroni Cię, uniemożliwiając realizację transakcji.",
       "networkFeeInfoDismissButton": "Rozumiem",
       "exchangeRate": "Kurs wymiany",
-      "exchangeRateInfo": "Kurs wymiany\n\nZnaleźliśmy dla Ciebie najlepszy kurs wymiany. Twoja transakcja zostanie sfinalizowana po cenie mieszczącej się w {{slippagePercentage}}% oszacowania lub transakcja zostanie anulowana, a środki zwrócone do Twojego portfela.",
-      "exchangeRateInfo_withAppFee": "Kurs wymiany\n\nZnaleźliśmy dla Ciebie najlepszy kurs wymiany. Twoja transakcja zostanie zrealizowana po cenie mieszczącej się w przedziale {{slippagePercentage}}% wartości szacunkowej lub transakcja zostanie anulowana, a środki zwrócone do Twojego portfela.\n\nSzacowany kurs obejmuje opłatę {{appName}} w wysokości {{appFeePercentage}}%.",
+      "exchangeRateInfo": "Kurs wymiany\n\nZnaleźliśmy dla Ciebie najlepszy kurs wymiany. Twoja transakcja zostanie zrealizowana po cenie mieszczącej się w przedziale {{slippagePercentage}}% wartości szacunkowej lub zostanie anulowana, a środki zostaną zwrócone do Twojego portfela.",
+      "exchangeRateInfo_withAppFee": "Kurs wymiany\n\nZnaleźliśmy dla Ciebie najlepszy kurs wymiany. Twoja transakcja zostanie zrealizowana po cenie mieszczącej się w przedziale {{slippagePercentage}}% wartości szacunkowej lub zostanie anulowana, a środki zostaną zwrócone do Twojego portfela.\n\nSzacowany kurs obejmuje opłatę {{appName}} w wysokości {{appFeePercentage}}%.",
       "exchangeRateInfoDismissButton": "Rozumiem",
       "estimatedValue": "Szacunkowa wartość"
     },
@@ -2067,7 +2067,7 @@
       "subtitle": "Wyślij środki lub zaproszenie do swoich kontaktów"
     },
     "jumpstart": {
-      "title": "Wyślij za pomocą łącza na żywo",
+      "title": "Wyślij za pomocą aktywnego linku",
       "subtitle": "Udostępnij link, aby wysłać kryptowalutę jako tekst"
     },
     "getStarted": {
@@ -2122,8 +2122,8 @@
   "viewOnArbiscan": "Wyświetl w Arbiscan",
   "viewOnOPMainnetExplorer": "Wyświetl w OP Mainnet Explorer",
   "viewOnOPSepoliaExplorer": "Wyświetl w OP Sepolia Explorer",
-  "viewOnPolygonPoSScan": "Zobacz na PolygonScan",
-  "viewOnBaseScan": "Zobacz na BaseScan",
+  "viewOnPolygonPoSScan": "Wyświetl w PolygonScan",
+  "viewOnBaseScan": "Wyświetl w BaseScan",
   "sendEnterAmountScreen": {
     "title": "Wprowadź kwotę",
     "selectToken": "Wybierz token",
@@ -2149,7 +2149,7 @@
     }
   },
   "jumpstartSendConfirmationScreen": {
-    "title": "Utwórz łącze na żywo",
+    "title": "Utwórz aktywny link",
     "sendAmountLabel": "Kwota w ramach aktywnego linku",
     "confirmButton": "Wyślij i utwórz link",
     "info": "Kiedy tworzysz link, środki są pobierane z Twojego portfela. Możesz odzyskać link w dowolnym momencie. Udostępniaj linki ostrożnie.",
@@ -2160,7 +2160,7 @@
     }
   },
   "jumpstartShareLinkScreen": {
-    "title": "Udostępnij swój link na żywo",
+    "title": "Udostępnij swój aktywny link",
     "description": "Skopiuj link, aby wysłać {{tokenSymbol}} za pośrednictwem wybranej aplikacji do przesyłania wiadomości, lub użyj kodu QR.",
     "linkLabel": "Aktywny link",
     "linkCopiedMessage": "Skopiowano aktywny link",
@@ -2213,13 +2213,13 @@
     },
     "rewardBottomSheet": {
       "title": "Zdobądź ETH o wartości 5 USD",
-      "description": "Zasil swój portfel dowolnym tokenem Ethereum do 4 kwietnia 2024 r. do godziny 12:00 czasu PDT, a my damy Ci 5 USD ETH 5 kwietnia 2024 r. do godziny 11:59 czasu PDT.\n\nJest to ekskluzywna oferta dla wczesnych odkrywców Ethereum.",
+      "description": "Zasil swój portfel dowolnym tokenem Ethereum do 4 kwietnia 2024 r. do godziny 12:00 czasu PDT, a my przekażemy Ci 5 USD ETH 5 kwietnia 2024 r. do godziny 11:59 czasu PDT.\n\nJest to ekskluzywna oferta dla wczesnych odkrywców Ethereum.",
       "expirationLabel": "Wygasa {{expirationLabelText}}",
       "cta": "Wykorzystaj nagrodę"
     },
     "rewardReminderBottomSheet": {
       "title": "Nie przegap okazji i zdobądź 5 USD ETH",
-      "description": "Zasil swój portfel dowolnym tokenem Ethereum do 4 kwietnia 2024 r. do godziny 12:00 czasu PDT, a my damy Ci 5 USD ETH 5 kwietnia 2024 r. do godziny 11:59 czasu PDT.\n\nJest to ekskluzywna oferta dla wczesnych odkrywców Ethereum.",
+      "description": "Zasil swój portfel dowolnym tokenem Ethereum do 4 kwietnia 2024 r. do godziny 12:00 czasu PDT, a my przekażemy Ci 5 USD ETH 5 kwietnia 2024 r. do godziny 11:59 czasu PDT.\n\nJest to ekskluzywna oferta dla wczesnych odkrywców Ethereum.",
       "expirationLabel": "Wygasa {{expirationLabelText}}",
       "cta": "Wykorzystaj nagrodę"
     }
@@ -2249,7 +2249,7 @@
   "jumpstartStatus": {
     "loading": {
       "title": "Sprawdzanie Twoich środków",
-      "description": "Poczekaj, aż sprawdzimy Twój Live Link. Wkrótce otrzymasz środki możliwe do odebrania."
+      "description": "Poczekaj, aż sprawdzimy Twój aktywny link. Wkrótce otrzymasz środki możliwe do odebrania."
     },
     "error": {
       "title": "Nie można odebrać środków",
@@ -2260,7 +2260,7 @@
     }
   },
   "jumpstartReclaim": {
-    "description": "Odzyskanie łącza wiąże się z opłatą za gaz sieciowy, czy chcesz kontynuować?",
+    "description": "Odzyskanie linku wiąże się z opłatą za gaz, czy chcesz kontynuować?",
     "fetchStatusError": {
       "title": "Ups, coś poszło nie tak",
       "description": "Nie mogliśmy uzyskać statusu tego zaproszenia, spróbuj ponownie później lub skontaktuj się z pomocą techniczną.",
@@ -2272,7 +2272,7 @@
     }
   },
   "multiSelect": {
-    "switchNetwork": "Sieć przełączników",
+    "switchNetwork": "Przełącz sieć",
     "allNetworks": "Wszystkie sieci"
   },
   "points": {
@@ -2281,7 +2281,7 @@
     "history": {
       "cards": {
         "createWallet": {
-          "title": "Uchwyt na portfel",
+          "title": "Posiadacz portfela",
           "subtitle": "Członek {{appName}}"
         },
         "swap": {
@@ -2289,15 +2289,15 @@
           "subtitle": "{{fromToken}} do {{toToken}}"
         }
       },
-      "title": "Moja aktywność punktowa",
+      "title": "Moja aktywność w zakresie punktów",
       "error": {
-        "title": "Nie można załadować aktywności punktów",
-        "subtitle": "Ups, coś poszło nie tak podczas próby załadowania Twojego kanału aktywności punktów. Spróbuj ponownie.",
+        "title": "Nie można załadować aktywności w zakresie punktów",
+        "subtitle": "Ups, coś poszło nie tak podczas próby załadowania Twojego kanału aktywności w zakresie punktów. Spróbuj ponownie.",
         "tryAgain": "Spróbuj ponownie"
       },
       "empty": {
-        "title": "Brak aktywności punktowej",
-        "subtitle": "Wygląda na to, że nie zdobyłeś jeszcze żadnych punktów. Użyj {{appName}} , aby zacząć zdobywać punkty!",
+        "title": "Brak aktywności w zakresie punktów",
+        "subtitle": "Wygląda na to, że nie udało Ci się zdobyć jeszcze żadnych punktów. Użyj {{appName}}, aby zacząć zdobywać punkty!",
         "gotIt": "Rozumiem"
       },
       "pageError": {
@@ -2307,13 +2307,13 @@
       }
     },
     "fetchBalanceError": {
-      "title": "Nie można załadować twoich punktów",
+      "title": "Nie można załadować Twoich punktów",
       "description": "Ups, coś poszło nie tak podczas próby załadowania Twoich punktów. Informacje na tej stronie mogą być nieaktualne. Odśwież stronę.",
       "retryCta": "Odśwież"
     },
     "loading": {
-      "title": "Zbierz swoje punkty",
-      "description": "Jesteśmy w trakcie podliczania twoich punktów, trzymaj się mocno"
+      "title": "Zbieranie punktów",
+      "description": "Jesteśmy w trakcie podliczania twoich punktów, zaczekaj"
     },
     "error": {
       "title": "Nie można załadować punktów",
@@ -2326,7 +2326,7 @@
     },
     "activitySection": {
       "title": "Jak mogę zdobywać punkty?",
-      "body": "To proste! Zdobywaj punkty po prostu korzystając z aplikacji."
+      "body": "To proste! Zdobywaj punkty, po prostu korzystając z aplikacji."
     },
     "noActivities": {
       "title": "Zaktualizuj, aby odblokować więcej punktów 🔓",
@@ -2337,11 +2337,11 @@
         "title": "Utwórz portfel {{appName}}"
       },
       "swap": {
-        "title": "Aktywa swapowe",
+        "title": "Dokonaj swapu aktywów",
         "bottomSheet": {
-          "title": "Aktywa swapowe",
-          "body": "To miejsce zostanie wykorzystane do podania wszystkich potrzebnych szczegółów. Może minimalna kwota do wymiany. \n\nZdobywaj punkty {{pointsValue}} za każdym razem, gdy wymieniasz aktywa za pomocą {{appName}}.",
-          "cta": "Przejdź do wymiany"
+          "title": "Dokonaj swapu aktywów",
+          "body": "To miejsce zostanie wykorzystane do podania wszystkich potrzebnych szczegółów. Może to być minimalna kwota do swapu. \n\nZdobywaj {{pointsValue}} punkty(-ów) za każdym razem, gdy dokonujesz swapu aktywów za pomocą {{appName}}.",
+          "cta": "Przejdź do swapu"
         }
       },
       "moreComing": {
@@ -2349,35 +2349,58 @@
       }
     },
     "discoverCard": {
-      "title": "{{appName}} Punkty",
-      "description": "Łatwo zdobywaj punkty dzięki {{appName}}. Korzystanie z aplikacji, w tym wymiana, prowadzi do zdobywania punktów!"
+      "title": "Punkty {{appName}}",
+      "description": "Łatwo zdobywaj punkty dzięki {{appName}}. Korzystanie z aplikacji, włączając w to dokonywanie swapów, prowadzi do zdobywania punktów!"
     },
     "intro": {
       "title": "Zdobywaj punkty bez wysiłku",
-      "description": "Poznaj nowy sposób zarabiania! Twoje działania na {{appName}} przynoszą teraz punkty. Zacznij zarabiać już dziś i odblokuj niesamowite korzyści.",
+      "description": "Poznaj nowy sposób zarabiania! Twoje działania w {{appName}} przynoszą teraz punkty. Zacznij zarabiać już dziś i odblokuj niesamowite korzyści.",
       "cta": "Rozpocznij swoją podróż po punkty"
     }
   },
   "earnFlow": {
     "gasSubsidized": "Valora pokrywa koszty gazu dla tej transakcji!",
     "addCryptoBottomSheet": {
-      "title": "Dodaj {{tokenSymbol}} na {{tokenNetwork}}",
-      "description": "Po dodaniu żetonów będziesz musiał wrócić, aby dokończyć wpłatę do puli.",
+      "title": "Dodaj {{tokenSymbol}} w {{tokenNetwork}}",
+      "description": "Po dodaniu tokenów konieczny będzie powrót, aby dokończyć wpłatę do puli.",
       "actions": {
         "add": "Kup",
         "transfer": "Transfer",
         "swap": "Zamieniaj"
       },
       "actionDescriptions": {
-        "add": "Kup {{tokenSymbol}} na {{tokenNetwork}} korzystając z usług jednego z naszych zaufanych dostawców.",
-        "transfer": "Użyj dowolnego portfela lub giełdy kompatybilnej z {{tokenNetwork}} , aby zdeponować {{tokenSymbol}}.",
-        "swap": "Zamień na {{tokenSymbol}} z innego tokena {{tokenNetwork}}"
+        "add": "Kup {{tokenSymbol}} w {{tokenNetwork}}, korzystając z usług jednego z naszych zaufanych dostawców",
+        "transfer": "Użyj dowolnego portfela lub giełdy kompatybilnej z {{tokenNetwork}}, aby wpłacić {{tokenSymbol}}",
+        "swap": "Dokonaj swapu na {{tokenSymbol}} z innego tokena {{tokenNetwork}}"
       }
     },
     "cta": {
       "title": "Zarabiaj na swoich stablecoinach",
       "subtitle": "Dokonaj wpłaty już dziś i zarabiaj",
-      "description": "Zobacz ile możesz zarobić zasilając pulę pożyczkową"
+      "description": "Zobacz, ile możesz zarobić, zasilając pulę pożyczkową"
+    },
+    "earnInfo": {
+      "title": "Zarabiaj na swoich stablecoinach\n",
+      "details": {
+        "earn": {
+          "titleGasSubsidy": "Maksymalizuj zarobki bez opłat za gaz*",
+          "title": "Maksymalizuj zarobki",
+          "subtitle": "Zarabiaj na stablecoinach i otrzymuj nagrody za zasilenie puli.",
+          "footnoteSubsidy": "*Opłaty za gaz są tymczasowo pokrywane przez Valora"
+        },
+        "manage": {
+          "title": "Zarządzaj bezpośrednio z Valora",
+          "subtitle": "Zajmiemy się konfiguracją, abyś mógł zarządzać swoją pozycją bezpośrednio z Valora."
+        },
+        "access": {
+          "title": "Łatwy dostęp do Twoich środków",
+          "subtitle": "Zbieraj środki bez wysiłku za pomocą jednego dotknięcia. Ciesz się tak samo natychmiastowym dostępem, jak bezpośrednio przez ulubione protokoły."
+        }
+      },
+      "action": {
+        "learn": "Dowiedz się więcej",
+        "earn": "Zacznij zarabiać"
+      }
     },
     "ctaV1_86": {
       "title": "Maksymalizuj zarobki na stablecoinach",
@@ -2386,72 +2409,72 @@
     },
     "enterAmount": {
       "earnUpToLabel": "Możesz zarobić do:",
-      "rateLabel": "Stawka (szacunkowa)",
-      "earnUpTo": "~{{fiatSymbol}}{{amount}} / rok",
-      "rate": "{{rate}}% RRSO",
+      "rateLabel": "Stawka (szac.)",
+      "earnUpTo": "~{{amount}}{{fiatSymbol}} / rok",
+      "rate": "{{rate}}% APY",
       "continue": "Kontynuuj",
-      "info": "Ta pula jest zasilana przez Aave",
+      "info": "Ta pula jest zapewniana przez Aave",
       "infoBottomSheet": {
-        "title": "Dlaczego ten basen?",
-        "description": "Ta pula Aave ma ponad 150 mln USD TVL i ponad 6000 współpracowników, co wskazuje na dużą płynność i wiarygodność. Wykorzystuje również USDC jako token i Abritrum jako sieć, co zmniejsza zmienność i zapewnia użytkownikom niedrogie stawki za gaz.\n\nWszystko to razem sprawia, że jest to bezpieczna i atrakcyjna opcja z konkurencyjnym APY, zapewniająca korzystne możliwości inwestycyjne dla naszych użytkowników.\n\nMożesz zapoznać się z innymi pulami Aave <0>tutaj</0>.",
+        "title": "Dlaczego ta pula?",
+        "description": "Ta pula Aave ma ponad 150 mln USD TVL i ponad 6000 uczestników, co wskazuje na dużą płynność i wiarygodność. Wykorzystuje również USDC jako token i Abritrum jako sieć, co zmniejsza zmienność i zapewnia użytkownikom niskie opłaty za gaz.\n\nWszystko to sprawia, że jest to bezpieczna i atrakcyjna opcja z konkurencyjnym APY, zapewniająca korzystne możliwości inwestycyjne dla naszych użytkowników.\n\nMożesz zapoznać się z innymi pulami Aave <0>tutaj</0>.",
         "dismiss": "Odrzuć"
       },
       "notEnoughBalanceForGasWarning": {
-        "title": "Potrzebujesz więcej {{feeTokenSymbol}} , aby kontynuować",
-        "description": "Dodaj {{feeTokenSymbol}} na {{network}} , aby pokryć opłaty za gaz",
-        "noGasCta": "Kup {{feeTokenSymbol}} na {{network}}"
+        "title": "Potrzebujesz więcej {{feeTokenSymbol}}, aby kontynuować",
+        "description": "Dodaj {{feeTokenSymbol}} w {{network}}, aby pokryć opłaty za gaz",
+        "noGasCta": "Kup {{feeTokenSymbol}} w {{network}}"
       }
     },
     "activePools": {
-      "title": "Aktywne baseny",
-      "totalValue": "Całkowita wartość:",
+      "title": "Aktywne pule",
+      "totalValue": "Wartość całkowita:",
       "apy": "~{{apy}}% APY",
-      "exitPool": "Wyjście z puli",
-      "depositMore": "Zdeponuj więcej",
-      "viewPools": "Zobacz baseny"
+      "exitPool": "Wyjdź z puli",
+      "depositMore": "Wpłać więcej",
+      "viewPools": "Pokaż pule"
     },
     "depositBottomSheet": {
       "title": "Przegląd i wpłata",
       "description": "Przed dokonaniem wpłaty do puli Aave zapoznaj się z poniższymi szczegółami transakcji",
       "amount": "Kwota wpłacona",
-      "fee": "Oszacuj. Opłaty za gaz",
+      "fee": "Szac. opłaty za gaz",
       "provider": "Dostawca zarobków",
       "network": "Sieć",
-      "footer": "Wpłacając kryptowaluty do puli Aave, akceptujesz ryzyko związane z korzystaniem z Aave. <0>Regulamin</0>",
-      "primaryCta": "Kompletny",
+      "footer": "Wpłacając kryptowaluty do puli Aave, akceptujesz ryzyko związane z korzystaniem z Aave. <0>Warunki</0>",
+      "primaryCta": "Zakończ",
       "secondaryCta": "Anuluj"
     },
     "collect": {
       "title": "Gratulacje! Przejrzyj i odbierz swoje zarobki",
       "total": "RAZEM",
       "plus": "PLUS",
-      "rate": "Stawka (szacunkowa)",
-      "apy": "{{apy}}% RRSO",
+      "rate": "Stawka (szac.)",
+      "apy": "{{apy}}% APY",
       "fee": "Opłata za gaz",
       "cta": "Zbieraj zarobki",
       "errorTitle": "Coś poszło nie tak",
       "errorDescription": "Nie można pobrać szczegółów wpłaty. Spróbuj ponownie.",
-      "noGasTitle": "Potrzebujesz więcej {{symbol}} , aby kontynuować",
-      "noGasDescription": "Dodaj {{symbol}} na {{network}} , aby pokryć opłaty za gaz",
-      "noGasCta": "Kup {{symbol}} na {{network}}"
+      "noGasTitle": "Potrzebujesz więcej {{symbol}}, aby kontynuować",
+      "noGasDescription": "Dodaj {{symbol}} w {{network}}, aby pokryć opłaty za gaz",
+      "noGasCta": "Kup {{symbol}} w {{network}}"
     },
     "transactionFeed": {
-      "earnClaimTitle": "Zebrane",
-      "earnClaimSubtitle": "z {{providerName}} Pool",
+      "earnClaimTitle": "Zebrano",
+      "earnClaimSubtitle": "z puli {{providerName}}",
       "earnDepositTitle": "Wpłacono",
-      "earnDepositSubtitle": "na {{providerName}} Pool",
-      "earnWithdrawTitle": "Wycofany",
-      "earnWithdrawSubtitle": "z {{providerName}} Pool"
+      "earnDepositSubtitle": "do puli {{providerName}}",
+      "earnWithdrawTitle": "Wycofano",
+      "earnWithdrawSubtitle": "z puli {{providerName}}"
     },
     "transactionDetails": {
       "descriptionLabel": "Szczegóły",
-      "earnClaimTitle": "Zebrane",
-      "earnClaimSubtitle": "Zebrano {{tokenSymbol}} z {{providerName}} Pool",
+      "earnClaimTitle": "Zebrano",
+      "earnClaimSubtitle": "Zebrano {{tokenSymbol}} z puli {{providerName}}",
       "earnClaimDetails": "Zebrana kwota",
       "earnDepositTitle": "Wpłacono",
       "earnDepositSubtitle": "Wpłacono {{tokenSymbol}} do puli {{providerName}}",
       "earnDepositDetails": "Kwota wpłacona",
-      "earnWithdrawTitle": "Wycofany",
+      "earnWithdrawTitle": "Wycofano",
       "earnWithdrawSubtitle": "Wycofano {{tokenSymbol}} z puli {{providerName}}",
       "earnWithdrawDetails": "Wypłacona kwota"
     }
diff --git a/locales/pt-BR/translation.json b/locales/pt-BR/translation.json
index 11ddbbcf3c..ab33623378 100644
--- a/locales/pt-BR/translation.json
+++ b/locales/pt-BR/translation.json
@@ -256,7 +256,7 @@
     }
   ],
   "consumerIncentivesTitle": "O Supercharge está acabando",
-  "consumerIncentivesSummary": "Mas mais recompensas estão chegando até você. Até 28 de maio, você receberá {{percent}}% de recompensas anuais sobre seu saldo mais alto em stablecoin (cUSD, cEUR ou cREAL). Veja como isso funciona:",
+  "consumerIncentivesSummary": "Mas há mais recompensas a caminho. Até 28 de maio, obtenha {{percent}}% de recompensas anuais sobre seu saldo mais alto em stablecoin (cUSD, cEUR ou cREAL). Veja como funciona:",
   "earnWeekly": {
     "header": "Conecte seu número de celular",
     "text": "Toque em Conectar o número caso ainda não o tenha conectado."
@@ -272,7 +272,7 @@
   },
   "conclusion": "É muito simples. Aumente seu cripto hoje mesmo!",
   "superchargeTitle": "O Supercharge está acabando",
-  "superchargeDescription": "Mas mais recompensas estão indo em sua direção. Até 28 de maio, você receberá {{apy}}% de prêmios anuais sobre seu saldo mais alto no site {{token}} . Veja como funciona:",
+  "superchargeDescription": "Mas há mais recompensas a caminho. Até 28 de maio, obtenha {{apy}}% de recompensas anuais sobre seu saldo mais alto em {{token}}. Veja como funciona:",
   "superchargeConnectNumber": "Conecte seu número de celular",
   "superchargeReconnectNumber": "Reconecte seu número de celular\n<0>Lançamos uma experiência aprimorada do Supercharge. Reconecte o seu número de celular para continuar ganhando recompensas com {{token}}.</0>",
   "superchargeMinimumBalance": "Adicione um saldo mínimo de {{amount}} {{token}}",
@@ -287,10 +287,10 @@
   "superchargingTitle": "Atualização do app necessária",
   "superchargingDescription": "Atualize o app da Valora para continuar recebendo recompensas do Supercharge semanalmente.",
   "superchargingTitleV1_54": "O Supercharge está acabando",
-  "superchargingDescriptionV1_54": "Você poderá resgatar as recompensas semanais até terça-feira, 28 de maio, às 23h59 UTC. A partir de 29 de maio, você não poderá mais resgatar as recompensas do Supercharge.",
+  "superchargingDescriptionV1_54": "Você poderá resgatar as recompensas semanais até terça-feira, 28 de maio, às 23h59 UTC. A partir de 29 de maio, não será mais possível resgatar as recompensas do Supercharge.",
   "superchargeRewardsAvailable": "Você tem {{amount}} {{token}} disponíveis para resgatar!",
   "superchargeRewardsAvailableMultipleTokens": "Você tem {{amounts}} disponíveis para resgatar!",
-  "superchargeClaimText": "Você pode solicitar suas recompensas até terça-feira, 28 de maio, às 23h59 UTC. A partir de 29 de maio, você não poderá mais reivindicar as recompensas do Supercharge.",
+  "superchargeClaimText": "Resgate suas recompensas até terça-feira, 28 de maio, às 23h59 UTC. A partir de 29 de maio, você não poderá mais resgatar as recompensas do Supercharge.",
   "superchargeClaimButton": "Resgatar recompensas",
   "superchargeFetchRewardsFailed": "Ocorreu um erro ao resgatar recompensas de Supercharge pendentes. Tente novamente mais tarde.",
   "superchargeClaimSuccess": "Suas recompensas de Supercharge foram adicionadas ao seu saldo total.",
@@ -678,7 +678,7 @@
   },
   "inviteRewardsBannerCUSD": {
     "title": "Convide amigos e ganhe até 12 cUSD",
-    "body": "Quando ele conectar seu número e adicionar fundos a {{appName}}, vocês dois receberão 0,50 cUSD."
+    "body": "Depois que a pessoa conectar seu número e adicionar fundos à {{appName}}, vocês dois receberão 0,50 cUSD."
   },
   "inviteWithUrl": {
     "title": "Convide um amigo",
@@ -692,8 +692,8 @@
       "body": "Convide seus amigos e familiares para baixar o app {{appName}} e cada um de vocês ganhará um NFT exclusivo"
     },
     "rewardsActiveCUSD": {
-      "title": "Você ganha até 12 cUSD por convidar seus amigos para o Valora!",
-      "body": "Ganhe 0,50 cUSD para cada amigo que você convidar para {{appName}}. Quando ele conectar seu número, adicionar fundos e mantê-los por 7 dias, vocês dois receberão 0,50 cUSD. Corra, pois os fundos são limitados! (Limite de 25 amigos)."
+      "title": "GANHE ATÉ 12 cUSD convidando seus amigos para a Valora!",
+      "body": "Ganhe 0,50 cUSD para cada amigo que você convidar para a {{appName}}. Quando seu amigo conectar seu número, adicionar fundos e os mantiver por 7 dias, vocês dois receberão 0,50 cUSD. Corra, pois os fundos são limitados! (Limite de 25 amigos)."
     }
   },
   "getReward": "Receba ${{reward}}",
@@ -712,13 +712,13 @@
   "termsColloquial": {
     "title": "Vamos começar criando sua carteira",
     "privacyHeading": "Suas informações e privacidade:",
-    "privacy1": "Coletamos dados de uso que nos ajudam a aprimorar o aplicativo e a segurança. O tipo de informação que coletamos, como a usamos e seus direitos relacionados a essas informações podem ser vistos em nossa <0>Política de Privacidade</0>.",
-    "privacy2": "Se você decidir vincular seu número de telefone, armazenaremos uma cópia criptografada dele.",
-    "privacy3": "Se você decidir conectar seus contatos, usaremos seus nomes, números e fotos de perfil para facilitar a localização deles.",
-    "walletHeading": "Sua carteira digital com a Valora:",
-    "wallet1": "Você está prestes a criar uma carteira digital. Somente você tem a chave de sua carteira. Não podemos recuperar sua chave ou seus ativos se você perder sua chave. Também não podemos reverter ações realizadas por meio da Valora em blockchains.",
-    "wallet2": "Os ativos digitais, os ativos com os quais você interagirá com o Valora, apresentam riscos exclusivos. Ao usar o Valora, você aceita esses riscos e assume a responsabilidade por eles. Considere suas finanças e sua tolerância a riscos antes de fazer escolhas.",
-    "fullTerms": "Leia nossos <0>Termos e Condições</0> completos"
+    "privacy1": "Coletamos dados de uso que nos ajudam a aprimorar o aplicativo e a segurança. As informações que coletamos, como as utilizamos e seus direitos relacionados a elas podem ser vistos em nossa <0>Política de privacidade</0>.",
+    "privacy2": "Se decidir vincular seu número de celular, armazenaremos uma cópia criptografada dele.",
+    "privacy3": "Se decidir conectar seus contatos, usaremos seus nomes, números e fotos de perfil para ser mais fácil encontrá-los.",
+    "walletHeading": "Sua carteira digital na Valora:",
+    "wallet1": "Você está prestes a criar uma carteira digital. Somente você tem a chave da sua carteira. Não podemos recuperar sua chave ou seus ativos se você perder sua chave. Também não podemos reverter ações realizadas por meio da Valora em blockchains.",
+    "wallet2": "Ativos digitais, os ativos com os quais você interagirá na Valora, têm riscos próprios. Ao usar a Valora, você aceita esses riscos e assume a responsabilidade por eles. Considere suas finanças e sua tolerância a riscos antes de fazer escolhas.",
+    "fullTerms": "Leia nossos <0>Termos e condições</0> na íntegra"
   },
   "fullNameOrPsuedonym": "Nome ou pseudônimo",
   "namePlaceholder": "nome",
@@ -827,7 +827,7 @@
     "hasWallet": "Já tenho uma carteira",
     "header": "Nossas boas-vindas! Vamos criar a sua carteira cripto.",
     "getStarted": "Começar",
-    "agreeToTerms": "Ao criar uma carteira, você concorda com nossos <0>Termos e Condições</0>"
+    "agreeToTerms": "Ao criar uma carteira, você concorda com nossos <0>Termos e condições</0>"
   },
   "accessContacts": {
     "disclosure": {
@@ -1011,7 +1011,7 @@
   "receivedFrom": "De",
   "commentLabel": "Mensagem",
   "amountSent": "Quantia enviada",
-  "amountReceived": "Valor recebido",
+  "amountReceived": "Quantia recebida",
   "amountCeloWithdrawn": "Quantia (CELO)",
   "feeEducation": "Blockchains cobram uma taxa de transação para manter o suporte e o bom funcionamento das redes.",
   "reviewPayment": "Revisar pagamento",
@@ -1034,7 +1034,7 @@
   "inviteWithoutPayment": "Olá! Estou usando a {{appName}} para enviar cripto para o mundo inteiro. É muito fácil de usar e eu gostaria de convidar você para conferir com este link: {{link}}",
   "inviteWithEscrowedPayment": "Olá! Estou usando a {{appName}} para enviar cripto para o mundo inteiro. Acabei de enviar {{amount}} {{token}} para você. Instale o aplicativo da {{appName}} e resgate seus {{token}} usando este link: {{link}}",
   "inviteWithRewards": "Oi! 👋 Estou usando a {{appName}} como minha carteira cripto. É super rápido baixar o app e conectar seu número de celular — além disso, nós dois receberemos um NFT de edição especial como recompensa. 💫 \n\nUse este link para baixar: {{link}}",
-  "inviteWithRewardsCUSD": "Neste momento, nós dois podemos receber uma recompensa gratuita de US$ 0,50 se você se inscrever, conectar seu número e depositar fundos na sua carteira Valora. Eu a utilizo para aumentar minhas economias em dólares e criptomoedas, e você pode configurá-la em segundos com apenas um número de telefone. Não deixe de se cadastrar com meu link de indicação aqui: \n\n{{link}} \n\n Não perca tempo, pois a promoção de indicação termina em breve.",
+  "inviteWithRewardsCUSD": "Oi! Nós dois podemos receber uma recompensa gratuita de US$ 0,50 se você se inscrever, conectar seu número e depositar fundos na sua carteira Valora. Com ela, eu aumento minhas economias em USD e cripto. Você só precisa de um número de celular para configurá-la em segundos. Não deixe de se inscrever com meu link de indicação aqui: \n\n{{link}} \n\nCorra, pois a promoção de indicação termina em breve.",
   "loadingContacts": "Encontrar seus contatos",
   "myCode": "Meu código",
   "scanCode": "Escanear",
@@ -1767,9 +1767,9 @@
     "swapToTokenSelection": "TROCA PARA",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "Os tokens selecionados não são suportados por nossos fornecedores de troca.",
-    "selectTokenLabel": "Selecione o token",
+    "selectTokenLabel": "Selecionar token",
     "tokenBottomSheetTitle": "Selecionar token",
-    "onNetwork": "Em {{networkName}}",
+    "onNetwork": "na {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "Você mudou para a rede {{networkName}}",
       "body_swapFrom": "Selecione um token de origem para trocar na rede {{networkName}} para continuar.",
@@ -1823,9 +1823,9 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Grátis",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Taxa\n\nA taxa {{appName}} de {{appFeePercentage}}% foi criada para aprimorar sua experiência, garantindo swaps rápidos, confiáveis e seguros.",
-      "appFeeInfo_free": "{{appName}} Tarifa\n\nEssa troca é gratuita.",
-      "appFeeInfo_placeholder": "{{appName}} Taxa\n\nA taxa é calculada com base na cotação que você receber.",
+      "appFeeInfo": "Taxa da {{appName}}\n\nA taxa da {{appName}} de {{appFeePercentage}}% foi criada para aprimorar sua experiência, garantindo trocas rápidas, confiáveis e seguras.",
+      "appFeeInfo_free": "Taxa da {{appName}}\n\nEsta troca é gratuita.",
+      "appFeeInfo_placeholder": "Taxa da {{appName}}\n\nA taxa é calculada com base na cotação que você receber.",
       "appFeeInfoDismissButton": "Entendi",
       "slippagePercentage": "Tolerância do slippage",
       "networkFeeInfo": "Você está trocando na rede {{networkName}}.\n\nEsta taxa de rede estimada é necessária para realizar uma transação na rede {{networkName}}. Essa taxa protege a sua transação e visa manter a rede operacional.",
@@ -1833,8 +1833,8 @@
       "slippageToleranceInfo": "Tolerância de slippage\n\nSua troca será executada dentro da porcentagem de tolerância de slippage. Se o preço mudar mais do que a tolerância de slippage, a {{appName}} protege você impedindo a execução da negociação.",
       "networkFeeInfoDismissButton": "Entendi",
       "exchangeRate": "Taxa de câmbio",
-      "exchangeRateInfo": "Taxa de câmbio\n\nEncontramos a melhor taxa de câmbio para você. Sua negociação será concluída a um preço dentro de {{slippagePercentage}}% da estimativa ou a transação será cancelada e os fundos serão devolvidos à sua carteira.",
-      "exchangeRateInfo_withAppFee": "Taxa de câmbio\n\nEncontramos a melhor taxa de câmbio para você. Sua negociação será concluída a um preço dentro de {{slippagePercentage}}% da estimativa ou a transação será cancelada e os fundos serão devolvidos à sua carteira.\n\nA taxa estimada inclui uma taxa {{appName}} de {{appFeePercentage}}%.",
+      "exchangeRateInfo": "Taxa de câmbio\n\nEncontramos a melhor taxa de câmbio para você. Sua transação será concluída a um preço de {{slippagePercentage}}% da estimativa ou a transação será cancelada e os fundos serão devolvidos à sua carteira.",
+      "exchangeRateInfo_withAppFee": "Taxa de câmbio\n\nEncontramos a melhor taxa de câmbio para você. Sua transação será concluída a um preço de {{slippagePercentage}}% da estimativa ou a transação será cancelada e os fundos serão devolvidos à sua carteira.\n\nA taxa estimada inclui uma taxa da {{appName}} de {{appFeePercentage}}%.",
       "exchangeRateInfoDismissButton": "Entendi",
       "estimatedValue": "Valor estimado"
     },
@@ -2063,8 +2063,8 @@
       "subtitle": "Envie fundos ou um convite para seus contatos"
     },
     "jumpstart": {
-      "title": "Enviar com um link ao vivo",
-      "subtitle": "Compartilhe um link para enviar criptografia como um texto"
+      "title": "Envie com um link ativo",
+      "subtitle": "Compartilhe um link e envie cripto tão fácil quanto enviar mensagens"
     },
     "getStarted": {
       "title": "Formas de enviar fundos na Valora",
@@ -2119,7 +2119,7 @@
   "viewOnOPMainnetExplorer": "Ver no OP Mainnet Explorer",
   "viewOnOPSepoliaExplorer": "Ver no OP Sepolia Explorer",
   "viewOnPolygonPoSScan": "Ver no PolygonScan",
-  "viewOnBaseScan": "Exibir no BaseScan",
+  "viewOnBaseScan": "Ver no BaseScan",
   "sendEnterAmountScreen": {
     "title": "Insira o valor",
     "selectToken": "Selecione um token",
@@ -2145,7 +2145,7 @@
     }
   },
   "jumpstartSendConfirmationScreen": {
-    "title": "Criar um link ao vivo",
+    "title": "Crie um link ativo",
     "sendAmountLabel": "Quantia do link ativo",
     "confirmButton": "Enviar e criar link",
     "info": "Ao criar um link, os fundos são retirados de sua carteira. Você pode recuperar o link a qualquer momento. Compartilhe links com cuidado.",
@@ -2156,7 +2156,7 @@
     }
   },
   "jumpstartShareLinkScreen": {
-    "title": "Compartilhe seu Live Link",
+    "title": "Compartilhe seu link ativo",
     "description": "Copie o link para enviar {{tokenSymbol}} pelo aplicativo de mensagens de sua preferência ou use o código QR.",
     "linkLabel": "Link ativo",
     "linkCopiedMessage": "Link ativo copiado",
@@ -2209,13 +2209,13 @@
     },
     "rewardBottomSheet": {
       "title": "Ganhe US$ 5 de ETH",
-      "description": "Adicione fundos à sua carteira com qualquer token Ethereum até 4 de abril de 2024 às 12:00 PM PDT, e nós daremos a você US$ 5 de ETH em 5 de abril de 2024 às 11:59 PM PDT.\n\nEsta é uma oferta exclusiva para você ser um Early Ethereum Explorer.",
+      "description": "Adicione fundos à sua carteira com qualquer token Ethereum até 4 de abril de 2024 às 12h00 PDT e nós daremos a você US$ 5 de ETH em 5 de abril de 2024 até às 23h59 PDT.\n\nEsta é uma oferta exclusiva para você ser um explorador pioneiro do Ethereum.",
       "expirationLabel": "Expira em {{expirationLabelText}}",
       "cta": "Usar recompensa"
     },
     "rewardReminderBottomSheet": {
-      "title": "Não perca essa chance, ganhe US$ 5 de ETH",
-      "description": "Adicione fundos à sua carteira com qualquer token Ethereum até 4 de abril de 2024 às 12:00 PM PDT, e nós daremos a você US$ 5 de ETH em 5 de abril de 2024 às 11:59 PM PDT.\n\nEsta é uma oferta exclusiva para você ser um Early Ethereum Explorer.",
+      "title": "Não perca a chance de ganhar $5 de ETH",
+      "description": "Adicione fundos à sua carteira com qualquer token Ethereum até 4 de abril de 2024 às 12h00 PDT e nós daremos a você US$ 5 de ETH em 5 de abril de 2024 até às 23h59 PDT.\n\nEsta é uma oferta exclusiva para você ser um explorador pioneiro do Ethereum.",
       "expirationLabel": "Expira em {{expirationLabelText}}",
       "cta": "Usar recompensa"
     }
@@ -2244,31 +2244,31 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Verificação de seus fundos",
-      "description": "Aguarde enquanto verificamos seu Live Link. Você receberá os fundos reivindicados em breve."
+      "title": "Verificando seu fundos",
+      "description": "Aguarde enquanto verificamos seu link ativo. Você receberá os fundos resgatados em breve."
     },
     "error": {
       "title": "Não foi possível resgatar os fundos",
-      "description": "Por um motivo desconhecido, não foi possível reivindicar este link",
-      "alreadyClaimedDescription": "O link já foi solicitado. Peça a seu amigo que envie um novo link",
+      "description": "Por um motivo desconhecido, não foi possível resgatar o link",
+      "alreadyClaimedDescription": "O link já foi resgatado. Peça a seu amigo que envie um novo link",
       "contactSupport": "Contate o suporte",
       "dismiss": "Ignorar"
     }
   },
   "jumpstartReclaim": {
-    "description": "A recuperação do seu link incorre em uma taxa de gás de rede. Você gostaria de continuar?",
+    "description": "O resgate do seu link incorre em uma taxa de gas de rede. Gostaria de continuar?",
     "fetchStatusError": {
       "title": "Ops, algo deu errado",
-      "description": "Não foi possível obter o status da reivindicação desse convite. Tente novamente mais tarde ou entre em contato com o suporte",
+      "description": "Não foi possível obter o status de resgate desse convite. Tente novamente mais tarde ou entre em contato com o suporte",
       "retryCta": "Repetir"
     },
     "reclaimError": {
-      "title": "Não foi possível recuperar os fundos",
-      "description": "Tente recuperar novamente ou entre em contato com o suporte"
+      "title": "Não foi possível resgatar os fundos",
+      "description": "Tente resgatar novamente ou entre em contato com o suporte"
     }
   },
   "multiSelect": {
-    "switchNetwork": "Rede de comutação",
+    "switchNetwork": "Trocar rede",
     "allNetworks": "Todas as redes"
   },
   "points": {
@@ -2277,8 +2277,8 @@
     "history": {
       "cards": {
         "createWallet": {
-          "title": "Porta-carteiras",
-          "subtitle": "Membro de {{appName}}"
+          "title": "Titular da carteira",
+          "subtitle": "Membro da {{appName}}"
         },
         "swap": {
           "title": "Trocar",
@@ -2287,38 +2287,38 @@
       },
       "title": "Minha atividade de pontos",
       "error": {
-        "title": "Não é possível carregar a atividade de pontos",
-        "subtitle": "Oops, algo deu errado ao tentar carregar seu feed de atividades de pontos. Por favor, tente novamente.",
+        "title": "Não foi possível carregar a atividade de pontos",
+        "subtitle": "Ops, algo deu errado ao tentar carregar seu feed de atividades de pontos. Tente novamente.",
         "tryAgain": "Tentar novamente"
       },
       "empty": {
-        "title": "Nenhuma atividade de pontos ainda",
-        "subtitle": "Parece que você ainda não ganhou nenhum ponto. Use o site {{appName}} para que você comece a ganhar pontos!",
+        "title": "Nenhuma atividade de pontos por enquanto",
+        "subtitle": "Parece que você ainda não ganhou nenhum ponto. Use a {{appName}} para começar a ganhar pontos!",
         "gotIt": "Entendi"
       },
       "pageError": {
-        "title": "Não é possível carregar",
-        "subtitle": "Oops, algo deu errado quando você tentou terminar o carregamento. Tente novamente.",
+        "title": "Não foi possível carregar",
+        "subtitle": "Ops, algo deu errado ao tentar concluir o carregamento. Tente novamente.",
         "refresh": "Atualizar"
       }
     },
     "fetchBalanceError": {
-      "title": "Não é possível carregar seus pontos",
-      "description": "Oops, algo deu errado ao tentar carregar seus pontos. As informações nesta página podem estar desatualizadas. Por favor, atualize.",
+      "title": "Não foi possível carregar seus pontos",
+      "description": "Ops, algo deu errado ao tentar carregar seus pontos. As informações nesta página podem estar desatualizadas. Atualize a página.",
       "retryCta": "Atualizar"
     },
     "loading": {
-      "title": "Reunir seus pontos",
-      "description": "Estamos no processo de contabilizar os pontos que você obteve, aguarde"
+      "title": "Reunindo seu pontos",
+      "description": "Estamos contabilizando seus pontos, aguarde"
     },
     "error": {
-      "title": "Não é possível carregar pontos",
-      "description": "Oops, algo deu errado ao tentar carregar seus pontos. Por favor, tente novamente.",
+      "title": "Não foi possível carregar os pontos",
+      "description": "Ops, algo deu errado ao tentar carregar seus pontos. Tente novamente.",
       "retryCta": "Tentar novamente"
     },
     "infoCard": {
-      "title": "Em breve, você terá mais maneiras de ganhar pontos 🚀.",
-      "body": "Estamos trabalhando para adicionar mais maneiras de você ganhar pontos usando o aplicativo. Continue checando para ver as atualizações."
+      "title": "Em breve, você terá mais maneiras de ganhar pontos 🚀",
+      "body": "Estamos trabalhando para adicionar mais maneiras de ganhar pontos usando o aplicativo. Continue verificando as atualizações."
     },
     "activitySection": {
       "title": "Como faço para ganhar pontos?",
@@ -2326,48 +2326,48 @@
     },
     "noActivities": {
       "title": "Atualize para desbloquear mais pontos 🔓",
-      "body": "Ops! Parece que você está usando uma versão mais antiga do {{appName}}. Atualize agora para descobrir todas as novas e empolgantes maneiras de você ganhar pontos."
+      "body": "Ops! Parece que você está usando uma versão mais antiga da {{appName}}. Atualize agora para descobrir todas as novas e empolgantes maneiras de ganhar pontos."
     },
     "activityCards": {
       "createWallet": {
-        "title": "Criar uma carteira {{appName}}"
+        "title": "Crie uma carteira {{appName}}"
       },
       "swap": {
-        "title": "Ativos de swap",
+        "title": "Trocar ativos",
         "bottomSheet": {
-          "title": "Ativos de swap",
-          "body": "Este espaço será usado para que você forneça todos os detalhes necessários para isso. Talvez o valor mínimo para você trocar. \n\nGanhe {{pointsValue}} pontos sempre que você trocar um ativo usando {{appName}}.",
+          "title": "Trocar ativos",
+          "body": "Este espaço será usado para fornecer todos os detalhes necessários. Talvez o valor mínimo para você trocar. \n\nGanhe {{pointsValue}} pontos sempre que você trocar um ativo usando a {{appName}}.",
           "cta": "Ir para a troca"
         }
       },
       "moreComing": {
-        "title": "Em breve, você receberá mais informações!"
+        "title": "Mais em breve!"
       }
     },
     "discoverCard": {
-      "title": "{{appName}} Pontos",
-      "description": "Ganhe pontos facilmente com o {{appName}}. Ao usar o aplicativo, incluindo a troca, você ganha pontos!"
+      "title": "Pontos {{appName}}",
+      "description": "Ganhe pontos facilmente com a {{appName}}. Ao usar o aplicativo, incluindo para trocas, você ganha pontos!"
     },
     "intro": {
       "title": "Ganhe pontos sem esforço",
-      "description": "Você está em uma nova forma de ganhar! Agora você ganha pontos com as ações do {{appName}} . Comece a ganhar pontos hoje mesmo e desbloqueie benefícios incríveis.",
+      "description": "Descubra uma nova forma de ganhar! Agora você ganha pontos com suas ações na {{appName}}. Comece a ganhar pontos hoje mesmo e desbloqueie benefícios incríveis.",
       "cta": "Comece sua jornada de pontos"
     }
   },
   "earnFlow": {
     "gasSubsidized": "Valora está cobrindo a gasolina para essa transação!",
     "addCryptoBottomSheet": {
-      "title": "Adicionar {{tokenSymbol}} em {{tokenNetwork}}",
-      "description": "Depois de adicionar tokens, você terá que voltar para terminar de depositar em um pool.",
+      "title": "Adicionar {{tokenSymbol}} na {{tokenNetwork}}",
+      "description": "Após adicionar tokens, você terá que voltar para terminar de depositar em um pool.",
       "actions": {
         "add": "Comprar",
-        "transfer": "Transferência",
+        "transfer": "Transferir",
         "swap": "Trocar"
       },
       "actionDescriptions": {
-        "add": "Compre {{tokenSymbol}} em {{tokenNetwork}} usando um de nossos provedores confiáveis",
-        "transfer": "Use qualquer carteira ou bolsa compatível com {{tokenNetwork}} para depositar {{tokenSymbol}}",
-        "swap": "Trocar para {{tokenSymbol}} de outro token {{tokenNetwork}}"
+        "add": "Compre {{tokenSymbol}} na {{tokenNetwork}} usando um dos nossos provedores confiáveis",
+        "transfer": "Use qualquer carteira ou exchange compatível com {{tokenNetwork}} para depositar {{tokenSymbol}}",
+        "swap": "Trocar para {{tokenSymbol}} de outro token da {{tokenNetwork}}"
       }
     },
     "cta": {
@@ -2375,6 +2375,29 @@
       "subtitle": "Deposite hoje e ganhe retornos",
       "description": "Veja quanto você pode ganhar ao fornecer um pool de empréstimos"
     },
+    "earnInfo": {
+      "title": "Ganhe com suas stablecoins\n",
+      "details": {
+        "earn": {
+          "titleGasSubsidy": "Maximize os ganhos sem taxas de gás*",
+          "title": "Maximizar os ganhos",
+          "subtitle": "Ganhe em suas stablecoins e receba recompensas quando você abastecer um pool.",
+          "footnoteSubsidy": "*As taxas de gás são temporariamente cobertas pela Valora"
+        },
+        "manage": {
+          "title": "Gerencie diretamente da Valora",
+          "subtitle": "Nós cuidaremos da configuração para que você possa gerenciar sua posição diretamente da Valora."
+        },
+        "access": {
+          "title": "Acesse facilmente seus fundos",
+          "subtitle": "Colete seus fundos sem esforço com um único toque. Aproveite o mesmo acesso instantâneo que você teria diretamente por meio de seus protocolos favoritos."
+        }
+      },
+      "action": {
+        "learn": "Saiba mais",
+        "earn": "Comece a ganhar"
+      }
+    },
     "ctaV1_86": {
       "title": "Maximizar os ganhos com stablecoins",
       "subtitle": "Compre {{symbol}}",
@@ -2383,72 +2406,72 @@
     "enterAmount": {
       "earnUpToLabel": "Você pode ganhar até:",
       "rateLabel": "Taxa (est.)",
-      "earnUpTo": "~{{fiatSymbol}}{{amount}} / ano",
-      "rate": "{{rate}}% APY",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}}/ano",
+      "rate": "{{rate}}% de APY",
       "continue": "Continuar",
-      "info": "Esta piscina é alimentada por Aave",
+      "info": "Este pool é desenvolvido pela Aave",
       "infoBottomSheet": {
-        "title": "Por que essa piscina?",
-        "description": "Esse pool da Aave tem mais de US$ 150 milhões em TVL e mais de 6.000 contribuintes, o que indica forte liquidez e confiabilidade. Ele também usa USDC como seu token e Abritrum como sua rede, o que reduz a volatilidade e garante que os usuários recebam taxas de gás baratas.\n\nTudo isso faz dela uma opção segura e atraente com APY competitivo, garantindo uma oportunidade de investimento benéfica para nossos usuários.\n\nVocê pode explorar outros pools da Aave <0>aqui</0>.",
+        "title": "Por que este pool?",
+        "description": "Este pool da Aave tem mais de US$ 150 milhões em TVL e mais de 6.000 contribuintes, o que indica forte liquidez e confiabilidade. Ele também usa USDC como seu token e Abritrum como sua rede, o que reduz a volatilidade e garante que os usuários recebam taxas de gas baratas.\n\nTudo isso faz dele uma opção segura e atrativa com APY competitivo, garantindo uma oportunidade de investimento benéfica para nossos usuários.\n\nVocê pode explorar outros pools da Aave <0>aqui</0>.",
         "dismiss": "Ignorar"
       },
       "notEnoughBalanceForGasWarning": {
         "title": "Você precisa de mais {{feeTokenSymbol}} para continuar",
-        "description": "Adicione {{feeTokenSymbol}} em {{network}} para cobrir suas taxas de gás",
-        "noGasCta": "Compre {{feeTokenSymbol}} em {{network}}"
+        "description": "Adicione {{feeTokenSymbol}} na {{network}} para cobrir suas taxas de gas",
+        "noGasCta": "Comprar {{feeTokenSymbol}} na {{network}}"
       }
     },
     "activePools": {
-      "title": "Piscinas ativas",
+      "title": "Pools ativos",
       "totalValue": "Valor Total:",
-      "apy": "~{{apy}}% APY",
-      "exitPool": "Pool de saída",
+      "apy": "~{{apy}}% de APY",
+      "exitPool": "Sair do pool",
       "depositMore": "Depositar mais",
-      "viewPools": "Ver piscinas"
+      "viewPools": "Ver pools"
     },
     "depositBottomSheet": {
-      "title": "Revisão e depósito",
-      "description": "Antes de depositar em um pool da Aave, leia os detalhes da transação abaixo",
+      "title": "Revisar e depositar",
+      "description": "Antes de depositar em um pool da Aave, revise os detalhes da transação abaixo",
       "amount": "Quantia depositada",
-      "fee": "Est. Taxas de gás",
+      "fee": "Taxas est. de gas",
       "provider": "Provedor de ganhos",
       "network": "Rede",
-      "footer": "Ao depositar criptomoedas em um pool da Aave, você aceita os riscos associados ao uso da Aave. <0>Termos e condições</0>",
-      "primaryCta": "Completo",
+      "footer": "Ao depositar cripto em um pool da Aave, você aceita os riscos associados ao uso da Aave. <0>Termos e condições</0>",
+      "primaryCta": "Concluir",
       "secondaryCta": "Cancelar"
     },
     "collect": {
-      "title": "Parabéns a você! Analise e receba seus ganhos",
+      "title": "Parabéns! Revise e receba seus ganhos",
       "total": "TOTAL",
       "plus": "MAIS",
       "rate": "Taxa (est.)",
-      "apy": "{{apy}}% APY",
-      "fee": "Taxa de gás",
-      "cta": "Coleta de ganhos",
+      "apy": "{{apy}}% de APY",
+      "fee": "Taxa de gas",
+      "cta": "Receber ganhos",
       "errorTitle": "Algo deu errado",
-      "errorDescription": "Não foi possível obter os detalhes do depósito. Por favor, tente novamente.",
+      "errorDescription": "Não foi possível obter os detalhes do depósito. Tente novamente.",
       "noGasTitle": "Você precisa de mais {{symbol}} para continuar",
-      "noGasDescription": "Adicione {{symbol}} em {{network}} para cobrir suas taxas de gás",
-      "noGasCta": "Compre {{symbol}} em {{network}}"
+      "noGasDescription": "Adicione {{symbol}} na {{network}} para cobrir suas taxas de gas",
+      "noGasCta": "Comprar {{symbol}} na {{network}}"
     },
     "transactionFeed": {
-      "earnClaimTitle": "Coletânea",
-      "earnClaimSubtitle": "do site {{providerName}} Pool",
+      "earnClaimTitle": "Recebido",
+      "earnClaimSubtitle": "do pool da {{providerName}}",
       "earnDepositTitle": "Depositado",
-      "earnDepositSubtitle": "para {{providerName}} Pool",
-      "earnWithdrawTitle": "Retirada",
-      "earnWithdrawSubtitle": "do site {{providerName}} Pool"
+      "earnDepositSubtitle": "para o pool da {{providerName}}",
+      "earnWithdrawTitle": "Sacado",
+      "earnWithdrawSubtitle": "do pool da {{providerName}}"
     },
     "transactionDetails": {
       "descriptionLabel": "Detalhes",
-      "earnClaimTitle": "Coletânea",
-      "earnClaimSubtitle": "Coletado {{tokenSymbol}} de {{providerName}} Pool",
-      "earnClaimDetails": "Valor coletado",
+      "earnClaimTitle": "Recebido",
+      "earnClaimSubtitle": "{{tokenSymbol}} recebido do pool da {{providerName}}",
+      "earnClaimDetails": "Quantia recebida",
       "earnDepositTitle": "Depositado",
-      "earnDepositSubtitle": "Depositado {{tokenSymbol}} para {{providerName}} Pool",
+      "earnDepositSubtitle": "{{tokenSymbol}} depositado para o pool da {{providerName}}",
       "earnDepositDetails": "Quantia depositada",
-      "earnWithdrawTitle": "Retirada",
-      "earnWithdrawSubtitle": "Você retirou o site {{tokenSymbol}} do pool {{providerName}}",
+      "earnWithdrawTitle": "Sacado",
+      "earnWithdrawSubtitle": "{{tokenSymbol}} sacado do pool da {{providerName}}",
       "earnWithdrawDetails": "Quantia retirada"
     }
   },
diff --git a/locales/ru-RU/translation.json b/locales/ru-RU/translation.json
index 42bb9ad23f..0179753596 100644
--- a/locales/ru-RU/translation.json
+++ b/locales/ru-RU/translation.json
@@ -255,8 +255,8 @@
       "text": "Любое лицо с помощью вашей фразы получит доступ к вашему аккаунту и всем его средствам. Не сообщайте ее другим людям."
     }
   ],
-  "consumerIncentivesTitle": "Суперзарядка заканчивается",
-  "consumerIncentivesSummary": "Но еще больше вознаграждений направляется в твою сторону. До 28 мая получай {{percent}}% годовых на свой самый высокий баланс в стабильных монетах (cUSD, cEUR или cREAL). Вот как это работает:",
+  "consumerIncentivesTitle": "Supercharge завершается",
+  "consumerIncentivesSummary": "Но вас ждут дополнительные вознаграждения. До 28 мая получите {{percent}}% годовых на самый высокий остаток в стейблкоинах (cUSD, cEUR или cREAL). Вот как это работает:",
   "earnWeekly": {
     "header": "Подключить номер телефона",
     "text": "Нажмите \"Подключить номер\", если подключение еще не выполнено."
@@ -271,14 +271,14 @@
     "text": "Это будет гарантировать, что ваши вознаграждения в безопасности и под вашим контролем."
   },
   "conclusion": "Все просто. Повысьте свои доходы от криптовалюты за счет программы Supercharge!",
-  "superchargeTitle": "Суперзарядка заканчивается",
-  "superchargeDescription": "Но тебя ждут еще большие вознаграждения. До 28 мая получи {{apy}}% годовых на свой самый высокий баланс {{token}} . Вот как это работает:",
+  "superchargeTitle": "Supercharge завершается",
+  "superchargeDescription": "Но вас ждут дополнительные вознаграждения. До 28 мая получите {{apy}}% годовых на самый высокий остаток в {{token}}. Вот как это работает:",
   "superchargeConnectNumber": "Подключите свой номер телефона",
   "superchargeReconnectNumber": "Переподключите свой номер телефона\n<0>Мы улучшили работу Supercharge. Переподключите свой номер телефона для получения вознаграждения по вашему {{token}}.</0>",
   "superchargeMinimumBalance": "Внесите минимальную сумму {{amount}} {{token}}",
-  "superchargeDisclaimer": "Это не повлияет на твой баланс или предыдущий заработок.",
-  "superchargeDisclaimerMaxRewards": "Это не повлияет на твой баланс или предыдущий заработок.",
-  "superchargeDisclaimerDayLimit": "Это не повлияет на твой баланс или предыдущие доходы. <0>Узнать больше</0>",
+  "superchargeDisclaimer": "Это не повлияет на ваш баланс или предыдущие доходы.",
+  "superchargeDisclaimerMaxRewards": "Это не повлияет на ваш баланс или предыдущие доходы.",
+  "superchargeDisclaimerDayLimit": "Это не повлияет на ваш баланс или предыдущие доходы. <0>Подробнее</0>",
   "superchargeTokenDetailsDialog": {
     "title": "На какие активы распространяется программа Supercharge?",
     "body": "Вы будете еженедельно получать вознаграждение за стейблкойн Celo с наибольшей стоимостью (cEUR, cUSD, cREAL).",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "Требуется обновление приложения",
   "superchargingDescription": "Обновите приложение Valora, чтобы по-прежнему получать вознаграждения по программе Supercharge.",
-  "superchargingTitleV1_54": "Суперзарядка заканчивается",
-  "superchargingDescriptionV1_54": "Еженедельные награды будут доступны для получения до вторника, 28 мая, в 23:59 по Гринвичу. Начиная с 29 мая ты больше не сможешь требовать вознаграждения за Supercharge.",
+  "superchargingTitleV1_54": "Supercharge завершается",
+  "superchargingDescriptionV1_54": "Еженедельные награды будут доступны для получения до 23:59 по Гринвичу вторника, 28 мая. Начиная с 29 мая вы больше не сможете претендовать на вознаграждения Supercharge.",
   "superchargeRewardsAvailable": "Вы можете заявить {{amount}} {{token}}!",
   "superchargeRewardsAvailableMultipleTokens": "У вас есть {{amounts}} для подачи заявки!",
-  "superchargeClaimText": "Получи свои награды до вторника, 28 мая, в 23:59 по Гринвичу. Начиная с 29 мая ты больше не сможешь претендовать на награды Supercharge.",
+  "superchargeClaimText": "Получите свои вознаграждения до 23:59 по Гринвичу вторника, 28 мая. Начиная с 29 мая вы больше не сможете претендовать на вознаграждения Supercharge.",
   "superchargeClaimButton": "Заявить о вознаграждениях",
   "superchargeFetchRewardsFailed": "Ошибка при получении ожидаемых вознаграждений Supercharge. Повторите попытку позже.",
   "superchargeClaimSuccess": "Ваши вознаграждения Supercharge были добавлены на ваш общий баланс.",
@@ -677,8 +677,8 @@
     "body": "Как только они настроят свои кошельки {{appName}} и подключат номера телефонов, вы получите по эксклюзивному NFT."
   },
   "inviteRewardsBannerCUSD": {
-    "title": "Пригласи друзей и получи до 12 cUSD",
-    "body": "Как только он подключит свой номер и пополнит счет на {{appName}}, вы оба получите по 0,50 cUSD."
+    "title": "Пригласите друзей и получите до 12 cUSD",
+    "body": "Как только они подключат свои номера и внесут средства в {{appName}}, вы получите по 0,50 cUSD."
   },
   "inviteWithUrl": {
     "title": "Пригласить друга",
@@ -692,8 +692,8 @@
       "body": "Предложите своим друзьям и родственникам скачать {{appName}}, а в награду и вы, и приглашенный вами участник получите эксклюзивный NFT"
     },
     "rewardsActiveCUSD": {
-      "title": "Получи до 12 cUSD за приглашение друзей в Valora!",
-      "body": "Получай 0,50 cUSD за каждого друга, которого ты пригласишь на {{appName}}. Как только он подключит свой номер, пополнит счет и продержит его в течение 7 дней, вы оба получите по 0,50 cUSD. Торопись, количество средств ограничено! (Ограничение - 25 друзей)."
+      "title": "ПОЛУЧИТЕ ДО 12 cUSD за приглашение друзей в Valora!",
+      "body": "Получайте по 0,50 cUSD за каждого друга/подругу, приглашенных в {{appName}}. Как только они подключат свои номера, внесут средства и продержит их в течение 7 дней, вы получите по 0,50 cUSD. Торопись, средства ограничены! (Не более 25 друзей)."
     }
   },
   "getReward": "Получить ${{reward}}",
@@ -710,15 +710,15 @@
     "goldDisclaimer": "При создании аккаунта в Valora вы создаете цифровой кошелек, доступ к которому есть только у вас. Никакие другие физические или юридические лица, включая Valora, не могут восстановить ваш ключ, изменить или отменить транзакции, а также вернуть потерянные средства. Помните, что криптовалюты являются частью нового класса активов и сопряжены с риском финансовых потерь. Тщательно оцените свое финансовое положение и толерантность к финансовым рискам перед покупкой любых активов."
   },
   "termsColloquial": {
-    "title": "Начнем с того, что создадим твой кошелек.",
-    "privacyHeading": "Твоя информация и конфиденциальность:",
-    "privacy1": "Мы собираем данные об использовании, которые помогают нам улучшать приложение и безопасность. О том, какую информацию мы собираем, как мы ее используем, а также о твоих правах, связанных с этой информацией, ты можешь прочитать в нашей <0>Политике конфиденциальности</0>.",
-    "privacy2": "Если ты решишь указать свой номер телефона, мы будем хранить его зашифрованную копию.",
-    "privacy3": "Если ты решишь подключить свои контакты, мы используем их имена, номера и фотографии профилей, чтобы было проще их найти.",
-    "walletHeading": "Твой цифровой кошелек с помощью Valora:",
-    "wallet1": "Сейчас ты создашь цифровой кошелек. Ключ от кошелька есть только у тебя. Мы не сможем восстановить твой ключ или твои активы, если ты потеряешь ключ. Мы также не можем отменить действия, совершенные через Valora на блокчейн.",
-    "wallet2": "Цифровые активы, с которыми ты будешь взаимодействовать с Valora, сопряжены с уникальными рисками. Используя Valora, ты принимаешь эти риски и берешь на себя ответственность за них. Пожалуйста, учитывай свои финансовые возможности и толерантность к риску, прежде чем делать выбор.",
-    "fullTerms": "Прочитай наши полные <0>правила и условия</0>"
+    "title": "Начнем с создания вашего кошелька",
+    "privacyHeading": "Ваша информация и конфиденциальность:",
+    "privacy1": "Мы собираем данные об использовании для улучшения приложения и безопасности. Сведения о типе собираемой информации, способах ее использования и своих правах, связанных с этой информацией, см. в нашей <0>Политике конфиденциальности</0>.",
+    "privacy2": "Если вы решите привязать свой номер телефона, мы сохраним его зашифрованную копию.",
+    "privacy3": "Если вы решите подключить свои контакты, мы используем их имена, номера и фотографии профилей для облегчения поиска.",
+    "walletHeading": "Ваш цифровой кошелек с Valora:",
+    "wallet1": "Вы создаете цифровой кошелек. Только у вас имеется ключ от кошелька. Мы не сможем восстановить ваш ключ или активы, если вы потеряете ключ. Мы также не можем отменить действия, совершенные через Valora в блокчейнах.",
+    "wallet2": "Цифровые активы, с которыми вы будете взаимодействовать в Valora, сопряжены с уникальными рисками. Используя Valora, вы принимаете эти риски и несете ответственность за них. Перед принятием решений учитывайте свои финансовые возможности и толерантность к риску.",
+    "fullTerms": "Прочитайте наши <0>Положения и условия</0> полностью"
   },
   "fullNameOrPsuedonym": "Полное имя или псевдоним",
   "namePlaceholder": "пример имени",
@@ -827,7 +827,7 @@
     "hasWallet": "У меня уже есть кошелек",
     "header": "Добро пожаловать в {{appName}}! Давайте создадим ваш криптокошелек.",
     "getStarted": "Начать",
-    "agreeToTerms": "Создавая кошелек, ты соглашаешься с нашими <0>правилами и условиями</0>"
+    "agreeToTerms": "Создавая кошелек, вы соглашаетесь с нашими <0>Положениями и условиями</0>"
   },
   "accessContacts": {
     "disclosure": {
@@ -1038,7 +1038,7 @@
   "inviteWithoutPayment": "Привет! Я использую {{appName}} для отправки криптовалют по всему миру. Это просто! Ознакомиться с этим способом можно по ссылке: {{link}}",
   "inviteWithEscrowedPayment": "Привет! Я использую {{appName}} для отправки криптовалют по всему миру. Я уже отправил(а) тебе {{amount}} {{token}}. Скачай приложение {{appName}} и приобрети {{token}} по этой ссылке: {{link}}",
   "inviteWithRewards": "Привет! 👋 Я использую {{appName}} в качестве криптокошелька. Очень просто скачать приложение и подключить номер телефона — и мы получим по специальному изданию NFT. 💫 \n\nВот ссылка для загрузки: {{link}}",
-  "inviteWithRewardsCUSD": "Привет! Прямо сейчас мы оба можем получить бесплатное вознаграждение в размере $0,50, если ты зарегистрируешься, подключишь свой номер и пополнишь свой кошелек Valora. Я использую его для приумножения своих сбережений в долларах США и криптовалютах, а ты можешь настроить его за считанные секунды, используя только номер телефона. Обязательно зарегистрируйся по моей реферальной ссылке здесь: \n\n{{link}} \n\n Торопись, реферальная акция скоро заканчивается.",
+  "inviteWithRewardsCUSD": "Привет! Сейчас мы можем получить по $0,50, если ты зарегистрируешься, подключишь свой номер и пополнишь свой кошелек Valora. Я использую его для приумножения своих сбережений в долларах США и криптовалютах, а ты можешь быстро настроить его, указав только номер телефона. Обязательно зарегистрируйся по моей реферальной ссылке здесь: \n\n{{link}} \n\n Торопись, реферальная акция скоро заканчивается.",
   "loadingContacts": "Поиск контактов",
   "myCode": "Мой код",
   "scanCode": "Сканировать",
@@ -1328,7 +1328,7 @@
   "feedItemSwapPath": "{{token1}} в {{token2}}",
   "feedItemJumpstartTitle": "Прямая ссылка",
   "feedItemJumpstartSentSubtitle": "Приглашение",
-  "feedItemJumpstartReceivedSubtitle": "Полученные средства",
+  "feedItemJumpstartReceivedSubtitle": "Средства получены",
   "transactionHeaderVerificationFee": "Подтверждение",
   "transactionHeaderNetworkFee": "Сообщество",
   "transactionHeaderFaucet": "Кран",
@@ -1773,7 +1773,7 @@
     "unsupportedSwapTokens": "Выбранные токены не поддерживаются.",
     "selectTokenLabel": "Выберите токен",
     "tokenBottomSheetTitle": "Выбрать токен",
-    "onNetwork": "на {{networkName}}",
+    "onNetwork": "в {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "Вы переключились на сеть {{networkName}}",
       "body_swapFrom": "Выберите токен, с которого нужно выполнить обмен, в сеть {{networkName}}.",
@@ -1827,9 +1827,9 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Бесплатно",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Комиссия\n\nКомиссия {{appName}} в размере {{appFeePercentage}}% призвана улучшить твой опыт, обеспечивая быстрые, надежные и безопасные свопы.",
-      "appFeeInfo_free": "{{appName}} Плата\n\nЭтот своп бесплатный.",
-      "appFeeInfo_placeholder": "{{appName}} Гонорар\n\nГонорар рассчитывается на основе полученной тобой цитаты.",
+      "appFeeInfo": "Комиссия {{appName}}\n\nКомиссия {{appName}} в размере {{appFeePercentage}}% призвана повысить качество обслуживания за счет обеспечения быстрых, надежных и безопасных обменов.",
+      "appFeeInfo_free": "Комиссия {{appName}}\n\nЭтот обмен бесплатный.",
+      "appFeeInfo_placeholder": "Комиссия {{appName}}\n\nКомиссия рассчитывается на основе полученной вами расценки.",
       "appFeeInfoDismissButton": "Понятно",
       "slippagePercentage": "Допустимое проскальзывание",
       "networkFeeInfo": "Вы выполняете обмен в сеть {{networkName}}.\n\nЭта примерная комиссия сеть необходима для выполнения транзакции в {{networkName}}. Она обеспечивает безопасность транзакции и работоспособность сеть.",
@@ -1837,8 +1837,8 @@
       "slippageToleranceInfo": "Допустимое проскальзывание\n\nВаш обмен будет выполнен в пределах процента допустимого проскальзывания. Если цена изменится больше этого значения, {{appName}} защитит вас, предотвратив исполнение сделки.",
       "networkFeeInfoDismissButton": "Понятно",
       "exchangeRate": "Обменный курс",
-      "exchangeRateInfo": "Курс обмена\n\nМы нашли для тебя самый выгодный курс обмена. Твоя сделка будет завершена по цене в пределах {{slippagePercentage}}% от этой оценки, или сделка будет отменена и средства вернутся на твой кошелек.",
-      "exchangeRateInfo_withAppFee": "Курс обмена\n\nМы нашли для тебя самый выгодный курс обмена. Твоя сделка будет завершена по цене в пределах {{slippagePercentage}}% от оценочного курса, либо сделка будет отменена и средства вернутся на твой кошелек.\n\nРасчетный курс включает {{appName}} комиссию в размере {{appFeePercentage}}%.",
+      "exchangeRateInfo": "Курс обмена\n\nМы нашли для вас самый выгодный курс обмена. Ваше сделка будет завершена по цене в пределах {{slippagePercentage}}% от примерной оценки или транзакция будет отменена и средства вернутся в ваш кошелек.",
+      "exchangeRateInfo_withAppFee": "Курс обмена\n\nМы нашли для вас самый выгодный курс обмена. Ваша сделка будет завершена по цене в пределах {{slippagePercentage}}% от примерной оценки или транзакция будет отменена и средства вернутся в ваш кошелек.\n\nРасчетная ставка включает комиссию {{appName}} в размере {{appFeePercentage}}%.",
       "exchangeRateInfoDismissButton": "Понятно",
       "estimatedValue": "Оценочная стоимость"
     },
@@ -2064,11 +2064,11 @@
     },
     "invite": {
       "title": "Отправляйте криптовалюту друзьям",
-      "subtitle": "Отправь средства или приглашение своим контактам"
+      "subtitle": "Отправить средства или приглашение вашим контактам"
     },
     "jumpstart": {
-      "title": "Отправить с помощью живой ссылки",
-      "subtitle": "Поделись ссылкой, чтобы отправить криптовалюту как текст"
+      "title": "Отправить по прямой ссылке",
+      "subtitle": "Поделитесь ссылкой для отправки криптовалюты как текст"
     },
     "getStarted": {
       "title": "Способы отправки средств на Valora",
@@ -2122,8 +2122,8 @@
   "viewOnArbiscan": "Посмотреть на Arbiscan",
   "viewOnOPMainnetExplorer": "Просмотр в OP Mainnet Explorer",
   "viewOnOPSepoliaExplorer": "Просмотр в OP Sepolia Explorer",
-  "viewOnPolygonPoSScan": "Просмотр на PolygonScan",
-  "viewOnBaseScan": "Смотреть на BaseScan",
+  "viewOnPolygonPoSScan": "Просмотр в PolygonScan",
+  "viewOnBaseScan": "Просмотр в BaseScan",
   "sendEnterAmountScreen": {
     "title": "Введите сумму",
     "selectToken": "Выберите токен",
@@ -2149,7 +2149,7 @@
     }
   },
   "jumpstartSendConfirmationScreen": {
-    "title": "Создайте живую ссылку",
+    "title": "Создать прямую ссылку",
     "sendAmountLabel": "Сумма по прямой ссылке",
     "confirmButton": "Отправка и создание ссылки",
     "info": "При создании ссылки средства выводятся из вашего кошелька. Вы можете вернуть ссылку в любое время. Делитесь ссылками с осторожностью.",
@@ -2160,7 +2160,7 @@
     }
   },
   "jumpstartShareLinkScreen": {
-    "title": "Поделись своей ссылкой на прямой эфир",
+    "title": "Поделиться прямой ссылкой",
     "description": "Скопируйте ссылку, чтобы отправить {{tokenSymbol}} через выбранное приложение обмена сообщениями или используйте QR-код.",
     "linkLabel": "Прямая ссылка",
     "linkCopiedMessage": "Прямая ссылка скопирована",
@@ -2212,14 +2212,14 @@
       "description": "Вы можете найти свой новый {{rewardName}} NFT у себя в разделе «Коллекционные токены»"
     },
     "rewardBottomSheet": {
-      "title": "Заработай 5 долларов ETH",
-      "description": "Пополни свой кошелек любым токеном Ethereum до 4 апреля 2024 года в 12:00 PM PDT, и мы подарим тебе 5 долларов ETH 5 апреля 2024 года в 11:59 PM PDT.\n\nЭто эксклюзивное предложение за то, что ты стал ранним исследователем Ethereum.",
+      "title": "Заработайте $5 в ETH",
+      "description": "Пополните свой кошелек любым токеном Ethereum до 12:00 по тихоокеанскому летнему времени 4 апреля 2024 года, и мы подарим вам 5 долларов в ETH 5 апреля 2024 года в 11:59 по тихоокеанскому летнему времени.\n\nЭто эксклюзивное предложение первым исследователям Ethereum.",
       "expirationLabel": "Истечение срока {{expirationLabelText}}",
       "cta": "Используйте вознаграждение"
     },
     "rewardReminderBottomSheet": {
-      "title": "Не упусти свой шанс, заработай 5 долларов ETH",
-      "description": "Пополни свой кошелек любым токеном Ethereum до 4 апреля 2024 года в 12:00 PM PDT, и мы подарим тебе 5 долларов ETH 5 апреля 2024 года в 11:59 PM PDT.\n\nЭто эксклюзивное предложение за то, что ты стал ранним исследователем Ethereum.",
+      "title": "Не упустите свой шанс заработать 5 долларов в ETH",
+      "description": "Пополните свой кошелек любым токеном Ethereum до 12:00 по тихоокеанскому летнему времени 4 апреля 2024 года, и мы подарим вам 5 долларов в ETH 5 апреля 2024 года в 11:59 по тихоокеанскому летнему времени.\n\nЭто эксклюзивное предложение первым исследователям Ethereum.",
       "expirationLabel": "Истечение срока {{expirationLabelText}}",
       "cta": "Используйте вознаграждение"
     }
@@ -2248,136 +2248,159 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Проверяй свои средства",
-      "description": "Пожалуйста, подожди, пока мы проверим твою Live Link. Средства, на которые можно претендовать, поступят в ближайшее время."
+      "title": "Проверка ваших средств",
+      "description": "Подождите, мы проверяем вашу прямую ссылку. Средства, на которые можно претендовать, скоро поступят."
     },
     "error": {
       "title": "Не удается востребовать средства",
-      "description": "Эта ссылка не может быть использована по неизвестной причине",
-      "alreadyClaimedDescription": "Эта ссылка уже была использована. Пожалуйста, попроси своего друга прислать новую ссылку",
+      "description": "Эту ссылку не удалось использовать для заявки по неизвестной причине",
+      "alreadyClaimedDescription": "Эта ссылка уже была использована для заявки. Попросите своего друга/подругу прислать новую ссылку",
       "contactSupport": "Обратитесь в службу поддержки",
       "dismiss": "Отклонить"
     }
   },
   "jumpstartReclaim": {
-    "description": "Восстановление твоей ссылки влечет за собой плату за сетевой газ, хочешь продолжить?",
+    "description": "Восстановление ссылки повлечет за собой взимание комиссии за газ сети, продолжить?",
     "fetchStatusError": {
-      "title": "Упс, что-то пошло не так",
-      "description": "Мы не смогли узнать статус этого приглашения, пожалуйста, попробуйте позже или обратитесь в службу поддержки",
+      "title": "Ой, что-то пошло не так",
+      "description": "Нам не удалось узнать статус этого запроса, повторите попытку позже или обратитесь в службу поддержки",
       "retryCta": "Повторить"
     },
     "reclaimError": {
       "title": "Невозможно вернуть средства",
-      "description": "Попробуй повторить попытку или обратись в службу поддержки"
+      "description": "Попробуйте повторить попытку возврата или обратись в службу поддержки"
     }
   },
   "multiSelect": {
-    "switchNetwork": "Сеть коммутаторов",
+    "switchNetwork": "Переключить сеть",
     "allNetworks": "Все сети"
   },
   "points": {
-    "title": "Очки Валора",
+    "title": "Баллы Valora",
     "activity": "Деятельность",
     "history": {
       "cards": {
         "createWallet": {
-          "title": "Держатель для бумажника",
-          "subtitle": "Член {{appName}}"
+          "title": "Владелец кошелька",
+          "subtitle": "Пользователь {{appName}}"
         },
         "swap": {
           "title": "Обмен",
           "subtitle": "{{fromToken}} в {{toToken}}"
         }
       },
-      "title": "Моя активность по набору очков",
+      "title": "Моя активность по набору баллов",
       "error": {
-        "title": "Невозможно загрузить активность очков",
-        "subtitle": "Упс, что-то пошло не так при попытке загрузить ленту активности твоих очков. Пожалуйста, попробуй еще раз.",
+        "title": "Невозможно загрузить активность по набору баллов",
+        "subtitle": "Ой, при попытке загрузить вашу активность по набору баллов что-то пошло не так. Повторите попытку.",
         "tryAgain": "Повторить попытку"
       },
       "empty": {
-        "title": "Пока нет активности по набору очков",
-        "subtitle": "Похоже, ты еще не заработал ни одного очка. Используй {{appName}} , чтобы начать зарабатывать очки!",
+        "title": "Пока нет активности по набору баллов",
+        "subtitle": "Похоже, вы пока не заработали баллы. Используйте {{appName}}, чтобы начать зарабатывать баллы!",
         "gotIt": "Понятно"
       },
       "pageError": {
         "title": "Невозможно загрузить",
-        "subtitle": "Упс, что-то пошло не так при попытке завершить загрузку. Пожалуйста, попробуй еще раз.",
+        "subtitle": "Ой, при попытке завершить загрузку что-то пошло не так. Повторите попытку.",
         "refresh": "Обновить"
       }
     },
     "fetchBalanceError": {
-      "title": "Невозможно загрузить очки",
-      "description": "Упс, что-то пошло не так при попытке загрузить твои очки. Информация на этой странице может быть устаревшей. Пожалуйста, обновите страницу.",
+      "title": "Невозможно загрузить баллы",
+      "description": "Ой, при попытке загрузить ваши баллы что-то пошло не так. Информация на этой странице, возможно, устарела. Обновите.",
       "retryCta": "Обновить"
     },
     "loading": {
-      "title": "Собираем твои очки",
-      "description": "Мы сейчас занимаемся подсчетом твоих очков, держись крепче."
+      "title": "Собираем ваши баллы",
+      "description": "Минутку, мы сейчас занимаемся подсчетом ваших баллов"
     },
     "error": {
-      "title": "Невозможно загрузить очки",
-      "description": "Упс, что-то пошло не так при попытке загрузить твои очки. Пожалуйста, попробуй еще раз.",
+      "title": "Невозможно загрузить баллы",
+      "description": "Ой, при попытке загрузить ваши баллы что-то пошло не так. Повторите попытку.",
       "retryCta": "Повторить попытку"
     },
     "infoCard": {
-      "title": "Скоро появится больше способов заработать очки 🚀.",
-      "body": "Мы работаем над тем, чтобы добавить больше способов заработать очки с помощью приложения. Следи за обновлениями."
+      "title": "Скоро появится больше способов заработать баллы 🚀",
+      "body": "Мы работаем над тем, чтобы добавить больше способов заработать баллы с помощью приложения. Следите за обновлениями."
     },
     "activitySection": {
-      "title": "Как зарабатывать очки?",
-      "body": "Это просто! Зарабатывай баллы, просто используя приложение."
+      "title": "Как можно зарабатывать баллы?",
+      "body": "Все просто! Зарабатывайте баллы, используя приложение."
     },
     "noActivities": {
-      "title": "Обновись, чтобы разблокировать больше очков 🔓.",
-      "body": "Упс! Похоже, ты используешь старую версию {{appName}}. Обновись сейчас и узнай обо всех новых интересных способах заработать очки."
+      "title": "Обновитесь, чтобы разблокировать больше баллов 🔓",
+      "body": "Ой! Кажется, вы используете более старую версию {{appName}}. Обновите сейчас, чтобы узнать все новые способы получения баллов."
     },
     "activityCards": {
       "createWallet": {
-        "title": "Создай кошелек {{appName}}"
+        "title": "Создайте кошелек {{appName}}"
       },
       "swap": {
-        "title": "Своп-активы",
+        "title": "Обменять активы",
         "bottomSheet": {
-          "title": "Своп-активы",
-          "body": "В этом месте можно будет указать все необходимые для этого детали. Возможно, минимальная сумма для обмена. \n\nЗарабатывай {{pointsValue}} очков каждый раз, когда обмениваешь актив, используя {{appName}}.",
-          "cta": "Переходи к обмену"
+          "title": "Обменять активы",
+          "body": "Здесь месте можно указать все необходимые для этого сведения. Возможно, минимальную сумму для обмена. \n\nЗарабатывайте по {{pointsValue}} баллов при каждом обмене актива, используя {{appName}}.",
+          "cta": "Перейти к обмену"
         }
       },
       "moreComing": {
-        "title": "Скоро будет больше!"
+        "title": "Скоро появятся новые возможности!"
       }
     },
     "discoverCard": {
-      "title": "{{appName}} Очки",
-      "description": "Зарабатывай очки легко с помощью {{appName}}. Использование приложения, включая обмен, приводит к начислению очков!"
+      "title": "Баллы {{appName}}",
+      "description": "Получите баллы с помощью {{appName}}. Для этого используйте приложение, включая обмен!"
     },
     "intro": {
-      "title": "Зарабатывай очки без особых усилий",
-      "description": "Переходи на новый способ заработка! За твои действия на сайте {{appName}} теперь начисляются баллы. Начни зарабатывать уже сегодня и открой для себя потрясающие преимущества.",
-      "cta": "Начни свое путешествие по очкам"
+      "title": "Простое получения баллов",
+      "description": "Перейдите на новый способ заработка! За ваши действия в {{appName}} теперь начисляются баллы. Начните зарабатывать сегодня и откройте для себя потрясающие преимущества.",
+      "cta": "Начните получать баллы"
     }
   },
   "earnFlow": {
     "gasSubsidized": "Валора покрывает газ для этой сделки!",
     "addCryptoBottomSheet": {
-      "title": "Добавь {{tokenSymbol}} на {{tokenNetwork}}",
-      "description": "Как только ты добавишь жетоны, тебе придется вернуться, чтобы закончить пополнение счета в пуле.",
+      "title": "Добавьте {{tokenSymbol}} в {{tokenNetwork}}",
+      "description": "Как только вы добавите токены, вам придется вернуться для завершения депонирования в пул.",
       "actions": {
         "add": "Купить",
-        "transfer": "Передача",
+        "transfer": "Перевод",
         "swap": "Обмен"
       },
       "actionDescriptions": {
-        "add": "Купи {{tokenSymbol}} на {{tokenNetwork}} , воспользовавшись услугами одного из наших проверенных провайдеров.",
-        "transfer": "Используй любой {{tokenNetwork}} совместимый кошелек или биржу, чтобы пополнить счет {{tokenSymbol}}.",
-        "swap": "Переключись на {{tokenSymbol}} с другого токена {{tokenNetwork}} ."
+        "add": "Купите {{tokenSymbol}} в {{tokenNetwork}} с помощью одного из доверенных поставщиков",
+        "transfer": "Используйте совместимый с {{tokenNetwork}} кошелек или криптобиржу для депонирования {{tokenSymbol}}",
+        "swap": "Обменять на {{tokenSymbol}} с другого токена {{tokenNetwork}}"
       }
     },
     "cta": {
-      "title": "Зарабатывай на своих стабильных монетах",
-      "subtitle": "Сделай депозит сегодня и получи доход",
-      "description": "Узнай, сколько ты сможешь заработать, предоставляя кредитный пул."
+      "title": "Зарабатывайте на своих стейблкоинах",
+      "subtitle": "Депонируйте сегодня и получайте доходы",
+      "description": "Узнайте, сколько можете заработать при предоставлении кредитного пула"
+    },
+    "earnInfo": {
+      "title": "Зарабатывай на своих стабильных монетах\n.",
+      "details": {
+        "earn": {
+          "titleGasSubsidy": "Максимизируй заработок без платы за газ*.",
+          "title": "Максимизируй заработок",
+          "subtitle": "Зарабатывай на своих стейблкоинах и получай вознаграждения, когда поставляешь пул.",
+          "footnoteSubsidy": "* Плата за газ временно покрывается компанией Valora"
+        },
+        "manage": {
+          "title": "Управляй напрямую из Valora",
+          "subtitle": "Мы позаботимся о настройке, чтобы ты мог управлять своей позицией прямо из Valora."
+        },
+        "access": {
+          "title": "Легкий доступ к своим средствам",
+          "subtitle": "Собирай средства без усилий, одним касанием. Наслаждайся таким же мгновенным доступом, как и непосредственно через свои любимые протоколы."
+        }
+      },
+      "action": {
+        "learn": "Подробнее",
+        "earn": "Начать зарабатывать"
+      }
     },
     "ctaV1_86": {
       "title": "Максимальный заработок на стабильных монетах",
@@ -2385,74 +2408,74 @@
       "description": "Зарабатывай примерно {{apy}}% в год, когда добавляешь {{symbol}} в бассейн."
     },
     "enterAmount": {
-      "earnUpToLabel": "Ты можешь заработать до:",
-      "rateLabel": "Ставка (эст.)",
+      "earnUpToLabel": "Вы можете заработать до:",
+      "rateLabel": "Ставка (прибл.)",
       "earnUpTo": "~{{fiatSymbol}}{{amount}} / год",
-      "rate": "{{rate}}% APY",
+      "rate": "Годовая ставка {{rate}}%",
       "continue": "Продолжить",
-      "info": "Этот бассейн работает под управлением Aave",
+      "info": "Этот пул поддерживается Aave",
       "infoBottomSheet": {
-        "title": "Почему именно этот бассейн?",
-        "description": "Этот пул Aave имеет более $150M TVL и более 6 000 вкладчиков, что говорит о высокой ликвидности и надежности. Кроме того, он использует USDC в качестве своего токена и Abritrum в качестве сети, что снижает волатильность и гарантирует пользователям недорогие тарифы на газ.\n\nВсе вместе это делает его безопасным и привлекательным вариантом с конкурентоспособной APY, обеспечивая выгодную инвестиционную возможность для наших пользователей.\n\nИзучить другие пулы Aave ты можешь <0>здесь</0>.",
+        "title": "Почему этот пул?",
+        "description": "Этот пул Aave имеет более $150M TVL и более 6000 вкладчиков, что говорит о высокой ликвидности и надежности. Кроме того, он использует USDC в качестве своего токена и Abritrum в качестве сети, что снижает волатильность и гарантирует пользователям небольшие комиссии за газ.\n\nВсё вместе это делает его безопасным и привлекательным вариантом с конкурентоспособной ставкой APY, обеспечивая выгодную инвестиционную возможность для наших пользователей.\n\nИзучить другие пулы Aave можно <0>здесь</0>.",
         "dismiss": "Отклонить"
       },
       "notEnoughBalanceForGasWarning": {
-        "title": "Тебе нужно больше {{feeTokenSymbol}} , чтобы продолжить",
-        "description": "Добавь {{feeTokenSymbol}} на {{network}} , чтобы покрыть расходы на бензин.",
-        "noGasCta": "Купить {{feeTokenSymbol}} на {{network}}"
+        "title": "Вам нужно больше {{feeTokenSymbol}} для продолжения",
+        "description": "Добавьте {{feeTokenSymbol}} в {{network}} для покрытия комиссий за газ",
+        "noGasCta": "Купите {{feeTokenSymbol}} в {{network}}"
       }
     },
     "activePools": {
-      "title": "Активные бассейны",
-      "totalValue": "Общая стоимость:",
-      "apy": "~{{apy}}% APY",
-      "exitPool": "Выходной бассейн",
-      "depositMore": "Депозит Подробнее",
-      "viewPools": "Бассейны с видом"
+      "title": "Активные пулы",
+      "totalValue": "Общая сумма:",
+      "apy": "Годовая ставка ~{{apy}}%",
+      "exitPool": "Выход из пула",
+      "depositMore": "Депонировать больше",
+      "viewPools": "Просмотр пулов"
     },
     "depositBottomSheet": {
-      "title": "Обзор и депонирование",
-      "description": "Перед тем как пополнить счет в пуле Aave, ознакомься с деталями сделки ниже",
+      "title": "Проверка и депонирование",
+      "description": "Перед депонированием в пул Aave ознакомься с деталями сделки ниже",
       "amount": "Вложенная сумма",
-      "fee": "Эст. Плата за газ",
-      "provider": "Поставщик заработка",
+      "fee": "Прибл. комиссия за газ",
+      "provider": "Поставщик заработков",
       "network": "Сообщество",
-      "footer": "Вкладывая криптовалюту в пул Aave, ты принимаешь риски, связанные с использованием Aave. <0>Правила и условия</0>",
-      "primaryCta": "Полный",
+      "footer": "Депонируя криптовалюту в пул Aave, вы принимаешь риски, связанные с использованием Aave. <0>Положения и условия</0>",
+      "primaryCta": "Завершить",
       "secondaryCta": "Отмена"
     },
     "collect": {
-      "title": "Поздравляю! Просмотри и забери свой заработок",
-      "total": "ВСЕ",
+      "title": "Поздравляем! Проверьте и получите свои доходы",
+      "total": "ВСЕГО",
       "plus": "ПЛЮС",
-      "rate": "Ставка (эст.)",
-      "apy": "{{apy}}% APY",
-      "fee": "Плата за газ",
-      "cta": "Собирайте заработок",
+      "rate": "Ставка (прибл.)",
+      "apy": "Годовая ставка {{apy}}%",
+      "fee": "Комиссия за газ",
+      "cta": "Получить доход",
       "errorTitle": "Что-то пошло не так",
-      "errorDescription": "Невозможно получить данные о депозите. Пожалуйста, попробуй еще раз.",
-      "noGasTitle": "Тебе нужно больше {{symbol}} , чтобы продолжить",
-      "noGasDescription": "Добавь {{symbol}} на {{network}} , чтобы покрыть расходы на бензин.",
-      "noGasCta": "Купить {{symbol}} на {{network}}"
+      "errorDescription": "Невозможно получить данные о депозите. Повторите попытку.",
+      "noGasTitle": "Вам нужно больше {{symbol}} для продолжения",
+      "noGasDescription": "Добавьте {{symbol}} в {{network}} для покрытия комиссий за газ",
+      "noGasCta": "Купите {{symbol}} в {{network}}"
     },
     "transactionFeed": {
-      "earnClaimTitle": "Собрано",
-      "earnClaimSubtitle": "с сайта {{providerName}} Pool",
-      "earnDepositTitle": "Депозит",
-      "earnDepositSubtitle": "на {{providerName}} Pool",
-      "earnWithdrawTitle": "Отказаться от",
-      "earnWithdrawSubtitle": "с сайта {{providerName}} Pool"
+      "earnClaimTitle": "Получено",
+      "earnClaimSubtitle": "из пула {{providerName}}",
+      "earnDepositTitle": "Депонировано",
+      "earnDepositSubtitle": "в пул {{providerName}}",
+      "earnWithdrawTitle": "Выведено",
+      "earnWithdrawSubtitle": "из пула {{providerName}}"
     },
     "transactionDetails": {
       "descriptionLabel": "Подробности",
-      "earnClaimTitle": "Собрано",
-      "earnClaimSubtitle": "Собрал {{tokenSymbol}} в бассейне {{providerName}}",
-      "earnClaimDetails": "Собранная сумма",
-      "earnDepositTitle": "Депозит",
-      "earnDepositSubtitle": "Депозит {{tokenSymbol}} на {{providerName}}",
+      "earnClaimTitle": "Получено",
+      "earnClaimSubtitle": "Получено {{tokenSymbol}} из пула {{providerName}}",
+      "earnClaimDetails": "Полученная сумма",
+      "earnDepositTitle": "Депонировано",
+      "earnDepositSubtitle": "Депонировано {{tokenSymbol}} в пул {{providerName}}",
       "earnDepositDetails": "Вложенная сумма",
-      "earnWithdrawTitle": "Отказаться от",
-      "earnWithdrawSubtitle": "Вывел {{tokenSymbol}} из пула {{providerName}}",
+      "earnWithdrawTitle": "Выведено",
+      "earnWithdrawSubtitle": "Выведено {{tokenSymbol}} из пула {{providerName}}",
       "earnWithdrawDetails": "Сумма выведено"
     }
   },
diff --git a/locales/th-TH/translation.json b/locales/th-TH/translation.json
index 0b849f938f..b90e8e148f 100644
--- a/locales/th-TH/translation.json
+++ b/locales/th-TH/translation.json
@@ -255,8 +255,8 @@
       "text": "ใครก็ตามที่มีวลีของคุณจะมีสิทธิ์เข้าถึงบัญชีและเงินทั้งหมดในบัญชีของคุณ ดังนั้นโปรดอย่าแบ่งปันให้ผู้อื่นทราบ"
     }
   ],
-  "consumerIncentivesTitle": "Supercharge is ending",
-  "consumerIncentivesSummary": "But more rewards are headed your way. Until May 28, get {{percent}}% annual rewards on your highest stablecoin balance (cUSD, cEUR, or cREAL). Here's how it works:",
+  "consumerIncentivesTitle": "Supercharge กำลังจะสิ้นสุดลง",
+  "consumerIncentivesSummary": "แต่ยังมีรางวัลอื่นๆ รอคุณอยู่มากมาย รับผลตอบแทน {{percent}}% ต่อปีจากยอดคงเหลือสูงสุดของ Stablecoin (cUSD, cEUR หรือ cREAL) ได้ถึง 28 พฤษภาคม โดยมีเงื่อนไขดังนี้",
   "earnWeekly": {
     "header": "เชื่อมต่อหมายเลขโทรศัพท์ของคุณ",
     "text": "แตะเชื่อมต่อหมายเลข หากคุณยังไม่เชื่อมต่อ"
@@ -271,14 +271,14 @@
     "text": "เพื่อให้แน่ใจว่ารางวัลของคุณปลอดภัยและอยู่ในการควบคุมของคุณ"
   },
   "conclusion": "ง่ายเพียงเท่านี้ Supercharge คริปโตของคุณวันนี้",
-  "superchargeTitle": "Supercharge is ending",
-  "superchargeDescription": "But more rewards are headed your way. Until May 28, get {{apy}}% annual rewards on your highest {{token}} balance. Here's how it works:",
+  "superchargeTitle": "Supercharge กำลังจะสิ้นสุดลง",
+  "superchargeDescription": "แต่ยังมีรางวัลอื่นๆ รอคุณอยู่มากมาย รับผลตอบแทน {{apy}}% ต่อปีจากยอดคงเหลือสูงสุดของ {{token}} ได้ถึง 28 พฤษภาคม โดยมีเงื่อนไขดังนี้",
   "superchargeConnectNumber": "เชื่อมต่อหมายเลขโทรศัพท์ของคุณ",
   "superchargeReconnectNumber": "เชื่อมต่อหมายเลขโทรศัพท์อีกครั้ง\n<0>เราได้เปิดตัว Supercharge ที่ปรับปรุงใหม่ โปรดเชื่อมต่อหมายเลขโทรศัพท์ของคุณอีกครั้งเพื่อรับรางวัลเป็น {{token}} ของคุณ</0>",
   "superchargeMinimumBalance": "เพิ่มยอดคงเหลือขั้นต่ำที่ {{amount}} {{token}}",
-  "superchargeDisclaimer": "This will not affect your balance or previous earnings.",
-  "superchargeDisclaimerMaxRewards": "This will not affect your balance or previous earnings.",
-  "superchargeDisclaimerDayLimit": "This will not affect your balance or previous earnings. <0>Learn more</0>",
+  "superchargeDisclaimer": "การดำเนินการนี้จะไม่ส่งผลต่อยอดคงเหลือหรือรายได้ก่อนหน้าของคุณ",
+  "superchargeDisclaimerMaxRewards": "การดำเนินการนี้จะไม่ส่งผลต่อยอดคงเหลือหรือรายได้ก่อนหน้าของคุณ",
+  "superchargeDisclaimerDayLimit": "การดำเนินการนี้จะไม่ส่งผลต่อยอดคงเหลือหรือรายได้ก่อนหน้าของคุณ <0>ดูข้อมูลเพิ่มเติม</0>",
   "superchargeTokenDetailsDialog": {
     "title": "สินทรัพย์ใดที่ฉันสามารถ Supercharge ได้",
     "body": "คุณจะได้รับรางวัลทุกสัปดาห์ในรูปแบบ Celo stablecoin ด้วยมูลค่าสูงสุด (cEUR, cUSD, cREAL)",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "ต้องอัปเดตแอป",
   "superchargingDescription": "อัปเดตแอป Valora เพื่อรับรางวัล Supercharge ทุกสัปดาห์อย่างต่อเนื่อง.",
-  "superchargingTitleV1_54": "Supercharge is ending",
-  "superchargingDescriptionV1_54": "Weekly rewards will be available to claim until Tuesday, May 28, at 23:59 UTC. Beginning May 29, you will nor longer be able to claim Supercharge rewards.",
+  "superchargingTitleV1_54": "Supercharge กำลังจะสิ้นสุดลง",
+  "superchargingDescriptionV1_54": "ขอรับรางวัลประจำสัปดาห์ได้ถึงวันอังคารที่ 28 พฤษภาคม 23:59 น. UTC ตั้งแต่วันที่ 29 พฤษภาคม คุณจะไม่สามารถขอรับรางวัล Supercharge ได้อีกต่อไป",
   "superchargeRewardsAvailable": "คุณมี {{amount}} {{token}} ที่สามารถขอรับได้!",
   "superchargeRewardsAvailableMultipleTokens": "คุณมี {{amounts}} ที่สามารถขอรับได้!",
-  "superchargeClaimText": "Claim your rewards until Tuesday, May 28, at 23:59 UTC. Beginning May 29, you will no longer be able to claim Supercharge rewards.",
+  "superchargeClaimText": "ขอรับรางวัลได้ถึงวันอังคารที่ 28 พฤษภาคม 23:59 น. UTC ตั้งแต่วันที่ 29 พฤษภาคม คุณจะไม่สามารถขอรับรางวัล Supercharge ได้อีกต่อไป",
   "superchargeClaimButton": "ขอรับรางวัล",
   "superchargeFetchRewardsFailed": "เกิดข้อผิดพลาดขณะเรียกดูรางวัล Supercharge ที่รอดำเนินการ โปรดลองอีกครั้งภายหลัง",
   "superchargeClaimSuccess": "เพิ่มรางวัล Supercharge ของคุณไปยังยอดคงเหลือรวมแล้ว",
@@ -677,8 +677,8 @@
     "body": "เมื่อมีการตั้งค่ากระเป๋าเงิน {{appName}} และเชื่อมต่อหมายเลขแล้ว คุณแต่ละคนจะได้รับ NFT พิเศษ"
   },
   "inviteRewardsBannerCUSD": {
-    "title": "Invite friends and get up to 12 cUSD",
-    "body": "Once they connect their number and add funds to {{appName}}, you’ll both receive 0.50 cUSD."
+    "title": "เชิญเพื่อนและรับสูงสุด 12 cUSD",
+    "body": "เมื่อเพื่อนเชื่อมต่อเบอร์และเพิ่มเงินทุนลงใน {{appName}} คุณทั้งคู่จะได้รับ 0.50 cUSD"
   },
   "inviteWithUrl": {
     "title": "เชิญเพื่อน",
@@ -692,8 +692,8 @@
       "body": "เชิญเพื่อนและครอบครัวให้ดาวน์โหลด {{appName}} ซึ่งคุณแต่ละคนจะได้รับ NFT พิเศษ"
     },
     "rewardsActiveCUSD": {
-      "title": "GET UP TO 12 cUSD for inviting your friends to Valora!",
-      "body": "Get 0.50 cUSD for every friend you invite to {{appName}}. Once they connect their number, add funds, and hold them for 7 days, you’ll both get 0.50 cUSD. Hurry, funds are limited! (Limit 25 friends)."
+      "title": "รับสูงสุด 12 cUSD เมื่อเชิญเพื่อนมาเทรดกับ Valora!",
+      "body": "รับ 0.50 cUSD ทุกครั้งที่เชิญเพื่อนมาเทรดกับ {{appName}} เมื่อเพื่อนเชื่อมต่อเบอร์ เพิ่มเงินทุน และถือไว้เป็นเวลา 7 วัน คุณทั้งคู่จะได้รับ 0.50 cUSD ด่วน เงินทุนมีจำนวนจำกัด (จำกัดเพื่อนสูงสุด 25 คน)"
     }
   },
   "getReward": "รับ ${{reward}}",
@@ -710,15 +710,15 @@
     "goldDisclaimer": "เมื่อคุณสร้าง \"บัญชี\" กับ Valora เท่ากับคุณกำลังสร้างกระเป๋าเงินดิจิทัลที่มีเพียงคุณผู้เดียวเท่านั้นที่เป็นผู้ถือกุญแจ ไม่มีบุคคลหรือหน่วยงานใด รวมถึง Valora ที่สามารถกู้คืนกุญแจของคุณ เปลี่ยนแปลงหรือยกเลิกธุรกรรม หรือเรียกคืนเงินที่สูญเสียไปได้ โปรดทราบว่าคริปโตเคอร์เรนซีเป็นส่วนหนึ่งของประเภทสินทรัพย์ใหม่และมีความเสี่ยงที่จะเกิดผลขาดทุนการเงิน โปรดพิจารณาสถานการณ์ทางการเงินและความสามารถในการยอมรับความเสี่ยงทางการเงินของคุณอย่างรอบคอบก่อนซื้อสินทรัพย์ใดๆ"
   },
   "termsColloquial": {
-    "title": "Let’s start by creating your wallet",
-    "privacyHeading": "Your Info & Privacy:",
-    "privacy1": "We gather usage data which helps us improve the app and security. The type of information we collect, how we use it and your rights related to that information can all be seen in our <0>Privacy Policy</0>.",
-    "privacy2": "If you decide to link your phone number, we will store an encrypted copy of it.",
-    "privacy3": "If you decide to connect your contacts, we use their names, numbers, and profile pictures to make it easier to find them.",
-    "walletHeading": "Your Digital Wallet with Valora:",
-    "wallet1": "You’re about to create a digital wallet. Only you have the key to your wallet. We cannot recover your key or your assets if you lose your key. We also cannot reverse actions taken through Valora on blockchains.",
-    "wallet2": "Digital assets, the assets with which you will interact with Valora, come with unique risks. By using Valora, you accept these risks and take responsibility for them. Please consider your finances and risk tolerance before making choices.",
-    "fullTerms": "Read our full <0>Terms & Conditions</0>"
+    "title": "มาเริ่มสร้างกระเป๋าเงินของคุณกัน",
+    "privacyHeading": "ข้อมูลและความเป็นส่วนตัวของคุณ:",
+    "privacy1": "เรารวบรวมข้อมูลการใช้งานเพื่อช่วยปรับปรุงแอปและความปลอดภัย คุณสามารถดูประเภทข้อมูลที่เรารวบรวม วิธีการใช้ข้อมูล และสิทธิ์ของคุณที่เกี่ยวข้องกับข้อมูลดังกล่าวได้ที่<0>นโยบายความเป็นส่วนตัว</0>ของเรา",
+    "privacy2": "หากคุณเลือกที่จะเชื่อมโยงหมายเลขโทรศัพท์ของคุณ เราจะจัดเก็บเป็นสำเนาที่เข้ารหัสไว้",
+    "privacy3": "หากคุณเลือกเชื่อมต่อรายชื่อติดต่อของคุณ เราจะใช้ชื่อ เบอร์โทรศัพท์ และรูปภาพโปรไฟล์เพื่อให้ค้นหาได้ง่ายขึ้น",
+    "walletHeading": "กระเป๋าเงินดิจิทัลของคุณกับ Valora:",
+    "wallet1": "คุณกำลังจะสร้างกระเป๋าเงินดิจิทัล มีเพียงคุณเท่านั้นที่มีคีย์เข้าสู่กระเป๋าเงินของคุณ หากคุณทำคีย์หาย เราไม่สามารถกู้คืนคีย์หรือสินทรัพย์ของคุณได้ นอกจากนี้เรายังไม่สามารถคืนค่าการดำเนินการที่ทำผ่าน Valora บนบล็อกเชนได้",
+    "wallet2": "สินทรัพย์ดิจิทัล ซึ่งเป็นสินทรัพย์ที่คุณจะดำเนินการกับ Valora มาพร้อมกับความเสี่ยงเฉพาะตัว เมื่อใช้ Valora ถือว่าคุณยอมรับและรับผิดชอบต่อความเสี่ยงเหล่านี้ โปรดพิจารณาการเงินและระดับความเสี่ยงที่ยอมรับได้ของคุณก่อนตัดสินใจ",
+    "fullTerms": "โปรดอ่าน<0>ข้อกำหนดและเงื่อนไข</0>ฉบับเต็มของเรา"
   },
   "fullNameOrPsuedonym": "ชื่อและนามสกุลหรือนามแฝง",
   "namePlaceholder": "ชื่อ",
@@ -827,7 +827,7 @@
     "hasWallet": "ฉันมีกระเป๋าเงินอยู่แล้ว",
     "header": "ยินดีต้อนรับสู่ {{appName}}! เรามาสร้างกระเป๋าเงินคริปโตกัน",
     "getStarted": "เริ่มต้นใช้งาน",
-    "agreeToTerms": "By creating a wallet you agree to our <0>Terms and Conditions</0>"
+    "agreeToTerms": "เมื่อสร้างกระเป๋าเงิน คุณยอมรับ<0>ข้อกำหนดและเงื่อนไข</0>ของเรา"
   },
   "accessContacts": {
     "disclosure": {
@@ -1009,7 +1009,7 @@
   "receivedFrom": "ได้รับจาก",
   "commentLabel": "ข้อความ",
   "amountSent": "จำนวนเงินที่ส่ง",
-  "amountReceived": "Amount Received",
+  "amountReceived": "จำนวนที่ได้รับ",
   "amountCeloWithdrawn": "จำนวนเงิน (CELO)",
   "feeEducation": "บล็อกเชนเก็บค่าธรรมเนียมการทำธุรกรรมเพื่อให้เครือข่ายได้รับการสนับสนุนและทำงานอย่างราบรื่น",
   "reviewPayment": "ตรวจสอบการชำระเงิน",
@@ -1032,7 +1032,7 @@
   "inviteWithoutPayment": "สวัสดี ฉันกำลังใช้ {{appName}} ส่งคริปโตไปทั่วโลก ลองใช้แอปได้ง่ายๆ และฉันต้องการเชิญคุณเข้าไปดูลิงก์นี้: {{link}}",
   "inviteWithEscrowedPayment": "สวัสดี ฉันกำลังใช้ {{appName}} ส่งคริปโตไปทั่วโลก ฉันเพิ่งส่ง {{amount}} {{token}} ให้คุณ โปรดดาวน์โหลดแอป {{appName}} และแลก {{token}} ของคุณ โดยใช้ลิงก์นี้: {{link}}",
   "inviteWithRewards": "สวัสดี 👋 ฉันใช้ {{appName}} เป็นกระเป๋าเงินคริปโต วิธีดาวน์โหลดแอปและเชื่อมต่อหมายเลขโทรศัพท์ทำได้เร็วมาก และเราทั้งสองคนจะได้รับ NFT รุ่นพิเศษเป็นรางวัลด้วย 💫\n\nใช้ลิงก์นี้เพื่อดาวน์โหลด: {{link}}",
-  "inviteWithRewardsCUSD": "Hey! Right now we can both get a free $0.50 reward if you sign up, connect your number, and fund your Valora wallet. I use it to grow my savings in USD and crypto, and you can set it up in seconds with just a phone number. Make sure to sign up with my referral link here: \n\n{{link}} \n\n Hurry, the referral promotion ends soon.",
+  "inviteWithRewardsCUSD": "เฮ้! ตอนนี้เราทั้งคู่สามารถรับรางวัล $0.50 ได้ฟรี หากคุณลงทะเบียน เชื่อมต่อเบอร์ และฝากเงินเข้ากระเป๋าเงิน Valora ของคุณ ฉันใช้กระเป๋าเงินนี้สะสมเงินดอลลาร์สหรัฐและคริปโต ซึ่งคุณก็ทำได้ในเวลาไม่กี่วินาทีเพียงมีหมายเลขโทรศัพท์ อย่าลืมลงทะเบียนผ่านลิงก์แนะนำของฉันที่นี่: \n\n{{link}} \n\n รีบเลย โปรโมชั่นแนะนำเพื่อนจะสิ้นสุดเร็วๆ นี้",
   "loadingContacts": "การค้นหาผู้ติดต่อของคุณ",
   "myCode": "รหัสของฉัน",
   "scanCode": "สแกน",
@@ -1321,8 +1321,8 @@
   "feedItemGoldReceived": "ได้รับจาก {{displayName}}",
   "feedItemSwapPath": "{{token1}} เป็น {{token2}}",
   "feedItemJumpstartTitle": "ลิงก์สด",
-  "feedItemJumpstartSentSubtitle": "Invitation",
-  "feedItemJumpstartReceivedSubtitle": "Funds received",
+  "feedItemJumpstartSentSubtitle": "คำเชิญ",
+  "feedItemJumpstartReceivedSubtitle": "เงินทุนที่ได้รับ",
   "transactionHeaderVerificationFee": "การยืนยัน",
   "transactionHeaderNetworkFee": "เครือข่าย",
   "transactionHeaderFaucet": "ฟอเซ็ต",
@@ -1765,9 +1765,9 @@
     "swapToTokenSelection": "สว็อปเป็น",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "ผู้ให้บริการสว็อปของเราไม่รองรับโทเค็นที่เลือก",
-    "selectTokenLabel": "Select token",
-    "tokenBottomSheetTitle": "Select Token",
-    "onNetwork": "on {{networkName}}",
+    "selectTokenLabel": "เลือกโทเค็น",
+    "tokenBottomSheetTitle": "เลือกโทเค็น",
+    "onNetwork": "บน {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "คุณเปลี่ยนไปใช้เครือข่าย {{networkName}} แล้ว",
       "body_swapFrom": "เลือกโทเค็นที่จะสว็อปจากบนเครือข่าย {{networkName}} เพื่อดำเนินการต่อ",
@@ -1821,9 +1821,9 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "ฟรี",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Fee\n\nThe {{appName}} fee of {{appFeePercentage}}% is designed to enhance your experience by ensuring fast, reliable, and secure swaps.",
-      "appFeeInfo_free": "{{appName}} Fee\n\nThis swap is free of charge.",
-      "appFeeInfo_placeholder": "{{appName}} Fee\n\nThe fee is calculated based on the quote you receive.",
+      "appFeeInfo": "ค่าธรรมเนียม {{appName}}\n\nค่าธรรมเนียม {{appName}} {{appFeePercentage}}% ออกแบบมาเพื่อยกระดับประสบการณ์ของคุณในการสว็อปที่รวดเร็ว เชื่อถือได้ และปลอดภัย",
+      "appFeeInfo_free": "ค่าธรรมเนียม {{appName}}\n\nไม่มีค่าใช้จ่ายในการสว็อปนี้",
+      "appFeeInfo_placeholder": "ค่าธรรมเนียม {{appName}}\n\nค่าธรรมเนียมจะคำนวณตามใบเสนอราคาที่คุณได้รับ",
       "appFeeInfoDismissButton": "เข้าใจแล้ว",
       "slippagePercentage": "การยอมรับราคาคลาดเคลื่อน",
       "networkFeeInfo": "คุณกำลังสว็อปบนเครือข่าย {{networkName}}\n\nการดำเนินการธุรกรรมบนเครือข่าย {{networkName}} จำเป็นต้องมีค่าธรรมเนียมเครือข่ายโดยประมาณนี้ ค่าธรรมเนียมนี้จะช่วยดูแลธุรกรรมของคุณให้ปลอดภัยและสนับสนุนการดำเนินงานของเครือข่าย",
@@ -1831,8 +1831,8 @@
       "slippageToleranceInfo": "ราคาคลาดเคลื่อนที่ยอมรับได้\n\nการสว็อปของคุณจะดำเนินการภายในเปอร์เซ็นต์ความคลาดเคลื่อนที่ยอมรับได้ หากราคาเปลี่ยนแปลงมากกว่าคลาดเคลื่อนที่ยอมรับได้ {{appName}} จะปกป้องคุณโดยการระงับการดำเนินการการเทรดนั้น",
       "networkFeeInfoDismissButton": "เข้าใจแล้ว",
       "exchangeRate": "อัตราแลกเปลี่ยน",
-      "exchangeRateInfo": "Exchange Rate\n\nWe've found the best exchange rate for you. Your trade will be completed at a price within {{slippagePercentage}}% of the estimate or the transaction will be cancelled & funds returned to your wallet.",
-      "exchangeRateInfo_withAppFee": "Exchange Rate\n\nWe've found the best exchange rate for you. Your trade will be completed at a price within {{slippagePercentage}}% of the estimate or the transaction will be cancelled & funds returned to your wallet.\n\nThe estimated rate includes a {{appName}} fee of {{appFeePercentage}}%.",
+      "exchangeRateInfo": "อัตราแลกเปลี่ยน\n\nเราพบอัตราแลกเปลี่ยนที่ดีที่สุดสำหรับคุณแล้ว การซื้อขายจะดำเนินการที่ราคาภายใน {{slippagePercentage}}% ของค่าโดยประมาณ มิฉะนั้น ธุรกรรมจะถูกยกเลิกและจะมีการคืนเงินไปยังกระเป๋าเงินของคุณ",
+      "exchangeRateInfo_withAppFee": "อัตราแลกเปลี่ยน\n\nเราพบอัตราแลกเปลี่ยนที่ดีที่สุดสำหรับคุณแล้ว การซื้อขายจะดำเนินการที่ราคาภายใน {{slippagePercentage}}% ของค่าโดยประมาณ มิฉะนั้น ธุรกรรมจะถูกยกเลิกและจะมีการคืนเงินไปยังกระเป๋าเงินของคุณ\n\nอัตราโดยประมาณรวมค่าธรรมเนียม {{appName}} {{appFeePercentage}}%",
       "exchangeRateInfoDismissButton": "เข้าใจแล้ว",
       "estimatedValue": "ค่าโดยประมาณ"
     },
@@ -2058,11 +2058,11 @@
     },
     "invite": {
       "title": "ส่งคริปโตให้เพื่อนของคุณ",
-      "subtitle": "Send funds or an invite to your contacts"
+      "subtitle": "ส่งเงินทุนหรือคำเชิญให้กับผู้ติดต่อของคุณ"
     },
     "jumpstart": {
-      "title": "Send with a Live Link",
-      "subtitle": "Share a link to send crypto like a text"
+      "title": "ส่งพร้อมลิงก์สด",
+      "subtitle": "แชร์ลิงก์เพื่อส่งคริปโตได้ง่ายๆ เหมือนส่งข้อความ"
     },
     "getStarted": {
       "title": "วิธีส่งเงินบน Valora",
@@ -2116,8 +2116,8 @@
   "viewOnArbiscan": "ดูบน Arbiscan",
   "viewOnOPMainnetExplorer": "ดูบน OP Mainnet Explorer",
   "viewOnOPSepoliaExplorer": "ดูบน OP Sepolia Explorer",
-  "viewOnPolygonPoSScan": "View on PolygonScan",
-  "viewOnBaseScan": "View on BaseScan",
+  "viewOnPolygonPoSScan": "ดูบน PolygonScan",
+  "viewOnBaseScan": "ดูบน BaseScan",
   "sendEnterAmountScreen": {
     "title": "ป้อนจำนวนเงิน",
     "selectToken": "เลือกโทเค็น",
@@ -2143,7 +2143,7 @@
     }
   },
   "jumpstartSendConfirmationScreen": {
-    "title": "Create a Live Link",
+    "title": "สร้างลิงก์สด",
     "sendAmountLabel": "จำนวนลิงก์สด",
     "confirmButton": "ส่งและสร้างลิงก์",
     "info": "เมื่อคุณสร้างลิงก์ เงินทุนจะถูกถอนออกจากกระเป๋าเงินของคุณ คุณสามารถเรียกคืนลิงก์ได้ตลอดเวลา โปรดแชร์ลิงก์ด้วยความระมัดระวัง",
@@ -2154,7 +2154,7 @@
     }
   },
   "jumpstartShareLinkScreen": {
-    "title": "Share your Live Link",
+    "title": "แชร์ลิงก์สด",
     "description": "คัดลอกลิงก์เพื่อส่ง {{tokenSymbol}} ผ่านแอปส่งข้อความที่คุณเลือก หรือใช้ QR Code",
     "linkLabel": "ลิงก์สด",
     "linkCopiedMessage": "คัดลอกลิงก์สดแล้ว",
@@ -2164,7 +2164,7 @@
       "ctaNavigate": "ไปหน้าหลัก"
     },
     "ctaShare": "แชร์ลิงก์",
-    "ctaScanQRCode": "Show QR Code",
+    "ctaScanQRCode": "แสดง QR Code",
     "shareMessage": "สวัสดี! ฉันส่งลิงก์ที่มีเงินทุนจำนวน {{tokenAmount}} {{tokenSymbol}} ใน {{appName}} ให้กับคุณ ใช้ลิงก์นี้เพื่อดาวน์โหลดแอป แล้วเงินทุนจะรอคุณอยู่ {{link}}",
     "qrCodeBottomSheet": {
       "title": "สแกนโค้ดเพื่อรับเงินทุน",
@@ -2206,14 +2206,14 @@
       "description": "คุณสามารถค้นหา {{rewardName}} NFT ใหม่ของคุณได้ในส่วน “ของสะสม”"
     },
     "rewardBottomSheet": {
-      "title": "Earn $5 of ETH",
-      "description": "Fund your wallet with any Ethereum token by April 4, 2024 at 12:00 PM PDT, and we'll give you $5 of ETH on April 5, 2024 by 11:59 PM PDT.\n\nThis is an exclusive offer for being an Early Ethereum Explorer.",
+      "title": "รับ ETH มูลค่า $5",
+      "description": "ฝากโทเค็น Ethereum ใดก็ได้ในกระเป๋าเงินของคุณภายในวันที่ 4 เมษายน 2024 เวลา 12:00 น. PDT จากนั้นเราจะมอบ ETH มูลค่า $5 ให้ในวันที่ 5 เมษายน 2024 ภายใน 23:59 น. PDT\n\n\nนี่คือข้อเสนอสุดพิเศษสำหรับ Early Ethereum Explorer",
       "expirationLabel": "หมดอายุ {{expirationLabelText}}",
       "cta": "ใช้รางวัล"
     },
     "rewardReminderBottomSheet": {
-      "title": "Don't miss out, earn $5 of ETH",
-      "description": "Fund your wallet with any Ethereum token by April 4, 2024 at 12:00 PM PDT, and we'll give you $5 of ETH on April 5, 2024 by 11:59 PM PDT.\n\nThis is an exclusive offer for being an Early Ethereum Explorer.",
+      "title": "อย่าพลาด รับ ETH มูลค่า $5",
+      "description": "ฝากโทเค็น Ethereum ใดก็ได้ในกระเป๋าเงินของคุณภายในวันที่ 4 เมษายน 2024 เวลา 12:00 น. PDT จากนั้นเราจะมอบ ETH มูลค่า $5 ให้ในวันที่ 5 เมษายน 2024 ภายใน 23:59 น. PDT\n\n\nนี่คือข้อเสนอสุดพิเศษสำหรับ Early Ethereum Explorer",
       "expirationLabel": "หมดอายุ {{expirationLabelText}}",
       "cta": "ใช้รางวัล"
     }
@@ -2242,211 +2242,234 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Checking on your funds",
-      "description": "Please wait while we check your Live Link. Claimable funds will arrive shortly."
+      "title": "ตรวจสอบเงินทุนของคุณ",
+      "description": "รอสักครู่ เรากำลังตรวจสอบลิงก์สด เงินที่เรียกคืนได้จะเข้าสู่บัญชีเร็วๆ นี้"
     },
     "error": {
       "title": "ไม่สามารถขอรับเงินทุนได้",
-      "description": "This link was not able to be claimed for an unknown reason",
-      "alreadyClaimedDescription": "The link has already been claimed. Please ask your friend to send a new link",
+      "description": "ไม่สามารถขอรับลิงก์นี้ได้โดยไม่ทราบสาเหตุ",
+      "alreadyClaimedDescription": "มีการขอรับลิงก์นี้แล้ว โปรดขอให้เพื่อนส่งลิงก์ใหม่",
       "contactSupport": "ติดต่อฝ่ายบริการลูกค้า",
       "dismiss": "ปิด"
     }
   },
   "jumpstartReclaim": {
-    "description": "Reclaiming your link incurs a network gas fee, would you like to proceed?",
+    "description": "การเรียกคืนลิงก์มีค่าก๊าซสำหรับเครือข่าย ต้องการดำเนินการต่อหรือไม่",
     "fetchStatusError": {
-      "title": "Oops, something went wrong",
-      "description": "We could not get the claim status of this invitation, please try again later or contact support",
+      "title": "อุ้ย เกิดข้อผิดพลาด",
+      "description": "เราไม่สามารถดูสถานะการขอรับรางวัลของคำเชิญนี้ได้ โปรดลองอีกครั้งในภายหลังหรือติดต่อฝ่ายบริการลูกค้า",
       "retryCta": "ลองอีกครั้ง"
     },
     "reclaimError": {
-      "title": "Unable to reclaim funds",
-      "description": "Try to reclaim again, or contact support"
+      "title": "ไม่สามารถเรียกคืนเงินทุนได้",
+      "description": "ลองเรียกคืนอีกครั้งหรือติดต่อฝ่ายบริการลูกค้า"
     }
   },
   "multiSelect": {
-    "switchNetwork": "Switch Network",
-    "allNetworks": "All Networks"
+    "switchNetwork": "เปลี่ยนเครือข่าย",
+    "allNetworks": "เครือข่ายทั้งหมด"
   },
   "points": {
-    "title": "Valora Points",
+    "title": "คะแนน Valora",
     "activity": "กิจกรรม",
     "history": {
       "cards": {
         "createWallet": {
-          "title": "Wallet holder",
-          "subtitle": "Member of {{appName}}"
+          "title": "ผู้ถือกระเป๋าเงิน",
+          "subtitle": "สมาชิกของ {{appName}}"
         },
         "swap": {
           "title": "สว็อป",
           "subtitle": "{{fromToken}} เป็น {{toToken}}"
         }
       },
-      "title": "My points activity",
+      "title": "ประวัติคะแนนของฉัน",
       "error": {
-        "title": "Unable to load points activity",
-        "subtitle": "Oops, something went wrong when trying to load your points activity feed. Please try again.",
+        "title": "ไม่สามารถโหลดประวัติคะแนนได้",
+        "subtitle": "อุ้ย เกิดข้อผิดพลาดขณะพยายามโหลดฟีดประวัติคะแนน โปรดลองอีกครั้ง",
         "tryAgain": "ลองอีกครั้ง"
       },
       "empty": {
-        "title": "No points activity yet",
-        "subtitle": "It looks like you haven't earned any points yet. Use {{appName}} to start earning points!",
+        "title": "ยังไม่มีประวัติคะแนน",
+        "subtitle": "ดูเหมือนว่าคุณยังไม่มีคะแนนเลย ใช้ {{appName}} เพื่อเริ่มสะสมคะแนน!",
         "gotIt": "เข้าใจแล้ว"
       },
       "pageError": {
-        "title": "Unable to load",
-        "subtitle": "Oops, something went wrong when trying to finish loading. Please try again.",
+        "title": "ไม่สามารถโหลดได้",
+        "subtitle": "อุ้ย เกิดข้อผิดพลาดขณะพยายามโหลดให้เสร็จสิ้น โปรดลองอีกครั้ง",
         "refresh": "รีเฟรช"
       }
     },
     "fetchBalanceError": {
-      "title": "Unable to load your points",
-      "description": "Oops, something went wrong when trying to load your points. The information on this page may be out of date. Please refresh.",
+      "title": "ไม่สามารถโหลดคะแนนของคุณได้",
+      "description": "อุ้ย เกิดข้อผิดพลาดขณะพยายามโหลดคะแนนของคุณ ข้อมูลบนหน้านี้อาจเป็นข้อมูลเก่า โปรดรีเฟรช",
       "retryCta": "รีเฟรช"
     },
     "loading": {
-      "title": "Gathering your points",
-      "description": "We're in the process of tallying up your points, hang tight"
+      "title": "กำลังรวบรวมคะแนนของคุณ",
+      "description": "เรากำลังรวมคะแนนของคุณอยู่ อีกแป๊ปเดียว"
     },
     "error": {
-      "title": "Unable to load points",
-      "description": "Oops, something went wrong when trying to load your points. Please try again.",
+      "title": "ไม่สามารถโหลดคะแนนได้",
+      "description": "อุ้ย เกิดข้อผิดพลาดขณะพยายามโหลดคะแนน โปรดลองอีกครั้ง",
       "retryCta": "ลองอีกครั้ง"
     },
     "infoCard": {
-      "title": "More ways to earn points coming soon 🚀",
-      "body": "We are working on adding more ways to earn points through using the app. Keep checking in for updates."
+      "title": "สะสมคะแนนได้อีกหลายช่องทางเร็วๆ นี้ 🚀",
+      "body": "เรากำลังเพิ่มวิธีสะสมคะแนนผ่านการใช้แอป โปรดติดตามการอัปเดต"
     },
     "activitySection": {
-      "title": "How do I earn points?",
-      "body": "It's easy! Earn points by simply using the app."
+      "title": "ฉันจะสะสมคะแนนได้อย่างไร",
+      "body": "ง่ายนิดเดียว! เพียงใช้แอปก็ได้รับคะแนนแล้ว"
     },
     "noActivities": {
-      "title": "Update to Unlock More Points 🔓",
-      "body": "Oops! It seems you're using an older version of {{appName}}. Update now to discover all the exciting new ways you can earn points."
+      "title": "อัปเดตเพื่อปลดล็อกคะแนนเพิ่มเติม 🔓",
+      "body": "อุ้ย! ดูเหมือนว่าคุณกำลังใช้ {{appName}} เวอร์ชันเก่าอยู่ อัปเดตตอนนี้เพื่อดูวิธีการใหม่ๆ ที่น่าตื่นเต้นในการสะสมคะแนนเลย"
     },
     "activityCards": {
       "createWallet": {
-        "title": "Create a {{appName}}  Wallet"
+        "title": "สร้างกระเป๋าเงิน {{appName}}"
       },
       "swap": {
-        "title": "Swap assets",
+        "title": "สว็อปสินทรัพย์",
         "bottomSheet": {
-          "title": "Swap assets",
-          "body": "This space will be used to give all the details needed for this. Maybe minimum amount to swap. \n\nEarn {{pointsValue}} points whenever you swap an asset using {{appName}}.",
-          "cta": "Go to swap"
+          "title": "สว็อปสินทรัพย์",
+          "body": "ส่วนนี้จะแสดงรายละเอียดทั้งหมดที่จำเป็นสำหรับการดำเนินการนี้ รวมถึงจำนวนขั้นต่ำในการสว็อป\n\nรับ {{pointsValue}} คะแนนทุกครั้งที่คุณสว็อปสินทรัพย์โดยใช้ {{appName}}",
+          "cta": "ไปที่สว็อป"
         }
       },
       "moreComing": {
-        "title": "More coming soon!"
+        "title": "จะเพิ่มในเร็วๆ นี้!"
       }
     },
     "discoverCard": {
-      "title": "{{appName}} Points",
-      "description": "Earn points easily with {{appName}}. Using the app, including swapping, leads to points!"
+      "title": "คะแนน {{appName}}",
+      "description": "รับคะแนนง่ายๆ ผ่าน {{appName}} ใช้แอปและสว็อปเพื่อรับคะแนน!"
     },
     "intro": {
-      "title": "Earn points effortlessly",
-      "description": "Jump into a new way to earn! Your {{appName}} actions now earn points. Start earning today and unlock awesome benefits.",
-      "cta": "Start your points journey"
+      "title": "รับคะแนนได้ง่ายๆ",
+      "description": "มาสร้างรายได้ด้วยวิธีการใหม่ๆ กัน! ตอนนี้คุณจะได้รับคะแนนจากการดำเนินการต่างๆ บน {{appName}} เริ่มสร้างรายได้วันนี้และปลดล็อกสิทธิประโยชน์สุดปัง",
+      "cta": "เริ่มสะสมคะแนนของคุณ"
     }
   },
   "earnFlow": {
-    "gasSubsidized": "Valora's covering gas for this transaction!",
+    "gasSubsidized": "ค่าก๊าซในการกู้คืนธุรกรรมนี้ของ Valora!",
     "addCryptoBottomSheet": {
-      "title": "Add {{tokenSymbol}} on {{tokenNetwork}}",
-      "description": "Once you add tokens you'll have to come back to finish depositing into a pool.",
+      "title": "เพิ่ม {{tokenSymbol}} บน {{tokenNetwork}}",
+      "description": "เมื่อคุณเพิ่มโทเค็นแล้ว คุณจะต้องย้อนกลับมาฝากเข้าพูลให้เสร็จสิ้น",
       "actions": {
         "add": "ซื้อ",
-        "transfer": "Transfer",
+        "transfer": "โอน",
         "swap": "สว็อป"
       },
       "actionDescriptions": {
-        "add": "Buy {{tokenSymbol}} on {{tokenNetwork}} using one of our trusted providers",
-        "transfer": "Use any {{tokenNetwork}} compatible wallet or exchange to deposit {{tokenSymbol}}",
-        "swap": "Swap into {{tokenSymbol}} from another {{tokenNetwork}} token"
+        "add": "ซื้อ {{tokenSymbol}} บน {{tokenNetwork}} ผ่านหนึ่งในผู้ให้บริการที่น่าเชื่อถือของเรา",
+        "transfer": "ใช้กระเป๋าเงินหรือกระดานแลกเปลี่ยนที่ใช้งานร่วมกันได้กับ {{tokenNetwork}} เพื่อฝาก {{tokenSymbol}}",
+        "swap": "สว็อปโทเค็นอื่นของ {{tokenNetwork}}เป็น {{tokenSymbol}}"
       }
     },
     "cta": {
-      "title": "Earn on your stablecoins",
-      "subtitle": "Deposit today and earn returns",
-      "description": "See how much you can earn when supplying a lending pool"
+      "title": "สร้างรายได้ผ่าน Stablecoin",
+      "subtitle": "ฝากวันนี้แล้วรับผลตอบแทน",
+      "description": "ดูรายได้ที่คุณสามารถรับเมื่อเข้าร่วมพูลการให้ยืม"
+    },
+    "earnInfo": {
+      "title": "Earn on your\nstablecoins",
+      "details": {
+        "earn": {
+          "titleGasSubsidy": "Maximize Earnings without Gas Fees*",
+          "title": "Maximize Earnings",
+          "subtitle": "Earn on your stablecoins and get rewards when you supply a pool.",
+          "footnoteSubsidy": "*Gas fees are temporarily covered by Valora"
+        },
+        "manage": {
+          "title": "Manage Directly from Valora",
+          "subtitle": "We’ll take care of the setup so you can manage your position directly from Valora."
+        },
+        "access": {
+          "title": "Easily Access your Funds",
+          "subtitle": "Collect your funds effortlessly with a single tap. Enjoy the same instant access as you would directly through your favorite protocols."
+        }
+      },
+      "action": {
+        "learn": "ดูข้อมูลเพิ่มเติม",
+        "earn": "เริ่มสร้างรายได้"
+      }
     },
     "ctaV1_86": {
-      "title": "Maximize earnings on stablecoins",
-      "subtitle": "Buy {{symbol}}",
-      "description": "Earn approximately {{apy}}% per year when you add {{symbol}} to a pool"
+      "title": "สร้างรายได้สูงสุดผ่าน Stablecoin",
+      "subtitle": "ซื้อ {{symbol}}",
+      "description": "สร้างรายได้ประมาณ {{apy}}% ต่อปีเมื่อเพิ่ม {{symbol}} ลงในพูล"
     },
     "enterAmount": {
-      "earnUpToLabel": "You could earn up to:",
-      "rateLabel": "Rate (est.)",
-      "earnUpTo": "~{{fiatSymbol}}{{amount}} / yr",
+      "earnUpToLabel": "คุณสามารถสร้างรายได้สูงถึง:",
+      "rateLabel": "อัตรา (โดยประมาณ)",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / ปี",
       "rate": "{{rate}}% APY",
       "continue": "ดำเนินการต่อ",
-      "info": "This pool is powered by Aave",
+      "info": "พูลนี้ดำเนินการโดย Aave",
       "infoBottomSheet": {
-        "title": "Why this pool?",
-        "description": "This Aave pool has over $150M TVL and more than 6,000 contributors, indicating strong liquidity and trustworthiness. It also uses USDC as its token and Abritrum as its network, which reduces volatility and ensures users will receive inexpensive gas rates.\n\nAll together this makes it a safe and attractive option with competitive APY, ensuring a beneficial investment opportunity for our users.\n\nYou can explore other Aave pools <0>here</0>.",
+        "title": "ทำไมต้องเป็นพูลนี้",
+        "description": "พูล Aave นี้มี TVL มูลค่ากว่า $150 ล้านและผู้เข้าร่วมมากกว่า 6,000 ราย ซึ่งแสดงให้เห็นถึงสภาพคล่องที่สูงและความน่าเชื่อถือ นอกจากนี้ยังใช้ USDC เป็นโทเค็นและใช้เครือข่าย Abritrum ที่ช่วยลดความผันผวนและรับประกันได้ว่าผู้ใช้จะได้รับค่าก๊าซในอัตราที่ไม่แพง\n\nทั้งหมดนี้ทำให้พูลนี้เป็นตัวเลือกที่ปลอดภัยและน่าสนใจด้วย APY ที่สูง ช่วยให้ผู้ใช้ของเรามีโอกาสในการลงทุนเพื่อการเติบโต\n\nคุณสามารถสำรวจพูลอื่นของ Aave ได้<0>ที่นี่</0>",
         "dismiss": "ปิด"
       },
       "notEnoughBalanceForGasWarning": {
-        "title": "You need more {{feeTokenSymbol}} to continue",
-        "description": "Add {{feeTokenSymbol}} on {{network}} to cover your gas fees",
-        "noGasCta": "Buy {{feeTokenSymbol}} on {{network}}"
+        "title": "คุณต้องมี {{feeTokenSymbol}} มากกว่านี้เพื่อดำเนินการต่อ",
+        "description": "เพิ่ม {{feeTokenSymbol}} บน {{network}} เพื่อให้เพียงพอสำหรับค่าก๊าซ",
+        "noGasCta": "ซื้อ {{feeTokenSymbol}} บน {{network}}"
       }
     },
     "activePools": {
-      "title": "Active Pools",
-      "totalValue": "Total Value:",
+      "title": "พูลที่ใช้งานอยู่",
+      "totalValue": "มูลค่าทั้งหมด:",
       "apy": "~{{apy}}% APY",
-      "exitPool": "Exit Pool",
-      "depositMore": "Deposit More",
-      "viewPools": "View Pools"
+      "exitPool": "ออกจากพูล",
+      "depositMore": "ฝากเพิ่ม",
+      "viewPools": "ดูพูล"
     },
     "depositBottomSheet": {
-      "title": "Review & Deposit",
-      "description": "Before depositing to an Aave pool, please review the transaction details below",
+      "title": "ตรวจสอบและฝากเงิน",
+      "description": "ก่อนฝากสินทรัพย์เข้าพูล Aave โปรดตรวจสอบรายละเอียดธุรกรรมที่ด้านล่าง",
       "amount": "จำนวนเงินที่ฝาก",
-      "fee": "Est. Gas Fees",
-      "provider": "Earnings provider",
+      "fee": "ค่าก๊าซโดยประมาณ",
+      "provider": "ผู้ให้บริการสร้างรายได้",
       "network": "เครือข่าย",
-      "footer": "By depositing crypto into an Aave pool, you accept the risks associated with using Aave. <0>Terms & Conditions</0>",
-      "primaryCta": "Complete",
+      "footer": "เมื่อฝากคริปโตในพูล Aave คุณยอมรับความเสี่ยงที่มาพร้อมการใช้ Aave <0>ข้อกำหนดและเงื่อนไข</0>",
+      "primaryCta": "เสร็จสมบูรณ์",
       "secondaryCta": "ยกเลิก"
     },
     "collect": {
-      "title": "Congratulations! Review & collect your earnings",
-      "total": "TOTAL",
-      "plus": "PLUS",
-      "rate": "Rate (est.)",
+      "title": "ยินดีด้วย! ตรวจสอบและเก็บรายได้ของคุณ",
+      "total": "ยอดรวม",
+      "plus": "บวก",
+      "rate": "อัตรา (โดยประมาณ)",
       "apy": "{{apy}}% APY",
-      "fee": "Gas Fee",
-      "cta": "Collect Earnings",
+      "fee": "ค่าก๊าซ",
+      "cta": "เก็บรายได้",
       "errorTitle": "มีบางอย่างผิดปกติ",
-      "errorDescription": "Unable to fetch deposit details. Please try again.",
-      "noGasTitle": "You need more {{symbol}} to continue",
-      "noGasDescription": "Add {{symbol}} on {{network}} to cover your gas fees",
-      "noGasCta": "Buy {{symbol}} on {{network}}"
+      "errorDescription": "ไม่สามารถเรียกดูรายละเอียดการฝากได้ โปรดลองอีกครั้ง",
+      "noGasTitle": "คุณต้องมี {{symbol}} เพิ่มเติมเพื่อดำเนินการต่อ",
+      "noGasDescription": "เพิ่ม {{symbol}} บน {{network}} เพื่อให้เพียงพอสำหรับค่าก๊าซ",
+      "noGasCta": "ซื้อ {{symbol}} บน {{network}}"
     },
     "transactionFeed": {
-      "earnClaimTitle": "Collected",
-      "earnClaimSubtitle": "from {{providerName}} Pool",
-      "earnDepositTitle": "Deposited",
-      "earnDepositSubtitle": "to {{providerName}} Pool",
-      "earnWithdrawTitle": "Withdrew",
-      "earnWithdrawSubtitle": "from {{providerName}} Pool"
+      "earnClaimTitle": "เก็บแล้ว",
+      "earnClaimSubtitle": "จากพูล {{providerName}}",
+      "earnDepositTitle": "ฝากแล้ว",
+      "earnDepositSubtitle": "ไปยังพูล {{providerName}}",
+      "earnWithdrawTitle": "ถอนแล้ว",
+      "earnWithdrawSubtitle": "จากพูล {{providerName}}"
     },
     "transactionDetails": {
       "descriptionLabel": "รายละเอียด",
-      "earnClaimTitle": "Collected",
-      "earnClaimSubtitle": "Collected {{tokenSymbol}} from {{providerName}} Pool",
-      "earnClaimDetails": "Amount Collected",
-      "earnDepositTitle": "Deposited",
-      "earnDepositSubtitle": "Deposited {{tokenSymbol}} to {{providerName}} Pool",
+      "earnClaimTitle": "เก็บแล้ว",
+      "earnClaimSubtitle": "เก็บ {{tokenSymbol}} จากพูล {{providerName}} แล้ว",
+      "earnClaimDetails": "จำนวนเงินที่เก็บแล้ว",
+      "earnDepositTitle": "ฝากแล้ว",
+      "earnDepositSubtitle": "ฝาก {{tokenSymbol}} ไปยังพูล {{providerName}} แล้ว",
       "earnDepositDetails": "จำนวนเงินที่ฝาก",
-      "earnWithdrawTitle": "Withdrew",
-      "earnWithdrawSubtitle": "Withdrew {{tokenSymbol}} from {{providerName}} Pool",
+      "earnWithdrawTitle": "ถอนแล้ว",
+      "earnWithdrawSubtitle": "ถอน {{tokenSymbol}} จากพูล {{providerName}} แล้ว",
       "earnWithdrawDetails": "จำนวนเงินที่ถอนแล้ว"
     }
   },
diff --git a/locales/tr-TR/translation.json b/locales/tr-TR/translation.json
index 250de01ebc..43c1236611 100644
--- a/locales/tr-TR/translation.json
+++ b/locales/tr-TR/translation.json
@@ -255,8 +255,8 @@
       "text": "Kurtarma Kelimelerinize sahip herhangi bir kişi hesabınıza erişebilir. Başkaları ile paylaşmayın."
     }
   ],
-  "consumerIncentivesTitle": "Supercharge sona eriyor",
-  "consumerIncentivesSummary": "Ancak daha fazla ödül size doğru geliyor. 28 Mayıs'a kadar, en yüksek stablecoin bakiyeniz (cUSD, cEUR veya cREAL) üzerinden {{percent}}% yıllık ödüller kazanın. İşte nasıl çalıştığı:",
+  "consumerIncentivesTitle": "Süper charge sona eriyor",
+  "consumerIncentivesSummary": "Ancak daha fazla ödül size geliyor. 28 Mayıs'a kadar, en yüksek sabit coin bakiyeniz (cUSD, cEUR veya cREAL) üzerinden %{{percent}} yıllık ödül kazanın. İşte nasıl çalıştığı:",
   "earnWeekly": {
     "header": "Telefon numaranızı bağlayın",
     "text": "Daha önce bağlamadıysanız Telefon Numaranı Bağlaya dokun."
@@ -271,8 +271,8 @@
     "text": "Böylelikle ödüllerinizin güvende ve kontrolünüzde olmasını sağlanacaktır."
   },
   "conclusion": "İşte bu kadar basit. Kriptonuzu hemen Supercharge'layın!",
-  "superchargeTitle": "Supercharge sona eriyor",
-  "superchargeDescription": "Ama daha fazla ödül size doğru geliyor. 28 Mayıs'a kadar en yüksek {{token}} bakiyeniz üzerinden {{apy}}% yıllık ödül kazanın. İşte nasıl çalıştığı:",
+  "superchargeTitle": "Süper charge sona eriyor",
+  "superchargeDescription": "Ancak daha fazla ödül size geliyor. 28 Mayıs'a kadar, en yüksek sabit {{token}} bakiyeniz üzerinden %{{apy}} yıllık ödül kazanın. İşte nasıl çalıştığı:",
   "superchargeConnectNumber": "Telefon numaranı bağla",
   "superchargeReconnectNumber": "Telefon numaranızı yeniden bağlayın\n<0>Gelişmiş bir Süper charge deneyimi başlattık. {{token}} tokeninizde ödüller kazanmaya devam etmek için telefon numaranızı yeniden bağlayın.</0>",
   "superchargeMinimumBalance": "En az {{amount}} {{token}} olacak şekilde bakiye ekleyin",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "Uygulama güncellemesi gerekli",
   "superchargingDescription": "Supercharge ödüllerini almaya devam etmek için Valora uygulamasını güncelleyin.",
-  "superchargingTitleV1_54": "Supercharge sona eriyor",
-  "superchargingDescriptionV1_54": "Haftalık ödüller 28 Mayıs Salı günü UTC ile saat 23:59'a kadar talep edilebilecektir. 29 Mayıs'tan itibaren Süper Şarj ödüllerini artık talep edemeyeceksiniz.",
+  "superchargingTitleV1_54": "Süper charge sona eriyor",
+  "superchargingDescriptionV1_54": "Haftalık ödüller 28 Mayıs Salı günü saat 23:59'a (UTC) kadar talep edilebilecektir. 29 Mayıs'tan itibaren Süper charge ödüllerini artık talep edemeyeceksiniz.",
   "superchargeRewardsAvailable": "{{amount}} {{token}} almaya hak kazandınız!",
   "superchargeRewardsAvailableMultipleTokens": "{{amounts}} almaya hak kazandınız!",
-  "superchargeClaimText": "Ödüllerinizi 28 Mayıs Salı günü UTC ile saat 23:59'a kadar talep edin. 29 Mayıs'tan itibaren artık Süper Şarj ödüllerini talep edemeyeceksiniz.",
+  "superchargeClaimText": "Ödüllerinizi 28 Mayıs Salı günü saat 23:59'a (UTC) kadar talep edin. 29 Mayıs'tan itibaren artık Süper charge ödüllerini talep edemeyeceksiniz.",
   "superchargeClaimButton": "Ödüllerinizi Alın",
   "superchargeFetchRewardsFailed": "Bekleyen Supercharge ödüllerini alırken bir hata oluştu. Lütfen tekrar deneyin.",
   "superchargeClaimSuccess": "Supercharge ödülleriniz Toplam Bakiyenize eklendi.",
@@ -678,7 +678,7 @@
   },
   "inviteRewardsBannerCUSD": {
     "title": "Arkadaşlarınızı davet edin ve 12 cUSD'ye kadar kazanın",
-    "body": "Numaralarını bağladıklarında ve {{appName}}adresine para eklediklerinde, her ikiniz de 0,50 cUSD alacaksınız."
+    "body": "Numaralarını bağladıklarında ve {{appName}} uygulamasına fon eklediklerinde her ikiniz de 0,50 cUSD alacaksınız."
   },
   "inviteWithUrl": {
     "title": "Arkadaşını davet et",
@@ -692,8 +692,8 @@
       "body": "Arkadaşlarınızı ve ailenizi {{appName}} uygulamasını indirmeye davet edin ve her biriniz özel bir NFT kazanın"
     },
     "rewardsActiveCUSD": {
-      "title": "Arkadaşlarınızı Valora'ya davet ettiğiniz için 12 cUSD'ye kadar kazanın!",
-      "body": "{{appName}}adresine davet ettiğiniz her arkadaşınız için 0,50 cUSD kazanın. Numaralarını bağladıklarında, para eklediklerinde ve 7 gün boyunca tuttuklarında, ikiniz de 0,50 cUSD alacaksınız. Acele edin, fonlar sınırlıdır! (25 arkadaşla sınırlıdır)."
+      "title": "Arkadaşlarınızı Valora'ya davet ederek 12 cUSD'ye KADAR KAZANIN!",
+      "body": "{{appName}} uygulamasına davet ettiğiniz her arkadaşınız için 0,50 cUSD kazanın. Numaralarını bağladıklarında, fon eklediklerinde ve 7 gün boyunca tuttuklarında ikiniz de 0,50 cUSD alacaksınız. Acele edin, fonlar sınırlıdır! (25 arkadaşla sınırlıdır)."
     }
   },
   "getReward": "${{reward}} kazanın",
@@ -713,11 +713,11 @@
     "title": "Cüzdanınızı oluşturarak başlayalım",
     "privacyHeading": "Bilgileriniz ve Gizliliğiniz:",
     "privacy1": "Uygulamayı ve güvenliği geliştirmemize yardımcı olan kullanım verilerini topluyoruz. Topladığımız bilgilerin türü, bunları nasıl kullandığımız ve bu bilgilerle ilgili haklarınızın tümü <0>Gizlilik Politikamızda</0> görülebilir.",
-    "privacy2": "Telefon numaranızı bağlamaya karar verirseniz, bunun şifrelenmiş bir kopyasını saklayacağız.",
-    "privacy3": "Kişilerinizi bağlamaya karar verirseniz, onları bulmayı kolaylaştırmak için adlarını, numaralarını ve profil resimlerini kullanırız.",
+    "privacy2": "Telefon numaranızı bağlamaya karar verirseniz bunun şifrelenmiş bir kopyasını saklayacağız.",
+    "privacy3": "Kişilerinizi bağlamaya karar verirseniz onları bulmayı kolaylaştırmak için adlarını, numaralarını ve profil resimlerini kullanırız.",
     "walletHeading": "Valora ile Dijital Cüzdanınız:",
-    "wallet1": "Dijital bir cüzdan oluşturmak üzeresiniz. Cüzdanınızın anahtarı sadece sizde var. Anahtarınızı kaybederseniz, anahtarınızı veya varlıklarınızı kurtaramayız. Ayrıca Valora aracılığıyla blok zincirleri üzerinde gerçekleştirilen eylemleri de tersine çeviremeyiz.",
-    "wallet2": "Valora ile etkileşim kuracağınız varlıklar olan dijital varlıklar, benzersiz risklerle birlikte gelir. Valora'yı kullanarak bu riskleri kabul eder ve bunların sorumluluğunu üstlenirsiniz. Lütfen seçim yapmadan önce mali durumunuzu ve risk toleransınızı göz önünde bulundurun.",
+    "wallet1": "Dijital bir cüzdan oluşturmak üzeresiniz. Cüzdanınızın anahtarı sadece sizde var. Anahtarınızı kaybederseniz, anahtarınızı veya varlıklarınızı kurtaramayız. Ayrıca Valora aracılığıyla blok zincirleri üzerinde gerçekleştirilen eylemleri de geri alamayız.",
+    "wallet2": "Valora ile etkileşim kuracağınız varlıklar olan dijital varlıklar, benzersiz risklerle birlikte gelir. Valora'yı kullanarak bu riskleri kabul eder ve bunların sorumluluğunu üstlenirsiniz. Lütfen seçim yapmadan önce mali durumunuzu ve risk toleransınızı göz önünde bulundurun.",
     "fullTerms": "<0>Şartlar ve Koşullarımızın</0> tamamını okuyun"
   },
   "fullNameOrPsuedonym": "Tam ad veya takma ad",
@@ -827,7 +827,7 @@
     "hasWallet": "Zaten cüzdanım var",
     "header": "{{appName}} uygulamasına hoş geldiniz! Kripto cüzdanınızı oluşturalım.",
     "getStarted": "Başlayın",
-    "agreeToTerms": "Bir cüzdan oluşturarak <0>Hüküm ve Koşullarımızı</0> kabul etmiş olursunuz"
+    "agreeToTerms": "Bir cüzdan oluşturarak <0>Şartlar ve Koşullarımızı</0> kabul etmiş olursunuz"
   },
   "accessContacts": {
     "disclosure": {
@@ -1034,7 +1034,7 @@
   "inviteWithoutPayment": "Merhaba, dünyanın her tarafına kripto göndermek için {{appName}} kullanıyorum. Denemen için seni davet etmek isterim. Bu bağlantıya göz atabilirsin: {{link}}",
   "inviteWithEscrowedPayment": "Merhaba, dünyanın her tarafına kripto göndermek için {{appName}} kullanıyorum. Sana az önce {{amount}} {{token}} gönderdim. {{appName}} uygulamasını indirerek {{token}} miktarını alabilmen lütfen şu bağlantıyı tıkla{{link}}",
   "inviteWithRewards": "Merhaba! 👋 {{appName}} uygulamasını kripto cüzdanım olarak kullanıyorum. Uygulamayı indirmek ve telefon numaranı bağlamak çok kolay, ayrıca ikimiz de ödül olarak özel bir NFT sürümü alacağız. 💫 \n\nBu bağlantıyla indir: {{link}}",
-  "inviteWithRewardsCUSD": "Hey! Şu anda kaydolur, numaranızı bağlar ve Valora cüzdanınıza para yatırırsanız ikimiz de ücretsiz 0,50 $ ödül kazanabiliriz. Birikimlerimi USD ve kripto olarak artırmak için kullanıyorum ve siz de sadece bir telefon numarasıyla saniyeler içinde kurabilirsiniz. Buradaki yönlendirme bağlantımla kaydolduğunuzdan emin olun: \n\n{{link}} \n\n Acele edin, yönlendirme promosyonu yakında sona eriyor.",
+  "inviteWithRewardsCUSD": "Hey! Şu anda Valora cüzdanına kaydolur, fon yatırır ve numaranı bağlarsanız ikimiz de ücretsiz 0,50 USD ödül kazanabiliriz. Tasarruflarımı USD ve kripto olarak büyütmek için bunu kullanıyorum ve siz de sadece bir telefon numarasıyla saniyeler içinde kurabilirsiniz. Buradaki davet bağlantımla kaydolduğunuzdan emin olun: \n\n{{link}} \n\nAncak acele edin, davet promosyonu yakında sona eriyor.",
   "loadingContacts": "Kişilerinizi bulma",
   "myCode": "Benim Kodum",
   "scanCode": "Tara",
@@ -1323,7 +1323,7 @@
   "feedItemGoldReceived": "{{displayName}} alındı",
   "feedItemSwapPath": "{{token1}} - {{token2}}",
   "feedItemJumpstartTitle": "Canlı Bağlantı",
-  "feedItemJumpstartSentSubtitle": "Davetiye",
+  "feedItemJumpstartSentSubtitle": "Davet",
   "feedItemJumpstartReceivedSubtitle": "Alınan fonlar",
   "transactionHeaderVerificationFee": "Onay",
   "transactionHeaderNetworkFee": "Ağ",
@@ -1767,9 +1767,9 @@
     "swapToTokenSelection": "ŞUNA TAKAS",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "Seçilen tokenleri swap sağlayıcılarımız desteklemiyor.",
-    "selectTokenLabel": "Belirteç seçin",
-    "tokenBottomSheetTitle": "Belirteç Seçin",
-    "onNetwork": "{{networkName}}adresinde",
+    "selectTokenLabel": "Token seçin",
+    "tokenBottomSheetTitle": "Token Seç",
+    "onNetwork": "{{networkName}} üzerinde",
     "switchedToNetworkWarning": {
       "title": "{{networkName}} ağına geçtiniz",
       "body_swapFrom": "Devam etmek için {{networkName}} ağında kendisinden swap yapılacak bir token seçin.",
@@ -1823,9 +1823,9 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Ücretsiz",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Ücret\n\n {{appName}} ücreti {{appFeePercentage}}%, hızlı, güvenilir ve güvenli takaslar sağlayarak deneyiminizi geliştirmek için tasarlanmıştır.",
-      "appFeeInfo_free": "{{appName}} Ücret\n\nBu takas ücretsizdir.",
-      "appFeeInfo_placeholder": "{{appName}} Ücret\n\nÜcret, aldığınız teklife göre hesaplanır.",
+      "appFeeInfo": "{{appName}} Ücreti\n\n%{{appFeePercentage}} oranındaki {{appName}} ücreti hızlı, güvenilir ve güvenli takaslar sağlayarak deneyiminizi geliştirmek için tasarlanmıştır.",
+      "appFeeInfo_free": "{{appName}} Ücreti\n\nBu takas ücretsizdir.",
+      "appFeeInfo_placeholder": "{{appName}} Ücreti\n\nÜcret, aldığınız orana göre hesaplanır.",
       "appFeeInfoDismissButton": "Anladım",
       "slippagePercentage": "Slipaj Toleransı",
       "networkFeeInfo": "{{networkName}} Ağında swap işlemi yapıyorsunuz.\n\nBu tahmini ağ ücreti, {{networkName}} Ağında bir işlem gerçekleştirmek için gereklidir. Bu ücret işleminizi güvence altına alır ve ağın çalışır durumda kalmasını sağlar.",
@@ -1833,8 +1833,8 @@
       "slippageToleranceInfo": "Slipaj toleransı\n\nSwap işleminiz slipaj toleransı yüzdesi dahilinde gerçekleşecektir. Fiyat slipaj toleransından fazla değişirse {{appName}} işlemin gerçekleşmesini engelleyerek sizi korur.",
       "networkFeeInfoDismissButton": "Anladım",
       "exchangeRate": "Döviz Kuru",
-      "exchangeRateInfo": "Döviz Kuru\n\nSizin için en iyi döviz kurunu bulduk. İşleminiz, tahminin % {{slippagePercentage}}'u dahilinde bir fiyatla tamamlanacak veya işlem iptal edilecek ve para cüzdanınıza iade edilecektir.",
-      "exchangeRateInfo_withAppFee": "Döviz Kuru\n\nSizin için en iyi döviz kurunu bulduk. İşleminiz tahmini kurun % {{slippagePercentage}}içinde bir fiyatla tamamlanacak veya işlem iptal edilecek ve paranız cüzdanınıza iade edilecektir.\n\nTahmini kura % {{appFeePercentage}}oranında bir {{appName}} ücreti dahildir.",
+      "exchangeRateInfo": "Kur\n\nSizin için en iyi kuru bulduk. İşleminiz, tahminin %{{slippagePercentage}} oranı dahilinde bir fiyatla tamamlanacak veya işlem iptal edilecek ve fonlar cüzdanınıza iade edilecektir.",
+      "exchangeRateInfo_withAppFee": "Kur\n\nSizin için en iyi kuru bulduk. İşleminiz, tahminin %{{slippagePercentage}} oranı dahilinde bir fiyatla tamamlanacak veya işlem iptal edilecek ve fonlar cüzdanınıza iade edilecektir.\n\nTahmini kura %{{appFeePercentage}} oranında {{appName}} ücreti dahildir.",
       "exchangeRateInfoDismissButton": "Anladım",
       "estimatedValue": "Tahmini Değer"
     },
@@ -2060,7 +2060,7 @@
     },
     "invite": {
       "title": "Arkadaşlarınıza kripto gönderin",
-      "subtitle": "Kişilerinize fon veya davetiye gönderin"
+      "subtitle": "Kişilerinize fon veya davet gönderin"
     },
     "jumpstart": {
       "title": "Canlı Bağlantı ile Gönder",
@@ -2145,7 +2145,7 @@
     }
   },
   "jumpstartSendConfirmationScreen": {
-    "title": "Canlı Bağlantı Oluşturma",
+    "title": "Canlı Bağlantı Oluştur",
     "sendAmountLabel": "Canlı Bağlantı Tutarı",
     "confirmButton": "Bağlantı gönder ve oluştur",
     "info": "Bir bağlantı oluşturduğunuzda fonlar cüzdanınızdan çekilir. Bağlantıyı istediğiniz zaman geri alabilirsiniz. Bağlantıları dikkatli paylaşın.",
@@ -2193,9 +2193,9 @@
   "getStartedHome": {
     "title": "Kripto satın alın veya token transfer edin",
     "body": "Kripto göndermek ve web3'ü keşfetmek için uyumlu tokenları satın alın veya transfer edin!",
-    "titleV1_86": "Cüzdanınıza para ekleyin",
-    "exploreTokens": "Tüm jetonları keşfedin",
-    "exploreTokensBody": "Valora'da 10'dan fazla jeton satın alabilirsiniz. Şunlara bir göz atın!"
+    "titleV1_86": "Cüzdanınıza fon ekleyin",
+    "exploreTokens": "Tüm tokenleri keşfedin",
+    "exploreTokensBody": "Valora'da 10'dan fazla token satın alabilirsiniz. Şunlara bir göz atın!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2208,14 +2208,14 @@
       "description": "Yeni {{rewardName}} NFT'nizi \"Koleksiyonlarınız\" altında bulabilirsiniz"
     },
     "rewardBottomSheet": {
-      "title": "5 $ ETH kazanın",
-      "description": "Cüzdanınıza 4 Nisan 2024 saat 12:00 PDT'ye kadar herhangi bir Ethereum tokenı ile para yatırın, biz de size 5 Nisan 2024 saat 11:59 PDT'ye kadar 5 $ ETH verelim.\n\nBu, Erken Ethereum Kaşifi olmanız için özel bir tekliftir.",
+      "title": "5$ değerinde ETH kazanın",
+      "description": "Cüzdanınıza 4 Nisan 2024 saat 00:00'a (PDT) kadar bir Ethereum tokeni ile fon yatırın, biz de size 5 Nisan 2024 saat 23:59'a (PDT) kadar 5$ değerinde ETH verelim.\n\nBu, Erken Ethereum Kaşifi olmanız için özel bir tekliftir.",
       "expirationLabel": "Son kullanma tarihi: {{expirationLabelText}}",
       "cta": "Ödülü kullanın"
     },
     "rewardReminderBottomSheet": {
-      "title": "Kaçırmayın, 5 $ ETH kazanın",
-      "description": "Cüzdanınıza 4 Nisan 2024 saat 12:00 PDT'ye kadar herhangi bir Ethereum tokenı ile para yatırın, biz de size 5 Nisan 2024 saat 11:59 PDT'ye kadar 5 $ ETH verelim.\n\nBu, Erken Ethereum Kaşifi olmanız için özel bir tekliftir.",
+      "title": "Kaçırmayın, 5$ değerinde ETH kazanın",
+      "description": "Cüzdanınıza 4 Nisan 2024 saat 00:00'a (PDT) kadar bir Ethereum tokeni ile fon yatırın, biz de size 5 Nisan 2024 saat 23:59'a (PDT) kadar 5$ değerinde ETH verelim.\n\nBu, Erken Ethereum Kaşifi olmanız için özel bir tekliftir.",
       "expirationLabel": "Son kullanma tarihi: {{expirationLabelText}}",
       "cta": "Ödülü kullanın"
     }
@@ -2244,7 +2244,7 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Fonlarınızı kontrol etme",
+      "title": "Fonlarınız kontrol ediliyor",
       "description": "Canlı Bağlantınızı kontrol ederken lütfen bekleyin. Talep edilebilir fonlar kısa süre içinde ulaşacaktır."
     },
     "error": {
@@ -2256,7 +2256,7 @@
     }
   },
   "jumpstartReclaim": {
-    "description": "Bağlantınızı geri almak şebeke gazı ücretine tabidir, devam etmek ister misiniz?",
+    "description": "Bağlantınızı geri almak bir ağ gas ücretine tabidir, devam etmek istiyor musunuz?",
     "fetchStatusError": {
       "title": "Oops, bir şeyler ters gitti",
       "description": "Bu davetin talep durumunu alamadık, lütfen daha sonra tekrar deneyin veya destek ekibiyle iletişime geçin",
@@ -2268,7 +2268,7 @@
     }
   },
   "multiSelect": {
-    "switchNetwork": "Anahtar Ağı",
+    "switchNetwork": "Ağı Değiştir",
     "allNetworks": "Tüm Ağlar"
   },
   "points": {
@@ -2277,8 +2277,8 @@
     "history": {
       "cards": {
         "createWallet": {
-          "title": "Cüzdan tutucu",
-          "subtitle": "{{appName}}üyesi"
+          "title": "Cüzdan sahibi",
+          "subtitle": "{{appName}} üyesi"
         },
         "swap": {
           "title": "Swap",
@@ -2293,7 +2293,7 @@
       },
       "empty": {
         "title": "Henüz puan etkinliği yok",
-        "subtitle": "Görünüşe göre henüz hiç puan kazanmamışsınız. Puan kazanmaya başlamak için {{appName}} adresini kullanın!",
+        "subtitle": "Görünüşe göre henüz hiç puan kazanmamışsınız. Puan kazanmaya başlamak için {{appName}} uygulamasını kullanın!",
         "gotIt": "Anladım"
       },
       "pageError": {
@@ -2308,11 +2308,11 @@
       "retryCta": "Yenile"
     },
     "loading": {
-      "title": "Puanlarınızı toplamak",
-      "description": "Puanlarınızı sayma aşamasındayız, sıkı durun"
+      "title": "Puanlarınız toplanıyor",
+      "description": "Puanlarınızı sayma aşamasındayız, bekleyin"
     },
     "error": {
-      "title": "Noktalar yüklenemiyor",
+      "title": "Puanlar yüklenemiyor",
       "description": "Oops, puanlarınızı yüklemeye çalışırken bir şeyler ters gitti. Lütfen tekrar deneyin.",
       "retryCta": "Tekrar deneyin"
     },
@@ -2326,18 +2326,18 @@
     },
     "noActivities": {
       "title": "Daha Fazla Puanın Kilidini Açmak için Güncelleyin 🔓",
-      "body": "Oops! Görünüşe göre {{appName}}'un eski bir sürümünü kullanıyorsunuz. Puan kazanabileceğiniz tüm heyecan verici yeni yolları keşfetmek için şimdi güncelleyin."
+      "body": "Oops! Görünüşe göre {{appName}} uygulamasının eski bir sürümünü kullanıyorsunuz. Puan kazanabileceğiniz tüm heyecan verici yeni yolları keşfetmek için şimdi güncelleyin."
     },
     "activityCards": {
       "createWallet": {
-        "title": "Bir {{appName}}  Cüzdanı Oluşturun"
+        "title": "Bir {{appName}} Cüzdanı Oluşturun"
       },
       "swap": {
-        "title": "Swap varlıkları",
+        "title": "Varlıkları takas edin",
         "bottomSheet": {
-          "title": "Swap varlıkları",
-          "body": "Bu alan, bunun için gereken tüm ayrıntıları vermek için kullanılacaktır. Belki takas için minimum miktar. \n\n {{appName}}adresini kullanarak bir varlığı takas ettiğinizde {{pointsValue}} puanı kazanın.",
-          "cta": "Takasa git"
+          "title": "Varlıkları takas edin",
+          "body": "Bu alan, bununla ilgili gereken tüm ayrıntıları vermek için kullanılacaktır. Takas için minimum tutar olabilir. \n\n{{appName}} uygulamasını kullanarak bir varlığı takas ettiğinizde {{pointsValue}} puan kazanın.",
+          "cta": "Takasa gidin"
         }
       },
       "moreComing": {
@@ -2345,8 +2345,8 @@
       }
     },
     "discoverCard": {
-      "title": "{{appName}} Puanlar",
-      "description": "{{appName}}ile kolayca puan kazanın. Takas da dahil olmak üzere uygulamayı kullanmak puan kazandırır!"
+      "title": "{{appName}} Puanları",
+      "description": "{{appName}} ile kolayca puan kazanın. Takas işlemi dahil olmak üzere uygulamayı kullanmak puan kazandırır!"
     },
     "intro": {
       "title": "Zahmetsizce puan kazanın",
@@ -2355,62 +2355,85 @@
     }
   },
   "earnFlow": {
-    "gasSubsidized": "Valora bu işlem için benzini karşılıyor!",
+    "gasSubsidized": "Valora bu işlem için gas ücretini karşılıyor!",
     "addCryptoBottomSheet": {
-      "title": "{{tokenSymbol}} adresini {{tokenNetwork}}adresine ekleyin",
-      "description": "Jeton ekledikten sonra havuza para yatırma işlemini tamamlamak için geri gelmeniz gerekecektir.",
+      "title": "{{tokenNetwork}} ağına {{tokenSymbol}} ekleyin",
+      "description": "Token ekledikten sonra havuza para yatırma işlemini tamamlamak için geri gelmeniz gerekecektir.",
       "actions": {
         "add": "Satın Al",
-        "transfer": "Transfer",
+        "transfer": "Transfer Et",
         "swap": "Swap"
       },
       "actionDescriptions": {
-        "add": "Güvenilir sağlayıcılarımızdan birini kullanarak {{tokenNetwork}} adresinden {{tokenSymbol}} satın alın",
-        "transfer": "{{tokenSymbol}}yatırmak için herhangi bir {{tokenNetwork}} uyumlu cüzdan veya borsa kullanın",
-        "swap": "Başka bir {{tokenNetwork}} belirtecinden {{tokenSymbol}} 'a geçiş yapın"
+        "add": "Güvenilir sağlayıcılarımızdan birini kullanarak {{tokenNetwork}} ağında {{tokenSymbol}} satın alın",
+        "transfer": "{{tokenSymbol}} yatırmak için {{tokenNetwork}} uyumlu cüzdan veya borsa kullanın",
+        "swap": "Başka bir {{tokenNetwork}} tokeninden {{tokenSymbol}} tokenine takas yapın"
       }
     },
     "cta": {
-      "title": "Sabit paralarınızdan kazanın",
+      "title": "Sabit coinlerinizden kazanın",
       "subtitle": "Bugün para yatırın ve getiri kazanın",
       "description": "Bir kredi havuzu sağlarken ne kadar kazanabileceğinizi görün"
     },
+    "earnInfo": {
+      "title": "\nstablecoin'lerinizden kazanın",
+      "details": {
+        "earn": {
+          "titleGasSubsidy": "Gaz Ücretleri Olmadan Kazancınızı En Üst Düzeye Çıkarın*",
+          "title": "Kazançları En Üst Düzeye Çıkarın",
+          "subtitle": "Sabit coin'lerinizden kazanın ve bir havuz tedarik ettiğinizde ödüller kazanın.",
+          "footnoteSubsidy": "*Gaz ücretleri geçici olarak Valora tarafından karşılanmaktadır"
+        },
+        "manage": {
+          "title": "Doğrudan Valora'dan Yönetin",
+          "subtitle": "Pozisyonunuzu doğrudan Valora'dan yönetebilmeniz için kurulumla biz ilgileneceğiz."
+        },
+        "access": {
+          "title": "Fonlarınıza Kolayca Erişin",
+          "subtitle": "Tek bir dokunuşla fonlarınızı zahmetsizce toplayın. Doğrudan favori protokolleriniz aracılığıyla yaptığınız gibi aynı anında erişimin keyfini çıkarın."
+        }
+      },
+      "action": {
+        "learn": "Daha Fazla Bilgi Edinin",
+        "earn": "Kazanmaya Başlayın"
+      }
+    },
     "ctaV1_86": {
       "title": "Sabit coinlerde kazancı en üst düzeye çıkarın",
-      "subtitle": "Satın Al {{symbol}}",
-      "description": "Bir havuza {{symbol}} eklediğinizde yılda yaklaşık {{apy}}% kazanın"
+      "subtitle": "{{symbol}} satın alın",
+      "description": "Bir havuza {{symbol}} ekleyerek yılda yaklaşık %{{apy}} kazanın"
     },
     "enterAmount": {
       "earnUpToLabel": "Şu kadar kazanabilirsiniz:",
       "rateLabel": "Oran (tahmini)",
       "earnUpTo": "~{{fiatSymbol}}{{amount}} / yıl",
-      "rate": "{{rate}}% APY",
+      "rate": "%{{rate}} Yıllık Getiri Oranı (APY)",
       "continue": "İleri",
       "info": "Bu havuz Aave tarafından desteklenmektedir",
       "infoBottomSheet": {
         "title": "Neden bu havuz?",
-        "description": "Bu Aave havuzu 150 milyon doların üzerinde TVL'ye ve 6.000'den fazla katılımcıya sahiptir, bu da güçlü likidite ve güvenilirliği gösterir. Ayrıca token olarak USDC ve ağ olarak Abritrum kullanır, bu da oynaklığı azaltır ve kullanıcıların ucuz gaz oranları almasını sağlar.\n\nTüm bunlar bir araya geldiğinde, rekabetçi APY ile güvenli ve cazip bir seçenek haline gelir ve kullanıcılarımız için faydalı bir yatırım fırsatı sağlar.\n\nDiğer Aave havuzlarını <0>buradan</0> keşfedebilirsiniz.",
+        "description": "Bu Aave havuzu 150 milyon ABD dolarının üzerinde TVL'ye ve 6000'den fazla katılımcıya sahiptir, bu da güçlü likidite ve güvenilirliği gösterir. Ayrıca token olarak USDC ve ağ olarak Abritrum kullanır, bu da oynaklığı azaltır ve kullanıcıların ucuz gas oranları almasını sağlar.\n\nTüm bunlar bir araya geldiğinde, rekabetçi Yıllık Getiri Oranı ile güvenli ve cazip bir seçenek haline gelir ve kullanıcılarımız için faydalı bir yatırım fırsatı sağlar.\n\nDiğer Aave havuzlarını <0>buradan</0> keşfedebilirsiniz.",
         "dismiss": "Yoksay"
       },
       "notEnoughBalanceForGasWarning": {
-        "title": "Devam etmek için daha fazlasına ihtiyacınız var {{feeTokenSymbol}}",
-        "description": "Gaz ücretlerinizi karşılamak için {{feeTokenSymbol}} adresini {{network}} adresine ekleyin",
-        "noGasCta": "{{feeTokenSymbol}} adresini {{network}}adresinden satın alın"
+        "title": "Devam etmek için daha fazla {{feeTokenSymbol}} bakiyesine ihtiyacınız var",
+        "description": "Gas ücretlerinizi karşılamak için {{network}} ağına {{feeTokenSymbol}} ekleyin",
+        "noGasCta": "{{network}} ağında {{feeTokenSymbol}} satın alın"
       }
     },
     "activePools": {
       "title": "Aktif Havuzlar",
       "totalValue": "Toplam Değer:",
-      "apy": "~{{apy}}% APY",
-      "exitPool": "Çıkış Havuzu",
+      "apy": "~%{{apy}} Yıllık Getiri Oranı (APY)",
+      "exitPool": "Havuzdan Çık",
       "depositMore": "Daha Fazla Yatırın",
       "viewPools": "Havuzları Görüntüle"
     },
     "depositBottomSheet": {
-      "title": "İnceleme ve Para Yatırma",
+      "title": "İncele ve Para Yatır",
       "description": "Bir Aave havuzuna para yatırmadan önce lütfen aşağıdaki işlem ayrıntılarını inceleyin",
       "amount": "Yatırılan Toplam",
-      "fee": "Est. Gaz Ücretleri",
+      "fee": "Tah. Gas Ücretleri",
       "provider": "Kazanç sağlayıcı",
       "network": "Ağ",
       "footer": "Bir Aave havuzuna kripto yatırarak, Aave kullanımıyla ilişkili riskleri kabul etmiş olursunuz. <0>Şartlar ve Koşullar</0>",
@@ -2418,37 +2441,37 @@
       "secondaryCta": "İptal"
     },
     "collect": {
-      "title": "Tebrikler! Kazancınızı gözden geçirin ve toplayın",
+      "title": "Tebrikler! Kazancınızı inceleyin ve toplayın",
       "total": "TOPLAM",
       "plus": "ARTI",
       "rate": "Oran (tahmini)",
-      "apy": "{{apy}}% APY",
-      "fee": "Gaz Ücreti",
+      "apy": "%{{apy}} Yıllık Getiri Oranı (APY)",
+      "fee": "Gas Ücreti",
       "cta": "Kazançları Toplayın",
       "errorTitle": "Bir şeyler ters gitti",
       "errorDescription": "Para yatırma detayları alınamıyor. Lütfen tekrar deneyin.",
-      "noGasTitle": "Devam etmek için daha fazlasına ihtiyacınız var {{symbol}}",
-      "noGasDescription": "Gaz ücretlerinizi karşılamak için {{symbol}} adresini {{network}} adresine ekleyin",
-      "noGasCta": "{{symbol}} adresini {{network}}adresinden satın alın"
+      "noGasTitle": "Devam etmek için daha fazla {{symbol}} bakiyesine ihtiyacınız var",
+      "noGasDescription": "Gas ücretlerinizi karşılamak için {{network}} ağına {{symbol}} ekleyin",
+      "noGasCta": "{{network}} ağında {{symbol}} satın alın"
     },
     "transactionFeed": {
-      "earnClaimTitle": "Toplanmış",
-      "earnClaimSubtitle": "{{providerName}} Pool'dan",
+      "earnClaimTitle": "Toplanan",
+      "earnClaimSubtitle": "{{providerName}} Havuzundan",
       "earnDepositTitle": "Yatırılan",
       "earnDepositSubtitle": "{{providerName}} Havuzuna",
-      "earnWithdrawTitle": "Geri çekildi",
-      "earnWithdrawSubtitle": "{{providerName}} Pool'dan"
+      "earnWithdrawTitle": "Çekilen",
+      "earnWithdrawSubtitle": "{{providerName}} Havuzundan"
     },
     "transactionDetails": {
       "descriptionLabel": "Detaylar",
-      "earnClaimTitle": "Toplanmış",
-      "earnClaimSubtitle": "{{tokenSymbol}} {{providerName}} Havuzundan Toplandı",
-      "earnClaimDetails": "Tahsil Edilen Tutar",
+      "earnClaimTitle": "Toplanan",
+      "earnClaimSubtitle": "{{providerName}} Havuzundan {{tokenSymbol}} Toplandı",
+      "earnClaimDetails": "Toplanan Tutar",
       "earnDepositTitle": "Yatırılan",
-      "earnDepositSubtitle": "{{tokenSymbol}} adresinden {{providerName}} Havuzuna yatırıldı",
+      "earnDepositSubtitle": "{{providerName}} Havuzuna {{tokenSymbol}} Yatırıldı",
       "earnDepositDetails": "Yatırılan Toplam",
-      "earnWithdrawTitle": "Geri çekildi",
-      "earnWithdrawSubtitle": "{{tokenSymbol}} adresini {{providerName}} havuzundan geri çekti",
+      "earnWithdrawTitle": "Çekilen",
+      "earnWithdrawSubtitle": "{{providerName}} Havuzundan {{tokenSymbol}} Çekildi",
       "earnWithdrawDetails": "Çekilen Tutar"
     }
   },
diff --git a/locales/uk-UA/translation.json b/locales/uk-UA/translation.json
index 6a2dcfea2d..8a93dee886 100644
--- a/locales/uk-UA/translation.json
+++ b/locales/uk-UA/translation.json
@@ -256,7 +256,7 @@
     }
   ],
   "consumerIncentivesTitle": "Суперзарядка закінчується",
-  "consumerIncentivesSummary": "Проте винагороди вас не оминуть! До 28 травня отримайте щорічну винагороду в {{percent}} % до вашого найбільшого балансу в стейблкоїнах (cUSD, cEUR, або cREAL). Ось як це працює:",
+  "consumerIncentivesSummary": "Проте винагороди вас не оминуть! До 28 травня отримайте {{percent}} % як щорічні винагороди за свій найбільший баланс у стейблкоїнах (cUSD, cEUR, або cREAL). Ось як це працює:",
   "earnWeekly": {
     "header": "Під’єднайте ваш телефонний номер",
     "text": "Натисніть «Під’єднати», якщо ви ще не під’єдналися до мережі."
@@ -272,13 +272,13 @@
   },
   "conclusion": "Це так просто. Отримуйте надбавку за криптовалюту сьогодні!",
   "superchargeTitle": "Суперощадність закінчується",
-  "superchargeDescription": "Але на вас чекають ще більші винагороди. До 28 травня отримуйте {{apy}}% річних винагород на свій найбільший баланс {{token}} . Ось як це працює:",
+  "superchargeDescription": "Проте винагороди вас не оминуть! До 28 травня отримайте {{apy}} % як щорічні винагороди за свій найбільший баланс у {{token}}. Ось як це працює:",
   "superchargeConnectNumber": "Під’єднати свій телефонний номер",
   "superchargeReconnectNumber": "Повторно під’єднайте свій номер телефону\n<0>Ми випустили оновлення щодо винагород Supercharge. Повторно під’єднайте свій номер телефону, щоб і надалі отримувати винагороди на свій {{token}}.</0>",
   "superchargeMinimumBalance": "Додати мінімальний залишок {{amount}} {{token}}",
-  "superchargeDisclaimer": "Це не вплине на ваш баланс або попередні заробітки.",
-  "superchargeDisclaimerMaxRewards": "Це не вплине на ваш баланс або попередні заробітки.",
-  "superchargeDisclaimerDayLimit": "Це не вплине на ваш баланс або попередні заробітки. <0>Дізнатися більше</0>",
+  "superchargeDisclaimer": "Ваш баланс чи попередні прибутки не зазнають змін.",
+  "superchargeDisclaimerMaxRewards": "Ваш баланс чи попередні прибутки не зазнають змін.",
+  "superchargeDisclaimerDayLimit": "Ваш баланс чи попередні прибутки не зазнають змін. <0>Докладніше</0>",
   "superchargeTokenDetailsDialog": {
     "title": "Які активи можна суперзарядити?",
     "body": "Ви отримаєте винагороду щотижня за ваші стейблкойни Celo з найбільшою вартістю (cEUR, cUSD, cREAL).",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "Треба оновити застосунок",
   "superchargingDescription": "Оновіть застосунок Valora, щоб і надалі щотижня отримувати винагороди Supercharge.",
-  "superchargingTitleV1_54": "Суперзаряд закінчується",
-  "superchargingDescriptionV1_54": "Щотижневі винагороди можна буде отримати до вівторка, 28 травня, 23:59 UTC. Починаючи з 29 травня, ви більше не зможете отримати винагороди Supercharge.",
+  "superchargingTitleV1_54": "Суперощадність закінчується",
+  "superchargingDescriptionV1_54": "Запити на щотижневі винагороди доступні до вівторка, 28 травня, 23:59 UTC. З 29 травня винагороди за суперощадність більше не діятимуть.",
   "superchargeRewardsAvailable": "У вас доступно {{amount}} {{token}} для запиту!",
   "superchargeRewardsAvailableMultipleTokens": "У вас доступно {{amounts}} для запиту!",
-  "superchargeClaimText": "Отримайте свої винагороди до вівторка, 28 травня, 23:59 UTC. Починаючи з 29 травня, ви більше не зможете отримати винагороди Supercharge.",
+  "superchargeClaimText": "Надсилайте запит на винагороди до вівторка, 28 травня, 23:59 UTC. З 29 травня винагороди за суперощадність більше не діятимуть.",
   "superchargeClaimButton": "Запит винагороди",
   "superchargeFetchRewardsFailed": "Помилка при отриманні очікуваних нагород за надбавку. Просимо, спробуйте ще раз пізніше.",
   "superchargeClaimSuccess": "Ваші нагороди за надбавку додані до вашого загального залишку.",
@@ -677,7 +677,7 @@
     "body": "Щойно вони налаштують свій гаманець {{appName}} і під’єднають номер, кожен із вас отримає ексклюзивний NFT."
   },
   "inviteRewardsBannerCUSD": {
-    "title": "Запрошуй друзів й отримуй до 12 cUSD",
+    "title": "Запрошуйте друзів і отримуйте до 12 cUSD",
     "body": "Щойно вони під’єднають свій номер і покладуть кошти у {{appName}}, кожен із вас отримає по 0,50 cUSD."
   },
   "inviteWithUrl": {
@@ -692,8 +692,8 @@
       "body": "Запрошуйте друзів і членів сім’ї завантажити {{appName}}, і кожен із вас отримає ексклюзивний NFT"
     },
     "rewardsActiveCUSD": {
-      "title": "Запроси друзів до Valora й ОТРИМАЙ ДО 12 cUSD!",
-      "body": "Запрошуй друзів до {{appName}} й за кожного отримуй по 0,50 cUSD. Щойно вони під’єднають свій номер, покладуть кошти й триматимуть їх протягом 7 днів, кожен із вас отримає по 0,50 cUSD. Поспішай! Виплати діють обмежений час! (макс. 25 друзів)."
+      "title": "Запрошуйте друзів до Valora й ОТРИМУЙТЕ ДО 12 cUSD!",
+      "body": "Запрошуйте друзів до {{appName}} й за кожного отримуйте по 0,50 cUSD. Щойно вони під’єднають свій номер, покладуть кошти й триматимуть їх протягом 7 днів, кожен із вас отримає по 0,50 cUSD. Поспішайте! Виплати діють обмежений час! (макс. 25 друзів)."
     }
   },
   "getReward": "Отримати винагороду ${{reward}}",
@@ -716,7 +716,7 @@
     "privacy2": "Якщо вирішите прив’язати свій номер телефону, він зберігатиметься у вигляді зашифрованої копії.",
     "privacy3": "Якщо вирішите під’єднати свої контакти, то ми спрощуємо пошук їхніх імен, номерів і фото профілів.",
     "walletHeading": "Ваш цифровий гаманець з Valora:",
-    "wallet1": "Ви збираєтеся створити цифровий гаманець. Тільки у вас є ключ до вашого гаманця. У разі втрати ключа ми не зможемо відновити ні його, ні ваші активи. Ми також не можемо скасувати дії, виконані через Valora на блокчейні.",
+    "wallet1": "Ви збираєтеся створити цифровий гаманець. Тільки у вас є ключ до вашого гаманця. У разі втрати ключа ми не зможемо відновити ні його, ні ваші активи. Ми також не можемо скасувати дії на блокчейнах, виконані у Valora.",
     "wallet2": "Цифрові активи, із якими ви взаємодіятимете у Valora, пов’язані з характерними ризиками. Якщо ви використовуєте Valora, то берете на себе такі ризики й відповідальність за них. Ураховуйте свої фінансові можливості та рівень прийняття ризиків, перш ніж робити вибір.",
     "fullTerms": "Прочитайте повну версію <0>Умов надання послуг</0>"
   },
@@ -1038,7 +1038,7 @@
   "inviteWithoutPayment": "Привіт! Я використовую {{appName}}, щоб надсилати криптовалюту по всьому світові. Легко спробувати, я хочу ще раз запросити вас відвідати це посилання: {{link}}",
   "inviteWithEscrowedPayment": "Привіт! Я використовую {{appName}}, щоб надсилати криптовалюту по всьому світові. Я щойно відправив вам {{amount}} {{token}}. Прошу, завантажте застосунок {{appName}} і отримайте {{token}} за допомогою цього посилання: {{link}}",
   "inviteWithRewards": "Привіт! 👋 Я використовую {{appName}} як криптогаманець. Завантажити застосунок надзвичайно швидко, як і під’єднати свій номер телефону, до того ж у винагороду ми обоє отримаємо спеціальний випуск NFT. 💫 \n\nСкористайся цим посиланням: {{link}}",
-  "inviteWithRewardsCUSD": "Привіт! Прямо зараз кожен із нас може отримати винагороду в розмірі 0,50 дол. США, якщо зареєструєш гаманець у застосунку Valora, поповниш його й під’єднаєш свій номер. Я накопичую в ньому свої заощадження в доларах США та криптовалюті. Тобі знадобиться лише номер телефону й лічені секунди, щоб його налаштувати. Для реєстрації скористайся моїм реферальним посиланням: \n\n{{link}} \n\nПоспішай! Реферальна акція невдовзі закінчиться.",
+  "inviteWithRewardsCUSD": "Привіт! Прямо зараз кожен із нас може отримати винагороду в розмірі 0,50 дол. США, якщо зареєструєш гаманець у застосунку Valora, поповниш його й під’єднаєш свій номер. Я накопичую в ньому свої заощадження в доларах США та крипті. Тобі знадобиться лише номер телефону й лічені секунди, щоб його налаштувати. Для реєстрації скористайся моїм реферальним посиланням: \n\n{{link}} \n\nПоспішай! Реферальна акція невдовзі закінчиться.",
   "loadingContacts": "Пошук контактів",
   "myCode": "Мій код",
   "scanCode": "Сканувати",
@@ -1827,7 +1827,7 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Безплатно",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Комісія\n\nКомісія {{appName}} у розмірі {{appFeePercentage}} % покликана поліпшити ваш досвід, щоб обміни проходили швидко, надійно та безпечно.",
+      "appFeeInfo": "{{appName}} Комісія\n\nКомісія {{appName}} в розмірі {{appFeePercentage}} % покликана поліпшити ваш досвід, щоб обміни проходили швидко, надійно та безпечно.",
       "appFeeInfo_free": "{{appName}} Комісія\n\nКомісія за цей своп не стягується.",
       "appFeeInfo_placeholder": "{{appName}} Комісія\n\nКомісія розраховується на основі отриманої вами цінової пропозиції.",
       "appFeeInfoDismissButton": "Зрозуміло",
@@ -2068,7 +2068,7 @@
     },
     "jumpstart": {
       "title": "Надіслати за прямим посиланням",
-      "subtitle": "Поділитися посиланням, щоб надіслати крипту як текстове повідомлення"
+      "subtitle": "Поділитися посиланням, щоб надіслати крипту, наче текстове повідомлення"
     },
     "getStarted": {
       "title": "Як надіслати кошти у Valora",
@@ -2212,14 +2212,14 @@
       "description": "У ваших «Колекціях» доступний новий {{rewardName}} NFT"
     },
     "rewardBottomSheet": {
-      "title": "Заробіть $5 ETH",
-      "description": "Поповніть свій гаманець будь-яким токеном Ethereum до 12:00 PDT 4 квітня 2024 року, і ми подаруємо вам $5 ETH 5 квітня 2024 року до 23:59 PDT.\n\nЦе ексклюзивна пропозиція для раннього дослідника Ethereum.",
+      "title": "Заробити 5 доларів США в ETH",
+      "description": "Поповніть свій гаманець будь-яким токеном Ethereum до 12:00 за PDT 4 квітня 2024 року, і ми нарахуємо вам $5 у ETH до 23:59 за PDT 5 квітня 2024 року.\n\nЦе ексклюзивна пропозиція для провідника Early Ethereum.",
       "expirationLabel": "Дійсно до {{expirationLabelText}}",
       "cta": "Використати винагороду"
     },
     "rewardReminderBottomSheet": {
-      "title": "Не пропустіть, заробіть $5 ETH",
-      "description": "Поповніть свій гаманець будь-яким токеном Ethereum до 12:00 PDT 4 квітня 2024 року, і ми подаруємо вам $5 ETH 5 квітня 2024 року до 23:59 PDT.\n\nЦе ексклюзивна пропозиція для раннього дослідника Ethereum.",
+      "title": "Не змарнуйте шанс заробити $5 у ETH",
+      "description": "Поповніть свій гаманець будь-яким токеном Ethereum до 12:00 за PDT 4 квітня 2024 року, і ми нарахуємо вам $5 у ETH до 23:59 за PDT 5 квітня 2024 року.\n\nЦе ексклюзивна пропозиція для провідника Early Ethereum.",
       "expirationLabel": "Дійсно до {{expirationLabelText}}",
       "cta": "Використати винагороду"
     }
@@ -2249,34 +2249,34 @@
   "jumpstartStatus": {
     "loading": {
       "title": "Перевірка стану ваших коштів",
-      "description": "Будь ласка, зачекайте, поки ми перевіримо ваше посилання. Кошти, на які можна претендувати, надійдуть найближчим часом."
+      "description": "Зачекайте, ми перевіряємо ваше пряме посилання. Кошти, що надсилаються за запитом, невдовзі надійдуть."
     },
     "error": {
       "title": "Неможливо забрати кошти",
-      "description": "Це посилання не вдалося завантажити з невідомої причини",
+      "description": "Це посилання не вдалося завантажити через невідому причину",
       "alreadyClaimedDescription": "Посилання вже використано. Попросіть свого друга надіслати нове",
       "contactSupport": "Звернутися до служби підтримки",
       "dismiss": "Відхилити"
     }
   },
   "jumpstartReclaim": {
-    "description": "Відновлення зв'язку передбачає плату за мережевий газ, чи бажаєте ви продовжити?",
+    "description": "Якщо відновити посилання, стягуватиметься комісія за газ. Продовжити?",
     "fetchStatusError": {
-      "title": "Ой, щось пішло не так",
-      "description": "Ми не змогли отримати статус заявки на це запрошення, будь ласка, повторіть спробу пізніше або зверніться до служби підтримки",
+      "title": "На жаль, сталася помилка",
+      "description": "Не вдалося отримати статус запиту на це запрошення. Спробуйте ще раз пізніше або зверніться до служби підтримки",
       "retryCta": "Повторити"
     },
     "reclaimError": {
       "title": "Неможливо повернути кошти",
-      "description": "Спробуйте повторити спробу або зверніться до служби підтримки"
+      "description": "Спробуйте повернути ще раз або зверніться до служби підтримки"
     }
   },
   "multiSelect": {
-    "switchNetwork": "Комутаційна мережа",
-    "allNetworks": "Всі мережі"
+    "switchNetwork": "Перемкнути мережу",
+    "allNetworks": "Усі мережі"
   },
   "points": {
-    "title": "Бали Валора",
+    "title": "Бали Valora",
     "activity": "Активність",
     "history": {
       "cards": {
@@ -2289,14 +2289,14 @@
           "subtitle": "{{fromToken}} до {{toToken}}"
         }
       },
-      "title": "Активність моїх балів",
+      "title": "Моя активність за балами",
       "error": {
         "title": "Не вдалося завантажити активність за балами",
         "subtitle": "На жаль, під час спроби завантажити вашу стрічку активності за балами сталася помилка. Спробуйте ще раз.",
         "tryAgain": "Спробувати ще раз"
       },
       "empty": {
-        "title": "Поки що жодної активності за балами немає",
+        "title": "Поки що жодної активності за балами",
         "subtitle": "Схоже, ви ще не заробили жодного балу. Скористайтеся {{appName}}, щоб почати заробляти бали!",
         "gotIt": "Зрозуміло"
       },
@@ -2312,72 +2312,95 @@
       "retryCta": "Оновити"
     },
     "loading": {
-      "title": "Збираємо бали",
-      "description": "Ми підраховуємо ваші бали, будьте напоготові"
+      "title": "Збираємо ваші бали",
+      "description": "Хвилинку, підраховується загальна сума балів"
     },
     "error": {
-      "title": "Неможливо завантажити точки",
-      "description": "Ой, щось пішло не так при спробі завантажити ваші бали. Будь ласка, спробуйте ще раз.",
+      "title": "Не вдалося завантажити бали",
+      "description": "На жаль, під час спроби завантажити ваші бали сталася помилка. Спробуйте ще раз.",
       "retryCta": "Спробувати ще раз"
     },
     "infoCard": {
-      "title": "Більше способів заробити бали незабаром 🚀.",
-      "body": "Ми працюємо над тим, щоб додати більше способів заробляти бали за допомогою додатку. Слідкуйте за оновленнями."
+      "title": "Незабаром з’явиться більше способів заробити бали 🚀",
+      "body": "Працюємо над тим, щоб додати більше способів заробляти бали, використовуючи застосунок. Стежте за оновленнями."
     },
     "activitySection": {
-      "title": "Як я можу заробити бали?",
-      "body": "Це дуже просто! Заробляйте бали, просто використовуючи додаток."
+      "title": "Як заробити бали?",
+      "body": "Це просто! Користуйтеся застосунком і заробляйте бали."
     },
     "noActivities": {
-      "title": "Оновіть, щоб розблокувати більше балів 🔓.",
-      "body": "Упс! Схоже, ви використовуєте стару версію {{appName}}. Оновіть її зараз, щоб відкрити для себе всі нові захоплюючі способи заробляти бали."
+      "title": "Оновити, щоб відкрити більше балів 🔓",
+      "body": "Ой! Здається ви використовуєте застарілу версію {{appName}}. Оновіть її зараз, щоб дізнатися про всі цікаві нові способи, як заробити бали."
     },
     "activityCards": {
       "createWallet": {
-        "title": "Створіть гаманець {{appName}}"
+        "title": "Створити гаманець {{appName}}"
       },
       "swap": {
-        "title": "Своп-активи",
+        "title": "Обміняти активи",
         "bottomSheet": {
-          "title": "Своп-активи",
-          "body": "Цей простір буде використано для надання всіх необхідних для цього деталей. Можливо, мінімальна сума для обміну. \n\nЗаробляйте {{pointsValue}} балів щоразу, коли ви обмінюєте актив за допомогою {{appName}}.",
-          "cta": "Перейдіть до обміну"
+          "title": "Обміняти активи",
+          "body": "Цей простір використовуватиметься, щоб надати всі необхідні для цього деталі. Можлива мінімальна сума для обміну. \n\n{{pointsValue}} — бали, що можна заробити щоразу під час обміну активу у {{appName}}.",
+          "cta": "Перейти до обміну"
         }
       },
       "moreComing": {
-        "title": "Скоро буде більше!"
+        "title": "Незабаром можливостей стане більше!"
       }
     },
     "discoverCard": {
-      "title": "{{appName}} Бали",
-      "description": "Легко заробляйте бали з {{appName}}. Використання додатку, включаючи обмін, приносить бали!"
+      "title": "Бали {{appName}}",
+      "description": "З {{appName}} заробляти бали просто. Отримуйте бали за користування застосунком, зокрема за операції обміну!"
     },
     "intro": {
       "title": "Заробляйте бали без зайвих зусиль",
-      "description": "Переходьте до нового способу заробітку! Ваша активність у {{appName}} тепер приносить бали. Почніть заробляти вже сьогодні та відкрийте нечувані переваги.",
+      "description": "Переходьте до нового способу заробітку! Тепер заробляйте бали за свою активність у {{appName}}. Почніть заробляти вже сьогодні та відкрийте нечувані переваги.",
       "cta": "Розпочніть гонитву за балами"
     }
   },
   "earnFlow": {
     "gasSubsidized": "Валора покриває газ для цієї транзакції!",
     "addCryptoBottomSheet": {
-      "title": "Додайте {{tokenSymbol}} на {{tokenNetwork}}",
-      "description": "Після того, як ви додасте токени, вам доведеться повернутися, щоб завершити депонування в пул.",
+      "title": "Додати {{tokenSymbol}} у мережі {{tokenNetwork}}",
+      "description": "Коли токени додано, вам потрібно повернутися і завершити поповнення пулу.",
       "actions": {
         "add": "Купити",
-        "transfer": "Переказ",
+        "transfer": "Переказати",
         "swap": "Обміняти"
       },
       "actionDescriptions": {
-        "add": "Купуйте {{tokenSymbol}} на {{tokenNetwork}} за допомогою одного з наших перевірених постачальників",
-        "transfer": "Використовуйте будь-який {{tokenNetwork}} сумісний гаманець або біржу, щоб поповнити {{tokenSymbol}}",
-        "swap": "Зміна на {{tokenSymbol}} з іншого токена {{tokenNetwork}}"
+        "add": "Купіть {{tokenSymbol}} у мережі {{tokenNetwork}} через одного з наших довірених постачальників",
+        "transfer": "Скористайтеся будь-яким гаманцем, сумісним із мережею {{tokenNetwork}} або виконайте обмін, щоб внести {{tokenSymbol}}",
+        "swap": "Обміняти на {{tokenSymbol}} з іншого токена {{tokenNetwork}}"
       }
     },
     "cta": {
       "title": "Заробляйте на своїх стейблкоїнах",
       "subtitle": "Внесіть кошти сьогодні й отримуйте прибуток",
-      "description": "Дізнайтеся, скільки ви можете заробити, надаючи послуги кредитного пулу"
+      "description": "Дізнайтеся, скільки можна заробити на послугах пулу з надавання позики"
+    },
+    "earnInfo": {
+      "title": "Заробляйте на своїх\nстейблкоїнах",
+      "details": {
+        "earn": {
+          "titleGasSubsidy": "Максимізуйте заробіток без плати за газ*.",
+          "title": "Максимізація заробітку",
+          "subtitle": "Заробляйте на своїх стейблкоінах і отримуйте винагороду, коли надаєте пул.",
+          "footnoteSubsidy": "*Плата за газ тимчасово покривається компанією Valora"
+        },
+        "manage": {
+          "title": "Керуйте безпосередньо з Valora",
+          "subtitle": "Ми подбаємо про налаштування, щоб ви могли керувати своєю позицією безпосередньо з Valora."
+        },
+        "access": {
+          "title": "Легкий доступ до ваших коштів",
+          "subtitle": "Отримуйте кошти без зайвих зусиль одним дотиком. Насолоджуйтесь таким же миттєвим доступом, як і безпосередньо через ваші улюблені протоколи."
+        }
+      },
+      "action": {
+        "learn": "Дізнатися більше",
+        "earn": "Почати заробляти"
+      }
     },
     "ctaV1_86": {
       "title": "Максимізуйте заробіток на стейблкоінах",
@@ -2393,7 +2416,7 @@
       "info": "Цей пул на платформі Aave",
       "infoBottomSheet": {
         "title": "Чому цей пул?",
-        "description": "Цей пул Aave має понад 150 млн дол. США загальної заблокованої вартості і понад 6000 учасників, що свідчить про високу ліквідність і надійність. Також унаслідок того що як токен використовується USDC, а як мережа — Abritrum, то знижується волатильність і користувачам гарантовані недорогі тарифи за газ.\n\nУсе це разом надає цьому варіанту безпеки й привабливості з конкурентоспроможним APY, що передбачає вигідні інвестиційні можливості для наших користувачів.\n\nЗ іншими пулами Aave можна ознайомитися <0>тут</0>.",
+        "description": "Цей пул Aave має понад 150 млн дол. США загальної заблокованої вартості й понад 6000 учасників, що свідчить про високу ліквідність і надійність. Також завдяки тому, що токеном є USDC, а мережею — Abritrum, то знижується волатильність і користувачам гарантовано недорогі тарифи за газ.\n\nУ підсумку цей варіант гарантує безпеку й привабливості з конкурентоспроможним APY, що передбачає вигідні інвестиційні можливості для наших користувачів.\n\nЗ іншими пулами Aave можна ознайомитися <0>тут</0>.",
         "dismiss": "Відхилити"
       },
       "notEnoughBalanceForGasWarning": {
@@ -2411,13 +2434,13 @@
       "viewPools": "Переглянути пули"
     },
     "depositBottomSheet": {
-      "title": "Перегляд та поповнення рахунку",
+      "title": "Огляд і поповнення",
       "description": "Перш ніж внести кошти до пулу Aave, ознайомтеся з деталями транзакції нижче",
       "amount": "Суму внесено",
-      "fee": "Передбачувані комісії за газ",
+      "fee": "Орієнт. комісії за газ",
       "provider": "Надавач заробітку",
       "network": "Мережа",
-      "footer": "Коли ви вносите криптовалюту в пул Aave, ви приймаєте ризики, пов'язані з використанням Aave. <0>Умови надання послуг</0>",
+      "footer": "Коли ви вносите крипту в пул Aave, то приймаєте ризики, пов’язані з використанням Aave. <0>Умови надання послуг</0>",
       "primaryCta": "Завершити",
       "secondaryCta": "Скасувати"
     },
@@ -2439,7 +2462,7 @@
       "earnClaimTitle": "Стягнено",
       "earnClaimSubtitle": "з пулу {{providerName}}",
       "earnDepositTitle": "Внесено",
-      "earnDepositSubtitle": "до пула {{providerName}}",
+      "earnDepositSubtitle": "до пулу {{providerName}}",
       "earnWithdrawTitle": "Знято",
       "earnWithdrawSubtitle": "з пулу {{providerName}}"
     },
diff --git a/locales/vi-VN/translation.json b/locales/vi-VN/translation.json
index 9f422b3175..66c202a508 100644
--- a/locales/vi-VN/translation.json
+++ b/locales/vi-VN/translation.json
@@ -255,8 +255,8 @@
       "text": "Bất kỳ ai có Cụm từ của bạn đều sẽ được quyền truy cập vào tài khoản của bạn và tất cả tiền trong đó. Không chia sẻ Cụm từ này cho bất kỳ ai."
     }
   ],
-  "consumerIncentivesTitle": "Supercharge is ending",
-  "consumerIncentivesSummary": "But more rewards are headed your way. Until May 28, get {{percent}}% annual rewards on your highest stablecoin balance (cUSD, cEUR, or cREAL). Here's how it works:",
+  "consumerIncentivesTitle": "Chương trình Supercharge sắp kết thúc",
+  "consumerIncentivesSummary": "Nhưng vẫn còn rất nhiều phần thưởng cho bạn đấy. Từ nay đến ngày 28 tháng 5, hãy nhận {{percent}}% phần thưởng hàng năm trên số dư stablecoin cao nhất bạn có (cUSD, cEUR hay cREAL). Đây là cách chương trình hoạt động:",
   "earnWeekly": {
     "header": "Kết nối số điện thoại của bạn",
     "text": "Nhấn vào Kết nối số nếu bạn chưa kết nối."
@@ -271,14 +271,14 @@
     "text": "Cụm từ này đảm bảo tiền thưởng được an toàn và bạn luôn nắm được quyền kiểm soát."
   },
   "conclusion": "Đơn giản vậy thôi. Hãy kiếm thêm tiền điện tử ngay hôm nay với Supercharge!",
-  "superchargeTitle": "Supercharge is ending",
-  "superchargeDescription": "But more rewards are headed your way. Until May 28, get {{apy}}% annual rewards on your highest {{token}} balance. Here's how it works:",
+  "superchargeTitle": "Chương trình Supercharge sắp kết thúc",
+  "superchargeDescription": "Nhưng vẫn còn rất nhiều phần thưởng cho bạn đấy. Từ nay đến ngày 28 tháng 5, hãy nhận {{apy}}% phần thưởng hàng năm trên số dư {{token}} cao nhất bạn có. Đây là cách chương trình hoạt động:",
   "superchargeConnectNumber": "Kết nối số điện thoại của bạn",
   "superchargeReconnectNumber": "Kết nối lại với điện thoại\n<0>Chúng tôi đã khởi chạy trải nghiệm chương trình Supercharge cải tiến. Kết nối lại số điện thoại của bạn để tiếp tục kiếm tiền thưởng từ {{token}}.</0>",
   "superchargeMinimumBalance": "Thêm số dư tối thiểu là {{amount}} {{token}}",
-  "superchargeDisclaimer": "This will not affect your balance or previous earnings.",
-  "superchargeDisclaimerMaxRewards": "This will not affect your balance or previous earnings.",
-  "superchargeDisclaimerDayLimit": "This will not affect your balance or previous earnings. <0>Learn more</0>",
+  "superchargeDisclaimer": "Điều này sẽ không ảnh hưởng đến số dư hoặc thu nhập trước đó của bạn.",
+  "superchargeDisclaimerMaxRewards": "Điều này sẽ không ảnh hưởng đến số dư hoặc thu nhập trước đó của bạn.",
+  "superchargeDisclaimerDayLimit": "Điều này sẽ không ảnh hưởng đến số dư hoặc thu nhập trước đó của bạn. <0>Tìm hiểu thêm</0>",
   "superchargeTokenDetailsDialog": {
     "title": "Tôi có thể sử dụng Supercharge cho những tài sản nào?",
     "body": "Bạn sẽ được nhận thưởng mỗi tuần tính trên stablecoin Celo có giá trị cao nhất (cEUR, cUSD, cREAL).",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "Cần cập nhật ứng dụng",
   "superchargingDescription": "Cập nhật ứng dụng Valora để tiếp tục nhận tiền thưởng Supercharge hàng tuần.",
-  "superchargingTitleV1_54": "Supercharge is ending",
-  "superchargingDescriptionV1_54": "Weekly rewards will be available to claim until Tuesday, May 28, at 23:59 UTC. Beginning May 29, you will nor longer be able to claim Supercharge rewards.",
+  "superchargingTitleV1_54": "Chương trình Supercharge sắp kết thúc",
+  "superchargingDescriptionV1_54": "Bạn có thể nhận tiền thưởng hàng tuần cho đến Thứ Ba, ngày 28 tháng 5, lúc 23:59 theo giờ UTC. Bắt đầu từ ngày 29 tháng 5, bạn sẽ không thể nhận tiền thưởng Supercharge nữa.",
   "superchargeRewardsAvailable": "Bạn có {{amount}} {{token}} cần xác nhận!",
   "superchargeRewardsAvailableMultipleTokens": "Bạn có {{amounts}} cần xác nhận!",
-  "superchargeClaimText": "Claim your rewards until Tuesday, May 28, at 23:59 UTC. Beginning May 29, you will no longer be able to claim Supercharge rewards.",
+  "superchargeClaimText": "Hãy nhận tiền thưởng hàng tuần trước Thứ Ba, ngày 28 tháng 5, lúc 23:59 theo giờ UTC. Bắt đầu từ ngày 29 tháng 5, bạn sẽ không thể nhận tiền thưởng Supercharge nữa.",
   "superchargeClaimButton": "Xác nhận tiền thưởng",
   "superchargeFetchRewardsFailed": "Đã xảy ra lỗi khi tìm nạp tiền thưởng Supercharge đang chờ xử lý. Vui lòng thử lại sau.",
   "superchargeClaimSuccess": "Tiền thưởng Supercharge đã được thêm vào Tổng số dư của bạn.",
@@ -677,8 +677,8 @@
     "body": "Sau khi họ thiết lập ví {{appName}} và kết nối số điện thoại, mỗi bạn sẽ nhận được một NFT độc quyền."
   },
   "inviteRewardsBannerCUSD": {
-    "title": "Invite friends and get up to 12 cUSD",
-    "body": "Once they connect their number and add funds to {{appName}}, you’ll both receive 0.50 cUSD."
+    "title": "Mời bạn bè và nhận đến 12 cUSD",
+    "body": "Khi họ kết nối số điện thoại và nạp tiền vào {{appName}}, cả hai bạn sẽ nhận được 0,50 cUSD mỗi người."
   },
   "inviteWithUrl": {
     "title": "Mời bạn bè",
@@ -692,8 +692,8 @@
       "body": "Mời bạn bè và gia đình tải xuống {{appName}} và mỗi người trong số các bạn sẽ nhận được một NFT độc quyền"
     },
     "rewardsActiveCUSD": {
-      "title": "GET UP TO 12 cUSD for inviting your friends to Valora!",
-      "body": "Get 0.50 cUSD for every friend you invite to {{appName}}. Once they connect their number, add funds, and hold them for 7 days, you’ll both get 0.50 cUSD. Hurry, funds are limited! (Limit 25 friends)."
+      "title": "NHẬN ĐẾN 12 cUSD khi giới thiệu bạn bè tới Valora!",
+      "body": "Với mỗi người mà bạn giới thiệu tới {{appName}}, bạn sẽ nhận được 0,50 cUSD. Khi họ kết nối số điện thoại, nạp tiền và giữ tiền trong vòng 7 ngày, cả hai bạn sẽ nhận được 0,50 cUSD mỗi người. Hãy nhanh tay, số tiền có hạn! (Giới hạn 25 bạn)."
     }
   },
   "getReward": "Nhận ${{reward}}",
@@ -710,15 +710,15 @@
     "goldDisclaimer": "Khi tạo \"tài khoản\" bằng Valora, bạn tạo một ví điện tử mà chỉ bạn giữ mã khóa. Không cá nhân hoặc tổ chức nào khác, bao gồm Valora, có thể khôi phục mã khóa của bạn, thay đổi hay hủy giao dịch hoặc thu hồi số tiền đã mất. Xin lưu ý rằng tiền điện tử thuộc loại tài sản mới và luôn tiềm ẩn rủi ro về tổn thất tài chính. Hãy cân nhắc kỹ tình hình tài chính của bạn cũng như khả năng chấp nhận rủi ro tài chính trước khi mua bất kỳ tài sản nào."
   },
   "termsColloquial": {
-    "title": "Let’s start by creating your wallet",
-    "privacyHeading": "Your Info & Privacy:",
-    "privacy1": "We gather usage data which helps us improve the app and security. The type of information we collect, how we use it and your rights related to that information can all be seen in our <0>Privacy Policy</0>.",
-    "privacy2": "If you decide to link your phone number, we will store an encrypted copy of it.",
-    "privacy3": "If you decide to connect your contacts, we use their names, numbers, and profile pictures to make it easier to find them.",
-    "walletHeading": "Your Digital Wallet with Valora:",
-    "wallet1": "You’re about to create a digital wallet. Only you have the key to your wallet. We cannot recover your key or your assets if you lose your key. We also cannot reverse actions taken through Valora on blockchains.",
-    "wallet2": "Digital assets, the assets with which you will interact with Valora, come with unique risks. By using Valora, you accept these risks and take responsibility for them. Please consider your finances and risk tolerance before making choices.",
-    "fullTerms": "Read our full <0>Terms & Conditions</0>"
+    "title": "Hãy bắt đầu từ bước tạo ví",
+    "privacyHeading": "Thông tin & Quyền riêng tư:",
+    "privacy1": "Chúng tôi thu thập dữ liệu sử dụng để có thể cải thiện ứng dụng và tăng cường bảo mật. Bạn có thể xem loại thông tin chúng tôi thu thập, cách chúng tôi sử dụng thông tin đó và các quyền của bạn liên quan đến thông tin đó trong <0>Chính sách quyền riêng tư</0> của chúng tôi.",
+    "privacy2": "Nếu bạn quyết định liên kết số điện thoại, chúng tôi sẽ lưu trữ bản sao mã hóa của số đó.",
+    "privacy3": "Nếu bạn quyết định liên kết danh bạ, chúng tôi sẽ sử dụng tên, số điện thoại và ảnh đại diện của những người trong danh bạ để giúp bạn tìm họ dễ dàng hơn.",
+    "walletHeading": "Ví điện tử của bạn với Valora:",
+    "wallet1": "Bạn đang bắt đầu các bước tạo ví điện tử. Chỉ riêng bạn có mã khóa cho ví của mình. Chúng tôi không thể khôi phục mã khóa hoặc tài sản của bạn nếu bạn làm mất mã khóa. Chúng tôi cũng không thể hoàn tác các hành động được thực hiện thông qua Valora trên chuỗi khối.",
+    "wallet2": "Tài sản số, tài sản mà bạn sẽ dùng để tương tác với Valora, có những rủi ro riêng. Khi sử dụng Valora, bạn chấp nhận và chịu trách nhiệm về những rủi ro này. Vui lòng cân nhắc khả năng tài chính và khả năng chịu rủi ro của bạn trước khi lựa chọn.",
+    "fullTerms": "Đọc <0>Điều khoản & Điều kiện</0> đầy đủ của chúng tôi"
   },
   "fullNameOrPsuedonym": "Họ và tên hoặc biệt danh",
   "namePlaceholder": "tên",
@@ -827,7 +827,7 @@
     "hasWallet": "Tôi đã có ví",
     "header": "Chào mừng bạn đến với {{appName}}! Hãy tạo ví tiền điện tử của bạn.",
     "getStarted": "Bắt đầu",
-    "agreeToTerms": "By creating a wallet you agree to our <0>Terms and Conditions</0>"
+    "agreeToTerms": "Khi tạo ví, bạn đồng ý với <0>Điều khoản và Điều kiện</0> của chúng tôi"
   },
   "accessContacts": {
     "disclosure": {
@@ -1009,7 +1009,7 @@
   "receivedFrom": "Đã nhận từ",
   "commentLabel": "Tin nhắn",
   "amountSent": "Đã gửi số tiền",
-  "amountReceived": "Amount Received",
+  "amountReceived": "Số tiền bạn đã nhận được",
   "amountCeloWithdrawn": "Số tiền (CELO)",
   "feeEducation": "Chuỗi khối thu phí giao dịch để hỗ trợ các mạng và đảm bảo mạng hoạt động thông suốt.",
   "reviewPayment": "Xem lại thanh toán",
@@ -1032,7 +1032,7 @@
   "inviteWithoutPayment": "Xin chào! Tôi đang sử dụng {{appName}} để gửi tiền điện tử trên toàn thế giới. Ứng dụng này rất dễ dùng nên tôi muốn mời bạn dùng thử bằng đường liên kết sau: {{link}}",
   "inviteWithEscrowedPayment": "Xin chào! Tôi đang sử dụng {{appName}} để gửi tiền điện tử trên toàn thế giới. Tôi vừa gửi cho bạn {{amount}} {{token}}. Vui lòng tải xuống Ứng dụng {{appName}} và chấp nhận {{token}} của bạn bằng đường liên kết sau: {{link}}",
   "inviteWithRewards": "Xin chào! 👋 Tôi đang sử dụng ví tiền điện tử {{appName}}. Bạn có thể tải nhanh ứng dụng này xuống và kết nối số điện thoại của mình, tất cả chúng ta sẽ cùng nhận được tiền thưởng dạng NFT phiên bản đặc biệt. 💫 \n\nSử dụng đường liên kết này để tải xuống: {{link}}",
-  "inviteWithRewardsCUSD": "Hey! Right now we can both get a free $0.50 reward if you sign up, connect your number, and fund your Valora wallet. I use it to grow my savings in USD and crypto, and you can set it up in seconds with just a phone number. Make sure to sign up with my referral link here: \n\n{{link}} \n\n Hurry, the referral promotion ends soon.",
+  "inviteWithRewardsCUSD": "Chào bạn! Chúng ta có thể nhận ngay số tiền thưởng $0,50 miễn phí nếu bạn đăng ký, kết nối số điện thoại và nạp tiền vào ví Valora. Tôi sử dụng ví này để tăng khoản tiết kiệm bằng USD và tiền điện tử của mình và bạn có thể dễ dàng tạo ví trong vài giây chỉ bằng số điện thoại. Hãy đăng ký bằng đường liên kết giới thiệu của tôi tại đây nhé: \n\n{{link}} \n\n Hãy nhanh tay lên, chương trình khuyến mãi giới thiệu sẽ kết thúc sớm đấy.",
   "loadingContacts": "Đang tìm danh bạ của bạn",
   "myCode": "Mã của tôi",
   "scanCode": "Quét",
@@ -1321,8 +1321,8 @@
   "feedItemGoldReceived": "Đã nhận từ {{displayName}}",
   "feedItemSwapPath": "{{token1}} sang {{token2}}",
   "feedItemJumpstartTitle": "Đường liên kết trực tiếp",
-  "feedItemJumpstartSentSubtitle": "Invitation",
-  "feedItemJumpstartReceivedSubtitle": "Funds received",
+  "feedItemJumpstartSentSubtitle": "Lời mời",
+  "feedItemJumpstartReceivedSubtitle": "Số tiền đã nhận",
   "transactionHeaderVerificationFee": "Xác nhận",
   "transactionHeaderNetworkFee": "Mạng lưới",
   "transactionHeaderFaucet": "Faucet",
@@ -1765,9 +1765,9 @@
     "swapToTokenSelection": "TRAO ĐỔI SANG",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "Các nhà cung cấp dịch vụ trao đổi của chúng tôi không hỗ trợ token đã chọn.",
-    "selectTokenLabel": "Select token",
-    "tokenBottomSheetTitle": "Select Token",
-    "onNetwork": "on {{networkName}}",
+    "selectTokenLabel": "Chọn token",
+    "tokenBottomSheetTitle": "Chọn token",
+    "onNetwork": "trên {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "Bạn đã chuyển sang mạng {{networkName}}",
       "body_swapFrom": "Để tiếp tục, hãy chọn một token để trao đổi từ mạng {{networkName}}.",
@@ -1821,9 +1821,9 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Miễn phí",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Fee\n\nThe {{appName}} fee of {{appFeePercentage}}% is designed to enhance your experience by ensuring fast, reliable, and secure swaps.",
-      "appFeeInfo_free": "{{appName}} Fee\n\nThis swap is free of charge.",
-      "appFeeInfo_placeholder": "{{appName}} Fee\n\nThe fee is calculated based on the quote you receive.",
+      "appFeeInfo": "Phí {{appName}}\n\nPhí {{appName}} ở mức {{appFeePercentage}}% được thiết kế để nâng cao trải nghiệm của bạn bằng cách đảm bảo trao đổi nhanh chóng, đáng tin cậy và an toàn.",
+      "appFeeInfo_free": "Phí {{appName}}\n\nGiao dịch trao đổi này được miễn phí.",
+      "appFeeInfo_placeholder": "Phí {{appName}}\n\nMức phí được tính theo báo giá bạn nhận được.",
       "appFeeInfoDismissButton": "Đã hiểu",
       "slippagePercentage": "Tỷ lệ trượt giá chấp nhận",
       "networkFeeInfo": "Bạn đang trao đổi trên Mạng {{networkName}}.\n\nĐể thực hiện giao dịch trên Mạng {{networkName}}, bạn bắt buộc phải trả khoản phí mạng lưới ước tính này. Khoản phí này sẽ đảm bảo cho giao dịch của bạn và được sử dụng để duy trì hoạt động của mạng.",
@@ -1831,8 +1831,8 @@
       "slippageToleranceInfo": "Tỷ lệ trượt giá chấp nhận\n\nViệc trao đổi sẽ được thực hiện trong phạm vi tỷ lệ trượt giá chấp nhận. Nếu giá thay đổi nhiều hơn tỷ lệ trượt giá chấp nhận, {{appName}} sẽ bảo vệ bạn bằng cách ngăn khớp lệnh giao dịch.",
       "networkFeeInfoDismissButton": "Đã hiểu",
       "exchangeRate": "Tỷ giá quy đổi",
-      "exchangeRateInfo": "Exchange Rate\n\nWe've found the best exchange rate for you. Your trade will be completed at a price within {{slippagePercentage}}% of the estimate or the transaction will be cancelled & funds returned to your wallet.",
-      "exchangeRateInfo_withAppFee": "Exchange Rate\n\nWe've found the best exchange rate for you. Your trade will be completed at a price within {{slippagePercentage}}% of the estimate or the transaction will be cancelled & funds returned to your wallet.\n\nThe estimated rate includes a {{appName}} fee of {{appFeePercentage}}%.",
+      "exchangeRateInfo": "Tỷ giá hối đoái\n\nChúng tôi đã tìm được tỷ giá hối đoái tốt nhất cho bạn. Chúng tôi sẽ hoàn thành giao dịch của bạn ở mức giá nằm trong khoảng {{slippagePercentage}}% so với ước tính hoặc sẽ hủy giao dịch và hoàn tiền vào ví của bạn.",
+      "exchangeRateInfo_withAppFee": "Tỷ giá hối đoái\n\nChúng tôi đã tìm được tỷ giá hối đoái tốt nhất cho bạn. Chúng tôi sẽ hoàn thành giao dịch của bạn ở mức giá nằm trong khoảng {{slippagePercentage}}% so với ước tính hoặc sẽ hủy giao dịch và hoàn tiền vào ví của bạn.\n\nTỷ giá ước tính bao gồm phí {{appName}} là {{appFeePercentage}}%.",
       "exchangeRateInfoDismissButton": "Đã hiểu",
       "estimatedValue": "Giá trị ước tính"
     },
@@ -2058,11 +2058,11 @@
     },
     "invite": {
       "title": "Gửi tiền điện tử cho bạn bè",
-      "subtitle": "Send funds or an invite to your contacts"
+      "subtitle": "Gửi tiền hoặc lời mời đến danh bạ của bạn"
     },
     "jumpstart": {
-      "title": "Send with a Live Link",
-      "subtitle": "Share a link to send crypto like a text"
+      "title": "Gửi bằng đường liên kết trực tiếp",
+      "subtitle": "Chia sẻ đường liên kết để gửi tiền điện tử dưới dạng tin nhắn"
     },
     "getStarted": {
       "title": "Các phương thức gửi tiền trên Valora",
@@ -2116,8 +2116,8 @@
   "viewOnArbiscan": "Xem trên Arbiscan",
   "viewOnOPMainnetExplorer": "Xem trên OP Mainnet Explorer",
   "viewOnOPSepoliaExplorer": "Xem trên OP Sepolia Explorer",
-  "viewOnPolygonPoSScan": "View on PolygonScan",
-  "viewOnBaseScan": "View on BaseScan",
+  "viewOnPolygonPoSScan": "Xem trên PolygonScan",
+  "viewOnBaseScan": "Xem trên BaseScan",
   "sendEnterAmountScreen": {
     "title": "Nhập số tiền",
     "selectToken": "Chọn token",
@@ -2143,7 +2143,7 @@
     }
   },
   "jumpstartSendConfirmationScreen": {
-    "title": "Create a Live Link",
+    "title": "Tạo đường liên kết trực tiếp",
     "sendAmountLabel": "Số tiền gửi qua đường liên kết trực tiếp",
     "confirmButton": "Gửi và tạo đường liên kết",
     "info": "Khi bạn tạo một đường liên kết, tiền sẽ được rút từ ví của bạn. Bạn có thể thu hồi đường liên kết này bất cứ lúc nào. Hãy thận trọng khi chia sẻ đường liên kết.",
@@ -2154,7 +2154,7 @@
     }
   },
   "jumpstartShareLinkScreen": {
-    "title": "Share your Live Link",
+    "title": "Chia sẻ đường liên kết trực tiếp của bạn",
     "description": "Sao chép đường liên kết để gửi {{tokenSymbol}} qua ứng dụng nhắn tin mà bạn chọn hoặc sử dụng mã QR.",
     "linkLabel": "Đường liên kết trực tiếp",
     "linkCopiedMessage": "Đã sao chép đường liên kết trực tiếp",
@@ -2164,7 +2164,7 @@
       "ctaNavigate": "Đi đến Trang chủ"
     },
     "ctaShare": "Chia sẻ đường liên kết",
-    "ctaScanQRCode": "Show QR Code",
+    "ctaScanQRCode": "Hiển thị mã QR",
     "shareMessage": "Xin chào! Tôi đang gửi cho bạn một đường liên kết được nạp tiền bằng {{tokenAmount}} {{tokenSymbol}} trên {{appName}}. Hãy sử dụng đường liên kết này để tải xuống ứng dụng và số tiền sẽ sẵn sàng chờ bạn sử dụng. {{link}}",
     "qrCodeBottomSheet": {
       "title": "Quét mã để nhận tiền",
@@ -2191,9 +2191,9 @@
   "getStartedHome": {
     "title": "Mua tiền kỹ thuật số hoặc chuyển token",
     "body": "Mua hoặc chuyển token tương thích để gửi tiền điện tử và khám phá web3!",
-    "titleV1_86": "Add funds to your wallet",
-    "exploreTokens": "Explore all tokens",
-    "exploreTokensBody": "You can buy up to 10+ tokens in Valora. Check them out!"
+    "titleV1_86": "Nạp tiền vào ví của bạn",
+    "exploreTokens": "Khám phá tất cả token",
+    "exploreTokensBody": "Bạn có thể mua tối đa hơn 10 token trong Valora. Hãy tìm hiểu ngay!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2206,14 +2206,14 @@
       "description": "Bạn có thể tìm thấy NFT {{rewardName}} mới của mình trong mục “Bộ sưu tập”"
     },
     "rewardBottomSheet": {
-      "title": "Earn $5 of ETH",
-      "description": "Fund your wallet with any Ethereum token by April 4, 2024 at 12:00 PM PDT, and we'll give you $5 of ETH on April 5, 2024 by 11:59 PM PDT.\n\nThis is an exclusive offer for being an Early Ethereum Explorer.",
+      "title": "Kiếm $5 ETH",
+      "description": "Nạp tiền vào ví bằng bất kỳ token Ethereum nào trước 12:00 trưa theo giờ PDT ngày 4 tháng 4 năm 2024 và chúng tôi sẽ tặng bạn $5 ETH vào ngày 5 tháng 4 năm 2024 trước 11:59 tối theo giờ PDT.\n\nĐây là ưu đãi độc quyền để trở thành Early Ethereum Explorer.",
       "expirationLabel": "Hết hạn {{expirationLabelText}}",
       "cta": "Sử dụng tiền thưởng"
     },
     "rewardReminderBottomSheet": {
-      "title": "Don't miss out, earn $5 of ETH",
-      "description": "Fund your wallet with any Ethereum token by April 4, 2024 at 12:00 PM PDT, and we'll give you $5 of ETH on April 5, 2024 by 11:59 PM PDT.\n\nThis is an exclusive offer for being an Early Ethereum Explorer.",
+      "title": "Đừng bỏ lỡ cơ hội kiếm được $5 ETH",
+      "description": "Nạp tiền vào ví bằng bất kỳ token Ethereum nào trước 12:00 trưa theo giờ PDT ngày 4 tháng 4 năm 2024 và chúng tôi sẽ tặng bạn $5 ETH vào ngày 5 tháng 4 năm 2024 trước 11:59 tối theo giờ PDT.\n\nĐây là ưu đãi độc quyền để trở thành Early Ethereum Explorer.",
       "expirationLabel": "Hết hạn {{expirationLabelText}}",
       "cta": "Sử dụng tiền thưởng"
     }
@@ -2242,211 +2242,234 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Checking on your funds",
-      "description": "Please wait while we check your Live Link. Claimable funds will arrive shortly."
+      "title": "Kiểm tra số tiền của bạn",
+      "description": "Vui lòng đợi chúng tôi kiểm tra đường liên kết trực tiếp của bạn. Bạn sẽ sớm nhận được tiền thưởng."
     },
     "error": {
       "title": "Không nhận được tiền",
-      "description": "This link was not able to be claimed for an unknown reason",
-      "alreadyClaimedDescription": "The link has already been claimed. Please ask your friend to send a new link",
+      "description": "Không thể xác nhận đường liên kết này vì lý do không xác định",
+      "alreadyClaimedDescription": "Đường liên kết này đã được nhận. Hãy nhờ bạn bè gửi đường liên kết mới",
       "contactSupport": "Liên hệ với bộ phận hỗ trợ",
       "dismiss": "Loại bỏ"
     }
   },
   "jumpstartReclaim": {
-    "description": "Reclaiming your link incurs a network gas fee, would you like to proceed?",
+    "description": "Bạn sẽ phải trả thêm phí ga mạng nếu muốn lấy lại đường liên kết, bạn có muốn tiếp tục không?",
     "fetchStatusError": {
-      "title": "Oops, something went wrong",
-      "description": "We could not get the claim status of this invitation, please try again later or contact support",
+      "title": "Rất tiếc, đã xảy ra lỗi",
+      "description": "Chúng tôi chưa ghi nhận trạng thái xác nhận của lời mời này, vui lòng thử lại sau hoặc liên hệ với bộ phận hỗ trợ",
       "retryCta": "Thử lại"
     },
     "reclaimError": {
       "title": "Unable to reclaim funds",
-      "description": "Try to reclaim again, or contact support"
+      "description": "Thử lấy lại hoặc liên hệ với bộ phận hỗ trợ"
     }
   },
   "multiSelect": {
-    "switchNetwork": "Switch Network",
-    "allNetworks": "All Networks"
+    "switchNetwork": "Chuyển mạng lưới",
+    "allNetworks": "Tất cả mạng lưới"
   },
   "points": {
-    "title": "Valora Points",
+    "title": "Điểm Valora",
     "activity": "Hoạt động",
     "history": {
       "cards": {
         "createWallet": {
-          "title": "Wallet holder",
-          "subtitle": "Member of {{appName}}"
+          "title": "Chủ sỡ hữu ví",
+          "subtitle": "Thành viên của {{appName}}"
         },
         "swap": {
           "title": "Trao đổi",
           "subtitle": "{{fromToken}} sang {{toToken}}"
         }
       },
-      "title": "My points activity",
+      "title": "Hoạt động tích điểm của tôi",
       "error": {
-        "title": "Unable to load points activity",
-        "subtitle": "Oops, something went wrong when trying to load your points activity feed. Please try again.",
+        "title": "Không thể tải hoạt động điểm",
+        "subtitle": "Rất tiếc, quá trình tải bảng tin hoạt động tích điểm của bạn đã xảy ra lỗi. Vui lòng thử lại.",
         "tryAgain": "Thử lại"
       },
       "empty": {
-        "title": "No points activity yet",
-        "subtitle": "It looks like you haven't earned any points yet. Use {{appName}} to start earning points!",
+        "title": "Chưa có hoạt động tích điểm nào",
+        "subtitle": "Có vẻ như bạn chưa kiếm được điểm nào. Hãy sử dụng {{appName}} để bắt đầu kiếm điểm!",
         "gotIt": "Đã hiểu"
       },
       "pageError": {
-        "title": "Unable to load",
-        "subtitle": "Oops, something went wrong when trying to finish loading. Please try again.",
+        "title": "Tải không thành công",
+        "subtitle": "Rất tiếc, quá trình tải dữ liệu không thể hoàn tất. Vui lòng thử lại.",
         "refresh": "Làm mới"
       }
     },
     "fetchBalanceError": {
-      "title": "Unable to load your points",
-      "description": "Oops, something went wrong when trying to load your points. The information on this page may be out of date. Please refresh.",
+      "title": "Không thể tải điểm của bạn",
+      "description": "Rất tiếc, quá trình tải điểm của bạn đã xảy ra lỗi. Thông tin trên trang này có thể đã cũ. Hãy làm mới trang.",
       "retryCta": "Làm mới"
     },
     "loading": {
-      "title": "Gathering your points",
-      "description": "We're in the process of tallying up your points, hang tight"
+      "title": "Thu thập điểm",
+      "description": "Chúng tôi đang tính điểm của bạn, vui lòng đợi"
     },
     "error": {
-      "title": "Unable to load points",
-      "description": "Oops, something went wrong when trying to load your points. Please try again.",
+      "title": "Không thể tải điểm",
+      "description": "Rất tiếc, quá trình tải điểm đã xảy ra lỗi. Vui lòng thử lại.",
       "retryCta": "Thử lại"
     },
     "infoCard": {
-      "title": "More ways to earn points coming soon 🚀",
-      "body": "We are working on adding more ways to earn points through using the app. Keep checking in for updates."
+      "title": "Bạn sắp có thêm nhiều cách để kiếm điểm 🚀",
+      "body": "Chúng tôi đang cố gắng bổ sung thêm nhiều cách kiếm điểm trong quá trình sử dụng ứng dụng. Hãy kiểm tra thường xuyên để biết thông tin cập nhật."
     },
     "activitySection": {
-      "title": "How do I earn points?",
-      "body": "It's easy! Earn points by simply using the app."
+      "title": "Tôi có thể kiếm điểm bằng cách nào?",
+      "body": "Rất dễ dàng! Bạn có thể kiếm điểm chỉ bằng cách sử dụng ứng dụng."
     },
     "noActivities": {
-      "title": "Update to Unlock More Points 🔓",
-      "body": "Oops! It seems you're using an older version of {{appName}}. Update now to discover all the exciting new ways you can earn points."
+      "title": "Cập nhật để có thêm cơ hội kiếm điểm 🔓",
+      "body": "Rất tiếc! Có vẻ như bạn đang sử dụng phiên bản cũ của {{appName}}. Hãy cập nhật ngay để khám phá tất cả những phương thức kiếm điểm mới đầy thú vị."
     },
     "activityCards": {
       "createWallet": {
-        "title": "Create a {{appName}}  Wallet"
+        "title": "Tạo Ví {{appName}}"
       },
       "swap": {
-        "title": "Swap assets",
+        "title": "Trao đổi tài sản",
         "bottomSheet": {
-          "title": "Swap assets",
-          "body": "This space will be used to give all the details needed for this. Maybe minimum amount to swap. \n\nEarn {{pointsValue}} points whenever you swap an asset using {{appName}}.",
-          "cta": "Go to swap"
+          "title": "Trao đổi tài sản",
+          "body": "Vùng này sẽ được sử dụng để cung cấp tất cả thông tin chi tiết cần thiết để thực hiện việc này. Bạn có thể điền số tiền tối thiểu để trao đổi. \n\nKiếm {{pointsValue}} điểm bất cứ khi nào bạn trao đổi tài sản bằng {{appName}}.",
+          "cta": "Bắt đầu trao đổi"
         }
       },
       "moreComing": {
-        "title": "More coming soon!"
+        "title": "Còn nhiều cách khác nữa!"
       }
     },
     "discoverCard": {
-      "title": "{{appName}} Points",
-      "description": "Earn points easily with {{appName}}. Using the app, including swapping, leads to points!"
+      "title": "Điểm {{appName}}",
+      "description": "Kiếm điểm dễ dàng với {{appName}}. Bạn có thể kiếm điểm bằng cách sử dụng ứng dụng, bao gồm cả hoạt động trao đổi!"
     },
     "intro": {
-      "title": "Earn points effortlessly",
-      "description": "Jump into a new way to earn! Your {{appName}} actions now earn points. Start earning today and unlock awesome benefits.",
-      "cta": "Start your points journey"
+      "title": "Kiếm điểm dễ dàng",
+      "description": "Khám phá cách kiếm tiền mới! Giờ đây, hoạt động của bạn trên {{appName}} có thể mang lại điểm. Hãy bắt đầu kiếm tiền ngay hôm nay và khám phá những lợi ích tuyệt vời.",
+      "cta": "Bắt đầu hành trình tích điểm"
     }
   },
   "earnFlow": {
-    "gasSubsidized": "Valora's covering gas for this transaction!",
+    "gasSubsidized": "Valora sẽ chi trả phí ga cho giao dịch này!",
     "addCryptoBottomSheet": {
-      "title": "Add {{tokenSymbol}} on {{tokenNetwork}}",
-      "description": "Once you add tokens you'll have to come back to finish depositing into a pool.",
+      "title": "Nạp {{tokenSymbol}} vào {{tokenNetwork}}",
+      "description": "Sau khi thêm token, bạn sẽ phải quay lại để hoàn tất việc nạp tiền vào quỹ.",
       "actions": {
         "add": "Mua",
-        "transfer": "Transfer",
+        "transfer": "Chuyển tiền",
         "swap": "Trao đổi"
       },
       "actionDescriptions": {
-        "add": "Buy {{tokenSymbol}} on {{tokenNetwork}} using one of our trusted providers",
-        "transfer": "Use any {{tokenNetwork}} compatible wallet or exchange to deposit {{tokenSymbol}}",
-        "swap": "Swap into {{tokenSymbol}} from another {{tokenNetwork}} token"
+        "add": "Mua {{tokenSymbol}} trên {{tokenNetwork}} qua một trong những nhà cung cấp uy tín của chúng tôi",
+        "transfer": "Sử dụng bất kỳ ví hoặc sàn giao dịch nào tương thích với {{tokenNetwork}} để nạp {{tokenSymbol}}",
+        "swap": "Trao đổi thành {{tokenSymbol}} từ một token {{tokenNetwork}} khác"
       }
     },
     "cta": {
-      "title": "Earn on your stablecoins",
-      "subtitle": "Deposit today and earn returns",
-      "description": "See how much you can earn when supplying a lending pool"
+      "title": "Nhận stablecoin",
+      "subtitle": "Nạp tiền ngay hôm nay và nhận tiền lãi",
+      "description": "Xem số tiền bạn có thể kiếm được khi nạp tiền vào quỹ cho vay"
+    },
+    "earnInfo": {
+      "title": "Earn on your\nstablecoins",
+      "details": {
+        "earn": {
+          "titleGasSubsidy": "Maximize Earnings without Gas Fees*",
+          "title": "Maximize Earnings",
+          "subtitle": "Earn on your stablecoins and get rewards when you supply a pool.",
+          "footnoteSubsidy": "*Gas fees are temporarily covered by Valora"
+        },
+        "manage": {
+          "title": "Manage Directly from Valora",
+          "subtitle": "We’ll take care of the setup so you can manage your position directly from Valora."
+        },
+        "access": {
+          "title": "Easily Access your Funds",
+          "subtitle": "Collect your funds effortlessly with a single tap. Enjoy the same instant access as you would directly through your favorite protocols."
+        }
+      },
+      "action": {
+        "learn": "Tìm hiểu thêm",
+        "earn": "Bắt đầu kiếm tiền"
+      }
     },
     "ctaV1_86": {
-      "title": "Maximize earnings on stablecoins",
-      "subtitle": "Buy {{symbol}}",
-      "description": "Earn approximately {{apy}}% per year when you add {{symbol}} to a pool"
+      "title": "Tối đa hóa thu nhập trên stablecoin",
+      "subtitle": "Mua {{symbol}}",
+      "description": "Kiếm khoảng {{apy}}% mỗi năm khi bạn nạp {{symbol}} vào quỹ"
     },
     "enterAmount": {
-      "earnUpToLabel": "You could earn up to:",
-      "rateLabel": "Rate (est.)",
-      "earnUpTo": "~{{fiatSymbol}}{{amount}} / yr",
+      "earnUpToLabel": "Bạn có thể kiếm được đến:",
+      "rateLabel": "Tỷ giá (ước tính)",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}} / năm",
       "rate": "{{rate}}% APY",
       "continue": "Tiếp tục",
-      "info": "This pool is powered by Aave",
+      "info": "Quỹ này do Aave cung cấp",
       "infoBottomSheet": {
-        "title": "Why this pool?",
-        "description": "This Aave pool has over $150M TVL and more than 6,000 contributors, indicating strong liquidity and trustworthiness. It also uses USDC as its token and Abritrum as its network, which reduces volatility and ensures users will receive inexpensive gas rates.\n\nAll together this makes it a safe and attractive option with competitive APY, ensuring a beneficial investment opportunity for our users.\n\nYou can explore other Aave pools <0>here</0>.",
+        "title": "Tại sao bạn nên chọn quỹ này?",
+        "description": "Quỹ Aave này có hơn $150 triệu TVL và hơn 6.000 người đóng góp, cho thấy tính thanh khoản và độ uy tín cao. Quỹ cũng sử dụng USDC làm token và Abritrum làm mạng lưới giúp giảm biến động và đảm bảo người dùng sẽ nhận được mức phí ga rẻ.\n\nTất cả những yếu tố này tạo nên một lựa chọn an toàn và hấp dẫn với APY cạnh tranh, đảm bảo cơ hội đầu tư có lợi cho người dùng.\n\nBạn có thể khám phá các quỹ Aave khác <0>tại đây</0>.",
         "dismiss": "Loại bỏ"
       },
       "notEnoughBalanceForGasWarning": {
-        "title": "You need more {{feeTokenSymbol}} to continue",
-        "description": "Add {{feeTokenSymbol}} on {{network}} to cover your gas fees",
-        "noGasCta": "Buy {{feeTokenSymbol}} on {{network}}"
+        "title": "Bạn cần nạp thêm {{feeTokenSymbol}} để tiếp tục",
+        "description": "Nạp thêm {{feeTokenSymbol}} trên {{network}} để chi trả phí ga",
+        "noGasCta": "Mua {{feeTokenSymbol}} trên {{network}}"
       }
     },
     "activePools": {
-      "title": "Active Pools",
-      "totalValue": "Total Value:",
+      "title": "Quỹ đang hoạt động",
+      "totalValue": "Tổng giá trị:",
       "apy": "~{{apy}}% APY",
-      "exitPool": "Exit Pool",
-      "depositMore": "Deposit More",
-      "viewPools": "View Pools"
+      "exitPool": "Thoát quỹ",
+      "depositMore": "Nạp thêm",
+      "viewPools": "Xem quỹ"
     },
     "depositBottomSheet": {
-      "title": "Review & Deposit",
-      "description": "Before depositing to an Aave pool, please review the transaction details below",
+      "title": "Xem lại & Nạp tiền",
+      "description": "Trước khi nạp tiền vào quỹ Aave, vui lòng xem lại chi tiết giao dịch bên dưới",
       "amount": "Số tiền đã nạp",
-      "fee": "Est. Gas Fees",
-      "provider": "Earnings provider",
+      "fee": "Phí ga ước tính",
+      "provider": "Nhà cung cấp thu nhập",
       "network": "Mạng lưới",
-      "footer": "By depositing crypto into an Aave pool, you accept the risks associated with using Aave. <0>Terms & Conditions</0>",
-      "primaryCta": "Complete",
+      "footer": "Khi nạp tiền điện tử vào quỹ Aave, bạn chấp nhận các rủi ro liên quan đến việc sử dụng Aave. <0>Điều khoản & Điều kiện</0>",
+      "primaryCta": "Hoàn thành",
       "secondaryCta": "Hủy"
     },
     "collect": {
-      "title": "Congratulations! Review & collect your earnings",
-      "total": "TOTAL",
-      "plus": "PLUS",
-      "rate": "Rate (est.)",
+      "title": "Xin chúc mừng! Hãy kiểm tra lại và nhận thu nhập của bạn",
+      "total": "TỔNG",
+      "plus": "THÊM",
+      "rate": "Tỷ giá (ước tính)",
       "apy": "{{apy}}% APY",
-      "fee": "Gas Fee",
-      "cta": "Collect Earnings",
+      "fee": "Phí ga",
+      "cta": "Nhận thu nhập",
       "errorTitle": "Đã xảy ra lỗi",
-      "errorDescription": "Unable to fetch deposit details. Please try again.",
-      "noGasTitle": "You need more {{symbol}} to continue",
-      "noGasDescription": "Add {{symbol}} on {{network}} to cover your gas fees",
-      "noGasCta": "Buy {{symbol}} on {{network}}"
+      "errorDescription": "Không thể tìm thông tin chi tiết về số tiền nạp. Vui lòng thử lại.",
+      "noGasTitle": "Bạn cần thêm {{symbol}} để tiếp tục",
+      "noGasDescription": "Nạp thêm {{symbol}} vào {{network}} để chi trả phí ga của bạn",
+      "noGasCta": "Mua {{symbol}} trên {{network}}"
     },
     "transactionFeed": {
-      "earnClaimTitle": "Collected",
-      "earnClaimSubtitle": "from {{providerName}} Pool",
-      "earnDepositTitle": "Deposited",
-      "earnDepositSubtitle": "to {{providerName}} Pool",
-      "earnWithdrawTitle": "Withdrew",
-      "earnWithdrawSubtitle": "from {{providerName}} Pool"
+      "earnClaimTitle": "Đã nhận",
+      "earnClaimSubtitle": "từ Quỹ {{providerName}}",
+      "earnDepositTitle": "Đã nạp",
+      "earnDepositSubtitle": "vào Quỹ {{providerName}}",
+      "earnWithdrawTitle": "Rút",
+      "earnWithdrawSubtitle": "từ Quỹ {{providerName}}"
     },
     "transactionDetails": {
       "descriptionLabel": "Chi tiết",
-      "earnClaimTitle": "Collected",
-      "earnClaimSubtitle": "Collected {{tokenSymbol}} from {{providerName}} Pool",
-      "earnClaimDetails": "Amount Collected",
-      "earnDepositTitle": "Deposited",
-      "earnDepositSubtitle": "Deposited {{tokenSymbol}} to {{providerName}} Pool",
+      "earnClaimTitle": "Đã nhận",
+      "earnClaimSubtitle": "Đã nhận {{tokenSymbol}} từ Quỹ {{providerName}}",
+      "earnClaimDetails": "Số tiền đã nhận",
+      "earnDepositTitle": "Đã nạp",
+      "earnDepositSubtitle": "Đã nạp {{tokenSymbol}} vào Quỹ {{providerName}}",
       "earnDepositDetails": "Số tiền đã nạp",
-      "earnWithdrawTitle": "Withdrew",
-      "earnWithdrawSubtitle": "Withdrew {{tokenSymbol}} from {{providerName}} Pool",
+      "earnWithdrawTitle": "Rút",
+      "earnWithdrawSubtitle": "Rút {{tokenSymbol}} từ Quỹ {{providerName}}",
       "earnWithdrawDetails": "Số tiền đã rút"
     }
   },
diff --git a/locales/zh-CN/translation.json b/locales/zh-CN/translation.json
index fe8d936889..26137ca4ae 100644
--- a/locales/zh-CN/translation.json
+++ b/locales/zh-CN/translation.json
@@ -255,8 +255,8 @@
       "text": "任何拥有您的短语的人都将能够访问您的账户和其中的所有资金。切勿将短语泄露给他人。"
     }
   ],
-  "consumerIncentivesTitle": "超级充电站即将关闭",
-  "consumerIncentivesSummary": "但更多奖励正在向您走来。在 5 月 28 日之前，稳定币最高余额（cUSD、cEUR 或 cREAL）可获得 {{percent}}% 的年度奖励。具体操作如下",
+  "consumerIncentivesTitle": "Supercharge 即将结束",
+  "consumerIncentivesSummary": "但还有更多奖励正等着您。在 5 月 28 日之前，稳定币最高余额（cUSD、cEUR 或 cREAL）可获得 {{percent}}% 的年度奖励。具体操作如下：",
   "earnWeekly": {
     "header": "关联您的手机号码",
     "text": "如果您尚未关联，请点按“关联号码”。"
@@ -271,14 +271,14 @@
     "text": "这将确保您的奖励安全可控。"
   },
   "conclusion": "就是如此简单，立即 Supercharge 您的加密货币吧！",
-  "superchargeTitle": "超级充电站即将关闭",
-  "superchargeDescription": "但更多奖励正在向您走来。在 5 月 28 日之前， {{token}} 最高余额可获得 {{apy}}% 的年度奖励。具体操作如下：",
+  "superchargeTitle": "Supercharge 即将结束",
+  "superchargeDescription": "但还有更多奖励正等着您。在 5 月 28 日之前， {{token}} 最高余额可获得 {{apy}}% 的年度奖励。具体操作如下：",
   "superchargeConnectNumber": "关联您的手机号码",
   "superchargeReconnectNumber": "重新关联您的手机号码\n<0>我们已经改进 Supercharge 体验。重新关联您的手机号码，继续获取基于您的 {{token}} 的奖励。</0>",
   "superchargeMinimumBalance": "添加 {{amount}} {{token}} 的最低余额",
   "superchargeDisclaimer": "这不会影响您的余额或之前的收入。",
   "superchargeDisclaimerMaxRewards": "这不会影响您的余额或之前的收入。",
-  "superchargeDisclaimerDayLimit": "这不会影响您的余额或之前的收入。<0>了解更多信息</0>",
+  "superchargeDisclaimerDayLimit": "这不会影响您的余额或之前的收入。<0>了解更多</0>",
   "superchargeTokenDetailsDialog": {
     "title": "我可以 Supercharge 哪种资产？",
     "body": "您将每周获得基于您的 Celo 稳定币最高价值（cEUR、cUSD、cREAL）的奖励。",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "必须更新应用",
   "superchargingDescription": "更新 Valora 应用以继续领取您每周的 Supercharge 奖励.",
-  "superchargingTitleV1_54": "超级充电站即将关闭",
-  "superchargingDescriptionV1_54": "每周奖励可在 5 月 28 日（星期二）23:59（世界协调时）之前领取。从 5 月 29 日起，您将无法再领取超级充值奖励。",
+  "superchargingTitleV1_54": "Supercharge 即将结束",
+  "superchargingDescriptionV1_54": "每周奖励可在 5 月 28 日（星期二）23:59（世界协调时）之前领取。从 5 月 29 日起，您将无法再领取 Supercharge 奖励。",
   "superchargeRewardsAvailable": "您有 {{amount}} {{token}} 可领取！",
   "superchargeRewardsAvailableMultipleTokens": "您有 {{amounts}} 可领取！",
-  "superchargeClaimText": "在世界协调时 5 月 28 日（星期二）23:59 之前领取奖励。自 5 月 29 日起，您将无法再领取超级充值奖励。",
+  "superchargeClaimText": "请在世界协调时 5 月 28 日（星期二）23:59 之前领取奖励。自 5 月 29 日起，您将无法再领取 Supercharge 奖励。",
   "superchargeClaimButton": "领取奖励",
   "superchargeFetchRewardsFailed": "获取待处理的 Supercharge 奖励时出错。请稍后再试。",
   "superchargeClaimSuccess": "您的 Supercharge 奖励已添加到您的总余额中。",
@@ -677,8 +677,8 @@
     "body": "在他们成功设置 {{appName}} 钱包并关联手机号码后，你们每个人都将获得一个专属 NFT。"
   },
   "inviteRewardsBannerCUSD": {
-    "title": "邀请朋友最多可获得 12 cUSD",
-    "body": "一旦他们连接了自己的号码并将资金添加到 {{appName}}，你们都将收到 0.50 cUSD。"
+    "title": "邀请朋友，最多可获得 12 cUSD",
+    "body": "他们连接了自己的号码并将资金添加到 {{appName}} 后，你们都将收到 0.50 cUSD。"
   },
   "inviteWithUrl": {
     "title": "邀请朋友",
@@ -692,8 +692,8 @@
       "body": "邀请您的朋友和家人下载 {{appName}} ，你们每个人都将获得一个独家的 NFT"
     },
     "rewardsActiveCUSD": {
-      "title": "邀请您的朋友加入 Valora，即可获得高达 12 美分！",
-      "body": "每邀请一位朋友登录 {{appName}}，即可获得 0.50 cUSD。一旦他们连接号码、添加资金并持有 7 天，你们都将获得 0.50 cUSD。快点，资金有限！(仅限 25 位好友）。"
+      "title": "邀请您的朋友加入 Valora，即可获得高达 12 cUSD！",
+      "body": "每邀请一位朋友加入 {{appName}}，即可获得 0.50 cUSD。他们连接号码、添加资金并持有 7 天后，你们都将获得 0.50 cUSD。立即行动，资金有限哦！（限 25 位好友）。"
     }
   },
   "getReward": "获得 ${{reward}}",
@@ -710,15 +710,15 @@
     "goldDisclaimer": "当您使用 Valora 创建一个“账户”时，您创建的是一个只有您拥有密钥的数字钱包。包括 Valora 在内的任何其他个人或实体都无法恢复您的密钥、更改或撤消交易或者追回丢失的资金。请注意，加密货币是新资产类别的一部分，存在财务损失风险。在购买任何资产之前，请仔细考虑您的财务状况和对财务风险的承受能力。"
   },
   "termsColloquial": {
-    "title": "让我们从创建钱包开始",
-    "privacyHeading": "您的信息和隐私",
-    "privacy1": "我们收集的使用数据有助于我们改进应用程序和安全性。我们收集的信息类型、使用方式以及您与这些信息相关的权利，请参阅我们的<0>隐私政策</0>。",
-    "privacy2": "如果您决定链接您的电话号码，我们将存储一份加密副本。",
+    "title": "先从创建钱包开始",
+    "privacyHeading": "您的信息和隐私：",
+    "privacy1": "我们收集的使用数据有助于我们改进应用程序和安全性。有关我们收集的信息类型、我们对信息的使用方式以及您与这些信息相关的权利，请参阅我们的<0>隐私政策</0>。",
+    "privacy2": "如果您决定关联您的电话号码，我们将存储该电话号码的加密副本。",
     "privacy3": "如果您决定连接您的联系人，我们会使用他们的姓名、电话号码和个人资料图片，以方便查找。",
-    "walletHeading": "您的电子钱包",
+    "walletHeading": "您的 Valora 电子钱包：",
     "wallet1": "您即将创建一个数字钱包。只有您才拥有钱包的密钥。如果您丢失了密钥，我们无法恢复您的密钥或您的资产。我们也无法逆转通过 Valora 在区块链上进行的操作。",
-    "wallet2": "数字资产是您与Valora互动的资产，具有独特的风险。通过使用Valora，您接受了这些风险并承担了相应的责任。在做出选择之前，请考虑您的财务状况和风险承受能力。",
-    "fullTerms": "阅读我们的完整<0>条款和条件</0>"
+    "wallet2": "数字资产是您与 Valora 互动的资产，具有独特的风险。使用 Valora 即表示您接受这些风险并承担相应的责任。在做出选择之前，请先考虑您的财务状况和风险承受能力。",
+    "fullTerms": "阅读我们完整的<0>条款和条件</0>"
   },
   "fullNameOrPsuedonym": "全名或化名",
   "namePlaceholder": "例如：姓名",
@@ -1032,7 +1032,7 @@
   "inviteWithoutPayment": "嗨！我一直在使用 {{appName}} 作为我的加密货币钱包。它使用简便，我想邀请您访问此链接试用： {{link}}",
   "inviteWithEscrowedPayment": "嗨！我一直在使用 {{appName}} 将加密货币发送到世界各地。我刚刚向您发送了 {{amount}} {{token}}。请使用此链接下载 {{appName}} 应用程序并兑换您的 {{token}}：{{link}}",
   "inviteWithRewards": "嗨！👋 我正在使用 {{appName}} 作为加密货币钱包。您可以快速下载此应用程序并关联手机号码，之后我们都可以获得一个特别版的 NFT 作为奖励。💫 \n\n请使用此链接下载: {{link}}",
-  "inviteWithRewardsCUSD": "嘿！现在，如果你注册、连接你的号码并为你的 Valora 钱包充值，我们都可以免费获得 0.5 美元的奖励。我用它来增加我的美元和加密货币储蓄，而你只需一个电话号码就能在几秒钟内完成设置。确保使用我的推荐链接注册： \n\n{{link}} \n\n 快点，推荐促销即将结束。",
+  "inviteWithRewardsCUSD": "嗨！如果您现在注册、连接您的号码并为您的 Valora 钱包充值，我们都可以免费获得 0.5 美元的奖励。我用奖励来增加我的美元和加密货币储蓄，您只需一个电话号码就能在几秒钟内完成设置。请务必通过我的推荐链接注册： \n\n{{link}} \n\n 赶快行动吧，推荐促销很快就结束了。",
   "loadingContacts": "查找您的联系人",
   "myCode": "我的代码",
   "scanCode": "扫描",
@@ -1765,9 +1765,9 @@
     "swapToTokenSelection": "替换至",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "我们的交换提供商不支持所选令牌。",
-    "selectTokenLabel": "选择令牌",
-    "tokenBottomSheetTitle": "选择令牌",
-    "onNetwork": "{{networkName}}",
+    "selectTokenLabel": "选择代币",
+    "tokenBottomSheetTitle": "选择代币",
+    "onNetwork": "在 {{networkName}}",
     "switchedToNetworkWarning": {
       "title": "您已转至 {{networkName}} 网络",
       "body_swapFrom": "在 {{networkName}} 网络上选择用于交换的代币，然后继续。",
@@ -1821,8 +1821,8 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "免费",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} 费用\n\n {{appName}} 费用为 {{appFeePercentage}}%，旨在通过确保快速、可靠和安全的交换来提高您的体验。",
-      "appFeeInfo_free": "{{appName}} 费用\n\n本次交换是免费的。",
+      "appFeeInfo": "{{appName}} 费用\n\n{{appFeePercentage}}% 的 {{appName}} 费用旨在通过确保快速、可靠、安全的交换来提高您的体验。",
+      "appFeeInfo_free": "{{appName}} 费用\n\n本次交换免费。",
       "appFeeInfo_placeholder": "{{appName}} 费用\n\n费用根据您收到的报价计算。",
       "appFeeInfoDismissButton": "知道了",
       "slippagePercentage": "滑点调整",
@@ -1831,8 +1831,8 @@
       "slippageToleranceInfo": "滑点调整\n\n您的交换将在滑点调整百分比范围内执行。如果价格变动超过滑点调整，{{appName}} 将阻止交易执行，为您提供保护。",
       "networkFeeInfoDismissButton": "知道了",
       "exchangeRate": "汇率",
-      "exchangeRateInfo": "汇率\n\n我们为您找到了最佳汇率。您的交易将以 {{slippagePercentage}}% 的估算价格完成，否则交易将被取消，资金将退回您的钱包。",
-      "exchangeRateInfo_withAppFee": "汇率\n\n我们为您找到了最佳汇率。您的交易将以 {{slippagePercentage}}% 的估算价格完成，否则交易将被取消，资金将返还到您的钱包。\n\n估算汇率包括 {{appName}} 费用 {{appFeePercentage}}%。",
+      "exchangeRateInfo": "汇率\n\n我们为您找到了最佳汇率。您的交易将以 {{slippagePercentage}}% 的估算价格完成，否则交易将被取消，且资金将退回您的钱包。",
+      "exchangeRateInfo_withAppFee": "汇率\n\n我们为您找到了最佳汇率。您的交易将以 {{slippagePercentage}}% 的估算价格完成，否则交易将被取消，且资金将返还到您的钱包。\n\n估算汇率包含 {{appFeePercentage}}% 的 {{appName}} 费用。",
       "exchangeRateInfoDismissButton": "知道了",
       "estimatedValue": "估计价值"
     },
@@ -2062,7 +2062,7 @@
     },
     "jumpstart": {
       "title": "通过实时链接发送",
-      "subtitle": "分享链接，像发送文本一样发送加密货币"
+      "subtitle": "分享链接，使发送加密货币就像发送文本一样简单"
     },
     "getStarted": {
       "title": "在 Valora 上发送资金的方式",
@@ -2154,7 +2154,7 @@
     }
   },
   "jumpstartShareLinkScreen": {
-    "title": "分享您的实时链接",
+    "title": "共享实时链接",
     "description": "复制链接，通过您选择的消息应用程序发送 {{tokenSymbol}} ，或使用二维码。",
     "linkLabel": "实时链接",
     "linkCopiedMessage": "复制的实时链接",
@@ -2164,7 +2164,7 @@
       "ctaNavigate": "返回主页"
     },
     "ctaShare": "共享链接",
-    "ctaScanQRCode": "显示 QR 码",
+    "ctaScanQRCode": "显示二维码",
     "shareMessage": "你好！我给您发了一个链接，资金来自 {{tokenAmount}} {{tokenSymbol}} ，网址是 {{appName}}。使用此链接下载应用程序，资金就会到账，等着您。 {{link}}",
     "qrCodeBottomSheet": {
       "title": "扫描代码接收资金",
@@ -2207,13 +2207,13 @@
     },
     "rewardBottomSheet": {
       "title": "赚取 5 美元 ETH",
-      "description": "在太平洋时间 2024 年 4 月 4 日下午 12:00 之前用任何以太坊代币为您的钱包充值，我们将在太平洋时间 2024 年 4 月 5 日下午 11:59 之前为您提供 5 美元的 ETH。\n\n这是对早期以太坊探索者的独家优惠。",
+      "description": "只要在太平洋时间 2024 年 4 月 4 日中午 12:00 之前用任何以太坊代币为您的钱包充值，我们就将在太平洋时间 2024 年 4 月 5 日晚上 11:59 之前为您提供 5 美元的 ETH。\n\n这是对早期以太坊探索者的独家优惠。",
       "expirationLabel": "过期 {{expirationLabelText}}",
       "cta": "使用奖励"
     },
     "rewardReminderBottomSheet": {
       "title": "不要错过，赚取 5 美元 ETH",
-      "description": "在太平洋时间 2024 年 4 月 4 日下午 12:00 之前用任何以太坊代币为您的钱包充值，我们将在太平洋时间 2024 年 4 月 5 日下午 11:59 之前为您提供 5 美元的 ETH。\n\n这是对早期以太坊探索者的独家优惠。",
+      "description": "只要在太平洋时间 2024 年 4 月 4 日中午 12:00 之前用任何以太坊代币为您的钱包充值，我们就将在太平洋时间 2024 年 4 月 5 日晚上 11:59 之前为您提供 5 美元的 ETH。\n\n这是对早期以太坊探索者的独家优惠。",
       "expirationLabel": "过期 {{expirationLabelText}}",
       "cta": "使用奖励"
     }
@@ -2242,27 +2242,27 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "检查您的资金",
-      "description": "请稍候，我们将检查您的 Live Link。可申请的资金将很快到账。"
+      "title": "正在检查您的资金",
+      "description": "请稍候，我们将检查您的实时链接。可申领的资金将很快到账。"
     },
     "error": {
       "title": "无法领取资金",
-      "description": "此链接无法申请，原因不明",
+      "description": "由于未知原因，无法使用此链接",
       "alreadyClaimedDescription": "链接已被使用。请让您的朋友发送一个新链接",
       "contactSupport": "联系支持团队",
       "dismiss": "忽略"
     }
   },
   "jumpstartReclaim": {
-    "description": "恢复链接需要支付网络气体费用，您是否愿意继续？",
+    "description": "恢复链接需要支付网络手续费，是否要继续？",
     "fetchStatusError": {
       "title": "哎呀，出错了",
       "description": "我们无法获取该邀请的申请状态，请稍后再试或联系支持人员",
       "retryCta": "重试"
     },
     "reclaimError": {
-      "title": "无法收回资金",
-      "description": "尝试再次回收，或联系支持人员"
+      "title": "无法领取资金",
+      "description": "尝试重新领取，或联系支持人员"
     }
   },
   "multiSelect": {
@@ -2270,13 +2270,13 @@
     "allNetworks": "所有网络"
   },
   "points": {
-    "title": "瓦洛拉积分",
+    "title": "Valora 积分",
     "activity": "活动",
     "history": {
       "cards": {
         "createWallet": {
-          "title": "钱包夹",
-          "subtitle": "{{appName}}成员"
+          "title": "钱包所有者",
+          "subtitle": "{{appName}} 成员"
         },
         "swap": {
           "title": "交换",
@@ -2285,13 +2285,13 @@
       },
       "title": "我的积分活动",
       "error": {
-        "title": "无法加载点活动",
-        "subtitle": "哎呀，在加载您的积分活动提要时出了点问题。请重试。",
+        "title": "无法加载积分活动",
+        "subtitle": "哎呀，在加载积分活动提要时出了点问题。请重试。",
         "tryAgain": "再试一次"
       },
       "empty": {
         "title": "尚无积分活动",
-        "subtitle": "看来您还没有获得任何积分。使用 {{appName}} 开始赚取积分！",
+        "subtitle": "您似乎还没有获得任何积分。使用 {{appName}} 开始赚取积分吧！",
         "gotIt": "知道了"
       },
       "pageError": {
@@ -2302,40 +2302,40 @@
     },
     "fetchBalanceError": {
       "title": "无法加载您的积分",
-      "description": "哎呀，在加载您的积分时出了点问题。本页面上的信息可能已经过时。请刷新。",
+      "description": "哎呀，在加载积分时出了点问题。本页面上的信息可能已过时。请刷新。",
       "retryCta": "刷新"
     },
     "loading": {
-      "title": "收集要点",
-      "description": "我们正在统计您的积分，请抓紧时间"
+      "title": "收集积分",
+      "description": "我们正在统计您的积分，请稍等"
     },
     "error": {
-      "title": "无法加载点",
-      "description": "哎呀，在加载您的积分时出了点问题。请重试。",
+      "title": "无法加载积分",
+      "description": "哎呀，在加载积分时出了点问题。请重试。",
       "retryCta": "再试一次"
     },
     "infoCard": {
-      "title": "更多赚取积分的方法即将推出 🚀",
+      "title": "即将推出更多赚取积分的方法 🚀",
       "body": "我们正在努力增加更多通过使用应用程序赚取积分的方法。请随时查看更新。"
     },
     "activitySection": {
-      "title": "如何获得积分？",
-      "body": "非常简单！只需使用该应用程序即可获得积分。"
+      "title": "如何赚取积分？",
+      "body": "非常简单！只需使用该应用程序即可赚取积分。"
     },
     "noActivities": {
-      "title": "更新以解锁更多积分 🔓",
-      "body": "哎呀！您使用的似乎是旧版本的 {{appName}}。立即更新，了解赚取积分的所有令人兴奋的新方法。"
+      "title": "进行更新，以解锁更多积分 🔓",
+      "body": "哎呀！您使用的似乎是旧版本的 {{appName}}。请立即更新，了解所有激动人心的赚取积分的新方式。"
     },
     "activityCards": {
       "createWallet": {
-        "title": "创建 {{appName}}  钱包"
+        "title": "创建 {{appName}} 钱包"
       },
       "swap": {
-        "title": "掉期资产",
+        "title": "交换资产",
         "bottomSheet": {
-          "title": "掉期资产",
-          "body": "这个空格将用来提供这方面所需的所有细节。也许是交换的最低金额。 \n\n每当您使用 {{appName}}进行资产交换时，都可以赚取 {{pointsValue}} 积分。",
-          "cta": "去交换"
+          "title": "交换资产",
+          "body": "这个空间将用来提供这方面所需的所有细节。也许是交换的最低金额。 \n\n每当您使用 {{appName}} 进行资产交换时，都可以赚取 {{pointsValue}} 积分。",
+          "cta": "前往交换"
         }
       },
       "moreComing": {
@@ -2344,34 +2344,57 @@
     },
     "discoverCard": {
       "title": "{{appName}} 积分",
-      "description": "通过 {{appName}}轻松赚取积分。使用应用程序（包括交换）可获得积分！"
+      "description": "通过 {{appName}} 轻松赚取积分。使用本应用程序（包括交换）可获得积分！"
     },
     "intro": {
       "title": "轻松赚取积分",
-      "description": "跳转到新的赚钱方式！您的 {{appName}} 行动现在可以赚取积分。今天就开始赚取积分，享受超值优惠。",
+      "description": "采用新的赚钱方式！您的 {{appName}} 行动现在可以赚取积分了。现在就开始赚取积分，享受超值优惠。",
       "cta": "开始您的积分之旅"
     }
   },
   "earnFlow": {
     "gasSubsidized": "Valora 公司为此次交易提供天然气！",
     "addCryptoBottomSheet": {
-      "title": "在 {{tokenNetwork}}上添加 {{tokenSymbol}}",
-      "description": "一旦您添加了代币，您就必须回来完成存入池的工作。",
+      "title": "在 {{tokenNetwork}} 上添加 {{tokenSymbol}}",
+      "description": "添加代币后，就必须返回并完成将资金存入池中。",
       "actions": {
         "add": "买入",
-        "transfer": "转让",
+        "transfer": "转账",
         "swap": "交换"
       },
       "actionDescriptions": {
-        "add": "使用我们值得信赖的供应商之一在 {{tokenNetwork}} 上购买 {{tokenSymbol}}",
-        "transfer": "使用任何与 {{tokenNetwork}} 兼容的钱包或交易所存款 {{tokenSymbol}}",
-        "swap": "从另一个 {{tokenNetwork}} 令牌换入 {{tokenSymbol}}"
+        "add": "使用我们值得信赖的提供商之一，在 {{tokenNetwork}} 上购买 {{tokenSymbol}}",
+        "transfer": "使用任何与 {{tokenNetwork}} 兼容的钱包或交易所，来存入 {{tokenSymbol}}",
+        "swap": "从另一个 {{tokenNetwork}} 代币换入 {{tokenSymbol}}"
       }
     },
     "cta": {
-      "title": "赚取稳定币",
-      "subtitle": "立即存款，赚取回报",
-      "description": "了解您在提供贷款池时能赚多少钱"
+      "title": "通过稳定币赚取收入",
+      "subtitle": "现在就存款，赚取收益",
+      "description": "了解在提供贷款池时您能赚取多少收入"
+    },
+    "earnInfo": {
+      "title": "赚取\n稳定币",
+      "details": {
+        "earn": {
+          "titleGasSubsidy": "无需汽油费即可实现收益最大化*。",
+          "title": "收益最大化",
+          "subtitle": "赚取稳定币，并在提供资金池时获得奖励。",
+          "footnoteSubsidy": "*燃气费暂时由 Valora 公司承担"
+        },
+        "manage": {
+          "title": "直接从 Valora 进行管理",
+          "subtitle": "我们将为您进行设置，您可以直接从 Valora 管理您的仓位。"
+        },
+        "access": {
+          "title": "轻松访问您的资金",
+          "subtitle": "只需轻轻一点，即可轻松收取资金。享受与直接通过您最喜爱的协议相同的即时访问。"
+        }
+      },
+      "action": {
+        "learn": "了解更多",
+        "earn": "开始赚钱"
+      }
     },
     "ctaV1_86": {
       "title": "最大化稳定币收益",
@@ -2379,74 +2402,74 @@
       "description": "将 {{symbol}} 加入游泳池后，每年可获得约 {{apy}}% 的收益"
     },
     "enterAmount": {
-      "earnUpToLabel": "您最多可以获得",
-      "rateLabel": "比率（估计值）",
-      "earnUpTo": "~{{fiatSymbol}}{{amount}} / 年",
-      "rate": "{{rate}}年利率",
+      "earnUpToLabel": "您最多可以赚取：",
+      "rateLabel": "费率（估算）",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}}/年",
+      "rate": "{{rate}}% APY",
       "continue": "继续",
-      "info": "本泳池由 Aave 提供能源",
+      "info": "此池由 Aave 提供支持",
       "infoBottomSheet": {
-        "title": "为什么是这个泳池？",
-        "description": "该 Aave 池拥有超过 1.5 亿美元的 TVL 和 6000 多名贡献者，这表明它具有很强的流动性和可信度。它还使用 USDC 作为代币，使用 Abritrum 作为网络，从而降低了波动性，确保用户获得低廉的天然气价格。\n\n所有这些都使其成为一个安全、有吸引力且年利率具有竞争力的选择，确保为我们的用户提供有利的投资机会。\n\n您可以<0>在这里</0>探索其他 Aave 池。",
+        "title": "为什么使用此池？",
+        "description": "这个 Aave 池拥有超过 1.5 亿美元的 TVL 和 6000 多名贡献者，这表明此池具有很强的流动性和可信度。此池还使用 USDC 作为代币，并以 Abritrum 作为网络，从而降低了波动性，确保用户获得低廉的手续费。\n\n结合所有方面来看，此池是一个安全、有吸引力且年利率具有竞争力的选择，确保为我们的用户提供有利的投资机会。\n\n您可以在<0>此处</0>探索其他 Aave 池。",
         "dismiss": "忽略"
       },
       "notEnoughBalanceForGasWarning": {
         "title": "您需要更多 {{feeTokenSymbol}} 才能继续",
-        "description": "在 {{network}} 上添加 {{feeTokenSymbol}} 以支付汽油费",
-        "noGasCta": "在 {{network}}上购买 {{feeTokenSymbol}}"
+        "description": "在 {{network}} 上添加 {{feeTokenSymbol}} 以支付手续费",
+        "noGasCta": "在 {{network}} 上购买 {{feeTokenSymbol}}"
       }
     },
     "activePools": {
-      "title": "活动泳池",
-      "totalValue": "总价值",
+      "title": "活动池",
+      "totalValue": "总值：",
       "apy": "~{{apy}}% APY",
-      "exitPool": "出口池",
-      "depositMore": "存款 更多",
-      "viewPools": "查看泳池"
+      "exitPool": "退出池",
+      "depositMore": "存入更多",
+      "viewPools": "查看各类池"
     },
     "depositBottomSheet": {
       "title": "审查和存款",
-      "description": "在向 Aave 奖池存款之前，请查看以下交易详情",
+      "description": "在向 Aave 池存款之前，请查看以下交易详情",
       "amount": "已转入金额",
-      "fee": "估计天然气费",
+      "fee": "估计手续费",
       "provider": "收入提供者",
       "network": "网络",
       "footer": "向 Aave 池存入加密货币，即表示您接受与使用 Aave 相关的风险。<0>条款和条件</0>",
-      "primaryCta": "完整",
+      "primaryCta": "完成",
       "secondaryCta": "取消"
     },
     "collect": {
-      "title": "恭喜您查看并领取收益",
+      "title": "恭喜！查看并领取您的收益",
       "total": "总计",
-      "plus": "加",
-      "rate": "比率（估计值）",
-      "apy": "{{apy}}年利率",
-      "fee": "燃气费",
-      "cta": "收取收益",
+      "plus": "PLUS",
+      "rate": "费率（估算）",
+      "apy": "{{apy}}% APY",
+      "fee": "手续费",
+      "cta": "领取收入",
       "errorTitle": "出错了",
       "errorDescription": "无法获取存款详情。请重试。",
       "noGasTitle": "您需要更多 {{symbol}} 才能继续",
-      "noGasDescription": "在 {{network}} 上添加 {{symbol}} 以支付汽油费",
-      "noGasCta": "在 {{network}}上购买 {{symbol}}"
+      "noGasDescription": "在 {{network}} 上添加 {{symbol}} 以支付手续费",
+      "noGasCta": "在 {{network}} 上购买 {{symbol}}"
     },
     "transactionFeed": {
-      "earnClaimTitle": "收藏",
-      "earnClaimSubtitle": "来自 {{providerName}} Pool",
-      "earnDepositTitle": "存入",
+      "earnClaimTitle": "已领取",
+      "earnClaimSubtitle": "从 {{providerName}} 池",
+      "earnDepositTitle": "已存入",
       "earnDepositSubtitle": "至 {{providerName}} 池",
-      "earnWithdrawTitle": "撤回",
-      "earnWithdrawSubtitle": "来自 {{providerName}} Pool"
+      "earnWithdrawTitle": "已取出",
+      "earnWithdrawSubtitle": "从 {{providerName}} 池"
     },
     "transactionDetails": {
       "descriptionLabel": "详细信息",
-      "earnClaimTitle": "收藏",
-      "earnClaimSubtitle": "从 {{providerName}} Pool 收集的 {{tokenSymbol}}",
-      "earnClaimDetails": "收款金额",
-      "earnDepositTitle": "存入",
-      "earnDepositSubtitle": "存入 {{tokenSymbol}} 至 {{providerName}} 奖池",
+      "earnClaimTitle": "已领取",
+      "earnClaimSubtitle": "已从 {{providerName}} 池领取 {{tokenSymbol}}",
+      "earnClaimDetails": "已领取金额",
+      "earnDepositTitle": "已存入",
+      "earnDepositSubtitle": "已向 {{providerName}} 池存入 {{tokenSymbol}}",
       "earnDepositDetails": "已转入金额",
-      "earnWithdrawTitle": "撤回",
-      "earnWithdrawSubtitle": "从 {{providerName}} Pool 提取 {{tokenSymbol}}",
+      "earnWithdrawTitle": "已取出",
+      "earnWithdrawSubtitle": "已从 {{providerName}} 池取出 {{tokenSymbol}}",
       "earnWithdrawDetails": "已提取金额"
     }
   },

From 5f2ef57dc335b59dd9b187516e7048e84097772a Mon Sep 17 00:00:00 2001
From: Alex Bakoushin <alex@bakoush.in>
Date: Mon, 27 May 2024 18:24:24 +0200
Subject: [PATCH 062/133] fix(points): app mount sagas have not been running #2
 (#5479)

### Description

Follow up PR to #5466

1. Uses `spawn` to start sagas

`spawn` does not propagate errors to the parent, so if one of the
spawned sagas will fail, this won't affect others -- effectively the
same as when `safely` wrapper was used.

2. Added simplified unit test to ensure the sagas are spawned only once
during user session.

### Test plan

* Tested manually
* Added unit test

### Related issues

NA

### Backwards compatibility

Y

### Network scalability

NA
---
 src/points/saga.test.ts | 24 +++++++++++-------------
 src/points/saga.ts      |  6 ++++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/points/saga.test.ts b/src/points/saga.test.ts
index 0edb4c9830..cff92f238e 100644
--- a/src/points/saga.test.ts
+++ b/src/points/saga.test.ts
@@ -4,7 +4,7 @@ import { FetchMock } from 'jest-fetch-mock/types'
 import { expectSaga } from 'redux-saga-test-plan'
 import * as matchers from 'redux-saga-test-plan/matchers'
 import { throwError } from 'redux-saga-test-plan/providers'
-import { call, select } from 'redux-saga/effects'
+import { call, select, spawn } from 'redux-saga/effects'
 import { Actions as AppActions } from 'src/app/actions'
 import { retrieveSignedMessage } from 'src/pincode/authentication'
 import * as pointsSaga from 'src/points/saga'
@@ -554,26 +554,24 @@ describe('watchAppMounted', () => {
     jest.clearAllMocks()
   })
 
-  it('should call sendPendingPointsEvents only once even if multiple "app mounted" actions are dispatched', async () => {
-    const mockSendPendingPointsEvents = jest.fn()
-    const mockGetPointsBalance = jest.fn()
-    const mockGetPointsConfig = jest.fn()
+  it('should spawn all sagas only once even if multiple "app mounted" actions are dispatched', async () => {
     const mockAction = { type: AppActions.APP_MOUNTED }
 
-    await expectSaga(watchAppMounted)
-      .withState(createMockStore().getState())
+    const result = await expectSaga(watchAppMounted)
       .provide([
-        [matchers.call.fn(pointsSaga.sendPendingPointsEvents), mockSendPendingPointsEvents()],
-        [matchers.call.fn(pointsSaga.getPointsBalance), mockGetPointsBalance()],
-        [matchers.call.fn(pointsSaga.getPointsConfig), mockGetPointsConfig()],
+        [spawn(getPointsConfig), null],
+        [spawn(getPointsBalance, getHistoryStarted({ getNextPage: false })), null],
+        [spawn(sendPendingPointsEvents), null],
       ])
       .dispatch(mockAction)
       .dispatch(mockAction)
       .run()
 
-    expect(mockSendPendingPointsEvents).toHaveBeenCalledTimes(1)
-    expect(mockGetPointsBalance).toHaveBeenCalledTimes(1)
-    expect(mockGetPointsConfig).toHaveBeenCalledTimes(1)
+    expect(result.effects.fork).toEqual([
+      spawn(getPointsConfig),
+      spawn(getPointsBalance, getHistoryStarted({ getNextPage: false })),
+      spawn(sendPendingPointsEvents),
+    ])
   })
 })
 
diff --git a/src/points/saga.ts b/src/points/saga.ts
index 326d0f7b1d..5625ee7e9b 100644
--- a/src/points/saga.ts
+++ b/src/points/saga.ts
@@ -36,7 +36,7 @@ import { fetchWithTimeout } from 'src/utils/fetchWithTimeout'
 import { safely } from 'src/utils/safely'
 import networkConfig from 'src/web3/networkConfig'
 import { walletAddressSelector } from 'src/web3/selectors'
-import { all, call, put, select, spawn, take, takeEvery, takeLeading } from 'typed-redux-saga'
+import { call, put, select, spawn, take, takeEvery, takeLeading } from 'typed-redux-saga'
 import { v4 as uuidv4 } from 'uuid'
 
 const TAG = 'Points/saga'
@@ -263,7 +263,9 @@ function* watchTrackPointsEvent() {
 
 export function* watchAppMounted() {
   yield* take(AppActions.APP_MOUNTED)
-  yield* all([safely(getPointsConfig), safely(getPointsBalance), safely(sendPendingPointsEvents)])
+  yield* spawn(getPointsConfig)
+  yield* spawn(getPointsBalance, getHistoryStarted({ getNextPage: false }))
+  yield* spawn(sendPendingPointsEvents)
 }
 
 export function* pointsSaga() {

From a012a8d212ad1b93ebb33b3a7c0ba05b92ed0e43 Mon Sep 17 00:00:00 2001
From: valora-bot-crowdin
 <80050969+valora-bot-crowdin@users.noreply.github.com>
Date: Mon, 27 May 2024 19:34:04 -0700
Subject: [PATCH 063/133] chore(l10n): update translations from Crowdin (#5478)

Co-authored-by: Valora Bot <89419329+valora-bot@users.noreply.github.com>
---
 locales/es-419/translation.json | 178 ++++++++++++++++----------------
 1 file changed, 89 insertions(+), 89 deletions(-)

diff --git a/locales/es-419/translation.json b/locales/es-419/translation.json
index ce01b63796..555eb3c661 100644
--- a/locales/es-419/translation.json
+++ b/locales/es-419/translation.json
@@ -255,8 +255,8 @@
       "text": "Cualquier persona que acceda a tu frase tendrá acceso a tu cuenta y a todos tus fondos. No la compartas con nadie."
     }
   ],
-  "consumerIncentivesTitle": "Se acaba la Supercarga",
-  "consumerIncentivesSummary": "Pero te esperan más recompensas. Hasta el 28 de mayo, obtén {{percent}}% de recompensas anuales en tu saldo más alto de stablecoin (cUSD, cEUR o cREAL). Así es como funciona:",
+  "consumerIncentivesTitle": "Se acaba Supercharge",
+  "consumerIncentivesSummary": "Pero te esperan más recompensas. Hasta el 28 de mayo, obtén {{percent}}% de recompensas anuales en tu saldo más alto de stablecoin (cUSD, cEUR o cREAL). Así funciona:",
   "earnWeekly": {
     "header": "Conecta tu número de teléfono",
     "text": "Toca Conecta tu número si aún no lo haz hecho."
@@ -271,8 +271,8 @@
     "text": "Esto garantizará que tus fondos estén seguros y siempre tengas acceso a ellos."
   },
   "conclusion": "Es así de simple. ¡Recárgate de cripto hoy!",
-  "superchargeTitle": "Se acaba la Supercarga",
-  "superchargeDescription": "Pero te esperan más recompensas. Hasta el 28 de mayo, obtén {{apy}}% de recompensa anual en tu saldo más alto de {{token}} . Así es como funciona:",
+  "superchargeTitle": "Se acaba Supercharge",
+  "superchargeDescription": "Pero te esperan más recompensas. Hasta el 28 de mayo, obtén {{apy}}% de recompensas anuales en tu saldo más alto de {{token}} . Así es como funciona:",
   "superchargeConnectNumber": "Conecta tu número de teléfono",
   "superchargeReconnectNumber": "Reconecta tu número de teléfono\n<0>Lanzamos un experiencia mejorada de Supercharge. Reconecta tu número de teléfono para seguir recibiendo recompensas sobre tus {{token}}.</0>",
   "superchargeMinimumBalance": "Agrega un saldo mínimo de {{amount}} {{token}}",
@@ -286,11 +286,11 @@
   },
   "superchargingTitle": "Actualización de aplicación necesaria",
   "superchargingDescription": "Actualiza la app Valora para seguir recibiendo tus recompensas semanales Supercharge.",
-  "superchargingTitleV1_54": "Se acaba la Supercarga",
-  "superchargingDescriptionV1_54": "Podrás reclamar las recompensas semanales hasta el martes 28 de mayo a las 23:59 UTC. A partir del 29 de mayo, ya no podrás reclamar recompensas de Supercarga.",
+  "superchargingTitleV1_54": "Se acaba Supercharge",
+  "superchargingDescriptionV1_54": "Podrás reclamar las recompensas semanales hasta el martes 28 de mayo a las 23:59 UTC. A partir del 29 de mayo, ya no podrás reclamar recompensas de Supercharge.",
   "superchargeRewardsAvailable": "¡Has acumulado {{amount}} {{token}} en recompensas!",
   "superchargeRewardsAvailableMultipleTokens": "¡Has acumulado {{amounts}} en recompensas!",
-  "superchargeClaimText": "Reclama tus recompensas hasta el martes 28 de mayo a las 23:59 UTC. A partir del 29 de mayo, ya no podrás reclamar recompensas de Supercarga.",
+  "superchargeClaimText": "Reclama tus recompensas hasta el martes 28 de mayo a las 23:59 UTC. A partir del 29 de mayo, ya no podrás reclamar recompensas de Supercharge.",
   "superchargeClaimButton": "Reclamar recompensas",
   "superchargeFetchRewardsFailed": "Hubo un error al recuperar tus recompensas de Supercharge pendientes. Vuelve a intentarlo más tarde.",
   "superchargeClaimSuccess": "Se agregaron tus recompensas de Supercharge a tu saldo total.",
@@ -678,7 +678,7 @@
   },
   "inviteRewardsBannerCUSD": {
     "title": "Invita a amigos y consigue hasta 12 cUSD",
-    "body": "Una vez que conecten su número y añadan fondos a {{appName}}, ambos recibiréis 0,50 cUSD."
+    "body": "Una vez que conecten su número y agreguen fondos a {{appName}}, ambos recibirán 0,50 cUSD."
   },
   "inviteWithUrl": {
     "title": "Invita a tus amigos",
@@ -693,7 +693,7 @@
     },
     "rewardsActiveCUSD": {
       "title": "¡GANA HASTA 12 cUSD por invitar a tus amigos a Valora!",
-      "body": "Consigue 0,50 cUSD por cada amigo que invites a {{appName}}. Una vez que conecten su número, añadan fondos y los mantengan durante 7 días, ambos obtendréis 0,50 cUSD. Date prisa, ¡los fondos son limitados! (Límite de 25 amigos)."
+      "body": "Obtén 0,50 cUSD por cada amigo que invites a {{appName}}. Una vez que conecten su número, agreguen fondos y los mantengan durante 7 días, ambos obtendrán 0,50 cUSD. Date prisa, ¡los fondos son limitados! (Límite de 25 amigos)."
     }
   },
   "getReward": "Obtén ${{reward}}",
@@ -710,13 +710,13 @@
     "goldDisclaimer": "Cuando creas una \"cuenta\" en Valora, estás creando una billetera digital de la que sólo tú tienes las claves. Ninguna otra persona o entidad, incluyendo Valora, puede recuperar tu clave, cambiar o deshacer transacciones, o recuperar fondos perdidos. Ten en cuenta que las criptomonedas forman parte de una nueva clase de activos y presentan un riesgo de pérdida financiera. Considera cuidadosamente tu circunstancia financiera y tu tolerancia al riesgo financiero antes de comprar cualquier activo."
   },
   "termsColloquial": {
-    "title": "Empecemos por crear tu monedero",
+    "title": "Empecemos por crear tu billetera",
     "privacyHeading": "Tu información y privacidad:",
     "privacy1": "Recopilamos datos de uso que nos ayudan a mejorar la aplicación y la seguridad. El tipo de información que recopilamos, cómo la utilizamos y tus derechos relacionados con esa información pueden consultarse en nuestra <0>Política de privacidad</0>.",
     "privacy2": "Si decides vincular tu número de teléfono, almacenaremos una copia encriptada del mismo.",
     "privacy3": "Si decides conectar tus contactos, utilizamos sus nombres, números y fotos de perfil para que sea más fácil encontrarlos.",
-    "walletHeading": "Tu Billetera Digital con Valora:",
-    "wallet1": "Estás a punto de crear un monedero digital. Sólo tú tienes la clave de tu monedero. No podemos recuperar tu clave ni tus activos si la pierdes. Tampoco podemos revertir las acciones realizadas a través de Valora en blockchains.",
+    "walletHeading": "Tu Billetera digital con Valora:",
+    "wallet1": "Estás a punto de crear una billetera digital. Sólo tú tienes la clave de tu billetera. No podemos recuperar tu clave o tus activos si pierdes tu clave. Tampoco podemos revertir las acciones tomadas a través de Valora en blockchains.",
     "wallet2": "Los activos digitales, los activos con los que interactuarás con Valora, conllevan riesgos únicos. Al utilizar Valora, aceptas estos riesgos y te responsabilizas de ellos. Por favor, considera tus finanzas y tu tolerancia al riesgo antes de tomar decisiones.",
     "fullTerms": "Lee nuestros <0>Términos y condiciones</0> completos"
   },
@@ -827,7 +827,7 @@
     "hasWallet": "Ya tengo una wallet",
     "header": "¡Te damos la bienvenida a {{appName}}! Demos el primer paso, creemos tu wallet.",
     "getStarted": "Primeros pasos",
-    "agreeToTerms": "Al crear un monedero aceptas nuestros <0>Términos y Condiciones</0>"
+    "agreeToTerms": "Al crear una billetera aceptas nuestros <0>Términos y condiciones</0>"
   },
   "accessContacts": {
     "disclosure": {
@@ -1011,7 +1011,7 @@
   "receivedFrom": "De",
   "commentLabel": "Mensaje",
   "amountSent": "Monto enviado",
-  "amountReceived": "Importe recibido",
+  "amountReceived": "Monto recibido",
   "amountCeloWithdrawn": "Monto (CELO)",
   "feeEducation": "Las blockchains cobran una tarifa de transacción para mantener el soporte de la red y que funcione sin problemas.",
   "reviewPayment": "Revisar pago",
@@ -1034,7 +1034,7 @@
   "inviteWithoutPayment": "¡Hola! Estoy usando {{appName}} para enviar cripto en todo el mundo. Es fácil de usar y me gustaría invitarte a probarla con este link: {{link}}",
   "inviteWithEscrowedPayment": "¡Hola! Estoy usando {{appName}} para enviar dinero en todo el mundo. Acabo de enviarte {{amount}} {{token}}. Puedes descargar la app de {{appName}} y reclamar tus {{token}} con este link: {{link}}",
   "inviteWithRewards": "¡Hola! 👋 Estoy usando la wallet cripto de {{appName}}. Descargarla y conectar tu número es muy fácil, y si lo haces ahora ambos recibiremos un NFT como recompensa 💫 \n\nUsa este enlace: {{link}}",
-  "inviteWithRewardsCUSD": "Hola! Ahora mismo ambos podemos conseguir una recompensa gratuita de 0,50 $ si te registras, conectas tu número y financias tu monedero Valora. Yo lo utilizo para aumentar mis ahorros en USD y criptomonedas, y tú puedes configurarlo en segundos con sólo un número de teléfono. Asegúrate de registrarte con mi enlace de recomendación aquí: \n\n{{link}} \n\n Date prisa, la promoción de recomendación termina pronto.",
+  "inviteWithRewardsCUSD": "¡Hola! Ahora ambos podemos obtener una recompensa gratuita de $0,50 si te registras, conectas tu número y agregas fondos en tu billetera Valora. Yo la utilizo para hacer crecer mis ahorros en USD y cripto, y puedes configurarla en segundos con sólo un número de teléfono. Asegúrate de registrarte con mi enlace de referencia aquí: \n\n{{link}} \n\nPero date prisa, la promoción de referencia termina pronto.",
   "loadingContacts": "Estamos encontrando tus contactos",
   "myCode": "Mi código",
   "scanCode": "Escanear",
@@ -1767,7 +1767,7 @@
     "swapToTokenSelection": "CAMBIAR A",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "Los tokens seleccionados no son compatibles con nuestros proveedores de swap.",
-    "selectTokenLabel": "Seleccionar ficha",
+    "selectTokenLabel": "Seleccionar token",
     "tokenBottomSheetTitle": "Seleccionar token",
     "onNetwork": "en {{networkName}}",
     "switchedToNetworkWarning": {
@@ -1823,9 +1823,9 @@
       "appFeeValue_withoutPriceUsd": "<0></0>",
       "appFeeValue_free": "Gratis",
       "appFeeValue_placeholder": "-",
-      "appFeeInfo": "{{appName}} Comisión\n\nLa comisión {{appName}} de {{appFeePercentage}}% está diseñada para mejorar tu experiencia garantizando intercambios rápidos, fiables y seguros.",
-      "appFeeInfo_free": "{{appName}} Tarifa\n\nEste intercambio es gratuito.",
-      "appFeeInfo_placeholder": "{{appName}} Tarifa\n\nLa tarifa se calcula en función del presupuesto que recibas.",
+      "appFeeInfo": "Tarifa de {{appName}}\n\nLa tarifa de {{appName}} del {{appFeePercentage}}% está diseñada para mejorar tu experiencia, garantizando intercambios rápidos, fiables y seguros.",
+      "appFeeInfo_free": "Tarifa {{appName}}\n\nEste intercambio es gratuito.",
+      "appFeeInfo_placeholder": "Tarifa {{appName}}\n\nLa tarifa se calcula en función de la cotización que recibas.",
       "appFeeInfoDismissButton": "Entendido",
       "slippagePercentage": "Tolerancia al slippage",
       "networkFeeInfo": "Estás intercambiando en la red {{networkName}}.\n\nSe requiere esta tarifa de red estimada para realizar una transacción en la red {{networkName}}. Esta tarifa asegura tu transacción y se destina a mantener la red.",
@@ -1833,8 +1833,8 @@
       "slippageToleranceInfo": "Tolerancia de deslizamiento\n\nTu swap se ejecutará dentro del porcentaje de tolerancia de deslizamiento. Si el precio varía más que la tolerancia de deslizamiento, {{appName}} te protege impidiendo que se ejecute la operación.",
       "networkFeeInfoDismissButton": "Entendido",
       "exchangeRate": "Tasa de cambio",
-      "exchangeRateInfo": "Tipo de cambio\n\nHemos encontrado el mejor tipo de cambio para ti. Tu intercambio se completará a un precio dentro de {{slippagePercentage}}% de la estimación o la transacción se cancelará y los fondos se devolverán a tu monedero.",
-      "exchangeRateInfo_withAppFee": "Tipo de cambio\n\nHemos encontrado el mejor tipo de cambio para ti. Tu intercambio se completará a un precio dentro de {{slippagePercentage}}% de la estimación o la transacción se cancelará y los fondos se devolverán a tu monedero.\n\nEl tipo de cambio estimado incluye una comisión de {{appName}} del {{appFeePercentage}}%.",
+      "exchangeRateInfo": "Tasa de cambio\n\nHemos encontrado la mejor tasa de cambio para ti. Tu intercambio se completará a un precio dentro del {{slippagePercentage}}% del estimado o la transacción se cancelará y los fondos se devolverán a tu billetera.",
+      "exchangeRateInfo_withAppFee": "Tasa de cambio\n\nHemos encontrado la mejor tasa de cambio para ti. Tu intercambio se completará a un precio dentro del {{slippagePercentage}}% del estimado o la transacción se cancelará y los fondos se devolverán a tu billetera.\n\nLa tasa estimada incluye una tarifa de {{appName}} del {{appFeePercentage}}%.",
       "exchangeRateInfoDismissButton": "Entendido",
       "estimatedValue": "Valor estimado"
     },
@@ -2064,7 +2064,7 @@
     },
     "jumpstart": {
       "title": "Enviar con un enlace en directo",
-      "subtitle": "Comparte un enlace para enviar criptomonedas como un texto"
+      "subtitle": "Comparte un enlace para enviar cripto como un texto"
     },
     "getStarted": {
       "title": "Formas de enviar fondos en Valora",
@@ -2208,14 +2208,14 @@
       "description": "Puedes encontrar tu nuevo NFT {{rewardName}} en tus \"Coleccionables\""
     },
     "rewardBottomSheet": {
-      "title": "Gana 5$ de ETH",
-      "description": "Deposita en tu monedero cualquier token de Ethereum antes del 4 de abril de 2024 a las 12:00 PM PDT, y te daremos 5 $ de ETH el 5 de abril de 2024 antes de las 11:59 PM PDT.\n\nSe trata de una oferta exclusiva por ser un Explorador Temprano de Ethereum.",
+      "title": "Gana $5 de ETH",
+      "description": "Deposita en tu billetera cualquier token de Ethereum antes del 4 de abril de 2024 a las 12:00 PM PDT, y te daremos $5 de ETH el 5 de abril de 2024 antes de las 11:59 PM PDT.\n\nSe trata de una oferta exclusiva por ser un explorador temprano de Ethereum.",
       "expirationLabel": "Caduca en {{expirationLabelText}}",
       "cta": "Utiliza la recompensa"
     },
     "rewardReminderBottomSheet": {
-      "title": "No te lo pierdas, gana 5$ de ETH",
-      "description": "Deposita en tu monedero cualquier token de Ethereum antes del 4 de abril de 2024 a las 12:00 PM PDT, y te daremos 5 $ de ETH el 5 de abril de 2024 antes de las 11:59 PM PDT.\n\nSe trata de una oferta exclusiva por ser un Explorador Temprano de Ethereum.",
+      "title": "No te lo pierdas, gana $5 de ETH",
+      "description": "Deposita en tu billetera cualquier token de Ethereum antes del 4 de abril de 2024 a las 12:00 PM PDT, y te daremos $5 de ETH el 5 de abril de 2024 antes de las 11:59 PM PDT.\n\nSe trata de una oferta exclusiva por ser un explorador temprano de Ethereum.",
       "expirationLabel": "Caduca en {{expirationLabelText}}",
       "cta": "Utiliza la recompensa"
     }
@@ -2244,31 +2244,31 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Comprobación de tus fondos",
-      "description": "Espera mientras comprobamos tu Live Link. Los fondos reclamables llegarán en breve."
+      "title": "Verificando tus fondos",
+      "description": "Espera mientras comprobamos tu enlace directo. Los fondos recuperables llegarán en breve."
     },
     "error": {
       "title": "No se pueden recuperar los fondos",
-      "description": "Este enlace no ha podido ser reclamado por una razón desconocida",
-      "alreadyClaimedDescription": "El enlace ya ha sido reclamado. Por favor, pide a tu amigo que envíe un nuevo enlace",
+      "description": "Este enlace no pudo ser recuperado por una razón desconocida",
+      "alreadyClaimedDescription": "El enlace ya ha sido recuperado. Por favor, pide a tu amigo que envíe un nuevo enlace",
       "contactSupport": "Contactar a Soporte",
       "dismiss": "Ignorar"
     }
   },
   "jumpstartReclaim": {
-    "description": "Reclamar tu enlace conlleva una tasa de gas de red, ¿quieres proceder?",
+    "description": "Reclamar tu enlace conlleva una tarifa de red, ¿quieres proceder?",
     "fetchStatusError": {
       "title": "Uy, algo ha salido mal",
-      "description": "No hemos podido obtener el estado de la solicitud de esta invitación, inténtalo más tarde o ponte en contacto con el servicio de asistencia.",
+      "description": "No pudimos obtener el estado de reclamación de esta invitación, inténtalo de nuevo más tarde o contacta con soporte técnico",
       "retryCta": "Reintentar"
     },
     "reclaimError": {
-      "title": "No se pueden reclamar los fondos",
-      "description": "Intenta reclamar de nuevo, o ponte en contacto con el servicio de asistencia"
+      "title": "No se pueden recuperar los fondos",
+      "description": "Intenta recuperar de nuevo, o ponte en contacto con soporte técnico"
     }
   },
   "multiSelect": {
-    "switchNetwork": "Red de conmutación",
+    "switchNetwork": "Cambiar red",
     "allNetworks": "Todas las redes"
   },
   "points": {
@@ -2277,7 +2277,7 @@
     "history": {
       "cards": {
         "createWallet": {
-          "title": "Portacarteras",
+          "title": "Portabilletera",
           "subtitle": "Miembro de {{appName}}"
         },
         "swap": {
@@ -2288,7 +2288,7 @@
       "title": "Mi actividad de puntos",
       "error": {
         "title": "No se puede cargar la actividad de puntos",
-        "subtitle": "Oops, algo ha ido mal al intentar cargar tu feed de actividad de puntos. Vuelve a intentarlo.",
+        "subtitle": "Ups, algo salió mal al intentar cargar la actividad de tus puntos. Vuelve a intentarlo.",
         "tryAgain": "Inténtalo de nuevo"
       },
       "empty": {
@@ -2298,59 +2298,59 @@
       },
       "pageError": {
         "title": "No se puede cargar",
-        "subtitle": "Ups, algo ha ido mal al intentar finalizar la carga. Vuelve a intentarlo.",
+        "subtitle": "Ups, algo salió mal al finalizar la carga. Vuelve a intentarlo.",
         "refresh": "Actualizar"
       }
     },
     "fetchBalanceError": {
       "title": "No se pueden cargar tus puntos",
-      "description": "Ups, algo ha ido mal al intentar cargar tus puntos. La información de esta página puede no estar actualizada. Por favor, actualízala.",
+      "description": "Ups, algo salió mal al intentar cargar tus puntos. La información de esta página puede no estar actualizada. Por favor, actualízala.",
       "retryCta": "Actualizar"
     },
     "loading": {
-      "title": "Reunir tus puntos",
+      "title": "Recolectando tus puntos",
       "description": "Estamos en proceso de contabilizar tus puntos, agárrate fuerte"
     },
     "error": {
       "title": "No se pueden cargar puntos",
-      "description": "Ups, algo ha ido mal al intentar cargar tus puntos. Vuelve a intentarlo.",
+      "description": "Ups, algo salió mal al intentar cargar tus puntos. Vuelve a intentarlo.",
       "retryCta": "Inténtalo de nuevo"
     },
     "infoCard": {
-      "title": "Pronto más formas de ganar puntos 🚀",
-      "body": "Estamos trabajando para añadir más formas de ganar puntos utilizando la aplicación. Mantente informado."
+      "title": "Más formas de ganar puntos próximamente 🚀",
+      "body": "Estamos trabajando en añadir más formas de ganar puntos usando la aplicación. Sigue revisando para obtener actualizaciones."
     },
     "activitySection": {
       "title": "¿Cómo gano puntos?",
-      "body": "¡Es muy fácil! Gana puntos simplemente utilizando la aplicación."
+      "body": "¡Es fácil! Gana puntos simplemente utilizando la aplicación."
     },
     "noActivities": {
-      "title": "Actualización para desbloquear más puntos 🔓",
-      "body": "¡Uy! Parece que estás utilizando una versión anterior de {{appName}}. Actualízate ahora para descubrir todas las nuevas y emocionantes formas de ganar puntos."
+      "title": "Actualiza para desbloquear más puntos 🔓",
+      "body": "¡Uy! Parece que estás utilizando una versión anterior de {{appName}}. Actualiza ahora para descubrir todas las nuevas y emocionantes formas de ganar puntos."
     },
     "activityCards": {
       "createWallet": {
-        "title": "Crea una Cartera {{appName}}"
+        "title": "Crear una billetera {{appName}}"
       },
       "swap": {
-        "title": "Activos de permuta",
+        "title": "Intercambiar activos",
         "bottomSheet": {
-          "title": "Activos de permuta",
-          "body": "Este espacio se utilizará para dar todos los detalles necesarios para ello. Tal vez la cantidad mínima para intercambiar. \n\nGana {{pointsValue}} puntos cada vez que intercambies un activo utilizando {{appName}}.",
+          "title": "Intercambiar activos",
+          "body": "Este espacio se utilizará para dar todos los detalles necesarios para ello. Tal vez el monto mínimo para intercambiar. \n\nGana puntos {{pointsValue}} cada vez que intercambies un activo utilizando {{appName}}.",
           "cta": "Ir al intercambio"
         }
       },
       "moreComing": {
-        "title": "¡Pronto más!"
+        "title": "¡Muy pronto!"
       }
     },
     "discoverCard": {
-      "title": "{{appName}} Puntos",
+      "title": "Puntos de {{appName}}",
       "description": "Gana puntos fácilmente con {{appName}}. Utilizar la aplicación, incluidos los intercambios, ¡conlleva puntos!"
     },
     "intro": {
       "title": "Gana puntos sin esfuerzo",
-      "description": "¡Entra en una nueva forma de ganar! Tus acciones en {{appName}} ahora ganan puntos. Empieza a ganar hoy y desbloquea increíbles ventajas.",
+      "description": "¡Entra en una nueva forma de ganar! Tus acciones en {{appName}} ahora ganan puntos. Empieza a ganar hoy y desbloquea increíbles beneficios.",
       "cta": "Comienza tu viaje por los puntos"
     }
   },
@@ -2358,22 +2358,22 @@
     "gasSubsidized": "¡Valora cubre la gasolina para esta transacción!",
     "addCryptoBottomSheet": {
       "title": "Añade {{tokenSymbol}} en {{tokenNetwork}}",
-      "description": "Una vez que añadas fichas, tendrás que volver para terminar de depositarlas en un fondo común.",
+      "description": "Una vez que añadas tokens tendrás que volver para terminar de depositar en un pool.",
       "actions": {
         "add": "Comprar",
-        "transfer": "Transferencia",
+        "transfer": "Transferir",
         "swap": "Cambiar"
       },
       "actionDescriptions": {
         "add": "Compra {{tokenSymbol}} en {{tokenNetwork}} utilizando uno de nuestros proveedores de confianza",
-        "transfer": "Utiliza cualquier monedero o bolsa compatible con {{tokenNetwork}} para depositar {{tokenSymbol}}",
-        "swap": "Cambia a {{tokenSymbol}} desde otra ficha {{tokenNetwork}}"
+        "transfer": "Utiliza cualquier billetera o exchange compatible con {{tokenNetwork}} para depositar {{tokenSymbol}}",
+        "swap": "Cambiar a {{tokenSymbol}} desde otro token {{tokenNetwork}}"
       }
     },
     "cta": {
       "title": "Gana con tus stablecoins",
-      "subtitle": "Deposita hoy y obtén beneficios",
-      "description": "Comprueba cuánto puedes ganar al abastecer un fondo común de préstamos"
+      "subtitle": "Deposita hoy y gana beneficios",
+      "description": "Mira cuánto puedes ganar al suministrar un pool de préstamo"
     },
     "earnInfo": {
       "title": "Gana con tus stablecoins\n",
@@ -2407,71 +2407,71 @@
       "earnUpToLabel": "Podrías ganar hasta:",
       "rateLabel": "Tasa (est.)",
       "earnUpTo": "~{{fiatSymbol}}{{amount}} / año",
-      "rate": "{{rate}}% APY",
+      "rate": "APY ~{{rate}}%",
       "continue": "Continuar",
-      "info": "Esta piscina funciona con Aave",
+      "info": "Este pool está alimentado por Aave",
       "infoBottomSheet": {
-        "title": "¿Por qué esta piscina?",
-        "description": "Este pool de Aave tiene más de 150 millones de USDC y más de 6.000 contribuyentes, lo que indica una gran liquidez y fiabilidad. También utiliza USDC como token y Abritrum como red, lo que reduce la volatilidad y garantiza que los usuarios recibirán tarifas de gas baratas.\n\nTodo ello lo convierte en una opción segura y atractiva con un APY competitivo, que garantiza una oportunidad de inversión beneficiosa para nuestros usuarios.\n\nPuedes explorar otros fondos de Aave <0>aquí</0>.",
+        "title": "¿Por qué este pool?",
+        "description": "Este pool de Aave tiene más de $150M de TVL y más de 6.000 contribuyentes, lo que indica una gran liquidez y fiabilidad. También utiliza USDC como token y Abritrum como red, lo que reduce la volatilidad y garantiza que los usuarios recibirán tasas baratas.\n\nTodo ello lo convierte en una opción segura y atractiva con un APY competitivo, que garantiza una oportunidad de inversión beneficiosa para nuestros usuarios.\n\nPuedes explorar otros pools de Aave <0>aquí</0>.",
         "dismiss": "Ignorar"
       },
       "notEnoughBalanceForGasWarning": {
         "title": "Necesitas más {{feeTokenSymbol}} para continuar",
-        "description": "Añade {{feeTokenSymbol}} en {{network}} para cubrir tus gastos de gasolina",
+        "description": "Agrega {{feeTokenSymbol}} en {{network}} para cubrir tus tarifas",
         "noGasCta": "Compra {{feeTokenSymbol}} en {{network}}"
       }
     },
     "activePools": {
-      "title": "Piscinas activas",
+      "title": "Pools activos",
       "totalValue": "Valor total:",
-      "apy": "~{{apy}}% APY",
-      "exitPool": "Piscina de salida",
+      "apy": "APY ~{{apy}}%",
+      "exitPool": "Salir de Pool",
       "depositMore": "Depositar más",
-      "viewPools": "Ver piscinas"
+      "viewPools": "Ver Pools"
     },
     "depositBottomSheet": {
       "title": "Revisión y depósito",
-      "description": "Antes de depositar en un fondo Aave, revisa los detalles de la transacción que aparecen a continuación",
+      "description": "Antes de depositar en un pool Aave, revisa los detalles de la transacción a continuación",
       "amount": "Monto depositado",
-      "fee": "Est. Tasas de gas",
-      "provider": "Proveedor de ingresos",
+      "fee": "Tarifas estimadas",
+      "provider": "Proveedor de ganancias",
       "network": "Red",
-      "footer": "Al depositar criptomonedas en un pool de Aave, aceptas los riesgos asociados al uso de Aave. <0>Condiciones de uso</0>",
-      "primaryCta": "Completa",
+      "footer": "Al depositar cripto en un pool de Aave, aceptas los riesgos asociados al uso de Aave. <0>Términos y condiciones</0>",
+      "primaryCta": "Finalizar",
       "secondaryCta": "Cancelar"
     },
     "collect": {
-      "title": "¡Enhorabuena! Revisa y cobra tus ganancias",
+      "title": "¡Felicidades! Revisa y recoge tus ganancias",
       "total": "TOTAL",
       "plus": "MÁS",
       "rate": "Tasa (est.)",
-      "apy": "{{apy}}% APY",
-      "fee": "Tasa del gas",
-      "cta": "Recaudar ingresos",
+      "apy": "APY {{apy}}%",
+      "fee": "Tarifa estimada",
+      "cta": "Recibir ganancias",
       "errorTitle": "Algo salió mal",
       "errorDescription": "No se han podido obtener los datos del depósito. Vuelve a intentarlo.",
       "noGasTitle": "Necesitas más {{symbol}} para continuar",
-      "noGasDescription": "Añade {{symbol}} en {{network}} para cubrir tus gastos de gasolina",
+      "noGasDescription": "Agrega {{symbol}} en {{network}} para cubrir tus tarifas",
       "noGasCta": "Compra {{symbol}} en {{network}}"
     },
     "transactionFeed": {
-      "earnClaimTitle": "Recopilado",
-      "earnClaimSubtitle": "de {{providerName}} Pool",
+      "earnClaimTitle": "Recibido",
+      "earnClaimSubtitle": "del pool {{providerName}}",
       "earnDepositTitle": "Depositado",
-      "earnDepositSubtitle": "a {{providerName}} Piscina",
-      "earnWithdrawTitle": "Retirada",
-      "earnWithdrawSubtitle": "de {{providerName}} Pool"
+      "earnDepositSubtitle": "a pool {{providerName}}",
+      "earnWithdrawTitle": "Retirado",
+      "earnWithdrawSubtitle": "del pool {{providerName}}"
     },
     "transactionDetails": {
       "descriptionLabel": "Detalles",
-      "earnClaimTitle": "Recopilado",
-      "earnClaimSubtitle": "Recogida {{tokenSymbol}} de {{providerName}} Piscina",
-      "earnClaimDetails": "Importe recaudado",
+      "earnClaimTitle": "Recibido",
+      "earnClaimSubtitle": "{{tokenSymbol}} recogido de pool {{providerName}}",
+      "earnClaimDetails": "Monto recibido",
       "earnDepositTitle": "Depositado",
-      "earnDepositSubtitle": "Depositado {{tokenSymbol}} en {{providerName}} Pool",
+      "earnDepositSubtitle": "{{tokenSymbol}} depositado a pool {{providerName}}",
       "earnDepositDetails": "Monto depositado",
-      "earnWithdrawTitle": "Retirada",
-      "earnWithdrawSubtitle": "Retirado {{tokenSymbol}} de {{providerName}} Pool",
+      "earnWithdrawTitle": "Retirado",
+      "earnWithdrawSubtitle": "{{tokenSymbol}} retirado de pool {{providerName}}",
       "earnWithdrawDetails": "Monto retirado"
     }
   },

From 1bb2371d0f17f1eb041a2463596a9471895b2358 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 28 May 2024 14:19:36 -0700
Subject: [PATCH 064/133] fix(deps): update dependency
 @react-native-community/netinfo to ^11.3.2 (#5476)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[@react-native-community/netinfo](https://togithub.com/react-native-netinfo/react-native-netinfo)
| [`^11.3.1` ->
`^11.3.2`](https://renovatebot.com/diffs/npm/@react-native-community%2fnetinfo/11.3.1/11.3.2)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/@react-native-community%2fnetinfo/11.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@react-native-community%2fnetinfo/11.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@react-native-community%2fnetinfo/11.3.1/11.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@react-native-community%2fnetinfo/11.3.1/11.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>react-native-netinfo/react-native-netinfo
(@&#8203;react-native-community/netinfo)</summary>

###
[`v11.3.2`](https://togithub.com/react-native-netinfo/react-native-netinfo/blob/HEAD/CHANGELOG.md#1132-2024-05-11)

[Compare
Source](https://togithub.com/react-native-netinfo/react-native-netinfo/compare/v11.3.1...v11.3.2)

##### Bug Fixes

- **types:** isConnected / isInternetReachable should be boolean not
true
([#&#8203;721](https://togithub.com/react-native-netinfo/react-native-netinfo/issues/721))
([6e2c422](https://togithub.com/react-native-netinfo/react-native-netinfo/commit/6e2c422))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ1cGRhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbIm5wbSIsInJlbm92YXRlIl19-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: valora-bot <valorabot@valoraapp.com>
---
 ios/Podfile.lock | 4 ++--
 package.json     | 2 +-
 yarn.lock        | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 390354acab..e83e559b1c 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -546,7 +546,7 @@ PODS:
     - React-Core
   - react-native-launch-arguments (4.0.2):
     - React
-  - react-native-netinfo (11.3.1):
+  - react-native-netinfo (11.3.2):
     - React-Core
   - react-native-randombytes (3.6.1):
     - React-Core
@@ -1209,7 +1209,7 @@ SPEC CHECKSUMS:
   react-native-get-random-values: 21325b2244dfa6b58878f51f9aa42821e7ba3d06
   react-native-in-app-review: db8bb167a5f238e7ceca5c242d6b36ce8c4404a4
   react-native-launch-arguments: 5f41e0abf88a15e3c5309b8875d6fd5ac43df49d
-  react-native-netinfo: bdb108d340cdb41875c9ced535977cac6d2ff321
+  react-native-netinfo: 076df4f9b07f6670acf4ce9a75aac8d34c2e2ccc
   react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
   react-native-safe-area-context: dcab599c527c2d7de2d76507a523d20a0b83823d
   react-native-shake: 8036ba95a1953c9b10821bdc33f5814c5d0bcef6
diff --git a/package.json b/package.json
index a02ba98249..e547db2fb1 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "@noble/secp256k1": "^1.7.1",
     "@react-native-async-storage/async-storage": "^1.23.1",
     "@react-native-clipboard/clipboard": "^1.14.1",
-    "@react-native-community/netinfo": "^11.3.1",
+    "@react-native-community/netinfo": "^11.3.2",
     "@react-native-cookies/cookies": "^6.2.1",
     "@react-native-firebase/analytics": "19.1.0",
     "@react-native-firebase/app": "19.1.0",
diff --git a/yarn.lock b/yarn.lock
index a11e0d4ef2..9b22704e37 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2987,10 +2987,10 @@
     prompts "^2.4.0"
     semver "^6.3.0"
 
-"@react-native-community/netinfo@^11.3.1":
-  version "11.3.1"
-  resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-11.3.1.tgz#4539371a2f4bd402d932031be82c2449ed63a1a5"
-  integrity sha512-UBnJxyV0b7i9Moa97Av+HKho1ByzX0DtbJXzUQS5E3xhQs6P2D/Os0iw3ouy7joY1TVd6uIhplPbr7l1SJNaNQ==
+"@react-native-community/netinfo@^11.3.2":
+  version "11.3.2"
+  resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-11.3.2.tgz#e63201d0b87ad42d086d1003be48ae7b327f0594"
+  integrity sha512-YsaS3Dutnzqd1BEoeC+DEcuNJedYRkN6Ef3kftT5Sm8ExnCF94C/nl4laNxuvFli3+Jz8Df3jO25Jn8A9S0h4w==
 
 "@react-native-cookies/cookies@^6.2.1":
   version "6.2.1"

From a02e9125b418e269c13c4bc48ea2b3804a1ca7ae Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Tue, 28 May 2024 15:38:27 -0700
Subject: [PATCH 065/133] refactor(token-bottom-sheet): remove unused generic
 (#5484)

### Description

This was added in https://github.com/valora-inc/wallet/pull/4242 when we
were working towards multichain, but now there shouldn't be a need for
multiple TokenBalance types

### Test plan

CI

### Related issues

N/A

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/components/TokenBottomSheet.test.tsx |  2 +-
 src/components/TokenBottomSheet.tsx      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/TokenBottomSheet.test.tsx b/src/components/TokenBottomSheet.test.tsx
index 9ffdd61813..0dc44d928a 100644
--- a/src/components/TokenBottomSheet.test.tsx
+++ b/src/components/TokenBottomSheet.test.tsx
@@ -114,7 +114,7 @@ describe('TokenBottomSheet', () => {
     jest.clearAllMocks()
   })
 
-  function renderBottomSheet(props: Partial<TokenBottomSheetProps<TokenBalance>> = {}) {
+  function renderBottomSheet(props: Partial<TokenBottomSheetProps> = {}) {
     return render(
       <Provider store={mockStore}>
         <TokenBottomSheet
diff --git a/src/components/TokenBottomSheet.tsx b/src/components/TokenBottomSheet.tsx
index 08346d93cf..ac954f6d32 100644
--- a/src/components/TokenBottomSheet.tsx
+++ b/src/components/TokenBottomSheet.tsx
@@ -34,15 +34,15 @@ export enum TokenPickerOrigin {
 
 export const DEBOUNCE_WAIT_TIME = 200
 
-export interface TokenBottomSheetProps<T extends TokenBalance> {
+export interface TokenBottomSheetProps {
   forwardedRef: RefObject<BottomSheetRefType>
   origin: TokenPickerOrigin
-  onTokenSelected: (token: T, tokenPositionInList: number) => void
+  onTokenSelected: (token: TokenBalance, tokenPositionInList: number) => void
   title: string
   titleStyle?: TextStyle
   searchEnabled?: boolean
   snapPoints?: (string | number)[]
-  tokens: T[]
+  tokens: TokenBalance[]
   TokenOptionComponent?: React.ComponentType<TokenOptionProps>
   showPriceUsdUnavailableWarning?: boolean
   filterChips?: FilterChip<TokenBalance>[]
@@ -87,7 +87,7 @@ function NoResults({
   )
 }
 
-function TokenBottomSheet<T extends TokenBalance>({
+function TokenBottomSheet({
   forwardedRef,
   snapPoints,
   origin,
@@ -99,7 +99,7 @@ function TokenBottomSheet<T extends TokenBalance>({
   showPriceUsdUnavailableWarning,
   filterChips = [],
   areSwapTokensShuffled,
-}: TokenBottomSheetProps<T>) {
+}: TokenBottomSheetProps) {
   const insets = useSafeAreaInsets()
 
   const filterChipsCarouselRef = useRef<ScrollView>(null)
@@ -157,7 +157,7 @@ function TokenBottomSheet<T extends TokenBalance>({
     }
   }
 
-  const onTokenPressed = (token: T, index: number) => () => {
+  const onTokenPressed = (token: TokenBalance, index: number) => () => {
     ValoraAnalytics.track(TokenBottomSheetEvents.token_selected, {
       origin,
       tokenAddress: token.address,

From d646d06bf36bc478364e6d7c96f16b6cb4ff3b35 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 29 May 2024 05:45:40 +0000
Subject: [PATCH 066/133] chore(deps): update webfactory/ssh-agent action to
 v0.9.0 (#5486)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [webfactory/ssh-agent](https://togithub.com/webfactory/ssh-agent) |
action | minor | `v0.8.0` -> `v0.9.0` |

---

### Release Notes

<details>
<summary>webfactory/ssh-agent (webfactory/ssh-agent)</summary>

###
[`v0.9.0`](https://togithub.com/webfactory/ssh-agent/releases/tag/v0.9.0):
Update to `node20`

[Compare
Source](https://togithub.com/webfactory/ssh-agent/compare/v0.8.0...v0.9.0)

This release updates the action to run on Node.js v20. When you're
running on GitHub hosted runners, just go ahead and update. When you're
using self-hosted runners, please make sure you have Node.js v20
installed before updating from `v0.8.0` to `v0.9.0` of this action.

#### New Contributors

- [@&#8203;npwolf](https://togithub.com/npwolf) made their first
contribution in
[https://github.com/webfactory/ssh-agent/pull/196](https://togithub.com/webfactory/ssh-agent/pull/196)
- [@&#8203;benzado](https://togithub.com/benzado) made their first
contribution in
[https://github.com/webfactory/ssh-agent/pull/206](https://togithub.com/webfactory/ssh-agent/pull/206)
- [@&#8203;felix-seifert](https://togithub.com/felix-seifert) made their
first contribution in
[https://github.com/webfactory/ssh-agent/pull/199](https://togithub.com/webfactory/ssh-agent/pull/199)
- [@&#8203;archen](https://togithub.com/archen) made their first
contribution in
[https://github.com/webfactory/ssh-agent/pull/201](https://togithub.com/webfactory/ssh-agent/pull/201)

**Full Changelog**:
https://github.com/webfactory/ssh-agent/compare/v0.8.0...v0.9.0

#### What's Changed

- Update README.md to reflect latest version by
[@&#8203;npwolf](https://togithub.com/npwolf) in
[https://github.com/webfactory/ssh-agent/pull/196](https://togithub.com/webfactory/ssh-agent/pull/196)
- Remove outdated claim from README by
[@&#8203;benzado](https://togithub.com/benzado) in
[https://github.com/webfactory/ssh-agent/pull/206](https://togithub.com/webfactory/ssh-agent/pull/206)
- chore: update all versions of `actions/checkout` to v4 by
[@&#8203;felix-seifert](https://togithub.com/felix-seifert) in
[https://github.com/webfactory/ssh-agent/pull/199](https://togithub.com/webfactory/ssh-agent/pull/199)
- bump to node20 by [@&#8203;archen](https://togithub.com/archen) in
[https://github.com/webfactory/ssh-agent/pull/201](https://togithub.com/webfactory/ssh-agent/pull/201)

#### New Contributors

- [@&#8203;npwolf](https://togithub.com/npwolf) made their first
contribution in
[https://github.com/webfactory/ssh-agent/pull/196](https://togithub.com/webfactory/ssh-agent/pull/196)
- [@&#8203;benzado](https://togithub.com/benzado) made their first
contribution in
[https://github.com/webfactory/ssh-agent/pull/206](https://togithub.com/webfactory/ssh-agent/pull/206)
- [@&#8203;felix-seifert](https://togithub.com/felix-seifert) made their
first contribution in
[https://github.com/webfactory/ssh-agent/pull/199](https://togithub.com/webfactory/ssh-agent/pull/199)
- [@&#8203;archen](https://togithub.com/archen) made their first
contribution in
[https://github.com/webfactory/ssh-agent/pull/201](https://togithub.com/webfactory/ssh-agent/pull/201)

**Full Changelog**:
https://github.com/webfactory/ssh-agent/compare/v0.8.0...v0.9.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJnaXRodWItYWN0aW9ucyIsInJlbm92YXRlIl19-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/bump-app-version.yml           | 2 +-
 .github/workflows/update-licenses-disclaimer.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/bump-app-version.yml b/.github/workflows/bump-app-version.yml
index 68b8d638da..896a9d98af 100644
--- a/.github/workflows/bump-app-version.yml
+++ b/.github/workflows/bump-app-version.yml
@@ -27,7 +27,7 @@ jobs:
           secrets: |-
             BOT_SSH_KEY:projects/1027349420744/secrets/BOT_SSH_PRIVATE_KEY
             VALORA_BOT_TOKEN:projects/1027349420744/secrets/VALORA_BOT_TOKEN
-      - uses: webfactory/ssh-agent@v0.8.0
+      - uses: webfactory/ssh-agent@v0.9.0
         with:
           ssh-private-key: ${{ steps.google-secrets.outputs.BOT_SSH_KEY }}
       - uses: actions/checkout@v3
diff --git a/.github/workflows/update-licenses-disclaimer.yml b/.github/workflows/update-licenses-disclaimer.yml
index b67adaf6a5..c7bcec91d7 100644
--- a/.github/workflows/update-licenses-disclaimer.yml
+++ b/.github/workflows/update-licenses-disclaimer.yml
@@ -27,7 +27,7 @@ jobs:
           secrets: |-
             BOT_SSH_KEY:projects/1027349420744/secrets/BOT_SSH_PRIVATE_KEY
             VALORA_BOT_TOKEN:projects/1027349420744/secrets/VALORA_BOT_TOKEN
-      - uses: webfactory/ssh-agent@v0.8.0
+      - uses: webfactory/ssh-agent@v0.9.0
         with:
           ssh-private-key: ${{ steps.google-secrets.outputs.BOT_SSH_KEY }}
       - uses: actions/checkout@v3

From 5d412f866ab2431461393636ea84f9ff1af808da Mon Sep 17 00:00:00 2001
From: valora-bot-crowdin
 <80050969+valora-bot-crowdin@users.noreply.github.com>
Date: Wed, 29 May 2024 02:18:20 -0700
Subject: [PATCH 067/133] chore(l10n): update translations from Crowdin (#5481)

Co-authored-by: Valora Bot <89419329+valora-bot@users.noreply.github.com>
---
 locales/es-419/translation.json |  2 +-
 locales/uk-UA/translation.json  | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/locales/es-419/translation.json b/locales/es-419/translation.json
index 555eb3c661..e254cadc1e 100644
--- a/locales/es-419/translation.json
+++ b/locales/es-419/translation.json
@@ -2235,7 +2235,7 @@
     },
     "home": {
       "tabName": "Inicio",
-      "title": "¡Saludos!"
+      "title": "¡Hola!"
     },
     "discover": {
       "tabName": "Explorar",
diff --git a/locales/uk-UA/translation.json b/locales/uk-UA/translation.json
index 8a93dee886..e9059c0253 100644
--- a/locales/uk-UA/translation.json
+++ b/locales/uk-UA/translation.json
@@ -2197,9 +2197,9 @@
   "getStartedHome": {
     "title": "Придбайте криптовалюту чи переведіть токени",
     "body": "Купуйте чи переводьте сумісні токени, щоб надсилати криптовалюту й досліджувати web3!",
-    "titleV1_86": "Поповнити гаманець",
-    "exploreTokens": "Ознайомтеся з усіма токенами",
-    "exploreTokensBody": "Ви можете купити до 10+ токенів у Valora. Перевірте їх!"
+    "titleV1_86": "Додайте кошти до свого гаманця",
+    "exploreTokens": "Вивчити всі токени",
+    "exploreTokensBody": "У Valora можна купити понад 10 токенів. Спробуйте!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2359,7 +2359,7 @@
     }
   },
   "earnFlow": {
-    "gasSubsidized": "Валора покриває газ для цієї транзакції!",
+    "gasSubsidized": "Valora відшкодовує комісію за газ для цієї транзакції!",
     "addCryptoBottomSheet": {
       "title": "Додати {{tokenSymbol}} у мережі {{tokenNetwork}}",
       "description": "Коли токени додано, вам потрібно повернутися і завершити поповнення пулу.",
@@ -2383,18 +2383,18 @@
       "title": "Заробляйте на своїх\nстейблкоїнах",
       "details": {
         "earn": {
-          "titleGasSubsidy": "Максимізуйте заробіток без плати за газ*.",
-          "title": "Максимізація заробітку",
-          "subtitle": "Заробляйте на своїх стейблкоінах і отримуйте винагороду, коли надаєте пул.",
-          "footnoteSubsidy": "*Плата за газ тимчасово покривається компанією Valora"
+          "titleGasSubsidy": "Максимізувати заробітки без комісій на газ*",
+          "title": "Максимізувати заробітки",
+          "subtitle": "Заробляйте на своїх стейблкоїнах й отримуйте винагороду на послугах пулу.",
+          "footnoteSubsidy": "*Valora тимчасово відшкодовує комісії за газ"
         },
         "manage": {
-          "title": "Керуйте безпосередньо з Valora",
-          "subtitle": "Ми подбаємо про налаштування, щоб ви могли керувати своєю позицією безпосередньо з Valora."
+          "title": "Керувати прямо з Valora",
+          "subtitle": "Ми влаштуємо так, щоб можна було керувати своєю позицією прямо з Valora."
         },
         "access": {
           "title": "Легкий доступ до ваших коштів",
-          "subtitle": "Отримуйте кошти без зайвих зусиль одним дотиком. Насолоджуйтесь таким же миттєвим доступом, як і безпосередньо через ваші улюблені протоколи."
+          "subtitle": "Забирайте свої кошти всього одним дотиком. Доступний той же миттєвий доступ, наче ви безпосередньо користуєтеся своїми улюбленими протоколами."
         }
       },
       "action": {
@@ -2403,9 +2403,9 @@
       }
     },
     "ctaV1_86": {
-      "title": "Максимізуйте заробіток на стейблкоінах",
+      "title": "Максимізувати заробітки на стейблкоїнах",
       "subtitle": "Купити {{symbol}}",
-      "description": "Заробляйте приблизно {{apy}}% на рік, додаючи {{symbol}} до пулу"
+      "description": "Заробляйте близько {{apy}} % річних, якщо додасте {{symbol}} до пулу"
     },
     "enterAmount": {
       "earnUpToLabel": "Можна заробити до:",

From b2f6e48f3bf5425cd9c77ec307d8433d60f07afc Mon Sep 17 00:00:00 2001
From: Kathy Luo <kathyluo18@gmail.com>
Date: Wed, 29 May 2024 11:32:27 +0200
Subject: [PATCH 068/133] fix(points): prevent multiple track requests, fix
 balance mount animation (#5480)

### Description

This PR fixes 2 things:
1. if a transaction is settled within the same app session, it is most
likely also picked up by our internal transaction watcher. previously,
this was causing 2 almost simultaneous requests to our track points
event backend (no bad side effects except we don't really need that
extra request)
2. ensure that the points balance animates on screen open

### Test plan

The balance animates on mount but not on refresh if the balance hasn't
changed:


https://github.com/valora-inc/wallet/assets/20150449/408ce7bc-a5b2-4b5b-bab1-d8f7432e5e2e


The balance animates on refresh if the balance has changed (I mocked the
balance to return 1 of 3 random balances):


https://github.com/valora-inc/wallet/assets/20150449/31d53994-0165-4860-903a-0d442655e40e



### Related issues

n/a

### Backwards compatibility

Y

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [ ] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/components/NumberTicker.tsx | 23 +++++++++++++---------
 src/points/PointsHome.tsx       |  9 +--------
 src/points/saga.test.ts         | 34 +++++++++++++++++++++++++++++++--
 src/points/saga.ts              | 16 ++++++++++++++--
 src/points/selectors.ts         |  2 +-
 5 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/src/components/NumberTicker.tsx b/src/components/NumberTicker.tsx
index b7d6657ee2..e5ac9ab1a4 100644
--- a/src/components/NumberTicker.tsx
+++ b/src/components/NumberTicker.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react'
+import React, { useEffect, useRef } from 'react'
 import { Animated, StyleSheet, Text, TextStyle, View } from 'react-native'
 import { typeScale } from 'src/styles/fonts'
 
@@ -34,15 +34,20 @@ function TickText({ value, textStyle }: TickTextProps) {
 }
 
 function Tick({ startValue, endValue, textStyle, textHeight, animationDuration }: TickProps) {
-  const animatedValue = new Animated.Value(startValue * textHeight * -1)
-  const transformStyle = { transform: [{ translateY: animatedValue }] }
+  const animatedValue = useRef(new Animated.Value(startValue * textHeight * -1))
+
+  const transformStyle = { transform: [{ translateY: animatedValue.current }] }
   const duration = animationDuration ?? 1300
 
-  Animated.timing(animatedValue, {
-    toValue: endValue * textHeight * -1,
-    duration,
-    useNativeDriver: true,
-  }).start()
+  useEffect(() => {
+    if (animatedValue.current) {
+      Animated.timing(animatedValue.current, {
+        toValue: endValue * textHeight * -1,
+        duration,
+        useNativeDriver: true,
+      }).start()
+    }
+  }, [endValue])
 
   return (
     <Animated.View style={transformStyle}>
@@ -83,7 +88,7 @@ export default function NumberTicker({
         const startValue = parseInt(startValueArray[index], 10)
         return (
           <Tick
-            key={`${value}-${index}-${startValueArray[index]}`}
+            key={`${value}-${index}`}
             startValue={startValue}
             endValue={endValue}
             textHeight={textHeight}
diff --git a/src/points/PointsHome.tsx b/src/points/PointsHome.tsx
index eaa9cd0478..b491bb6b59 100644
--- a/src/points/PointsHome.tsx
+++ b/src/points/PointsHome.tsx
@@ -46,7 +46,6 @@ export default function PointsHome({ route, navigation }: Props) {
   const pointsBalanceStatus = useSelector(pointsBalanceStatusSelector)
   const pointsHistoryStatus = useSelector(pointsHistoryStatusSelector)
 
-  const lastKnownPointsBalance = useRef(pointsBalance)
   const historyBottomSheetRef = useRef<BottomSheetRefType>(null)
   const activityCardBottomSheetRef = useRef<BottomSheetRefType>(null)
 
@@ -63,12 +62,6 @@ export default function PointsHome({ route, navigation }: Props) {
     onRefreshHistoryAndBalance()
   }, [])
 
-  useEffect(() => {
-    if (pointsBalanceStatus === 'success') {
-      lastKnownPointsBalance.current = pointsBalance
-    }
-  }, [pointsBalanceStatus])
-
   const onRefreshHistoryAndBalance = () => {
     dispatch(getHistoryStarted({ getNextPage: false }))
   }
@@ -153,7 +146,7 @@ export default function PointsHome({ route, navigation }: Props) {
               <NumberTicker
                 testID="PointsBalance"
                 value={pointsBalance}
-                disableAnimation={lastKnownPointsBalance.current === pointsBalance}
+                disableAnimation={pointsBalanceStatus === 'loading'}
               />
               <LogoHeart size={28} />
             </View>
diff --git a/src/points/saga.test.ts b/src/points/saga.test.ts
index cff92f238e..0d926ef1be 100644
--- a/src/points/saga.test.ts
+++ b/src/points/saga.test.ts
@@ -18,7 +18,7 @@ import {
   sendPointsEvent,
   watchAppMounted,
 } from 'src/points/saga'
-import { trackOnceActivitiesSelector } from 'src/points/selectors'
+import { pendingPointsEventsSelector, trackOnceActivitiesSelector } from 'src/points/selectors'
 import pointsReducer, {
   PendingPointsEvent,
   getHistoryError,
@@ -35,6 +35,7 @@ import pointsReducer, {
   trackPointsEvent,
 } from 'src/points/slice'
 import { ClaimHistory, GetHistoryResponse, PointsEvent } from 'src/points/types'
+import { NetworkId } from 'src/transactions/types'
 import Logger from 'src/utils/Logger'
 import * as fetchWithTimeout from 'src/utils/fetchWithTimeout'
 import networkConfig from 'src/web3/networkConfig'
@@ -398,6 +399,7 @@ describe('sendPointsEvent', () => {
       .provide([
         [matchers.call.fn(pointsSaga.fetchTrackPointsEventsEndpoint), mockServerSuccessResponse],
         [select(trackOnceActivitiesSelector), { 'create-wallet': false }],
+        [select(pendingPointsEventsSelector), []],
       ])
       .put(
         sendPointsEventStarted({
@@ -417,6 +419,7 @@ describe('sendPointsEvent', () => {
       .provide([
         [matchers.call.fn(pointsSaga.fetchTrackPointsEventsEndpoint), mockServerErrorResponse],
         [select(trackOnceActivitiesSelector), { 'create-wallet': false }],
+        [select(pendingPointsEventsSelector), []],
       ])
       .put(
         sendPointsEventStarted({
@@ -441,7 +444,34 @@ describe('sendPointsEvent', () => {
     const mockAction = trackPointsEvent({ activityId: 'create-wallet' })
 
     return expectSaga(sendPointsEvent, mockAction)
-      .provide([[select(trackOnceActivitiesSelector), { 'create-wallet': true }]])
+      .provide([
+        [select(trackOnceActivitiesSelector), { 'create-wallet': true }],
+        [select(pendingPointsEventsSelector), []],
+      ])
+      .not.put(sendPointsEventStarted(expect.anything()))
+      .not.call(fetchTrackPointsEventsEndpoint)
+      .not.put(pointsEventProcessed(expect.anything()))
+      .run()
+  })
+
+  it('should ignore any activities that are currently being tracked', async () => {
+    const mockSwapEvent = {
+      activityId: 'swap' as const,
+      transactionHash: '0x1234',
+      networkId: NetworkId['celo-mainnet'],
+      toTokenId: 'toTokenId',
+      fromTokenId: 'fromTokenId',
+    }
+    const mockAction = trackPointsEvent(mockSwapEvent)
+
+    return expectSaga(sendPointsEvent, mockAction)
+      .provide([
+        [select(trackOnceActivitiesSelector), { 'create-wallet': true }],
+        [
+          select(pendingPointsEventsSelector),
+          [{ id: 'someId', timestamp: 1234, event: mockSwapEvent }],
+        ],
+      ])
       .not.put(sendPointsEventStarted(expect.anything()))
       .not.call(fetchTrackPointsEventsEndpoint)
       .not.put(pointsEventProcessed(expect.anything()))
diff --git a/src/points/saga.ts b/src/points/saga.ts
index 5625ee7e9b..affb4d09b3 100644
--- a/src/points/saga.ts
+++ b/src/points/saga.ts
@@ -1,9 +1,10 @@
 import { differenceInDays } from 'date-fns'
+import { isEqual } from 'lodash'
 import { Actions as AppActions } from 'src/app/actions'
 import { retrieveSignedMessage } from 'src/pincode/authentication'
 import {
   nextPageUrlSelector,
-  pendingPointsEvents,
+  pendingPointsEventsSelector,
   trackOnceActivitiesSelector,
 } from 'src/points/selectors'
 import {
@@ -192,6 +193,17 @@ export function* sendPointsEvent({ payload: event }: ReturnType<typeof trackPoin
     return
   }
 
+  const pendingPointsEvents = yield* select(pendingPointsEventsSelector)
+  if (pendingPointsEvents.some((pendingEvent) => isEqual(pendingEvent.event, event))) {
+    // this can happen for events that are tracked after a transaction is
+    // confirmed within the same app session, if it is also picked up by the
+    // internal transactions watcher. The trackPointsEvent action could be
+    // dispatched by the specific feature saga as well as the internal
+    // transactions watcher.
+    Logger.debug(TAG, `Skipping already pending tracked event: ${JSON.stringify(event)}`)
+    return
+  }
+
   const id = uuidv4()
 
   yield* put(
@@ -222,7 +234,7 @@ export function* sendPendingPointsEvents() {
   const LOG_TAG = `${TAG}@sendPendingPointsEvents`
 
   const now = new Date()
-  const pendingEvents = yield* select(pendingPointsEvents)
+  const pendingEvents = yield* select(pendingPointsEventsSelector)
 
   for (const pendingEvent of pendingEvents) {
     const { id, timestamp, event } = pendingEvent
diff --git a/src/points/selectors.ts b/src/points/selectors.ts
index 0d32149036..af9f561986 100644
--- a/src/points/selectors.ts
+++ b/src/points/selectors.ts
@@ -67,7 +67,7 @@ export const pointsSectionsSelector = createSelector(
   }
 )
 
-export const pendingPointsEvents = (state: RootState) => {
+export const pendingPointsEventsSelector = (state: RootState) => {
   return state.points.pendingPointsEvents
 }
 

From 98103752edaabd908625b41a14156802f66e0e04 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 29 May 2024 08:57:13 -0700
Subject: [PATCH 069/133] fix(settings): header shown as white when bottom
 sheet is open (#5467)

### Description

When the bottom sheet was opened on setting the header was shown in
white instead of the same gray opaque seen on the rest of the screen.
This PR fixes that on Android and iOS.

#### Screenshots

| iOS Before | Android Before | iOS After | Android After |
| ----- | ----- | ----- | ----- |
|
![](https://github.com/valora-inc/wallet/assets/26950305/a22329e5-9b58-402c-97b5-cfa10e7799c6
"iOS Before") |
![](https://github.com/valora-inc/wallet/assets/26950305/b1c38381-a80a-423b-8d9b-2867b1ebf28c
"Android Before") |
![](https://github.com/valora-inc/wallet/assets/26950305/0e54ddfe-7e8a-4be9-8a56-421ad65abc33
"iOS After") |
![](https://github.com/valora-inc/wallet/assets/26950305/07276b59-6f3e-4121-b477-00b58c46b464
"Android After") |

### Test plan

- [x] Tested locally on iOS
- [x] Tested locally on Android

### Related issues

- Fixes ACT-1153

### Backwards compatibility

Yes

### Network scalability

N/A
---
 src/account/Settings.tsx    | 9 ++++++++-
 src/navigator/Navigator.tsx | 6 +-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/account/Settings.tsx b/src/account/Settings.tsx
index 7ed130f30c..d79286f14e 100644
--- a/src/account/Settings.tsx
+++ b/src/account/Settings.tsx
@@ -45,6 +45,7 @@ import {
   supportedBiometryTypeSelector,
   walletConnectEnabledSelector,
 } from 'src/app/selectors'
+import BackButton from 'src/components/BackButton'
 import BottomSheet, { BottomSheetRefType } from 'src/components/BottomSheet'
 import Button, { BtnSizes, BtnTypes } from 'src/components/Button'
 import Dialog from 'src/components/Dialog'
@@ -58,6 +59,7 @@ import {
   SettingsItemTextValue,
 } from 'src/components/SettingsItem'
 import Toast from 'src/components/Toast'
+import CustomHeader from 'src/components/header/CustomHeader'
 import { PRIVACY_LINK, TOS_LINK } from 'src/config'
 import { currentLanguageSelector } from 'src/i18n/selectors'
 import ForwardChevron from 'src/icons/ForwardChevron'
@@ -79,6 +81,7 @@ import { StatsigFeatureGates } from 'src/statsig/types'
 import colors from 'src/styles/colors'
 import fontStyles from 'src/styles/fonts'
 import { Spacing } from 'src/styles/styles'
+import variables from 'src/styles/variables'
 import Logger from 'src/utils/Logger'
 import { navigateToURI } from 'src/utils/linking'
 import { useRevokeCurrentPhoneNumber } from 'src/verify/hooks'
@@ -434,7 +437,8 @@ export const Account = ({ navigation, route }: Props) => {
   }
 
   return (
-    <SafeAreaView style={styles.container} edges={['bottom', 'left', 'right']}>
+    <SafeAreaView style={styles.container}>
+      <CustomHeader left={<BackButton />} style={styles.paddingHorizontal} />
       <ScrollView testID="SettingsScrollView">
         <TouchableWithoutFeedback onPress={onDevSettingsTriggerPress}>
           <Text style={styles.title} testID={'SettingsTitle'}>
@@ -643,6 +647,9 @@ const styles = StyleSheet.create({
     marginRight: Spacing.Smallest8,
     marginLeft: 4,
   },
+  paddingHorizontal: {
+    paddingHorizontal: variables.contentPadding,
+  },
 })
 
 export default Account
diff --git a/src/navigator/Navigator.tsx b/src/navigator/Navigator.tsx
index c3de18206c..2676f09fe1 100644
--- a/src/navigator/Navigator.tsx
+++ b/src/navigator/Navigator.tsx
@@ -527,11 +527,7 @@ const generalScreens = (Navigator: typeof Stack) => (
       component={ProfileMenu}
       options={ProfileMenu.navigationOptions as NativeStackNavigationOptions}
     />
-    <Navigator.Screen
-      name={Screens.Settings}
-      component={SettingsScreen}
-      options={headerWithBackButton}
-    />
+    <Navigator.Screen name={Screens.Settings} component={SettingsScreen} options={noHeader} />
     <Navigator.Screen name={Screens.Invite} component={Invite} options={noHeader} />
     <Navigator.Screen name={Screens.Support} component={Support} options={headerWithBackButton} />
   </>

From 666f310d0581fa39c73d12fa1fd93b47acc7abc4 Mon Sep 17 00:00:00 2001
From: Jacob Waterman <jacobrwaterman@gmail.com>
Date: Wed, 29 May 2024 12:19:29 -0700
Subject: [PATCH 070/133] feat(earn): prepare transactions for supply when gas
 fee is covered (#5483)

### Description

When gas fees are subsidized:
1. use the simulateTransactions endpoint to estimate gas for the approve
transaction.
1. ignore limitations of not having enough gas when preparing
transactions

### Test plan

Verified that the transaction goes through when using the syndicate RPC
node on mainnet and that the UI works regardless of whether or not the
user has enough gas when the feature flag is on.

### Related issues

https://linear.app/valora/issue/ACT-1193/new-enter-amount-screen
---
 src/earn/prepareTransactions.test.ts | 96 +++++++++++++++++++++++++++-
 src/earn/prepareTransactions.ts      | 20 +++++-
 src/statsig/constants.ts             |  1 +
 src/viem/prepareTransactions.test.ts | 83 +++++++++++++++++++++++-
 src/viem/prepareTransactions.ts      | 10 ++-
 5 files changed, 200 insertions(+), 10 deletions(-)

diff --git a/src/earn/prepareTransactions.test.ts b/src/earn/prepareTransactions.test.ts
index 1faae04052..7ab6abd0d3 100644
--- a/src/earn/prepareTransactions.test.ts
+++ b/src/earn/prepareTransactions.test.ts
@@ -7,8 +7,8 @@ import {
   prepareSupplyTransactions,
   prepareWithdrawAndClaimTransactions,
 } from 'src/earn/prepareTransactions'
-import { getDynamicConfigParams } from 'src/statsig'
-import { StatsigDynamicConfigs } from 'src/statsig/types'
+import { getDynamicConfigParams, getFeatureGate } from 'src/statsig'
+import { StatsigDynamicConfigs, StatsigFeatureGates } from 'src/statsig/types'
 import { TokenBalance } from 'src/tokens/slice'
 import { Network, NetworkId } from 'src/transactions/types'
 import { publicClient } from 'src/viem'
@@ -63,10 +63,16 @@ describe('prepareTransactions', () => {
     jest.mocked(encodeFunctionData).mockReturnValue('0xencodedData')
     jest.mocked(getDynamicConfigParams).mockImplementation(({ configName, defaultValues }) => {
       if (configName === StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG) {
-        return { ...defaultValues, depositGasPadding: 100 }
+        return { ...defaultValues, depositGasPadding: 100, approveGasPadding: 200 }
       }
       return defaultValues
     })
+    jest.mocked(getFeatureGate).mockImplementation((featureGate) => {
+      if (featureGate === StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES) {
+        return false
+      }
+      throw new Error(`Unexpected feature gate: ${featureGate}`)
+    })
   })
 
   describe('prepareSupplyTransactions', () => {
@@ -146,6 +152,89 @@ describe('prepareTransactions', () => {
         feeCurrencies: [mockFeeCurrency],
         spendToken: mockToken,
         spendTokenAmount: new BigNumber(5),
+        isGasSubsidized: false,
+      })
+    })
+    it('prepares fees from the cloud function for approve and supply when subsidizing gas fees', async () => {
+      mockFetch.mockResponseOnce(
+        JSON.stringify({
+          status: 'OK',
+          simulatedTransactions: [
+            {
+              status: 'success',
+              blockNumber: '1',
+              gasNeeded: 3000,
+              gasUsed: 2800,
+              gasPrice: '1',
+            },
+            {
+              status: 'success',
+              blockNumber: '1',
+              gasNeeded: 50000,
+              gasUsed: 49800,
+              gasPrice: '1',
+            },
+          ],
+        })
+      )
+      jest.mocked(getFeatureGate).mockImplementation((featureGate) => {
+        if (featureGate === StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES) {
+          return true
+        }
+        throw new Error(`Unexpected feature gate: ${featureGate}`)
+      })
+
+      const result = await prepareSupplyTransactions({
+        amount: '5',
+        token: mockToken,
+        walletAddress: '0x1234',
+        feeCurrencies: [mockFeeCurrency],
+        poolContractAddress: '0x5678',
+      })
+
+      const expectedTransactions = [
+        {
+          from: '0x1234',
+          to: mockTokenAddress,
+          data: '0xencodedData',
+          gas: BigInt(3200),
+          _estimatedGasUse: BigInt(2800),
+        },
+        {
+          from: '0x1234',
+          to: '0x5678',
+          data: '0xencodedData',
+          gas: BigInt(50100),
+          _estimatedGasUse: BigInt(49800),
+        },
+      ]
+      expect(result).toEqual({
+        type: 'possible',
+        feeCurrency: mockFeeCurrency,
+        transactions: expectedTransactions,
+      })
+      expect(publicClient[Network.Arbitrum].readContract).toHaveBeenCalledWith({
+        address: mockTokenAddress,
+        abi: erc20.abi,
+        functionName: 'allowance',
+        args: ['0x1234', '0x5678'],
+      })
+      expect(encodeFunctionData).toHaveBeenNthCalledWith(1, {
+        abi: erc20.abi,
+        functionName: 'approve',
+        args: ['0x5678', BigInt(5e6)],
+      })
+      expect(encodeFunctionData).toHaveBeenNthCalledWith(2, {
+        abi: aavePool,
+        functionName: 'supply',
+        args: [mockTokenAddress, BigInt(5e6), '0x1234', 0],
+      })
+      expect(prepareTransactions).toHaveBeenCalledWith({
+        baseTransactions: expectedTransactions,
+        feeCurrencies: [mockFeeCurrency],
+        spendToken: mockToken,
+        spendTokenAmount: new BigNumber(5),
+        isGasSubsidized: true,
       })
     })
 
@@ -204,6 +293,7 @@ describe('prepareTransactions', () => {
         feeCurrencies: [mockFeeCurrency],
         spendToken: mockToken,
         spendTokenAmount: new BigNumber(5),
+        isGasSubsidized: false,
       })
     })
 
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index b5675c0f23..7990910b91 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -4,9 +4,9 @@ import aaveIncentivesV3Abi from 'src/abis/AaveIncentivesV3'
 import aavePool from 'src/abis/AavePoolV3'
 import erc20 from 'src/abis/IERC20'
 import { RewardsInfo } from 'src/earn/types'
-import { getDynamicConfigParams } from 'src/statsig'
+import { getDynamicConfigParams, getFeatureGate } from 'src/statsig'
 import { DynamicConfigs } from 'src/statsig/constants'
-import { StatsigDynamicConfigs } from 'src/statsig/types'
+import { StatsigDynamicConfigs, StatsigFeatureGates } from 'src/statsig/types'
 import { TokenBalance } from 'src/tokens/slice'
 import Logger from 'src/utils/Logger'
 import { ensureError } from 'src/utils/ensureError'
@@ -122,7 +122,7 @@ export async function prepareSupplyTransactions({
     )
   }
 
-  const { depositGasPadding } = getDynamicConfigParams(
+  const { depositGasPadding, approveGasPadding } = getDynamicConfigParams(
     DynamicConfigs[StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG]
   )
 
@@ -131,11 +131,25 @@ export async function prepareSupplyTransactions({
   )
   baseTransactions[baseTransactions.length - 1]._estimatedGasUse = BigInt(supplySimulatedTx.gasUsed)
 
+  const isGasSubsidized = getFeatureGate(StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES)
+  if (isGasSubsidized && baseTransactions.length > 1) {
+    // extract fee of the approve transaction and set gas fields
+    const approveSimulatedTx = simulatedTransactions[0]
+    if (approveSimulatedTx.status !== 'success') {
+      throw new Error(
+        `Failed to simulate approve transaction. response: ${JSON.stringify(simulatedTransactions)}`
+      )
+    }
+    baseTransactions[0].gas = BigInt(approveSimulatedTx.gasNeeded) + BigInt(approveGasPadding)
+    baseTransactions[0]._estimatedGasUse = BigInt(approveSimulatedTx.gasUsed)
+  }
+
   return prepareTransactions({
     feeCurrencies,
     baseTransactions,
     spendToken: token,
     spendTokenAmount: new BigNumber(amount),
+    isGasSubsidized,
   })
 }
 
diff --git a/src/statsig/constants.ts b/src/statsig/constants.ts
index aef3a0d4fc..66de15f7d0 100644
--- a/src/statsig/constants.ts
+++ b/src/statsig/constants.ts
@@ -143,6 +143,7 @@ export const DynamicConfigs = {
       providerLogoUrl: '',
       providerTermsAndConditionsUrl: '',
       depositGasPadding: 0,
+      approveGasPadding: 0,
       moreAavePoolsUrl: '',
     },
   },
diff --git a/src/viem/prepareTransactions.test.ts b/src/viem/prepareTransactions.test.ts
index 03f6425314..b6580ea96e 100644
--- a/src/viem/prepareTransactions.test.ts
+++ b/src/viem/prepareTransactions.test.ts
@@ -178,7 +178,7 @@ describe('prepareTransactions module', () => {
       })
       mocked(estimateGas).mockResolvedValue(BigInt(1_000))
 
-      // max gas fee is 10 * 10k = 100k units, too high for either fee currency
+      // max gas fee is 100 * 1k = 100k units, too high for either fee currency
 
       const result = await prepareTransactions({
         feeCurrencies: mockFeeCurrencies,
@@ -198,6 +198,47 @@ describe('prepareTransactions module', () => {
         feeCurrencies: mockFeeCurrencies,
       })
     })
+    it("returns a 'possible' result when the balances for feeCurrencies are too low to cover the fee but isGasSubsidized is true", async () => {
+      mocked(estimateFeesPerGas).mockResolvedValue({
+        maxFeePerGas: BigInt(100),
+        maxPriorityFeePerGas: BigInt(2),
+        baseFeePerGas: BigInt(50),
+      })
+      mocked(estimateGas).mockResolvedValue(BigInt(1_000))
+
+      // max gas fee is 100 * 1k = 100k units, too high for either fee currency
+
+      const result = await prepareTransactions({
+        feeCurrencies: mockFeeCurrencies,
+        spendToken: mockSpendToken,
+        spendTokenAmount: new BigNumber(45_000),
+        decreasedAmountGasFeeMultiplier: 1,
+        baseTransactions: [
+          {
+            from: '0xfrom' as Address,
+            to: '0xto' as Address,
+            data: '0xdata',
+          },
+        ],
+        isGasSubsidized: true,
+      })
+      expect(result).toStrictEqual({
+        type: 'possible',
+        feeCurrency: mockFeeCurrencies[0],
+        transactions: [
+          {
+            from: '0xfrom',
+            to: '0xto',
+            data: '0xdata',
+
+            gas: BigInt(1000),
+            maxFeePerGas: BigInt(100),
+            maxPriorityFeePerGas: BigInt(2),
+            _baseFeePerGas: BigInt(50),
+          },
+        ],
+      })
+    })
     it("returns a 'not-enough-balance-for-gas' result when gas estimation throws error due to insufficient funds", async () => {
       mocked(estimateFeesPerGas).mockResolvedValue({
         maxFeePerGas: BigInt(100),
@@ -304,6 +345,46 @@ describe('prepareTransactions module', () => {
         decreasedSpendAmount: new BigNumber(4.35), // 70.0 balance minus maxGasFee
       })
     })
+    it("returns a 'possible' result when spending the exact max amount of a feeCurrency, and no other feeCurrency has enough balance to pay for the fee and isGasSubsidized is true", async () => {
+      mocked(estimateFeesPerGas).mockResolvedValue({
+        maxFeePerGas: BigInt(1),
+        maxPriorityFeePerGas: BigInt(2),
+        baseFeePerGas: BigInt(1),
+      })
+
+      const result = await prepareTransactions({
+        feeCurrencies: mockFeeCurrencies,
+        spendToken: mockFeeCurrencies[1],
+        spendTokenAmount: mockFeeCurrencies[1].balance.shiftedBy(mockFeeCurrencies[1].decimals),
+        decreasedAmountGasFeeMultiplier: 1.01,
+        isGasSubsidized: true,
+        baseTransactions: [
+          {
+            from: '0xfrom' as Address,
+            to: '0xto' as Address,
+            data: '0xdata',
+            _estimatedGasUse: BigInt(50),
+            gas: BigInt(15_000),
+          },
+        ],
+      })
+      expect(result).toStrictEqual({
+        type: 'possible',
+        feeCurrency: mockFeeCurrencies[0],
+        transactions: [
+          {
+            _baseFeePerGas: BigInt(1),
+            _estimatedGasUse: BigInt(50),
+            from: '0xfrom',
+            gas: BigInt(15_000),
+            maxFeePerGas: BigInt(1),
+            maxPriorityFeePerGas: BigInt(2),
+            to: '0xto',
+            data: '0xdata',
+          },
+        ],
+      })
+    })
     it("returns a 'need-decrease-spend-amount-for-gas' result when spending close to the max amount of a feeCurrency, and no other feeCurrency has enough balance to pay for the fee", async () => {
       mocked(estimateFeesPerGas).mockResolvedValue({
         maxFeePerGas: BigInt(1),
diff --git a/src/viem/prepareTransactions.ts b/src/viem/prepareTransactions.ts
index 744aef8e42..d2be8d783a 100644
--- a/src/viem/prepareTransactions.ts
+++ b/src/viem/prepareTransactions.ts
@@ -261,6 +261,7 @@ export async function tryEstimateTransactions(
  * @param decreasedAmountGasFeeMultiplier
  * @param baseTransactions
  * @param throwOnSpendTokenAmountExceedsBalance
+ * @param isGasSubsidized - This flag should only be set to true if all of the baseTransactions already have gas estimates, aka the 'gas' and '_estimatedGasUse' fields have been manually set
  */
 export async function prepareTransactions({
   feeCurrencies,
@@ -269,6 +270,7 @@ export async function prepareTransactions({
   decreasedAmountGasFeeMultiplier = 1,
   baseTransactions,
   throwOnSpendTokenAmountExceedsBalance = true,
+  isGasSubsidized = false,
 }: {
   feeCurrencies: TokenBalance[]
   spendToken?: TokenBalance
@@ -276,6 +278,7 @@ export async function prepareTransactions({
   decreasedAmountGasFeeMultiplier?: number
   baseTransactions: (TransactionRequest & { gas?: bigint })[]
   throwOnSpendTokenAmountExceedsBalance?: boolean
+  isGasSubsidized?: boolean
 }): Promise<PreparedTransactionsResult> {
   if (!spendToken && spendTokenAmount.isGreaterThan(0)) {
     throw new Error(
@@ -299,7 +302,7 @@ export async function prepareTransactions({
     estimatedGasFeeInDecimal: BigNumber
   }> = []
   for (const feeCurrency of feeCurrencies) {
-    if (feeCurrency.balance.isLessThanOrEqualTo(0)) {
+    if (feeCurrency.balance.isLessThanOrEqualTo(0) && !isGasSubsidized) {
       // No balance, try next fee currency
       continue
     }
@@ -314,7 +317,7 @@ export async function prepareTransactions({
     const estimatedGasFee = getEstimatedGasFee(estimatedTransactions)
     const estimatedGasFeeInDecimal = estimatedGasFee?.shiftedBy(-feeDecimals)
     gasFees.push({ feeCurrency, maxGasFeeInDecimal, estimatedGasFeeInDecimal })
-    if (maxGasFeeInDecimal.isGreaterThan(feeCurrency.balance)) {
+    if (maxGasFeeInDecimal.isGreaterThan(feeCurrency.balance) && !isGasSubsidized) {
       // Not enough balance to pay for gas, try next fee currency
       continue
     }
@@ -322,7 +325,8 @@ export async function prepareTransactions({
     if (
       spendToken &&
       spendToken.tokenId === feeCurrency.tokenId &&
-      spendAmountDecimal.plus(maxGasFeeInDecimal).isGreaterThan(spendToken.balance)
+      spendAmountDecimal.plus(maxGasFeeInDecimal).isGreaterThan(spendToken.balance) &&
+      !isGasSubsidized
     ) {
       // Not enough balance to pay for gas, try next fee currency
       continue

From a7019b674b87cbf5cf945b48156324cb405bb0c6 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Wed, 29 May 2024 19:13:40 -0700
Subject: [PATCH 071/133] refactor(token-bottom-sheet): support bottom sheet
 screen and use in cico (#5485)

### Description

Refactors the TokenBottomSheet component so that it can be used as a
bottom sheet screen for CICO flow. This will allow enabling filters
without needing to duplicate much of the code

### Test plan

Confirmed token bottom sheet works correctly on all the flows

### Related issues

- Part of ACT-1710

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 e2e/src/usecases/ChooseYourAdventure.js       |   4 +-
 src/components/TokenBottomSheet.test.tsx      |  14 +-
 src/components/TokenBottomSheet.tsx           | 165 +++++++++++-------
 .../FiatExchangeCurrencyBottomSheet.test.tsx  |  17 --
 .../FiatExchangeCurrencyBottomSheet.tsx       |  66 +++----
 5 files changed, 136 insertions(+), 130 deletions(-)

diff --git a/e2e/src/usecases/ChooseYourAdventure.js b/e2e/src/usecases/ChooseYourAdventure.js
index 042abfc322..6bd5ff7abc 100644
--- a/e2e/src/usecases/ChooseYourAdventure.js
+++ b/e2e/src/usecases/ChooseYourAdventure.js
@@ -41,10 +41,10 @@ export default ChooseYourAdventure = () => {
     await element(by.text('Add funds')).tap()
 
     // Check that we are on the bottom sheet
-    await waitForElementId('FiatExchangeCurrencyBottomSheet')
+    await waitForElementId('TokenBottomSheet')
 
     // dismissing the bottom sheet should show home screen
-    await element(by.id('FiatExchangeCurrencyBottomSheet')).swipe('down')
+    await element(by.id('TokenBottomSheet')).swipe('down')
     await waitForElementId('HomeAction-Send')
   })
 
diff --git a/src/components/TokenBottomSheet.test.tsx b/src/components/TokenBottomSheet.test.tsx
index 0dc44d928a..e73410633a 100644
--- a/src/components/TokenBottomSheet.test.tsx
+++ b/src/components/TokenBottomSheet.test.tsx
@@ -109,21 +109,29 @@ const mockStore = createMockStore({
 
 const onTokenSelectedMock = jest.fn()
 
-describe('TokenBottomSheet', () => {
+describe.each([
+  { isScreen: true, testName: 'screen' },
+  { isScreen: false, testName: 'component' },
+])('TokenBottomSheet (as $testName)', ({ isScreen }) => {
   beforeEach(() => {
     jest.clearAllMocks()
   })
 
-  function renderBottomSheet(props: Partial<TokenBottomSheetProps> = {}) {
+  function renderBottomSheet(
+    props: Partial<Omit<TokenBottomSheetProps, 'isScreen' | 'forwardedRef'>> = {}
+  ) {
+    const additionalProps = isScreen
+      ? { isScreen: true as const }
+      : { forwardedRef: { current: null } }
     return render(
       <Provider store={mockStore}>
         <TokenBottomSheet
           title="testTitle"
-          forwardedRef={{ current: null }}
           origin={TokenPickerOrigin.Send}
           onTokenSelected={onTokenSelectedMock}
           tokens={tokens}
           {...props}
+          {...additionalProps}
         />
       </Provider>
     )
diff --git a/src/components/TokenBottomSheet.tsx b/src/components/TokenBottomSheet.tsx
index ac954f6d32..4a0b215653 100644
--- a/src/components/TokenBottomSheet.tsx
+++ b/src/components/TokenBottomSheet.tsx
@@ -1,9 +1,10 @@
 import { BottomSheetFlatList, BottomSheetFlatListMethods } from '@gorhom/bottom-sheet'
+import { BottomSheetFlatListProps } from '@gorhom/bottom-sheet/lib/typescript/components/bottomSheetScrollable/types'
 import { debounce } from 'lodash'
 import React, { RefObject, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { StyleSheet, Text, TextStyle, View } from 'react-native'
-import { ScrollView } from 'react-native-gesture-handler'
+import { FlatListProps, StyleSheet, Text, TextStyle, View } from 'react-native'
+import { FlatList, ScrollView } from 'react-native-gesture-handler'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { TokenBottomSheetEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
@@ -20,22 +21,23 @@ import InfoIcon from 'src/icons/InfoIcon'
 import colors, { Colors } from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
 import { Spacing } from 'src/styles/styles'
+import variables from 'src/styles/variables'
 import { TokenBalanceItem } from 'src/tokens/TokenBalanceItem'
 import { TokenBalance } from 'src/tokens/slice'
 import { NetworkId } from 'src/transactions/types'
 
 export enum TokenPickerOrigin {
   Send = 'Send',
-  SendConfirmation = 'SendConfirmation',
-  Exchange = 'Exchange',
   SwapFrom = 'Swap/From',
   SwapTo = 'Swap/To',
+  CashIn = 'CashIn',
+  CashOut = 'CashOut',
+  Spend = 'Spend',
 }
 
 export const DEBOUNCE_WAIT_TIME = 200
 
-export interface TokenBottomSheetProps {
-  forwardedRef: RefObject<BottomSheetRefType>
+export type TokenBottomSheetProps = {
   origin: TokenPickerOrigin
   onTokenSelected: (token: TokenBalance, tokenPositionInList: number) => void
   title: string
@@ -47,7 +49,10 @@ export interface TokenBottomSheetProps {
   showPriceUsdUnavailableWarning?: boolean
   filterChips?: FilterChip<TokenBalance>[]
   areSwapTokensShuffled?: boolean
-}
+} & (
+  | { isScreen: true; forwardedRef?: undefined }
+  | { forwardedRef: RefObject<BottomSheetRefType>; isScreen?: false }
+)
 
 interface TokenOptionProps {
   tokenInfo: TokenBalance
@@ -99,11 +104,14 @@ function TokenBottomSheet({
   showPriceUsdUnavailableWarning,
   filterChips = [],
   areSwapTokensShuffled,
+  isScreen,
 }: TokenBottomSheetProps) {
   const insets = useSafeAreaInsets()
 
   const filterChipsCarouselRef = useRef<ScrollView>(null)
-  const tokenListRef = useRef<BottomSheetFlatListMethods>(null)
+  const tokenListBottomSheetFlatListRef = useRef<BottomSheetFlatListMethods>(null)
+  const tokenListFlatListRef = useRef<FlatList>(null)
+  const tokenListRef = isScreen ? tokenListFlatListRef : tokenListBottomSheetFlatListRef
   const [headerHeight, setHeaderHeight] = useState(0)
   const [searchTerm, setSearchTerm] = useState('')
   const [filters, setFilters] = useState(filterChips)
@@ -224,6 +232,15 @@ function TokenBottomSheet({
     setHeaderHeight(event.nativeEvent.layout.height)
   }
 
+  // same issue as BottomSheetScrollView, BottomSheetFlatList does not scroll
+  // correctly when used in a screen. See comment in
+  // src/components/BottomSheetScrollView for more details
+  const FlatListComponent = isScreen
+    ? (props: FlatListProps<TokenBalance>) => <FlatList ref={tokenListFlatListRef} {...props} />
+    : (props: BottomSheetFlatListProps<TokenBalance>) => (
+        <BottomSheetFlatList ref={tokenListBottomSheetFlatListRef} {...props} />
+      )
+
   // This component implements a sticky header using an absolutely positioned
   // component on top of a blank container of the same height in the
   // ListHeaderComponent of the Flatlist. Unfortunately the out of the box
@@ -231,69 +248,80 @@ function TokenBottomSheet({
   // scroll methods inside dynamically sized bottom sheets and it was observed
   // that the header would be stuck to the wrong position between sheet reopens.
   // See https://valora-app.slack.com/archives/C04B61SJ6DS/p1707757919681089
-  return (
+  const content = (
     <>
-      <BottomSheetBase forwardedRef={forwardedRef} snapPoints={snapPoints}>
-        <View style={styles.container} testID="TokenBottomSheet">
-          <BottomSheetFlatList
-            ref={tokenListRef}
-            data={tokenList}
-            keyExtractor={(item) => item.tokenId}
-            contentContainerStyle={[styles.tokenListContainer, { paddingBottom: insets.bottom }]}
-            scrollIndicatorInsets={{ top: headerHeight }}
-            renderItem={({ item, index }) => {
-              return (
-                <TokenBalanceItem
-                  token={item}
-                  balanceUsdErrorFallback={t('tokenDetails.priceUnavailable') ?? undefined}
-                  onPress={onTokenPressed(item, index)}
-                  containerStyle={styles.tokenBalanceItemContainer}
-                  showPriceUsdUnavailableWarning={showPriceUsdUnavailableWarning}
-                />
-              )
-            }}
-            ListHeaderComponent={<View style={{ height: headerHeight }} />}
-            ListEmptyComponent={() => {
-              if (searchEnabled || filterChips.length > 0) {
-                return <NoResults searchTerm={searchTerm} activeFilters={activeFilters} />
-              }
-              return null
+      <FlatListComponent
+        data={tokenList}
+        keyExtractor={(item) => item.tokenId}
+        contentContainerStyle={[styles.tokenListContainer, { paddingBottom: insets.bottom }]}
+        scrollIndicatorInsets={{ top: headerHeight }}
+        renderItem={({ item, index }) => {
+          return (
+            <TokenBalanceItem
+              token={item}
+              balanceUsdErrorFallback={t('tokenDetails.priceUnavailable') ?? undefined}
+              onPress={onTokenPressed(item, index)}
+              containerStyle={styles.tokenBalanceItemContainer}
+              showPriceUsdUnavailableWarning={showPriceUsdUnavailableWarning}
+            />
+          )
+        }}
+        ListHeaderComponent={<View style={{ height: headerHeight }} />}
+        ListEmptyComponent={() => {
+          if (searchEnabled || filterChips.length > 0) {
+            return <NoResults searchTerm={searchTerm} activeFilters={activeFilters} />
+          }
+          return null
+        }}
+      />
+      <View style={styles.headerContainer} onLayout={handleMeasureHeader}>
+        <Text style={[styles.title, titleStyle]}>{title}</Text>
+        {searchEnabled && (
+          <SearchInput
+            placeholder={t('tokenBottomSheet.searchAssets') ?? undefined}
+            value={searchTerm}
+            onChangeText={(text) => {
+              setSearchTerm(text)
+              sendAnalytics(text)
             }}
+            style={styles.searchInput}
+            returnKeyType={'search'}
+            // disable autoCorrect and spellCheck since the search terms here
+            // are token names which autoCorrect would get in the way of. This
+            // combination also hides the keyboard suggestions bar from the top
+            // of the iOS keyboard, preserving screen real estate.
+            autoCorrect={false}
+            spellCheck={false}
           />
-          <View style={styles.headerContainer} onLayout={handleMeasureHeader}>
-            <Text style={[styles.title, titleStyle]}>{title}</Text>
-            {searchEnabled && (
-              <SearchInput
-                placeholder={t('tokenBottomSheet.searchAssets') ?? undefined}
-                value={searchTerm}
-                onChangeText={(text) => {
-                  setSearchTerm(text)
-                  sendAnalytics(text)
-                }}
-                style={styles.searchInput}
-                returnKeyType={'search'}
-                // disable autoCorrect and spellCheck since the search terms here
-                // are token names which autoCorrect would get in the way of. This
-                // combination also hides the keyboard suggestions bar from the top
-                // of the iOS keyboard, preserving screen real estate.
-                autoCorrect={false}
-                spellCheck={false}
-              />
-            )}
-            {filterChips.length > 0 && (
-              <FilterChipsCarousel
-                chips={filters}
-                onSelectChip={handleToggleFilterChip}
-                primaryColor={colors.successDark}
-                secondaryColor={colors.successLight}
-                style={styles.filterChipsCarouselContainer}
-                forwardedRef={filterChipsCarouselRef}
-                scrollEnabled={false}
-              />
-            )}
-          </View>
+        )}
+        {filterChips.length > 0 && (
+          <FilterChipsCarousel
+            chips={filters}
+            onSelectChip={handleToggleFilterChip}
+            primaryColor={colors.successDark}
+            secondaryColor={colors.successLight}
+            style={styles.filterChipsCarouselContainer}
+            forwardedRef={filterChipsCarouselRef}
+            scrollEnabled={false}
+          />
+        )}
+      </View>
+    </>
+  )
+
+  return (
+    <>
+      {isScreen ? (
+        <View style={styles.screenContainer} testID="TokenBottomSheet">
+          {content}
         </View>
-      </BottomSheetBase>
+      ) : (
+        <BottomSheetBase forwardedRef={forwardedRef} snapPoints={snapPoints}>
+          <View style={styles.container} testID="TokenBottomSheet">
+            {content}
+          </View>
+        </BottomSheetBase>
+      )}
       {networkChip && (
         <NetworkMultiSelectBottomSheet
           allNetworkIds={networkChip.allNetworkIds}
@@ -319,6 +347,9 @@ const styles = StyleSheet.create({
   container: {
     flex: 1,
   },
+  screenContainer: {
+    maxHeight: variables.height * 0.9,
+  },
   searchInput: {
     marginTop: Spacing.Regular16,
   },
diff --git a/src/fiatExchanges/FiatExchangeCurrencyBottomSheet.test.tsx b/src/fiatExchanges/FiatExchangeCurrencyBottomSheet.test.tsx
index 23c034b7c0..08dde31113 100644
--- a/src/fiatExchanges/FiatExchangeCurrencyBottomSheet.test.tsx
+++ b/src/fiatExchanges/FiatExchangeCurrencyBottomSheet.test.tsx
@@ -113,7 +113,6 @@ jest.mock('src/web3/networkConfig', () => {
 
 jest.mock('src/statsig', () => ({
   getDynamicConfigParams: jest.fn(),
-  getFeatureGate: jest.fn().mockReturnValue(true),
 }))
 
 describe(FiatExchangeCurrencyBottomSheet, () => {
@@ -282,20 +281,4 @@ describe(FiatExchangeCurrencyBottomSheet, () => {
     expect(getAllByTestId('TokenBalanceItem')[3]).toHaveTextContent('CELO')
     expect(getAllByTestId('TokenBalanceItem')[4]).toHaveTextContent('ETH')
   })
-  it('renders correctly if token list is empty', () => {
-    const { queryByTestId, getByTestId } = render(
-      <Provider store={createMockStore({ tokens: { tokenBalances: {} } })}>
-        <MockedNavigator
-          component={FiatExchangeCurrencyBottomSheet}
-          params={{
-            flow: FiatExchangeFlow.CashIn,
-          }}
-        />
-      </Provider>
-    )
-    expect(queryByTestId('TokenBalanceItem')).toBeFalsy()
-    // asserts whether tokenList.length (0) isn't rendered, which causes a
-    // crash in the app
-    expect(getByTestId('FiatExchangeCurrencyBottomSheet')).not.toHaveTextContent('0')
-  })
 })
diff --git a/src/fiatExchanges/FiatExchangeCurrencyBottomSheet.tsx b/src/fiatExchanges/FiatExchangeCurrencyBottomSheet.tsx
index 6d9fc7e02a..8c4b6af031 100644
--- a/src/fiatExchanges/FiatExchangeCurrencyBottomSheet.tsx
+++ b/src/fiatExchanges/FiatExchangeCurrencyBottomSheet.tsx
@@ -1,16 +1,12 @@
 import { BottomSheetScreenProps } from '@th3rdwave/react-navigation-bottom-sheet'
 import React, { useEffect, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import { StyleSheet, Text } from 'react-native'
-import BottomSheetScrollView from 'src/components/BottomSheetScrollView'
+import TokenBottomSheet, { TokenPickerOrigin } from 'src/components/TokenBottomSheet'
 import { fetchFiatConnectProviders } from 'src/fiatconnect/slice'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { StackParamList } from 'src/navigator/types'
 import { useDispatch } from 'src/redux/hooks'
-import { typeScale } from 'src/styles/fonts'
-import { Spacing } from 'src/styles/styles'
-import { TokenBalanceItem } from 'src/tokens/TokenBalanceItem'
 import { useCashInTokens, useCashOutTokens, useSpendTokens } from 'src/tokens/hooks'
 import { TokenBalance } from 'src/tokens/slice'
 import { sortCicoTokens } from 'src/tokens/utils'
@@ -40,48 +36,36 @@ function FiatExchangeCurrencyBottomSheet({ route }: Props) {
     dispatch(fetchFiatConnectProviders())
   }, [])
 
-  const onTokenPressed =
-    ({ tokenId, symbol }: TokenBalance) =>
-    () => {
-      if (flow === FiatExchangeFlow.Spend) {
-        return navigate(Screens.BidaliScreen, {
-          // ResolveCurrency is okay to use here since Bidali only
-          // supports cEUR and cUSD
-          currency: resolveCurrency(symbol),
-        })
-      }
-      navigate(Screens.FiatExchangeAmount, {
-        tokenId: tokenId,
-        flow: flow === FiatExchangeFlow.CashIn ? CICOFlow.CashIn : CICOFlow.CashOut,
-        tokenSymbol: symbol,
+  const onTokenPressed = ({ tokenId, symbol }: TokenBalance) => {
+    if (flow === FiatExchangeFlow.Spend) {
+      return navigate(Screens.BidaliScreen, {
+        // ResolveCurrency is okay to use here since Bidali only
+        // supports cEUR and cUSD
+        currency: resolveCurrency(symbol),
       })
     }
+    navigate(Screens.FiatExchangeAmount, {
+      tokenId: tokenId,
+      flow: flow === FiatExchangeFlow.CashIn ? CICOFlow.CashIn : CICOFlow.CashOut,
+      tokenSymbol: symbol,
+    })
+  }
 
   return (
-    <BottomSheetScrollView
+    <TokenBottomSheet
       isScreen
-      containerStyle={{ padding: undefined }}
-      testId="FiatExchangeCurrencyBottomSheet"
-    >
-      {/* padding undefined to prevent android ripple bug */}
-      <Text style={styles.selectDigitalCurrency}>{t('sendEnterAmountScreen.selectToken')}</Text>
-      {!!tokenList.length &&
-        tokenList.map((tokenInfo) => {
-          return (
-            <React.Fragment key={`token-${tokenInfo.tokenId}`}>
-              <TokenBalanceItem token={tokenInfo} onPress={onTokenPressed(tokenInfo)} />
-            </React.Fragment>
-          )
-        })}
-    </BottomSheetScrollView>
+      tokens={tokenList}
+      onTokenSelected={onTokenPressed}
+      title={t('sendEnterAmountScreen.selectToken')}
+      origin={
+        flow === FiatExchangeFlow.CashIn
+          ? TokenPickerOrigin.CashIn
+          : flow === FiatExchangeFlow.CashOut
+            ? TokenPickerOrigin.CashOut
+            : TokenPickerOrigin.Spend
+      }
+    />
   )
 }
 
-const styles = StyleSheet.create({
-  selectDigitalCurrency: {
-    ...typeScale.titleSmall,
-    paddingHorizontal: Spacing.Thick24,
-  },
-})
-
 export default FiatExchangeCurrencyBottomSheet

From 50d1160b8dd7259429fd85b20489e93a2a141782 Mon Sep 17 00:00:00 2001
From: valora-bot-crowdin
 <80050969+valora-bot-crowdin@users.noreply.github.com>
Date: Wed, 29 May 2024 19:37:34 -0700
Subject: [PATCH 072/133] chore(l10n): update translations from Crowdin (#5489)

Co-authored-by: Valora Bot <89419329+valora-bot@users.noreply.github.com>
---
 locales/de/translation.json     |  26 ++--
 locales/es-419/translation.json | 220 ++++++++++++++++----------------
 locales/fr-FR/translation.json  |  42 +++---
 locales/it-IT/translation.json  |  26 ++--
 locales/pl-PL/translation.json  |  14 +-
 locales/pt-BR/translation.json  |  44 +++----
 locales/ru-RU/translation.json  |  30 ++---
 locales/th-TH/translation.json  |  24 ++--
 locales/tr-TR/translation.json  |  10 +-
 locales/vi-VN/translation.json  |  18 +--
 locales/zh-CN/translation.json  |  30 ++---
 11 files changed, 242 insertions(+), 242 deletions(-)

diff --git a/locales/de/translation.json b/locales/de/translation.json
index 155186e023..4a7f6d0cdb 100644
--- a/locales/de/translation.json
+++ b/locales/de/translation.json
@@ -2193,8 +2193,8 @@
   "getStartedHome": {
     "title": "Krypto kaufen oder Tokens überweisen",
     "body": "Kaufe oder überweise kompatible Token, um Krypto zu senden und web3 zu erkunden!",
-    "titleV1_86": "Guthaben zu deinem Geldbeutel hinzufügen",
-    "exploreTokens": "Alle Token erforschen",
+    "titleV1_86": "Füge Guthaben zu deinem Wallet hinzu",
+    "exploreTokens": "Erkunde alle Token",
     "exploreTokensBody": "Du kannst bis zu 10+ Token in Valora kaufen. Schau sie dir an!"
   },
   "nftCelebration": {
@@ -2278,7 +2278,7 @@
       "cards": {
         "createWallet": {
           "title": "Wallet-Inhaber",
-          "subtitle": "Mitglied von {{appName}}"
+          "subtitle": "{{appName}}-Mitglied"
         },
         "swap": {
           "title": "Tauschen",
@@ -2330,7 +2330,7 @@
     },
     "activityCards": {
       "createWallet": {
-        "title": "Erstelle eine {{appName}} Wallet"
+        "title": "{{appName}}-Wallet erstellen"
       },
       "swap": {
         "title": "Vermögen tauschen",
@@ -2355,7 +2355,7 @@
     }
   },
   "earnFlow": {
-    "gasSubsidized": "Valora übernimmt das Benzin für diese Transaktion!",
+    "gasSubsidized": "Valora übernimmt das Gas für diese Transaktion!",
     "addCryptoBottomSheet": {
       "title": "Füge {{tokenSymbol}} auf {{tokenNetwork}} hinzu",
       "description": "Sobald du Tokens hinzugefügt hast, musst du zurückkommen, um die Einzahlung in einen Pool zu beenden.",
@@ -2376,12 +2376,12 @@
       "description": "Erfahre, wie viel du an der Bereitstellung eines Kreditpools verdienen kannst"
     },
     "earnInfo": {
-      "title": "Verdiene mit deinen\nstablecoins",
+      "title": "Verdiene mit deinen\nStablecoins",
       "details": {
         "earn": {
-          "titleGasSubsidy": "Maximiere deine Einnahmen ohne Gasgebühren*",
-          "title": "Gewinne maximieren",
-          "subtitle": "Verdiene an deinen Stablecoins und erhalte Belohnungen, wenn du einen Pool belieferst.",
+          "titleGasSubsidy": "Maximiere Verdienste ohne Gasgebühren*",
+          "title": "Maximiere Verdienste",
+          "subtitle": "Verdiene an deinen Stablecoins und erhalte Rewards, wenn du einen Pool belieferst.",
           "footnoteSubsidy": "*Gasgebühren werden vorübergehend von Valora übernommen"
         },
         "manage": {
@@ -2389,8 +2389,8 @@
           "subtitle": "Wir kümmern uns um die Einrichtung, damit du deine Position direkt von Valora aus verwalten kannst."
         },
         "access": {
-          "title": "Einfacher Zugriff auf dein Geld",
-          "subtitle": "Sammle dein Geld mühelos mit einem einzigen Tap. Genieße den gleichen sofortigen Zugang wie direkt über deine Lieblingsprotokolle."
+          "title": "Einfacher Zugriff auf dein Guthaben",
+          "subtitle": "Erhalte dein Guthaben mühelos mit einem einzigen Tippen. Genieße den gleichen sofortigen Zugang wie direkt über deine Lieblingsprotokolle."
         }
       },
       "action": {
@@ -2399,8 +2399,8 @@
       }
     },
     "ctaV1_86": {
-      "title": "Maximiere den Ertrag von Stablecoins",
-      "subtitle": "Kaufen {{symbol}}",
+      "title": "Maximiere den Verdienst von Stablecoins",
+      "subtitle": "Kaufe {{symbol}}",
       "description": "Verdiene etwa {{apy}}% pro Jahr, wenn du {{symbol}} zu einem Pool hinzufügst"
     },
     "enterAmount": {
diff --git a/locales/es-419/translation.json b/locales/es-419/translation.json
index e254cadc1e..5fa84037e2 100644
--- a/locales/es-419/translation.json
+++ b/locales/es-419/translation.json
@@ -255,8 +255,8 @@
       "text": "Cualquier persona que acceda a tu frase tendrá acceso a tu cuenta y a todos tus fondos. No la compartas con nadie."
     }
   ],
-  "consumerIncentivesTitle": "Se acaba Supercharge",
-  "consumerIncentivesSummary": "Pero te esperan más recompensas. Hasta el 28 de mayo, obtén {{percent}}% de recompensas anuales en tu saldo más alto de stablecoin (cUSD, cEUR o cREAL). Así funciona:",
+  "consumerIncentivesTitle": "Supercharge llega a su fin",
+  "consumerIncentivesSummary": "Pero te esperan más recompensas. Hasta el 28 de mayo, obtén {{percent}}% en recompensas anuales sobre tu saldo más alto de cUSD, cEUR o cREAL. Así funciona:",
   "earnWeekly": {
     "header": "Conecta tu número de teléfono",
     "text": "Toca Conecta tu número si aún no lo haz hecho."
@@ -271,14 +271,14 @@
     "text": "Esto garantizará que tus fondos estén seguros y siempre tengas acceso a ellos."
   },
   "conclusion": "Es así de simple. ¡Recárgate de cripto hoy!",
-  "superchargeTitle": "Se acaba Supercharge",
-  "superchargeDescription": "Pero te esperan más recompensas. Hasta el 28 de mayo, obtén {{apy}}% de recompensas anuales en tu saldo más alto de {{token}} . Así es como funciona:",
+  "superchargeTitle": "Supercharge llega a su fin",
+  "superchargeDescription": "Pero te esperan más recompensas. Hasta el 28 de mayo, obtén {{apy}}% en recompensas anuales sobre tu saldo más alto de {{token}} . Así es como funciona:",
   "superchargeConnectNumber": "Conecta tu número de teléfono",
   "superchargeReconnectNumber": "Reconecta tu número de teléfono\n<0>Lanzamos un experiencia mejorada de Supercharge. Reconecta tu número de teléfono para seguir recibiendo recompensas sobre tus {{token}}.</0>",
   "superchargeMinimumBalance": "Agrega un saldo mínimo de {{amount}} {{token}}",
-  "superchargeDisclaimer": "Esto no afectará a tu saldo ni a tus ganancias anteriores.",
-  "superchargeDisclaimerMaxRewards": "Esto no afectará a tu saldo ni a tus ganancias anteriores.",
-  "superchargeDisclaimerDayLimit": "Esto no afectará a tu saldo ni a tus ganancias anteriores. <0>Más información</0>",
+  "superchargeDisclaimer": "Esto no afectará tu saldo ni tus ganancias anteriores.",
+  "superchargeDisclaimerMaxRewards": "Esto no afectará tu saldo ni tus ganancias anteriores.",
+  "superchargeDisclaimerDayLimit": "Esto no afectará tu saldo ni tus ganancias anteriores. <0>Más información</0>",
   "superchargeTokenDetailsDialog": {
     "title": "¿Qué activos generan recompensas con Supercharge?",
     "body": "Recibirás recompensas semanales sobre tu stablecoin Celo con mayor saldo (cEUR, cUSD, cREAL).",
@@ -286,7 +286,7 @@
   },
   "superchargingTitle": "Actualización de aplicación necesaria",
   "superchargingDescription": "Actualiza la app Valora para seguir recibiendo tus recompensas semanales Supercharge.",
-  "superchargingTitleV1_54": "Se acaba Supercharge",
+  "superchargingTitleV1_54": "Supercharge llega a su fin",
   "superchargingDescriptionV1_54": "Podrás reclamar las recompensas semanales hasta el martes 28 de mayo a las 23:59 UTC. A partir del 29 de mayo, ya no podrás reclamar recompensas de Supercharge.",
   "superchargeRewardsAvailable": "¡Has acumulado {{amount}} {{token}} en recompensas!",
   "superchargeRewardsAvailableMultipleTokens": "¡Has acumulado {{amounts}} en recompensas!",
@@ -516,7 +516,7 @@
   "to": "Para",
   "for": "Motivo",
   "reclaim": "Recuperar",
-  "claimed": "Reclamada",
+  "claimed": "Ganancias",
   "celoGold": "CELO",
   "celoEuros": "Celo Euros",
   "balanceAvailable": "<0></0> disponibles",
@@ -693,7 +693,7 @@
     },
     "rewardsActiveCUSD": {
       "title": "¡GANA HASTA 12 cUSD por invitar a tus amigos a Valora!",
-      "body": "Obtén 0,50 cUSD por cada amigo que invites a {{appName}}. Una vez que conecten su número, agreguen fondos y los mantengan durante 7 días, ambos obtendrán 0,50 cUSD. Date prisa, ¡los fondos son limitados! (Límite de 25 amigos)."
+      "body": "Obtén 0,50 cUSD por cada amigo que invites a {{appName}}. Una vez que conecten su número, agreguen fondos y los mantengan durante 7 días, ambos obtendrán 0,50 cUSD. Date prisa, ¡los fondos son limitados! (límite de 25 amigos)."
     }
   },
   "getReward": "Obtén ${{reward}}",
@@ -710,15 +710,15 @@
     "goldDisclaimer": "Cuando creas una \"cuenta\" en Valora, estás creando una billetera digital de la que sólo tú tienes las claves. Ninguna otra persona o entidad, incluyendo Valora, puede recuperar tu clave, cambiar o deshacer transacciones, o recuperar fondos perdidos. Ten en cuenta que las criptomonedas forman parte de una nueva clase de activos y presentan un riesgo de pérdida financiera. Considera cuidadosamente tu circunstancia financiera y tu tolerancia al riesgo financiero antes de comprar cualquier activo."
   },
   "termsColloquial": {
-    "title": "Empecemos por crear tu billetera",
+    "title": "Empecemos por crear tu wallet",
     "privacyHeading": "Tu información y privacidad:",
-    "privacy1": "Recopilamos datos de uso que nos ayudan a mejorar la aplicación y la seguridad. El tipo de información que recopilamos, cómo la utilizamos y tus derechos relacionados con esa información pueden consultarse en nuestra <0>Política de privacidad</0>.",
-    "privacy2": "Si decides vincular tu número de teléfono, almacenaremos una copia encriptada del mismo.",
-    "privacy3": "Si decides conectar tus contactos, utilizamos sus nombres, números y fotos de perfil para que sea más fácil encontrarlos.",
-    "walletHeading": "Tu Billetera digital con Valora:",
-    "wallet1": "Estás a punto de crear una billetera digital. Sólo tú tienes la clave de tu billetera. No podemos recuperar tu clave o tus activos si pierdes tu clave. Tampoco podemos revertir las acciones tomadas a través de Valora en blockchains.",
-    "wallet2": "Los activos digitales, los activos con los que interactuarás con Valora, conllevan riesgos únicos. Al utilizar Valora, aceptas estos riesgos y te responsabilizas de ellos. Por favor, considera tus finanzas y tu tolerancia al riesgo antes de tomar decisiones.",
-    "fullTerms": "Lee nuestros <0>Términos y condiciones</0> completos"
+    "privacy1": "Recopilamos datos de uso que nos ayudan a mejorar la aplicación y la seguridad. Puedes consultar el tipo de información que recopilamos, cómo la utilizamos y tus derechos relacionados con esa información en nuestra <0>Política de privacidad</0>.",
+    "privacy2": "Si decides vincular tu número de teléfono, almacenaremos una copia encriptada de este.",
+    "privacy3": "Si decides conectar tus contactos, utilizaremos sus nombres, números y fotos de perfil para que sea más fácil encontrarlos.",
+    "walletHeading": "Tu wallet digital en Valora:",
+    "wallet1": "Estás a punto de crear una wallet digital. Solo tú tienes la clave para acceder a ella. Si la pierdes, no podremos recuperar tu clave o activos. Tampoco podemos revertir las acciones tomadas a través de Valora en las blockchains habilitadas.",
+    "wallet2": "Los activos digitales, con los que interactuarás con Valora, conllevan riesgos únicos. Al utilizar Valora, aceptas estos riesgos y te responsabilizas de ellos. Toma en cuenta tus finanzas y tolerancia al riesgo antes de tomar decisiones.",
+    "fullTerms": "Lee nuestros <0>Términos y condiciones</0>."
   },
   "fullNameOrPsuedonym": "Nombre o alias",
   "namePlaceholder": "p. ej. nombre",
@@ -827,7 +827,7 @@
     "hasWallet": "Ya tengo una wallet",
     "header": "¡Te damos la bienvenida a {{appName}}! Demos el primer paso, creemos tu wallet.",
     "getStarted": "Primeros pasos",
-    "agreeToTerms": "Al crear una billetera aceptas nuestros <0>Términos y condiciones</0>"
+    "agreeToTerms": "Al crear una wallet aceptas nuestros <0>Términos y condiciones</0>."
   },
   "accessContacts": {
     "disclosure": {
@@ -1034,7 +1034,7 @@
   "inviteWithoutPayment": "¡Hola! Estoy usando {{appName}} para enviar cripto en todo el mundo. Es fácil de usar y me gustaría invitarte a probarla con este link: {{link}}",
   "inviteWithEscrowedPayment": "¡Hola! Estoy usando {{appName}} para enviar dinero en todo el mundo. Acabo de enviarte {{amount}} {{token}}. Puedes descargar la app de {{appName}} y reclamar tus {{token}} con este link: {{link}}",
   "inviteWithRewards": "¡Hola! 👋 Estoy usando la wallet cripto de {{appName}}. Descargarla y conectar tu número es muy fácil, y si lo haces ahora ambos recibiremos un NFT como recompensa 💫 \n\nUsa este enlace: {{link}}",
-  "inviteWithRewardsCUSD": "¡Hola! Ahora ambos podemos obtener una recompensa gratuita de $0,50 si te registras, conectas tu número y agregas fondos en tu billetera Valora. Yo la utilizo para hacer crecer mis ahorros en USD y cripto, y puedes configurarla en segundos con sólo un número de teléfono. Asegúrate de registrarte con mi enlace de referencia aquí: \n\n{{link}} \n\nPero date prisa, la promoción de referencia termina pronto.",
+  "inviteWithRewardsCUSD": "¡Hola! Ahora mismo, ambos podemos obtener una recompensa de USD 0,50 si te registras, conectas tu número de teléfono y agregas fondos en tu wallet Valora. Yo la utilizo para hacer crecer mis ahorros en USD y cripto, y puedes configurarla en segundos con solo un número de teléfono. Asegúrate de registrarte con mi enlace de referencia aquí: \n\n{{link}} \n\nDate prisa, ¡la promoción termina pronto!",
   "loadingContacts": "Estamos encontrando tus contactos",
   "myCode": "Mi código",
   "scanCode": "Escanear",
@@ -1767,7 +1767,7 @@
     "swapToTokenSelection": "CAMBIAR A",
     "tokenUsdValueUnknown": "-",
     "unsupportedSwapTokens": "Los tokens seleccionados no son compatibles con nuestros proveedores de swap.",
-    "selectTokenLabel": "Seleccionar token",
+    "selectTokenLabel": "Selecciona un token",
     "tokenBottomSheetTitle": "Seleccionar token",
     "onNetwork": "en {{networkName}}",
     "switchedToNetworkWarning": {
@@ -1824,8 +1824,8 @@
       "appFeeValue_free": "Gratis",
       "appFeeValue_placeholder": "-",
       "appFeeInfo": "Tarifa de {{appName}}\n\nLa tarifa de {{appName}} del {{appFeePercentage}}% está diseñada para mejorar tu experiencia, garantizando intercambios rápidos, fiables y seguros.",
-      "appFeeInfo_free": "Tarifa {{appName}}\n\nEste intercambio es gratuito.",
-      "appFeeInfo_placeholder": "Tarifa {{appName}}\n\nLa tarifa se calcula en función de la cotización que recibas.",
+      "appFeeInfo_free": "Tarifa de {{appName}}\n\nEste intercambio es gratuito.",
+      "appFeeInfo_placeholder": "Tarifa de {{appName}}\n\nLa tarifa se calcula en función de la cotización que recibas.",
       "appFeeInfoDismissButton": "Entendido",
       "slippagePercentage": "Tolerancia al slippage",
       "networkFeeInfo": "Estás intercambiando en la red {{networkName}}.\n\nSe requiere esta tarifa de red estimada para realizar una transacción en la red {{networkName}}. Esta tarifa asegura tu transacción y se destina a mantener la red.",
@@ -1833,8 +1833,8 @@
       "slippageToleranceInfo": "Tolerancia de deslizamiento\n\nTu swap se ejecutará dentro del porcentaje de tolerancia de deslizamiento. Si el precio varía más que la tolerancia de deslizamiento, {{appName}} te protege impidiendo que se ejecute la operación.",
       "networkFeeInfoDismissButton": "Entendido",
       "exchangeRate": "Tasa de cambio",
-      "exchangeRateInfo": "Tasa de cambio\n\nHemos encontrado la mejor tasa de cambio para ti. Tu intercambio se completará a un precio dentro del {{slippagePercentage}}% del estimado o la transacción se cancelará y los fondos se devolverán a tu billetera.",
-      "exchangeRateInfo_withAppFee": "Tasa de cambio\n\nHemos encontrado la mejor tasa de cambio para ti. Tu intercambio se completará a un precio dentro del {{slippagePercentage}}% del estimado o la transacción se cancelará y los fondos se devolverán a tu billetera.\n\nLa tasa estimada incluye una tarifa de {{appName}} del {{appFeePercentage}}%.",
+      "exchangeRateInfo": "Tasa de cambio\n\nHemos encontrado la mejor tasa de cambio para ti. Tu intercambio se completará a un precio dentro del {{slippagePercentage}}% del estimado o la transacción se cancelará y los fondos se devolverán a tu wallet.",
+      "exchangeRateInfo_withAppFee": "Tasa de cambio\n\nHemos encontrado la mejor tasa de cambio para ti. Tu intercambio se completará a un precio dentro del {{slippagePercentage}}% del estimado o la transacción se cancelará y los fondos se devolverán a tu wallet.\n\nLa tasa estimada incluye una tarifa de {{appName}} del {{appFeePercentage}}%.",
       "exchangeRateInfoDismissButton": "Entendido",
       "estimatedValue": "Valor estimado"
     },
@@ -2063,8 +2063,8 @@
       "subtitle": "Envía fondos o una invitación a tus contactos"
     },
     "jumpstart": {
-      "title": "Enviar con un enlace en directo",
-      "subtitle": "Comparte un enlace para enviar cripto como un texto"
+      "title": "Envia con un enlace directo",
+      "subtitle": "Comparte un enlace para enviar cripto como envías mensajes a tus amigos"
     },
     "getStarted": {
       "title": "Formas de enviar fondos en Valora",
@@ -2145,7 +2145,7 @@
     }
   },
   "jumpstartSendConfirmationScreen": {
-    "title": "Crear un enlace en directo",
+    "title": "Crear un enlace directo",
     "sendAmountLabel": "Monto del enlace activo",
     "confirmButton": "Enviar y crear enlace",
     "info": "Cuando creas un enlace, los fondos se retiran de tu billetera. Puedes recuperar el enlace en cualquier momento. Comparte enlaces con cuidado.",
@@ -2156,7 +2156,7 @@
     }
   },
   "jumpstartShareLinkScreen": {
-    "title": "Comparte tu enlace en directo",
+    "title": "Comparte tu enlace directo",
     "description": "Copia el enlace para enviar {{tokenSymbol}} a través de la app de mensajería que prefieras, o usa el código QR.",
     "linkLabel": "Enlace activo",
     "linkCopiedMessage": "Enlace activo copiado",
@@ -2194,8 +2194,8 @@
     "title": "Comprar cripto o transferir tokens",
     "body": "Compra o transfiere tokens compatibles para enviar cripto y explora web3",
     "titleV1_86": "Agrega fondos a tu wallet",
-    "exploreTokens": "Explorar todas las fichas",
-    "exploreTokensBody": "Puedes comprar hasta más de 10 fichas en Valora. ¡Compruébalo!"
+    "exploreTokens": "Explora todos los tokens",
+    "exploreTokensBody": "Puedes comprar más de 10 tokens en Valora. ¡Descúbrelos todos!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2209,13 +2209,13 @@
     },
     "rewardBottomSheet": {
       "title": "Gana $5 de ETH",
-      "description": "Deposita en tu billetera cualquier token de Ethereum antes del 4 de abril de 2024 a las 12:00 PM PDT, y te daremos $5 de ETH el 5 de abril de 2024 antes de las 11:59 PM PDT.\n\nSe trata de una oferta exclusiva por ser un explorador temprano de Ethereum.",
+      "description": "Deposita cualquier token de Ethereum antes del 4 de abril de 2024 a las 12:00 PM PDT, y te daremos $5 de ETH el 5 de abril de 2024 antes de las 11:59 PM PDT.\n\nEsta es una oferta exclusiva por ser un explorador temprano de Ethereum.",
       "expirationLabel": "Caduca en {{expirationLabelText}}",
       "cta": "Utiliza la recompensa"
     },
     "rewardReminderBottomSheet": {
       "title": "No te lo pierdas, gana $5 de ETH",
-      "description": "Deposita en tu billetera cualquier token de Ethereum antes del 4 de abril de 2024 a las 12:00 PM PDT, y te daremos $5 de ETH el 5 de abril de 2024 antes de las 11:59 PM PDT.\n\nSe trata de una oferta exclusiva por ser un explorador temprano de Ethereum.",
+      "description": "Deposita cualquier token de Ethereum antes del 4 de abril de 2024 a las 12:00 PM PDT, y te daremos $5 de ETH el 5 de abril de 2024 antes de las 11:59 PM PDT.\n\nEsta es una oferta exclusiva por ser un explorador temprano de Ethereum.",
       "expirationLabel": "Caduca en {{expirationLabelText}}",
       "cta": "Utiliza la recompensa"
     }
@@ -2244,27 +2244,27 @@
   },
   "jumpstartStatus": {
     "loading": {
-      "title": "Verificando tus fondos",
+      "title": "Estamos verificando tus fondos",
       "description": "Espera mientras comprobamos tu enlace directo. Los fondos recuperables llegarán en breve."
     },
     "error": {
       "title": "No se pueden recuperar los fondos",
-      "description": "Este enlace no pudo ser recuperado por una razón desconocida",
-      "alreadyClaimedDescription": "El enlace ya ha sido recuperado. Por favor, pide a tu amigo que envíe un nuevo enlace",
+      "description": "No fue posible recuperar los fondos en este enlace por una razón desconocida",
+      "alreadyClaimedDescription": "Los fondos en este enlace ya han sido recuperados por alguien más.",
       "contactSupport": "Contactar a Soporte",
       "dismiss": "Ignorar"
     }
   },
   "jumpstartReclaim": {
-    "description": "Reclamar tu enlace conlleva una tarifa de red, ¿quieres proceder?",
+    "description": "Reclamar los fondos en tu enlace conlleva una tarifa de red, ¿deseas continuar?",
     "fetchStatusError": {
-      "title": "Uy, algo ha salido mal",
-      "description": "No pudimos obtener el estado de reclamación de esta invitación, inténtalo de nuevo más tarde o contacta con soporte técnico",
+      "title": "Uy, algo salió mal",
+      "description": "No pudimos obtener el estado de esta invitación, inténtalo de nuevo más tarde o contacta a soporte técnico",
       "retryCta": "Reintentar"
     },
     "reclaimError": {
-      "title": "No se pueden recuperar los fondos",
-      "description": "Intenta recuperar de nuevo, o ponte en contacto con soporte técnico"
+      "title": "No fue posible recuperar los fondos",
+      "description": "Inténtalo de nuevo, o contacta al soporte técnico"
     }
   },
   "multiSelect": {
@@ -2277,52 +2277,52 @@
     "history": {
       "cards": {
         "createWallet": {
-          "title": "Portabilletera",
+          "title": "Registro",
           "subtitle": "Miembro de {{appName}}"
         },
         "swap": {
-          "title": "Cambiar",
+          "title": "Cambio",
           "subtitle": "{{fromToken}} > {{toToken}}"
         }
       },
-      "title": "Mi actividad de puntos",
+      "title": "Acciones puntuadas",
       "error": {
-        "title": "No se puede cargar la actividad de puntos",
-        "subtitle": "Ups, algo salió mal al intentar cargar la actividad de tus puntos. Vuelve a intentarlo.",
-        "tryAgain": "Inténtalo de nuevo"
+        "title": "Error al cargar las acciones puntuadas",
+        "subtitle": "Ups, algo salió mal al intentar cargar tus acciones puntuadas. Inténtalo de nuevo.",
+        "tryAgain": "Reintentar"
       },
       "empty": {
-        "title": "Aún no hay actividad de puntos",
+        "title": "Aún no tienes acciones puntuadas",
         "subtitle": "Parece que aún no has ganado puntos. ¡Utiliza {{appName}} para empezar a ganar puntos!",
         "gotIt": "Entendido"
       },
       "pageError": {
-        "title": "No se puede cargar",
+        "title": "Error al cargar",
         "subtitle": "Ups, algo salió mal al finalizar la carga. Vuelve a intentarlo.",
         "refresh": "Actualizar"
       }
     },
     "fetchBalanceError": {
-      "title": "No se pueden cargar tus puntos",
-      "description": "Ups, algo salió mal al intentar cargar tus puntos. La información de esta página puede no estar actualizada. Por favor, actualízala.",
+      "title": "No fue posible cargar tus puntos",
+      "description": "Ups, algo salió mal al cargar tus puntos. La información de esta página puede no estar actualizada. Por favor, actualízala.",
       "retryCta": "Actualizar"
     },
     "loading": {
-      "title": "Recolectando tus puntos",
-      "description": "Estamos en proceso de contabilizar tus puntos, agárrate fuerte"
+      "title": "Recolectando puntos",
+      "description": "Estamos contabilizando tus puntos, aguarda un momento"
     },
     "error": {
-      "title": "No se pueden cargar puntos",
-      "description": "Ups, algo salió mal al intentar cargar tus puntos. Vuelve a intentarlo.",
-      "retryCta": "Inténtalo de nuevo"
+      "title": "No fue posible cargar tus puntos",
+      "description": "Ups, algo salió mal al cargar tus puntos. Vuelve a intentarlo.",
+      "retryCta": "Reintentar"
     },
     "infoCard": {
-      "title": "Más formas de ganar puntos próximamente 🚀",
-      "body": "Estamos trabajando en añadir más formas de ganar puntos usando la aplicación. Sigue revisando para obtener actualizaciones."
+      "title": "Más formas de ganar puntos pronto 🚀",
+      "body": "Estamos trabajando para agregar más formas de ganar puntos. ¡No te pierdas lo que se viene!"
     },
     "activitySection": {
       "title": "¿Cómo gano puntos?",
-      "body": "¡Es fácil! Gana puntos simplemente utilizando la aplicación."
+      "body": "¡Es fácil! Solo tienes que usar la app."
     },
     "noActivities": {
       "title": "Actualiza para desbloquear más puntos 🔓",
@@ -2330,14 +2330,14 @@
     },
     "activityCards": {
       "createWallet": {
-        "title": "Crear una billetera {{appName}}"
+        "title": "Crea una wallet {{appName}}"
       },
       "swap": {
-        "title": "Intercambiar activos",
+        "title": "Intercambia activos",
         "bottomSheet": {
-          "title": "Intercambiar activos",
-          "body": "Este espacio se utilizará para dar todos los detalles necesarios para ello. Tal vez el monto mínimo para intercambiar. \n\nGana puntos {{pointsValue}} cada vez que intercambies un activo utilizando {{appName}}.",
-          "cta": "Ir al intercambio"
+          "title": "Intercambia activos",
+          "body": "Este espacio se utilizará para traerte más detalles. \n\nGana puntos {{pointsValue}} cada vez que intercambies un activo utilizando {{appName}}.",
+          "cta": "Ir a Intercambiar"
         }
       },
       "moreComing": {
@@ -2346,51 +2346,51 @@
     },
     "discoverCard": {
       "title": "Puntos de {{appName}}",
-      "description": "Gana puntos fácilmente con {{appName}}. Utilizar la aplicación, incluidos los intercambios, ¡conlleva puntos!"
+      "description": "Gana puntos fácilmente con {{appName}}. ¡Solo tienes que usar la app!"
     },
     "intro": {
       "title": "Gana puntos sin esfuerzo",
-      "description": "¡Entra en una nueva forma de ganar! Tus acciones en {{appName}} ahora ganan puntos. Empieza a ganar hoy y desbloquea increíbles beneficios.",
-      "cta": "Comienza tu viaje por los puntos"
+      "description": "¡Entra en una nueva forma de ganar! Tus acciones en {{appName}} ahora tienen puntos. Empieza a ganar hoy y desbloquea increíbles beneficios.",
+      "cta": "¡No pares de ganar puntos!"
     }
   },
   "earnFlow": {
-    "gasSubsidized": "¡Valora cubre la gasolina para esta transacción!",
+    "gasSubsidized": "¡Valora cubre la tarifa de esta transacción!",
     "addCryptoBottomSheet": {
-      "title": "Añade {{tokenSymbol}} en {{tokenNetwork}}",
-      "description": "Una vez que añadas tokens tendrás que volver para terminar de depositar en un pool.",
+      "title": "Agrega {{tokenSymbol}} en {{tokenNetwork}}",
+      "description": "Una vez que agregues tokens, tendrás que volver para terminar de depositar en esta pool.",
       "actions": {
         "add": "Comprar",
         "transfer": "Transferir",
         "swap": "Cambiar"
       },
       "actionDescriptions": {
-        "add": "Compra {{tokenSymbol}} en {{tokenNetwork}} utilizando uno de nuestros proveedores de confianza",
-        "transfer": "Utiliza cualquier billetera o exchange compatible con {{tokenNetwork}} para depositar {{tokenSymbol}}",
-        "swap": "Cambiar a {{tokenSymbol}} desde otro token {{tokenNetwork}}"
+        "add": "Compra {{tokenSymbol}} en {{tokenNetwork}} a uno de nuestros proveedores de confianza.",
+        "transfer": "Usa cualquier wallet o exchange compatible con {{tokenNetwork}} para depositar {{tokenSymbol}}.",
+        "swap": "Cambia otro token en {{tokenNetwork}} por {{tokenSymbol}}."
       }
     },
     "cta": {
       "title": "Gana con tus stablecoins",
       "subtitle": "Deposita hoy y gana beneficios",
-      "description": "Mira cuánto puedes ganar al suministrar un pool de préstamo"
+      "description": "Mira cuánto puedes ganar en una pool de préstamo"
     },
     "earnInfo": {
-      "title": "Gana con tus stablecoins\n",
+      "title": "Gana con tus \nstablecoins",
       "details": {
         "earn": {
-          "titleGasSubsidy": "Maximiza las ganancias sin tasas de gas*.",
-          "title": "Maximizar las ganancias",
-          "subtitle": "Gana con tus stablecoins y obtén recompensas cuando suministres un pool.",
-          "footnoteSubsidy": "*Las tasas de gas las cubre temporalmente Valora"
+          "titleGasSubsidy": "Maximiza tus ganancias sin tarifas*",
+          "title": "Maximiza tus ganancias",
+          "subtitle": "Gana con tus stablecoins y obtén recompensas por participar en una pool.",
+          "footnoteSubsidy": "*Por ahora, Valora cubrirá las tarifas de transacción."
         },
         "manage": {
-          "title": "Gestiona directamente desde Valora",
-          "subtitle": "Nosotros nos encargamos de la configuración para que puedas gestionar tu posición directamente desde Valora."
+          "title": "Gestiona tus ganancias directamente en Valora",
+          "subtitle": "Nos encargamos de todo para darte más facilidad."
         },
         "access": {
           "title": "Accede fácilmente a tus fondos",
-          "subtitle": "Recoge tus fondos sin esfuerzo con un solo toque. Disfruta del mismo acceso instantáneo que tendrías directamente a través de tus protocolos favoritos."
+          "subtitle": "Recibe tus fondos con un solo toque. Disfruta del mismo acceso instantáneo que tendrías directamente a través de tus protocolos favoritos."
         }
       },
       "action": {
@@ -2399,44 +2399,44 @@
       }
     },
     "ctaV1_86": {
-      "title": "Maximizar las ganancias en stablecoins",
-      "subtitle": "Comprar {{symbol}}",
-      "description": "Gana aproximadamente {{apy}}% al año cuando añades {{symbol}} a una piscina"
+      "title": "Maximiza tus ganancias en stablecoins",
+      "subtitle": "Compra {{symbol}}",
+      "description": "Gana aproximadamente {{apy}}% al año en la pool de {{symbol}}"
     },
     "enterAmount": {
       "earnUpToLabel": "Podrías ganar hasta:",
       "rateLabel": "Tasa (est.)",
-      "earnUpTo": "~{{fiatSymbol}}{{amount}} / año",
+      "earnUpTo": "~{{fiatSymbol}}{{amount}}/año",
       "rate": "APY ~{{rate}}%",
       "continue": "Continuar",
-      "info": "Este pool está alimentado por Aave",
+      "info": "Esta pool es administrada por Aave",
       "infoBottomSheet": {
-        "title": "¿Por qué este pool?",
-        "description": "Este pool de Aave tiene más de $150M de TVL y más de 6.000 contribuyentes, lo que indica una gran liquidez y fiabilidad. También utiliza USDC como token y Abritrum como red, lo que reduce la volatilidad y garantiza que los usuarios recibirán tasas baratas.\n\nTodo ello lo convierte en una opción segura y atractiva con un APY competitivo, que garantiza una oportunidad de inversión beneficiosa para nuestros usuarios.\n\nPuedes explorar otros pools de Aave <0>aquí</0>.",
+        "title": "¿Por qué esta pool?",
+        "description": "Esta pool de Aave tiene más de $150M de TVL y más de 6000 contribuyentes, lo que indica una gran liquidez y fiabilidad. También utiliza USDC como token y Abritrum como red, lo que reduce la volatilidad y garantiza que los usuarios recibirán tasas baratas.\n\nTodo ello la convierte en una opción segura y atractiva con un APY competitivo, que garantiza una oportunidad de inversión beneficiosa para nuestros usuarios.\n\nPuedes explorar otras pools de Aave <0>aquí</0>.",
         "dismiss": "Ignorar"
       },
       "notEnoughBalanceForGasWarning": {
         "title": "Necesitas más {{feeTokenSymbol}} para continuar",
-        "description": "Agrega {{feeTokenSymbol}} en {{network}} para cubrir tus tarifas",
+        "description": "Agrega {{feeTokenSymbol}} en {{network}} para cubrir las tarifas",
         "noGasCta": "Compra {{feeTokenSymbol}} en {{network}}"
       }
     },
     "activePools": {
-      "title": "Pools activos",
+      "title": "Pools activas",
       "totalValue": "Valor total:",
       "apy": "APY ~{{apy}}%",
-      "exitPool": "Salir de Pool",
-      "depositMore": "Depositar más",
+      "exitPool": "Retirar",
+      "depositMore": "Depositar +",
       "viewPools": "Ver Pools"
     },
     "depositBottomSheet": {
-      "title": "Revisión y depósito",
-      "description": "Antes de depositar en un pool Aave, revisa los detalles de la transacción a continuación",
+      "title": "Revisar y depositar",
+      "description": "Antes de depositar en una pool de Aave, revisa los detalles de la transacción a continuación",
       "amount": "Monto depositado",
       "fee": "Tarifas estimadas",
       "provider": "Proveedor de ganancias",
       "network": "Red",
-      "footer": "Al depositar cripto en un pool de Aave, aceptas los riesgos asociados al uso de Aave. <0>Términos y condiciones</0>",
+      "footer": "Al depositar cripto en una pool de Aave, aceptas los riesgos asociados a su uso. <0>Términos y condiciones</0>",
       "primaryCta": "Finalizar",
       "secondaryCta": "Cancelar"
     },
@@ -2447,31 +2447,31 @@
       "rate": "Tasa (est.)",
       "apy": "APY {{apy}}%",
       "fee": "Tarifa estimada",
-      "cta": "Recibir ganancias",
+      "cta": "Recoger ganancias",
       "errorTitle": "Algo salió mal",
-      "errorDescription": "No se han podido obtener los datos del depósito. Vuelve a intentarlo.",
+      "errorDescription": "No fue posible obtener los datos del depósito. Vuelve a intentarlo.",
       "noGasTitle": "Necesitas más {{symbol}} para continuar",
       "noGasDescription": "Agrega {{symbol}} en {{network}} para cubrir tus tarifas",
       "noGasCta": "Compra {{symbol}} en {{network}}"
     },
     "transactionFeed": {
-      "earnClaimTitle": "Recibido",
-      "earnClaimSubtitle": "del pool {{providerName}}",
-      "earnDepositTitle": "Depositado",
-      "earnDepositSubtitle": "a pool {{providerName}}",
-      "earnWithdrawTitle": "Retirado",
-      "earnWithdrawSubtitle": "del pool {{providerName}}"
+      "earnClaimTitle": "Ganancias recibidas",
+      "earnClaimSubtitle": "de la pool {{providerName}}",
+      "earnDepositTitle": "Fondos depositados",
+      "earnDepositSubtitle": "en la pool {{providerName}}",
+      "earnWithdrawTitle": "Fondos retirados",
+      "earnWithdrawSubtitle": "de la pool {{providerName}}"
     },
     "transactionDetails": {
       "descriptionLabel": "Detalles",
-      "earnClaimTitle": "Recibido",
-      "earnClaimSubtitle": "{{tokenSymbol}} recogido de pool {{providerName}}",
+      "earnClaimTitle": "Ganancias recibidas",
+      "earnClaimSubtitle": "{{tokenSymbol}} recibidos de la pool {{providerName}}",
       "earnClaimDetails": "Monto recibido",
-      "earnDepositTitle": "Depositado",
-      "earnDepositSubtitle": "{{tokenSymbol}} depositado a pool {{providerName}}",
+      "earnDepositTitle": "Fondos depositados",
+      "earnDepositSubtitle": "{{tokenSymbol}} depositados en la pool {{providerName}}",
       "earnDepositDetails": "Monto depositado",
-      "earnWithdrawTitle": "Retirado",
-      "earnWithdrawSubtitle": "{{tokenSymbol}} retirado de pool {{providerName}}",
+      "earnWithdrawTitle": "Fondos retirados",
+      "earnWithdrawSubtitle": "{{tokenSymbol}} retirados de la pool {{providerName}}",
       "earnWithdrawDetails": "Monto retirado"
     }
   },
diff --git a/locales/fr-FR/translation.json b/locales/fr-FR/translation.json
index 36a2d40a57..3924271f94 100644
--- a/locales/fr-FR/translation.json
+++ b/locales/fr-FR/translation.json
@@ -2193,9 +2193,9 @@
   "getStartedHome": {
     "title": "Acheter des cryptomonnaies ou des jetons de transfert",
     "body": "Achetez ou transférez des jetons compatibles pour envoyer des cryptomonnaies et découvrir le web3 !",
-    "titleV1_86": "Ajoute des fonds à ton portefeuille",
-    "exploreTokens": "Explorer tous les jetons",
-    "exploreTokensBody": "Tu peux acheter jusqu'à plus de 10 jetons à Valora. Jette un coup d'œil !"
+    "titleV1_86": "Ajouter des fonds à votre portefeuille",
+    "exploreTokens": "Découvrir tous les jetons",
+    "exploreTokensBody": "Vous pouvez acheter plus de 10 jetons sur Valora. Découvrez-les !"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2281,18 +2281,18 @@
           "subtitle": "Membre de {{appName}}"
         },
         "swap": {
-          "title": "Échanger",
+          "title": "Échange",
           "subtitle": "{{fromToken}} > {{toToken}}"
         }
       },
-      "title": "L'activité de mes points",
+      "title": "Mes actions ponctuées",
       "error": {
-        "title": "Impossible de charger l'activité des points",
-        "subtitle": "Oups, une erreur s'est produite lors du chargement de l'activité de vos points. Veuillez réessayer.",
+        "title": "Impossible de charger les actions ponctuées",
+        "subtitle": "Oups, une erreur s'est produite lors du chargement de vos actions ponctuées. Veuillez réessayer.",
         "tryAgain": "Veuillez réessayer"
       },
       "empty": {
-        "title": "Encore aucune activité de points",
+        "title": "Encore aucune action ponctuée",
         "subtitle": "Il semble que vous n'ayez pas encore gagné de points. Utilisez {{appName}} pour commencer à en gagner !",
         "gotIt": "J'ai compris"
       },
@@ -2330,12 +2330,12 @@
     },
     "activityCards": {
       "createWallet": {
-        "title": "Créer un portefeuille {{appName}}"
+        "title": "Créez un portefeuille {{appName}}"
       },
       "swap": {
-        "title": "Échanger des actifs",
+        "title": "Échangez des actifs",
         "bottomSheet": {
-          "title": "Échanger des actifs",
+          "title": "Échangez des actifs",
           "body": "Cet espace vous présentera tous les détails nécessaires. Il s'agira peut-être d'un montant minimum à échanger. \n\nGagnez {{pointsValue}} points chaque fois que vous échangez un actif avec {{appName}}.",
           "cta": "Aller à l'échange"
         }
@@ -2355,7 +2355,7 @@
     }
   },
   "earnFlow": {
-    "gasSubsidized": "Valora couvre le gaz pour cette transaction !",
+    "gasSubsidized": "Valora couvre les frais de gaz pour cette transaction !",
     "addCryptoBottomSheet": {
       "title": "Ajouter {{tokenSymbol}} sur {{tokenNetwork}}",
       "description": "Une fois que vous ajoutez des jetons, vous devrez revenir pour finaliser votre dépôt dans un pool.",
@@ -2376,21 +2376,21 @@
       "description": "Voyez combien vous pouvez gagner en participant à un pool de prêt"
     },
     "earnInfo": {
-      "title": "Gagne sur tes\nstablecoins",
+      "title": "Gagnez de l'argent sur vos stablecoins",
       "details": {
         "earn": {
-          "titleGasSubsidy": "Maximiser les gains sans frais d'essence*",
+          "titleGasSubsidy": "Maximiser vos gains sans frais de gaz*",
           "title": "Maximiser les gains",
-          "subtitle": "Gagne sur tes stablecoins et obtiens des récompenses lorsque tu alimentes un pool.",
-          "footnoteSubsidy": "*Les frais de gaz sont temporairement couverts par Valora."
+          "subtitle": "Gagnez sur vos stablecoins et obtenez des récompenses quand vous approvisionnez un pool.",
+          "footnoteSubsidy": "*Les frais de gaz sont temporairement couverts par Valora"
         },
         "manage": {
-          "title": "Gérer directement à partir de Valora",
-          "subtitle": "Nous nous occupons de la mise en place pour que tu puisses gérer ta position directement depuis Valora."
+          "title": "Gérez vos transat directement sur Valora",
+          "subtitle": "Nous nous chargerons de la configuration de votre compte pour vous permettre de le gérer directement sur Valora."
         },
         "access": {
-          "title": "Accède facilement à tes fonds",
-          "subtitle": "Collecte tes fonds sans effort, d'une simple pression. Profite du même accès instantané que si tu passais directement par tes protocoles préférés."
+          "title": "Accédez facilement à vos fonds",
+          "subtitle": "Collectez vos fonds en un seul clic. Profitez du même accès instantané que sur vos protocoles préférés."
         }
       },
       "action": {
@@ -2401,7 +2401,7 @@
     "ctaV1_86": {
       "title": "Maximiser les gains sur les stablecoins",
       "subtitle": "Acheter {{symbol}}",
-      "description": "Gagne environ {{apy}}% par an lorsque tu ajoutes {{symbol}} à une piscine."
+      "description": "Gagnez environ {{apy}}% par an lorsque vous ajoutez {{symbol}} à un pool"
     },
     "enterAmount": {
       "earnUpToLabel": "Vous pourriez gagner jusqu'à :",
diff --git a/locales/it-IT/translation.json b/locales/it-IT/translation.json
index da856e285e..656d7b636b 100644
--- a/locales/it-IT/translation.json
+++ b/locales/it-IT/translation.json
@@ -2281,25 +2281,25 @@
           "subtitle": "Membro di {{appName}}"
         },
         "swap": {
-          "title": "Scambia",
+          "title": "Scambio",
           "subtitle": "{{fromToken}} > {{toToken}}"
         }
       },
-      "title": "I miei punti attività",
+      "title": "Azioni punteggiate",
       "error": {
-        "title": "Impossibile caricare i punti attività",
-        "subtitle": "Ops. Qualcosa non ha funzionato durante il tentativo di caricare il feed dei tuoi punti attività. Riprova.",
+        "title": "Impossibile caricare le azioni punteggiate",
+        "subtitle": "Ops. Qualcosa non ha funzionato durante il tentativo di caricare il feed dei azioni punteggiate. Riprova.",
         "tryAgain": "Riprova"
       },
       "empty": {
-        "title": "Non ci sono ancora punti attività",
+        "title": "Non ci sono ancora azione punteggiata",
         "subtitle": "Sembra che tu non abbia ancora guadagnato punti. Usa {{appName}} per iniziare ad accumulare punti!",
         "gotIt": "Ho capito"
       },
       "pageError": {
         "title": "Impossibile caricare",
         "subtitle": "Ops. Qualcosa è andato storto durante il caricamento. Riprova.",
-        "refresh": "Aggiornare"
+        "refresh": "Aggiorna"
       }
     },
     "fetchBalanceError": {
@@ -2376,21 +2376,21 @@
       "description": "Scopri quanto puoi guadagnare mettendo a disposizione un lending pool"
     },
     "earnInfo": {
-      "title": "Guadagna sulle stablecoin di\n",
+      "title": "Guadagna sulle tue stablecoin",
       "details": {
         "earn": {
-          "titleGasSubsidy": "Massimizza i guadagni senza le tasse sul gas*",
-          "title": "Massimizzare i guadagni",
-          "subtitle": "Guadagna sulle tue stablecoin e ottieni ricompense quando rifornisci un pool.",
-          "footnoteSubsidy": "*Le spese per il gas sono temporaneamente coperte da Valora."
+          "titleGasSubsidy": "Massimizza i guadagni senza Gas fee*",
+          "title": "Massimizza i guadagni",
+          "subtitle": "Guadagna sulle tue stablecoin e ottieni premi quando alimenti un pool.",
+          "footnoteSubsidy": "*Le gas fee sono temporaneamente coperte da Valora"
         },
         "manage": {
           "title": "Gestisci direttamente da Valora",
-          "subtitle": "Ci occuperemo noi della configurazione in modo che tu possa gestire la tua posizione direttamente da Valora."
+          "subtitle": "Ci occupiamo noi della configurazione in modo che tu possa gestire la tua posizione direttamente da Valora."
         },
         "access": {
           "title": "Accedi facilmente ai tuoi fondi",
-          "subtitle": "Raccogli i tuoi fondi senza sforzo con un solo tocco. Goditi lo stesso accesso istantaneo che otterresti direttamente attraverso i tuoi protocolli preferiti."
+          "subtitle": "Riscuoti facilmente i tuoi fondi con un solo tocco. Usufruisci dello stesso accesso istantaneo che otterresti direttamente attraverso i tuoi protocolli preferiti."
         }
       },
       "action": {
diff --git a/locales/pl-PL/translation.json b/locales/pl-PL/translation.json
index 7c8f37582d..21f3b81e17 100644
--- a/locales/pl-PL/translation.json
+++ b/locales/pl-PL/translation.json
@@ -2199,7 +2199,7 @@
     "body": "Kupuj lub przesyłaj kompatybilne tokeny, aby wysyłać kryptowaluty i odkrywać web3!",
     "titleV1_86": "Dodaj środki do swojego portfela",
     "exploreTokens": "Poznaj wszystkie tokeny",
-    "exploreTokensBody": "Możesz kupić do 10+ tokenów w Valora. Sprawdź je!"
+    "exploreTokensBody": "Możesz kupić do 10+ tokenów w Valorze. Sprawdź je!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2380,21 +2380,21 @@
       "description": "Zobacz, ile możesz zarobić, zasilając pulę pożyczkową"
     },
     "earnInfo": {
-      "title": "Zarabiaj na swoich stablecoinach\n",
+      "title": "Zarabiaj na swoich\nstablecoinach",
       "details": {
         "earn": {
           "titleGasSubsidy": "Maksymalizuj zarobki bez opłat za gaz*",
           "title": "Maksymalizuj zarobki",
           "subtitle": "Zarabiaj na stablecoinach i otrzymuj nagrody za zasilenie puli.",
-          "footnoteSubsidy": "*Opłaty za gaz są tymczasowo pokrywane przez Valora"
+          "footnoteSubsidy": "* Opłaty za gaz są tymczasowo pokrywane przez Valorę"
         },
         "manage": {
-          "title": "Zarządzaj bezpośrednio z Valora",
-          "subtitle": "Zajmiemy się konfiguracją, abyś mógł zarządzać swoją pozycją bezpośrednio z Valora."
+          "title": "Zarządzaj bezpośrednio z Valory",
+          "subtitle": "Zajmiemy się konfiguracją, abyś mógł/mogła zarządzać swoją pozycją bezpośrednio z Valory."
         },
         "access": {
           "title": "Łatwy dostęp do Twoich środków",
-          "subtitle": "Zbieraj środki bez wysiłku za pomocą jednego dotknięcia. Ciesz się tak samo natychmiastowym dostępem, jak bezpośrednio przez ulubione protokoły."
+          "subtitle": "Zbieraj środki bez problemów za pomocą jednego dotknięcia. Ciesz się takim samym natychmiastowym dostępem, jak bezpośrednio przez ulubione protokoły."
         }
       },
       "action": {
@@ -2405,7 +2405,7 @@
     "ctaV1_86": {
       "title": "Maksymalizuj zarobki na stablecoinach",
       "subtitle": "Kup {{symbol}}",
-      "description": "Zarabiaj około {{apy}}% rocznie, dodając {{symbol}} do puli."
+      "description": "Zarabiaj około {{apy}}% rocznie, dodając {{symbol}} do puli"
     },
     "enterAmount": {
       "earnUpToLabel": "Możesz zarobić do:",
diff --git a/locales/pt-BR/translation.json b/locales/pt-BR/translation.json
index ab33623378..05699ed24f 100644
--- a/locales/pt-BR/translation.json
+++ b/locales/pt-BR/translation.json
@@ -2194,8 +2194,8 @@
     "title": "Comprar cripto ou transferir tokens",
     "body": "Compre ou transfira tokens compatíveis para enviar cripto e explorar a web3!",
     "titleV1_86": "Adicione fundos à sua carteira",
-    "exploreTokens": "Explore todos os tokens",
-    "exploreTokensBody": "Você pode comprar até 10+ tokens em Valora. Dê uma olhada neles!"
+    "exploreTokens": "Explorar todos os tokens",
+    "exploreTokensBody": "Você pode comprar até 10 ou mais tokens na Valora. Confira!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2281,18 +2281,18 @@
           "subtitle": "Membro da {{appName}}"
         },
         "swap": {
-          "title": "Trocar",
-          "subtitle": "{{fromToken}} para {{toToken}}"
+          "title": "Troca",
+          "subtitle": "{{fromToken}} > {{toToken}}"
         }
       },
       "title": "Minha atividade de pontos",
       "error": {
-        "title": "Não foi possível carregar a atividade de pontos",
-        "subtitle": "Ops, algo deu errado ao tentar carregar seu feed de atividades de pontos. Tente novamente.",
+        "title": "Não foi possível carregar as ações pontuadas",
+        "subtitle": "Ops, algo deu errado ao tentar carregar seu feed de ações pontuadas. Tente novamente.",
         "tryAgain": "Tentar novamente"
       },
       "empty": {
-        "title": "Nenhuma atividade de pontos por enquanto",
+        "title": "Nenhuma ação pontuada por enquanto",
         "subtitle": "Parece que você ainda não ganhou nenhum ponto. Use a {{appName}} para começar a ganhar pontos!",
         "gotIt": "Entendi"
       },
@@ -2333,9 +2333,9 @@
         "title": "Crie uma carteira {{appName}}"
       },
       "swap": {
-        "title": "Trocar ativos",
+        "title": "Troque ativos",
         "bottomSheet": {
-          "title": "Trocar ativos",
+          "title": "Troque ativos",
           "body": "Este espaço será usado para fornecer todos os detalhes necessários. Talvez o valor mínimo para você trocar. \n\nGanhe {{pointsValue}} pontos sempre que você trocar um ativo usando a {{appName}}.",
           "cta": "Ir para a troca"
         }
@@ -2355,7 +2355,7 @@
     }
   },
   "earnFlow": {
-    "gasSubsidized": "Valora está cobrindo a gasolina para essa transação!",
+    "gasSubsidized": "A Valora está cobrindo o gás desta transação!",
     "addCryptoBottomSheet": {
       "title": "Adicionar {{tokenSymbol}} na {{tokenNetwork}}",
       "description": "Após adicionar tokens, você terá que voltar para terminar de depositar em um pool.",
@@ -2376,21 +2376,21 @@
       "description": "Veja quanto você pode ganhar ao fornecer um pool de empréstimos"
     },
     "earnInfo": {
-      "title": "Ganhe com suas stablecoins\n",
+      "title": "Ganhe com as\nsuas stablecoins",
       "details": {
         "earn": {
-          "titleGasSubsidy": "Maximize os ganhos sem taxas de gás*",
-          "title": "Maximizar os ganhos",
-          "subtitle": "Ganhe em suas stablecoins e receba recompensas quando você abastecer um pool.",
-          "footnoteSubsidy": "*As taxas de gás são temporariamente cobertas pela Valora"
+          "titleGasSubsidy": "Maximize seus ganhos sem taxas de gás*",
+          "title": "Maximize seus ganhos",
+          "subtitle": "Ganhe com suas stablecoins e receba recompensas quando fornecer um pool.",
+          "footnoteSubsidy": "*As taxas de gás estão temporariamente cobertas pela Valora"
         },
         "manage": {
-          "title": "Gerencie diretamente da Valora",
-          "subtitle": "Nós cuidaremos da configuração para que você possa gerenciar sua posição diretamente da Valora."
+          "title": "Gerenciar diretamente pela Valora",
+          "subtitle": "Cuidaremos da configuração para que você possa gerenciar sua posição diretamente pela Valora."
         },
         "access": {
-          "title": "Acesse facilmente seus fundos",
-          "subtitle": "Colete seus fundos sem esforço com um único toque. Aproveite o mesmo acesso instantâneo que você teria diretamente por meio de seus protocolos favoritos."
+          "title": "Acesse seus fundos com facilidade",
+          "subtitle": "Colete seus fundos sem esforço com um único toque. Aproveite o mesmo acesso instantâneo que você teria diretamente por meio dos seus protocolos favoritos."
         }
       },
       "action": {
@@ -2399,9 +2399,9 @@
       }
     },
     "ctaV1_86": {
-      "title": "Maximizar os ganhos com stablecoins",
-      "subtitle": "Compre {{symbol}}",
-      "description": "Ganhe aproximadamente {{apy}}% por ano quando você adiciona {{symbol}} a um pool"
+      "title": "Maximize seus ganhos com stablecoins",
+      "subtitle": "Comprar {{symbol}}",
+      "description": "Ganhe cerca de {{apy}}% por ano ao adicionar {{symbol}} a um pool"
     },
     "enterAmount": {
       "earnUpToLabel": "Você pode ganhar até:",
diff --git a/locales/ru-RU/translation.json b/locales/ru-RU/translation.json
index 0179753596..cf7c83445a 100644
--- a/locales/ru-RU/translation.json
+++ b/locales/ru-RU/translation.json
@@ -2197,9 +2197,9 @@
   "getStartedHome": {
     "title": "Покупайте криптовалюту или переводите токены",
     "body": "Покупайте или переводите совместимые токены, чтобы отправлять криптовалюту и исследовать web3!",
-    "titleV1_86": "Добавляй средства в свой кошелек",
-    "exploreTokens": "Изучи все жетоны",
-    "exploreTokensBody": "В Валоре ты можешь купить до 10+ жетонов. Проверь их!"
+    "titleV1_86": "Добавьте средства в свой кошелек",
+    "exploreTokens": "Изучите все токены",
+    "exploreTokensBody": "Вы можете купить до 10+ токенов в Valora. Проверьте их!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2359,7 +2359,7 @@
     }
   },
   "earnFlow": {
-    "gasSubsidized": "Валора покрывает газ для этой сделки!",
+    "gasSubsidized": "Valora оплачивает комиссию за газ для этой транзакции!",
     "addCryptoBottomSheet": {
       "title": "Добавьте {{tokenSymbol}} в {{tokenNetwork}}",
       "description": "Как только вы добавите токены, вам придется вернуться для завершения депонирования в пул.",
@@ -2380,21 +2380,21 @@
       "description": "Узнайте, сколько можете заработать при предоставлении кредитного пула"
     },
     "earnInfo": {
-      "title": "Зарабатывай на своих стабильных монетах\n.",
+      "title": "Зарабатывайте на своих стейблкоинах",
       "details": {
         "earn": {
-          "titleGasSubsidy": "Максимизируй заработок без платы за газ*.",
-          "title": "Максимизируй заработок",
-          "subtitle": "Зарабатывай на своих стейблкоинах и получай вознаграждения, когда поставляешь пул.",
-          "footnoteSubsidy": "* Плата за газ временно покрывается компанией Valora"
+          "titleGasSubsidy": "Увеличьте доходы без комиссий за газ*",
+          "title": "Увеличьте доходы",
+          "subtitle": "Зарабатывайте на своих стейблкоинах и получайте вознаграждения при добавлении в пул.",
+          "footnoteSubsidy": "* Комиссия за газ временно оплачивается Valora"
         },
         "manage": {
-          "title": "Управляй напрямую из Valora",
-          "subtitle": "Мы позаботимся о настройке, чтобы ты мог управлять своей позицией прямо из Valora."
+          "title": "Управляйте напрямую из Valora",
+          "subtitle": "Мы позаботимся о настройке, чтобы вы смогли управлять своей позицией прямо из Valora."
         },
         "access": {
-          "title": "Легкий доступ к своим средствам",
-          "subtitle": "Собирай средства без усилий, одним касанием. Наслаждайся таким же мгновенным доступом, как и непосредственно через свои любимые протоколы."
+          "title": "Удобный доступ к своим средствам",
+          "subtitle": "Соберите свои средства одним касанием. Воспользуйтесь тем же мгновенным доступом, что и через ваши любимые протоколы."
         }
       },
       "action": {
@@ -2403,9 +2403,9 @@
       }
     },
     "ctaV1_86": {
-      "title": "Максимальный заработок на стабильных монетах",
+      "title": "Максимальный доход по стейблкоинам",
       "subtitle": "Купить {{symbol}}",
-      "description": "Зарабатывай примерно {{apy}}% в год, когда добавляешь {{symbol}} в бассейн."
+      "description": "Зарабатывайте примерно {{apy}}% в год при добавлении {{symbol}} в пул"
     },
     "enterAmount": {
       "earnUpToLabel": "Вы можете заработать до:",
diff --git a/locales/th-TH/translation.json b/locales/th-TH/translation.json
index b90e8e148f..88ac771c63 100644
--- a/locales/th-TH/translation.json
+++ b/locales/th-TH/translation.json
@@ -2191,9 +2191,9 @@
   "getStartedHome": {
     "title": "ซื้อคริปโตหรือโอนโทเค็น",
     "body": "ซื้อหรือโอนโทเค็นที่เข้ากันได้เพื่อส่งคริปโตและสำรวจ web3!",
-    "titleV1_86": "Add funds to your wallet",
-    "exploreTokens": "Explore all tokens",
-    "exploreTokensBody": "You can buy up to 10+ tokens in Valora. Check them out!"
+    "titleV1_86": "เพิ่มเงินทุนในกระเป๋าเงิน",
+    "exploreTokens": "สำรวจโทเค็นทั้งหมด",
+    "exploreTokensBody": "คุณสามารถซื้อโทเค็นได้สูงสุด 10+ รายการใน Valora ไปดูเลย!"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2374,21 +2374,21 @@
       "description": "ดูรายได้ที่คุณสามารถรับเมื่อเข้าร่วมพูลการให้ยืม"
     },
     "earnInfo": {
-      "title": "Earn on your\nstablecoins",
+      "title": "สร้างรายได้ผ่าน\nStablecoin",
       "details": {
         "earn": {
-          "titleGasSubsidy": "Maximize Earnings without Gas Fees*",
-          "title": "Maximize Earnings",
-          "subtitle": "Earn on your stablecoins and get rewards when you supply a pool.",
-          "footnoteSubsidy": "*Gas fees are temporarily covered by Valora"
+          "titleGasSubsidy": "สร้างรายได้สูงสุดโดยไม่เสียค่าก๊าซ*",
+          "title": "สร้างรายได้สูงสุด",
+          "subtitle": "สร้างรายได้ผ่าน Stablecoin และรับรางวัลเมื่อคุณเข้าร่วมพูล",
+          "footnoteSubsidy": "*Valora เป็นผู้รับผิดชอบค่าก๊าซชั่วคราว"
         },
         "manage": {
-          "title": "Manage Directly from Valora",
-          "subtitle": "We’ll take care of the setup so you can manage your position directly from Valora."
+          "title": "จัดการโดยตรงจาก Valora",
+          "subtitle": "เราจะดูแลการตั้งค่าให้คุณสามารถจัดการสถานะของคุณได้โดยตรงจาก Valora"
         },
         "access": {
-          "title": "Easily Access your Funds",
-          "subtitle": "Collect your funds effortlessly with a single tap. Enjoy the same instant access as you would directly through your favorite protocols."
+          "title": "เข้าถึงเงินทุนของคุณได้ง่ายๆ",
+          "subtitle": "เก็บเงินทุนของคุณได้ง่ายๆ เพียงแตะครั้งเดียว รับการเข้าถึงทันทีอย่างที่ทำได้โดยตรงผ่านโปรโตคอลโปรดของคุณ"
         }
       },
       "action": {
diff --git a/locales/tr-TR/translation.json b/locales/tr-TR/translation.json
index 43c1236611..fe83f4c440 100644
--- a/locales/tr-TR/translation.json
+++ b/locales/tr-TR/translation.json
@@ -2376,13 +2376,13 @@
       "description": "Bir kredi havuzu sağlarken ne kadar kazanabileceğinizi görün"
     },
     "earnInfo": {
-      "title": "\nstablecoin'lerinizden kazanın",
+      "title": "Sabit coinlerinizden\nkazanın",
       "details": {
         "earn": {
-          "titleGasSubsidy": "Gaz Ücretleri Olmadan Kazancınızı En Üst Düzeye Çıkarın*",
+          "titleGasSubsidy": "Gas Ücretleri Olmadan Kazancınızı En Üst Düzeye Çıkarın*",
           "title": "Kazançları En Üst Düzeye Çıkarın",
-          "subtitle": "Sabit coin'lerinizden kazanın ve bir havuz tedarik ettiğinizde ödüller kazanın.",
-          "footnoteSubsidy": "*Gaz ücretleri geçici olarak Valora tarafından karşılanmaktadır"
+          "subtitle": "Sabit coinlerinizden kazanın ve bir havuz sağladığınızda ödüller kazanın.",
+          "footnoteSubsidy": "*Gas ücretleri geçici olarak Valora tarafından karşılanmaktadır"
         },
         "manage": {
           "title": "Doğrudan Valora'dan Yönetin",
@@ -2390,7 +2390,7 @@
         },
         "access": {
           "title": "Fonlarınıza Kolayca Erişin",
-          "subtitle": "Tek bir dokunuşla fonlarınızı zahmetsizce toplayın. Doğrudan favori protokolleriniz aracılığıyla yaptığınız gibi aynı anında erişimin keyfini çıkarın."
+          "subtitle": "Tek bir dokunuşla fonlarınızı zahmetsizce toplayın. Doğrudan favori protokolleriniz aracılığıyla yaptığınızla aynı şekilde anında erişimin keyfini çıkarın."
         }
       },
       "action": {
diff --git a/locales/vi-VN/translation.json b/locales/vi-VN/translation.json
index 66c202a508..6b290f62da 100644
--- a/locales/vi-VN/translation.json
+++ b/locales/vi-VN/translation.json
@@ -2374,21 +2374,21 @@
       "description": "Xem số tiền bạn có thể kiếm được khi nạp tiền vào quỹ cho vay"
     },
     "earnInfo": {
-      "title": "Earn on your\nstablecoins",
+      "title": "Kiếm tiền từ\nstablecoin",
       "details": {
         "earn": {
-          "titleGasSubsidy": "Maximize Earnings without Gas Fees*",
-          "title": "Maximize Earnings",
-          "subtitle": "Earn on your stablecoins and get rewards when you supply a pool.",
-          "footnoteSubsidy": "*Gas fees are temporarily covered by Valora"
+          "titleGasSubsidy": "Tối đa hóa thu nhập mà không mất phí ga*",
+          "title": "Tối đa hóa thu nhập",
+          "subtitle": "Kiếm tiền từ stablecoin của bạn và nhận tiền thưởng khi bạn cung cấp quỹ.",
+          "footnoteSubsidy": "*Phí ga được Valora tạm thời chi trả"
         },
         "manage": {
-          "title": "Manage Directly from Valora",
-          "subtitle": "We’ll take care of the setup so you can manage your position directly from Valora."
+          "title": "Quản lý trực tiếp từ Valora",
+          "subtitle": "Chúng tôi sẽ đảm nhiệm việc thiết lập để bạn có thể quản lý lệnh giao dịch trực tiếp từ Valora."
         },
         "access": {
-          "title": "Easily Access your Funds",
-          "subtitle": "Collect your funds effortlessly with a single tap. Enjoy the same instant access as you would directly through your favorite protocols."
+          "title": "Tiếp cận tiền dễ dàng",
+          "subtitle": "Nhận tiền của bạn dễ dàng chỉ bằng một cú nhấn. Được quyền truy cập tức thời giống như bạn truy cập trực tiếp thông qua các giao thức yêu thích."
         }
       },
       "action": {
diff --git a/locales/zh-CN/translation.json b/locales/zh-CN/translation.json
index 26137ca4ae..73fa166b27 100644
--- a/locales/zh-CN/translation.json
+++ b/locales/zh-CN/translation.json
@@ -2191,9 +2191,9 @@
   "getStartedHome": {
     "title": "购买加密货币或转移代币。",
     "body": "购买或转移兼容的代币，发送加密货币并探索 Web3！",
-    "titleV1_86": "为钱包添加资金",
-    "exploreTokens": "探索所有代币",
-    "exploreTokensBody": "您最多可以在瓦罗拉购买 10 多个代币。查看它们！"
+    "titleV1_86": "添加资金到钱包中",
+    "exploreTokens": "了解所有代币",
+    "exploreTokensBody": "您可以在 Valora 购买多达超过 10 个代币。快去试试吧！"
   },
   "nftCelebration": {
     "bottomSheet": {
@@ -2353,7 +2353,7 @@
     }
   },
   "earnFlow": {
-    "gasSubsidized": "Valora 公司为此次交易提供天然气！",
+    "gasSubsidized": "Valora 目前会为此交易承担手续费！",
     "addCryptoBottomSheet": {
       "title": "在 {{tokenNetwork}} 上添加 {{tokenSymbol}}",
       "description": "添加代币后，就必须返回并完成将资金存入池中。",
@@ -2374,21 +2374,21 @@
       "description": "了解在提供贷款池时您能赚取多少收入"
     },
     "earnInfo": {
-      "title": "赚取\n稳定币",
+      "title": "通过稳定币赚取收入",
       "details": {
         "earn": {
-          "titleGasSubsidy": "无需汽油费即可实现收益最大化*。",
-          "title": "收益最大化",
-          "subtitle": "赚取稳定币，并在提供资金池时获得奖励。",
-          "footnoteSubsidy": "*燃气费暂时由 Valora 公司承担"
+          "titleGasSubsidy": "实现收入最大化，且无需手续费*",
+          "title": "实现收入最大化",
+          "subtitle": "通过稳定币赚取收入，并在提供资金池后获取奖励。",
+          "footnoteSubsidy": "*手续费目前暂时由 Valora 承担"
         },
         "manage": {
-          "title": "直接从 Valora 进行管理",
-          "subtitle": "我们将为您进行设置，您可以直接从 Valora 管理您的仓位。"
+          "title": "直接在 Valora 管理",
+          "subtitle": "我们会处理好设置问题，以便您能直接在 Valora 管理持仓。"
         },
         "access": {
-          "title": "轻松访问您的资金",
-          "subtitle": "只需轻轻一点，即可轻松收取资金。享受与直接通过您最喜爱的协议相同的即时访问。"
+          "title": "轻松获取资金",
+          "subtitle": "只需轻轻一按，即可轻松收取资金。直接通过最喜欢的协议收取，享受即时获取的便利。"
         }
       },
       "action": {
@@ -2397,9 +2397,9 @@
       }
     },
     "ctaV1_86": {
-      "title": "最大化稳定币收益",
+      "title": "实现稳定币收入最大化",
       "subtitle": "购买 {{symbol}}",
-      "description": "将 {{symbol}} 加入游泳池后，每年可获得约 {{apy}}% 的收益"
+      "description": "将 {{symbol}} 添加到池中，每年可赚取大约 {{apy}}%"
     },
     "enterAmount": {
       "earnUpToLabel": "您最多可以赚取：",

From b60f70339daa99c2adb297b73cedf6f6b78ee83c Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Wed, 29 May 2024 20:26:18 -0700
Subject: [PATCH 073/133] feat(cico): add token filters for cash in (#5490)

### Description

Adds token filters for cash in flow only, gated by [statsig feature
gate](https://console.statsig.com/4plizaPmWwPL21ASV4QAO0/gates/show_cash_in_token_filters)

### Test plan

Unit tests, manual


https://github.com/valora-inc/wallet/assets/5062591/ab18b07a-11df-4628-8305-cc43691fdba9


### Related issues

- Fixes ACT-1170

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 locales/base/translation.json                 |   4 +-
 src/components/FilterChipsCarousel.tsx        |   1 +
 src/components/TokenBottomSheet.tsx           |  10 +-
 .../FiatExchangeCurrencyBottomSheet.test.tsx  | 371 +++++++++---------
 .../FiatExchangeCurrencyBottomSheet.tsx       |  65 ++-
 src/statsig/constants.ts                      |   1 +
 src/statsig/types.ts                          |   1 +
 src/tokens/hooks.test.tsx                     |   2 +
 src/tokens/selectors.ts                       |   7 +
 test/values.ts                                |   8 +
 10 files changed, 280 insertions(+), 190 deletions(-)

diff --git a/locales/base/translation.json b/locales/base/translation.json
index 3a639d7747..9456eed2c7 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -1957,7 +1957,9 @@
       "popular": "Popular",
       "recentlySwapped": "Recently swapped",
       "network": "{{networkName}} Network",
-      "selectNetwork": "Network"
+      "selectNetwork": "Network",
+      "stablecoins": "Stablecoins",
+      "gasTokens": "Gas Tokens"
     }
   },
   "homeActions": {
diff --git a/src/components/FilterChipsCarousel.tsx b/src/components/FilterChipsCarousel.tsx
index b9bd20e790..081df2a644 100644
--- a/src/components/FilterChipsCarousel.tsx
+++ b/src/components/FilterChipsCarousel.tsx
@@ -56,6 +56,7 @@ function FilterChipsCarousel<T>({
       style={[styles.container, style]}
       contentContainerStyle={[styles.contentContainer, { width: scrollEnabled ? 'auto' : '100%' }]}
       ref={forwardedRef}
+      testID="FilterChipsCarousel"
     >
       {chips.map((chip) => {
         return (
diff --git a/src/components/TokenBottomSheet.tsx b/src/components/TokenBottomSheet.tsx
index 4a0b215653..d1bc9364c0 100644
--- a/src/components/TokenBottomSheet.tsx
+++ b/src/components/TokenBottomSheet.tsx
@@ -312,7 +312,12 @@ function TokenBottomSheet({
   return (
     <>
       {isScreen ? (
-        <View style={styles.screenContainer} testID="TokenBottomSheet">
+        <View
+          // use fixed height if there are filter chips, otherwise the bottom
+          // sheet height changes as tokens as filtered
+          style={filterChips.length ? styles.screenContainerFixed : styles.screenContainer}
+          testID="TokenBottomSheet"
+        >
           {content}
         </View>
       ) : (
@@ -350,6 +355,9 @@ const styles = StyleSheet.create({
   screenContainer: {
     maxHeight: variables.height * 0.9,
   },
+  screenContainerFixed: {
+    height: variables.height * 0.9,
+  },
   searchInput: {
     marginTop: Spacing.Regular16,
   },
diff --git a/src/fiatExchanges/FiatExchangeCurrencyBottomSheet.test.tsx b/src/fiatExchanges/FiatExchangeCurrencyBottomSheet.test.tsx
index 08dde31113..cf9b5a4b63 100644
--- a/src/fiatExchanges/FiatExchangeCurrencyBottomSheet.test.tsx
+++ b/src/fiatExchanges/FiatExchangeCurrencyBottomSheet.test.tsx
@@ -1,96 +1,25 @@
-import { render } from '@testing-library/react-native'
+import { fireEvent, render, within } from '@testing-library/react-native'
 import React from 'react'
 import { Provider } from 'react-redux'
 import FiatExchangeCurrencyBottomSheet from 'src/fiatExchanges/FiatExchangeCurrencyBottomSheet'
 import { FiatExchangeFlow } from 'src/fiatExchanges/utils'
-import { getDynamicConfigParams } from 'src/statsig'
-import { NetworkId } from 'src/transactions/types'
+import { getDynamicConfigParams, getFeatureGate } from 'src/statsig'
+import { StatsigDynamicConfigs, StatsigFeatureGates } from 'src/statsig/types'
 import MockedNavigator from 'test/MockedNavigator'
 import { createMockStore } from 'test/utils'
 import {
-  mockCeloAddress,
   mockCeloTokenId,
-  mockCeurAddress,
   mockCeurTokenId,
-  mockCrealAddress,
   mockCrealTokenId,
-  mockCusdAddress,
   mockCusdTokenId,
   mockEthTokenId,
+  mockTokenBalances,
 } from 'test/values'
 
-const mockDate = 1588200517518
-
 const MOCK_STORE_DATA = {
   tokens: {
     tokenBalances: {
-      [mockCusdTokenId]: {
-        tokenId: mockCusdTokenId,
-        networkId: NetworkId['celo-alfajores'],
-        name: 'cUSD',
-        address: mockCusdAddress,
-        balance: '50',
-        priceUsd: '1',
-        symbol: 'cUSD',
-        priceFetchedAt: mockDate,
-        isSwappable: true,
-        showZeroBalance: true,
-        isCashInEligible: true,
-        isCashOutEligible: true,
-      },
-      [mockCeurTokenId]: {
-        tokenId: mockCeurTokenId,
-        networkId: NetworkId['celo-alfajores'],
-        name: 'cEUR',
-        address: mockCeurAddress,
-        balance: '0',
-        priceUsd: '0.5',
-        symbol: 'cEUR',
-        isSupercharged: true,
-        priceFetchedAt: mockDate,
-        showZeroBalance: true,
-        isCashInEligible: true,
-        isCashOutEligible: true,
-      },
-      [mockCeloTokenId]: {
-        tokenId: mockCeloTokenId,
-        networkId: NetworkId['celo-alfajores'],
-        name: 'Celo',
-        address: mockCeloAddress,
-        balance: '0',
-        priceUsd: '0.2',
-        symbol: 'CELO',
-        isSupercharged: true,
-        priceFetchedAt: mockDate,
-        showZeroBalance: true,
-        isCashInEligible: true,
-        isCashOutEligible: true,
-      },
-      [mockCrealTokenId]: {
-        tokenId: mockCrealTokenId,
-        networkId: NetworkId['celo-alfajores'],
-        name: 'cREAL',
-        address: mockCrealAddress,
-        balance: '10',
-        priceUsd: '0.75',
-        symbol: 'cREAL',
-        isSupercharged: true,
-        priceFetchedAt: mockDate,
-        showZeroBalance: true,
-        isCashInEligible: true,
-      },
-      [mockEthTokenId]: {
-        tokenId: mockEthTokenId,
-        networkId: NetworkId['ethereum-sepolia'],
-        name: 'Ether',
-        balance: '0',
-        priceUsd: '0.1000',
-        symbol: 'ETH',
-        isSupercharged: true,
-        priceFetchedAt: mockDate,
-        showZeroBalance: true,
-        isCashInEligible: true,
-      },
+      ...mockTokenBalances,
     },
   },
 }
@@ -111,174 +40,244 @@ jest.mock('src/web3/networkConfig', () => {
   }
 })
 
-jest.mock('src/statsig', () => ({
-  getDynamicConfigParams: jest.fn(),
-}))
+jest.mock('src/statsig')
 
 describe(FiatExchangeCurrencyBottomSheet, () => {
   const mockStore = createMockStore(MOCK_STORE_DATA)
   beforeEach(() => {
     jest.clearAllMocks()
-    jest.mocked(getDynamicConfigParams).mockReturnValue({
-      showCico: ['celo-alfajores'],
-      tokenInfo: {
-        [mockEthTokenId]: { cicoOrder: 1 },
-        [mockCeloTokenId]: { cicoOrder: 2 },
-        [mockCusdTokenId]: { cicoOrder: 3 },
-        [mockCeurTokenId]: { cicoOrder: 4 },
-        [mockCrealTokenId]: { cicoOrder: 5 },
-      },
+    jest.mocked(getFeatureGate).mockReturnValue(false)
+    jest.mocked(getDynamicConfigParams).mockImplementation(({ configName, defaultValues }) => {
+      switch (configName) {
+        case StatsigDynamicConfigs.MULTI_CHAIN_FEATURES:
+          return {
+            ...defaultValues,
+            showCico: ['celo-alfajores', 'ethereum-sepolia'],
+          }
+        case StatsigDynamicConfigs.CICO_TOKEN_INFO:
+          return {
+            tokenInfo: {
+              [mockEthTokenId]: { cicoOrder: 1 },
+              [mockCeloTokenId]: { cicoOrder: 2 },
+              [mockCusdTokenId]: { cicoOrder: 3 },
+              [mockCeurTokenId]: { cicoOrder: 4 },
+              [mockCrealTokenId]: { cicoOrder: 5 },
+            },
+          }
+        case StatsigDynamicConfigs.SWAP_CONFIG:
+          return {
+            popularTokenIds: [mockEthTokenId, mockCeloTokenId],
+          }
+        default:
+          return defaultValues
+      }
     })
   })
-  it('shows the correct tokens for cash in (multichain disabled, no ETH)', () => {
-    const { queryByTestId, getAllByTestId } = render(
+  it('shows the correct tokens for cash in', () => {
+    const { getAllByTestId } = render(
       <Provider store={mockStore}>
         <MockedNavigator
           component={FiatExchangeCurrencyBottomSheet}
-          params={{
-            flow: FiatExchangeFlow.CashIn,
-          }}
+          params={{ flow: FiatExchangeFlow.CashIn }}
         />
       </Provider>
     )
-    expect(getAllByTestId('TokenBalanceItem')[0]).toHaveTextContent('CELO')
-    expect(getAllByTestId('TokenBalanceItem')[1]).toHaveTextContent('cUSD')
-    expect(getAllByTestId('TokenBalanceItem')[2]).toHaveTextContent('cEUR')
-    expect(getAllByTestId('TokenBalanceItem')[3]).toHaveTextContent('cREAL')
-    expect(queryByTestId('ETHSymbol')).toBeFalsy()
-  })
-  it('shows the correct tokens for cash in (multichain)', () => {
-    jest.mocked(getDynamicConfigParams).mockReturnValue({
-      showCico: ['celo-alfajores', 'ethereum-sepolia'],
-      tokenInfo: {
-        [mockEthTokenId]: { cicoOrder: 1 },
-        [mockCeloTokenId]: { cicoOrder: 2 },
-        [mockCusdTokenId]: { cicoOrder: 3 },
-        [mockCeurTokenId]: { cicoOrder: 4 },
-        [mockCrealTokenId]: { cicoOrder: 5 },
-      },
+    expect(getAllByTestId('TokenBalanceItem')).toHaveLength(6)
+    ;['ETH', 'CELO', 'cUSD', 'cEUR', 'cREAL', 'USDC'].forEach((token, index) => {
+      expect(getAllByTestId('TokenBalanceItem')[index]).toHaveTextContent(token)
     })
+  })
+  it('shows the correct tokens for cash out', () => {
     const { getAllByTestId } = render(
       <Provider store={mockStore}>
         <MockedNavigator
           component={FiatExchangeCurrencyBottomSheet}
-          params={{
-            flow: FiatExchangeFlow.CashIn,
-          }}
+          params={{ flow: FiatExchangeFlow.CashOut }}
         />
       </Provider>
     )
-    expect(getAllByTestId('TokenBalanceItem')[0]).toHaveTextContent('ETH')
-    expect(getAllByTestId('TokenBalanceItem')[1]).toHaveTextContent('CELO')
-    expect(getAllByTestId('TokenBalanceItem')[2]).toHaveTextContent('cUSD')
-    expect(getAllByTestId('TokenBalanceItem')[3]).toHaveTextContent('cEUR')
-    expect(getAllByTestId('TokenBalanceItem')[4]).toHaveTextContent('cREAL')
+    expect(getAllByTestId('TokenBalanceItem')).toHaveLength(2)
+    ;['CELO', 'cUSD'].forEach((token, index) => {
+      expect(getAllByTestId('TokenBalanceItem')[index]).toHaveTextContent(token)
+    })
   })
-  it('shows the correct tokens for cash out', () => {
-    const { queryByTestId, getAllByTestId } = render(
+  it('shows the correct tokens for cash spend', () => {
+    const { getAllByTestId } = render(
       <Provider store={mockStore}>
         <MockedNavigator
           component={FiatExchangeCurrencyBottomSheet}
-          params={{
-            flow: FiatExchangeFlow.CashOut,
-          }}
+          params={{ flow: FiatExchangeFlow.Spend }}
         />
       </Provider>
     )
-    expect(getAllByTestId('TokenBalanceItem')[0]).toHaveTextContent('CELO')
-    expect(getAllByTestId('TokenBalanceItem')[1]).toHaveTextContent('cUSD')
-    expect(getAllByTestId('TokenBalanceItem')[2]).toHaveTextContent('cEUR')
-    expect(queryByTestId('cREALSymbol')).toBeFalsy()
+    expect(getAllByTestId('TokenBalanceItem')).toHaveLength(2)
+    ;['cUSD', 'cEUR'].forEach((token, index) => {
+      expect(getAllByTestId('TokenBalanceItem')[index]).toHaveTextContent(token)
+    })
   })
-  it('shows the correct tokens for cash out (multichain)', () => {
-    jest.mocked(getDynamicConfigParams).mockReturnValue({
-      showCico: ['celo-alfajores', 'ethereum-sepolia'],
-      tokenInfo: {
-        [mockEthTokenId]: { cicoOrder: 1 },
-        [mockCeloTokenId]: { cicoOrder: 2 },
-        [mockCusdTokenId]: { cicoOrder: 3 },
-        [mockCeurTokenId]: { cicoOrder: 4 },
-        [mockCrealTokenId]: { cicoOrder: 5 },
-      },
+  it('shows the correct order when cicoOrder missing/same value', () => {
+    jest.mocked(getDynamicConfigParams).mockImplementation(({ configName, defaultValues }) => {
+      switch (configName) {
+        case StatsigDynamicConfigs.MULTI_CHAIN_FEATURES:
+          return {
+            ...defaultValues,
+            showCico: ['celo-alfajores', 'ethereum-sepolia'],
+          }
+        case StatsigDynamicConfigs.CICO_TOKEN_INFO:
+          return {
+            tokenInfo: {
+              [mockCusdTokenId]: { cicoOrder: 1 },
+              [mockCrealTokenId]: { cicoOrder: 1 },
+            },
+          }
+        default:
+          return defaultValues
+      }
     })
-    const { queryByTestId, getAllByTestId } = render(
+    const { getAllByTestId } = render(
       <Provider store={mockStore}>
         <MockedNavigator
           component={FiatExchangeCurrencyBottomSheet}
-          params={{
-            flow: FiatExchangeFlow.CashOut,
-          }}
+          params={{ flow: FiatExchangeFlow.CashIn }}
         />
       </Provider>
     )
-    expect(getAllByTestId('TokenBalanceItem')[0]).toHaveTextContent('CELO')
-    expect(getAllByTestId('TokenBalanceItem')[1]).toHaveTextContent('cUSD')
-    expect(getAllByTestId('TokenBalanceItem')[2]).toHaveTextContent('cEUR')
-    expect(queryByTestId('cREALSymbol')).toBeFalsy()
-    expect(queryByTestId('ETHSymbol')).toBeFalsy()
+    expect(getAllByTestId('TokenBalanceItem')).toHaveLength(6)
+    ;['cUSD', 'cREAL', 'cEUR', 'CELO', 'ETH', 'USDC'].forEach((token, index) => {
+      expect(getAllByTestId('TokenBalanceItem')[index]).toHaveTextContent(token)
+    })
   })
-  it('shows the correct tokens for cash spend', () => {
-    const { queryByTestId, getAllByTestId } = render(
+
+  it.each([
+    { flow: FiatExchangeFlow.CashIn, gate: false },
+    { flow: FiatExchangeFlow.CashOut, gate: true },
+    { flow: FiatExchangeFlow.Spend, gate: true },
+  ])(`does not show filters for $flow when gate is $gate`, ({ flow, gate }) => {
+    jest
+      .mocked(getFeatureGate)
+      .mockImplementation(
+        (feature) => feature === StatsigFeatureGates.SHOW_CASH_IN_TOKEN_FILTERS && gate
+      )
+    const { queryByTestId } = render(
+      <Provider store={mockStore}>
+        <MockedNavigator component={FiatExchangeCurrencyBottomSheet} params={{ flow }} />
+      </Provider>
+    )
+    expect(queryByTestId('FilterChipsCarousel')).toBeFalsy()
+  })
+
+  it('shows filters for cash in when gate is true', () => {
+    jest
+      .mocked(getFeatureGate)
+      .mockImplementation((feature) => feature === StatsigFeatureGates.SHOW_CASH_IN_TOKEN_FILTERS)
+    const { getByTestId, getByText } = render(
       <Provider store={mockStore}>
         <MockedNavigator
           component={FiatExchangeCurrencyBottomSheet}
-          params={{
-            flow: FiatExchangeFlow.Spend,
-          }}
+          params={{ flow: FiatExchangeFlow.CashIn }}
         />
       </Provider>
     )
-    expect(getAllByTestId('TokenBalanceItem')[0]).toHaveTextContent('cUSD')
-    expect(getAllByTestId('TokenBalanceItem')[1]).toHaveTextContent('cEUR')
-    expect(queryByTestId('CELOSymbol')).toBeFalsy()
-    expect(queryByTestId('cREALSymbol')).toBeFalsy()
+    expect(getByTestId('FilterChipsCarousel')).toBeTruthy()
+    expect(getByText('tokenBottomSheet.filters.popular')).toBeTruthy()
+    expect(getByText('tokenBottomSheet.filters.stablecoins')).toBeTruthy()
+    expect(getByText('tokenBottomSheet.filters.gasTokens')).toBeTruthy()
+    expect(getByText('tokenBottomSheet.filters.selectNetwork')).toBeTruthy()
   })
-  it('shows the correct tokens for cash spend (multichain)', () => {
-    jest.mocked(getDynamicConfigParams).mockReturnValue({
-      showCico: ['celo-alfajores', 'ethereum-sepolia'],
-      tokenInfo: {
-        [mockEthTokenId]: { cicoOrder: 1 },
-        [mockCeloTokenId]: { cicoOrder: 2 },
-        [mockCusdTokenId]: { cicoOrder: 3 },
-        [mockCeurTokenId]: { cicoOrder: 4 },
-        [mockCrealTokenId]: { cicoOrder: 5 },
-      },
+
+  it('popular filter filters correctly', () => {
+    jest
+      .mocked(getFeatureGate)
+      .mockImplementation((feature) => feature === StatsigFeatureGates.SHOW_CASH_IN_TOKEN_FILTERS)
+    const { getAllByTestId, getByText } = render(
+      <Provider store={mockStore}>
+        <MockedNavigator
+          component={FiatExchangeCurrencyBottomSheet}
+          params={{ flow: FiatExchangeFlow.CashIn }}
+        />
+      </Provider>
+    )
+
+    expect(getAllByTestId('TokenBalanceItem')).toHaveLength(6)
+    fireEvent.press(getByText('tokenBottomSheet.filters.popular'))
+    expect(getAllByTestId('TokenBalanceItem')).toHaveLength(2)
+    ;['ETH', 'CELO'].forEach((token, index) => {
+      expect(getAllByTestId('TokenBalanceItem')[index]).toHaveTextContent(token)
     })
-    const { queryByTestId, getAllByTestId } = render(
+  })
+
+  it('stablecoin filter filters correctly', () => {
+    jest
+      .mocked(getFeatureGate)
+      .mockImplementation((feature) => feature === StatsigFeatureGates.SHOW_CASH_IN_TOKEN_FILTERS)
+    const { getAllByTestId, getByText } = render(
       <Provider store={mockStore}>
         <MockedNavigator
           component={FiatExchangeCurrencyBottomSheet}
-          params={{
-            flow: FiatExchangeFlow.Spend,
-          }}
+          params={{ flow: FiatExchangeFlow.CashIn }}
         />
       </Provider>
     )
-    expect(getAllByTestId('TokenBalanceItem')[0]).toHaveTextContent('cUSD')
-    expect(getAllByTestId('TokenBalanceItem')[1]).toHaveTextContent('cEUR')
-    expect(queryByTestId('CELOSymbol')).toBeFalsy()
-    expect(queryByTestId('cREALSymbol')).toBeFalsy()
-    expect(queryByTestId('ETHSymbol')).toBeFalsy()
+
+    expect(getAllByTestId('TokenBalanceItem')).toHaveLength(6)
+    fireEvent.press(getByText('tokenBottomSheet.filters.stablecoins'))
+    expect(getAllByTestId('TokenBalanceItem')).toHaveLength(4)
+    ;['cUSD', 'cEUR', 'cREAL', 'USDC'].forEach((token, index) => {
+      expect(getAllByTestId('TokenBalanceItem')[index]).toHaveTextContent(token)
+    })
   })
-  it('shows the correct order when cicoOrder missing/same value', () => {
-    jest.mocked(getDynamicConfigParams).mockReturnValue({
-      showCico: ['celo-alfajores', 'ethereum-sepolia'],
-      tokenInfo: { [mockCusdTokenId]: { cicoOrder: 1 }, [mockCrealTokenId]: { cicoOrder: 1 } },
+
+  it('gas tokens filter filters correctly', () => {
+    jest
+      .mocked(getFeatureGate)
+      .mockImplementation((feature) => feature === StatsigFeatureGates.SHOW_CASH_IN_TOKEN_FILTERS)
+    const { getAllByTestId, getByText } = render(
+      <Provider store={mockStore}>
+        <MockedNavigator
+          component={FiatExchangeCurrencyBottomSheet}
+          params={{ flow: FiatExchangeFlow.CashIn }}
+        />
+      </Provider>
+    )
+
+    expect(getAllByTestId('TokenBalanceItem')).toHaveLength(6)
+    fireEvent.press(getByText('tokenBottomSheet.filters.gasTokens'))
+    expect(getAllByTestId('TokenBalanceItem')).toHaveLength(5)
+    ;['ETH', 'CELO', 'cUSD', 'cEUR', 'cREAL'].forEach((token, index) => {
+      expect(getAllByTestId('TokenBalanceItem')[index]).toHaveTextContent(token)
     })
-    const { getAllByTestId } = render(
+  })
+
+  it('network filter filters correctly', () => {
+    jest
+      .mocked(getFeatureGate)
+      .mockImplementation((feature) => feature === StatsigFeatureGates.SHOW_CASH_IN_TOKEN_FILTERS)
+    const { getAllByTestId, getByText } = render(
       <Provider store={mockStore}>
         <MockedNavigator
           component={FiatExchangeCurrencyBottomSheet}
-          params={{
-            flow: FiatExchangeFlow.CashIn,
-          }}
+          params={{ flow: FiatExchangeFlow.CashIn }}
         />
       </Provider>
     )
-    expect(getAllByTestId('TokenBalanceItem')[0]).toHaveTextContent('cUSD')
-    expect(getAllByTestId('TokenBalanceItem')[1]).toHaveTextContent('cREAL')
-    expect(getAllByTestId('TokenBalanceItem')[2]).toHaveTextContent('cEUR')
-    expect(getAllByTestId('TokenBalanceItem')[3]).toHaveTextContent('CELO')
-    expect(getAllByTestId('TokenBalanceItem')[4]).toHaveTextContent('ETH')
+
+    const networkMultiSelect = getAllByTestId('MultiSelectBottomSheet')[0]
+
+    expect(getAllByTestId('TokenBalanceItem')).toHaveLength(6)
+    fireEvent.press(getByText('tokenBottomSheet.filters.selectNetwork'))
+
+    // select celo filter
+    fireEvent.press(within(networkMultiSelect).getByTestId('Celo Alfajores-icon'))
+    expect(getAllByTestId('TokenBalanceItem')).toHaveLength(4)
+    ;['CELO', 'cUSD', 'cEUR', 'cREAL'].forEach((token, index) => {
+      expect(getAllByTestId('TokenBalanceItem')[index]).toHaveTextContent(token)
+    })
+
+    // select eth filter
+    fireEvent.press(within(networkMultiSelect).getByTestId('Ethereum Sepolia-icon'))
+    expect(getAllByTestId('TokenBalanceItem')).toHaveLength(2)
+    ;['ETH', 'USDC'].forEach((token, index) => {
+      expect(getAllByTestId('TokenBalanceItem')[index]).toHaveTextContent(token)
+    })
   })
 })
diff --git a/src/fiatExchanges/FiatExchangeCurrencyBottomSheet.tsx b/src/fiatExchanges/FiatExchangeCurrencyBottomSheet.tsx
index 8c4b6af031..6e08a19245 100644
--- a/src/fiatExchanges/FiatExchangeCurrencyBottomSheet.tsx
+++ b/src/fiatExchanges/FiatExchangeCurrencyBottomSheet.tsx
@@ -1,20 +1,79 @@
 import { BottomSheetScreenProps } from '@th3rdwave/react-navigation-bottom-sheet'
 import React, { useEffect, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
+import { FilterChip } from 'src/components/FilterChipsCarousel'
 import TokenBottomSheet, { TokenPickerOrigin } from 'src/components/TokenBottomSheet'
 import { fetchFiatConnectProviders } from 'src/fiatconnect/slice'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { StackParamList } from 'src/navigator/types'
-import { useDispatch } from 'src/redux/hooks'
+import { useDispatch, useSelector } from 'src/redux/hooks'
+import { getDynamicConfigParams, getFeatureGate } from 'src/statsig'
+import { DynamicConfigs } from 'src/statsig/constants'
+import { StatsigDynamicConfigs, StatsigFeatureGates } from 'src/statsig/types'
 import { useCashInTokens, useCashOutTokens, useSpendTokens } from 'src/tokens/hooks'
+import { allFeeCurrenciesSelector } from 'src/tokens/selectors'
 import { TokenBalance } from 'src/tokens/slice'
 import { sortCicoTokens } from 'src/tokens/utils'
+import { NetworkId } from 'src/transactions/types'
 import { resolveCurrency } from 'src/utils/currencies'
 import { CICOFlow, FiatExchangeFlow } from './utils'
 
 type Props = BottomSheetScreenProps<StackParamList, Screens.FiatExchangeCurrencyBottomSheet>
 
+function useFilterChips(flow: FiatExchangeFlow): FilterChip<TokenBalance>[] {
+  const { t } = useTranslation()
+  const feeCurrencies = useSelector(allFeeCurrenciesSelector)
+  const feeTokenIds = useMemo(
+    () => new Set(feeCurrencies.map((currency) => currency.tokenId)),
+    [feeCurrencies]
+  )
+  if (
+    flow !== FiatExchangeFlow.CashIn ||
+    !getFeatureGate(StatsigFeatureGates.SHOW_CASH_IN_TOKEN_FILTERS)
+  ) {
+    return []
+  }
+  const supportedNetworkIds = getDynamicConfigParams(
+    DynamicConfigs[StatsigDynamicConfigs.MULTI_CHAIN_FEATURES]
+  ).showCico
+  // reuse the same popular tokens as for swap
+  const popularTokenIds: string[] = getDynamicConfigParams(
+    DynamicConfigs[StatsigDynamicConfigs.SWAP_CONFIG]
+  ).popularTokenIds
+
+  return [
+    {
+      id: 'popular',
+      name: t('tokenBottomSheet.filters.popular'),
+      filterFn: (token: TokenBalance) => popularTokenIds.includes(token.tokenId),
+      isSelected: false,
+    },
+    {
+      id: 'stablecoins',
+      name: t('tokenBottomSheet.filters.stablecoins'),
+      filterFn: (token: TokenBalance) => !!token.isStableCoin,
+      isSelected: false,
+    },
+    {
+      id: 'gas-tokens',
+      name: t('tokenBottomSheet.filters.gasTokens'),
+      filterFn: (token: TokenBalance) => feeTokenIds.has(token.tokenId),
+      isSelected: false,
+    },
+    {
+      id: 'network-ids',
+      name: t('tokenBottomSheet.filters.selectNetwork'),
+      filterFn: (token: TokenBalance, selected?: NetworkId[]) => {
+        return !!selected && selected.includes(token.networkId)
+      },
+      isSelected: false,
+      allNetworkIds: supportedNetworkIds,
+      selectedNetworkIds: supportedNetworkIds,
+    },
+  ]
+}
+
 function FiatExchangeCurrencyBottomSheet({ route }: Props) {
   const { t } = useTranslation()
   const dispatch = useDispatch()
@@ -29,7 +88,8 @@ function FiatExchangeCurrencyBottomSheet({ route }: Props) {
         ? cashOutTokens
         : spendTokens
 
-  const tokenList = useMemo(() => unsortedTokenList.sort(sortCicoTokens), [unsortedTokenList])
+  const tokenList = useMemo(() => [...unsortedTokenList].sort(sortCicoTokens), [unsortedTokenList])
+  const filterChips = useFilterChips(flow)
 
   // Fetch FiatConnect providers silently in the background early in the CICO funnel
   useEffect(() => {
@@ -64,6 +124,7 @@ function FiatExchangeCurrencyBottomSheet({ route }: Props) {
             ? TokenPickerOrigin.CashOut
             : TokenPickerOrigin.Spend
       }
+      filterChips={filterChips}
     />
   )
 }
diff --git a/src/statsig/constants.ts b/src/statsig/constants.ts
index 66de15f7d0..7c63c2ee25 100644
--- a/src/statsig/constants.ts
+++ b/src/statsig/constants.ts
@@ -29,6 +29,7 @@ export const FeatureGates = {
   [StatsigFeatureGates.SHOW_POINTS]: false,
   [StatsigFeatureGates.SHOW_STABLECOIN_EARN]: false,
   [StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES]: false,
+  [StatsigFeatureGates.SHOW_CASH_IN_TOKEN_FILTERS]: false,
 } satisfies { [key in StatsigFeatureGates]: boolean }
 
 export const ExperimentConfigs = {
diff --git a/src/statsig/types.ts b/src/statsig/types.ts
index 39f1da54e8..07a86d0979 100644
--- a/src/statsig/types.ts
+++ b/src/statsig/types.ts
@@ -32,6 +32,7 @@ export enum StatsigFeatureGates {
   SHOW_POINTS = 'show_points',
   SHOW_STABLECOIN_EARN = 'show_stablecoin_earn',
   SUBSIDIZE_STABLECOIN_EARN_GAS_FEES = 'subsidize_stablecoin_earn_gas_fees',
+  SHOW_CASH_IN_TOKEN_FILTERS = 'show_cash_in_token_filters',
 }
 
 export enum StatsigExperiments {
diff --git a/src/tokens/hooks.test.tsx b/src/tokens/hooks.test.tsx
index 92952d1414..26a61a53e4 100644
--- a/src/tokens/hooks.test.tsx
+++ b/src/tokens/hooks.test.tsx
@@ -25,6 +25,7 @@ import {
   mockCusdTokenId,
   mockPoofTokenId,
   mockTokenBalances,
+  mockUSDCTokenId,
 } from 'test/values'
 
 jest.mock('src/statsig')
@@ -345,6 +346,7 @@ describe('useCashInTokens', () => {
       mockCeloTokenId,
       mockCrealTokenId,
       ethTokenId,
+      mockUSDCTokenId,
     ])
   })
 })
diff --git a/src/tokens/selectors.ts b/src/tokens/selectors.ts
index 71842568c5..8ac2f7f60e 100644
--- a/src/tokens/selectors.ts
+++ b/src/tokens/selectors.ts
@@ -492,6 +492,13 @@ export const feeCurrenciesSelector = createSelector(
   }
 )
 
+export const allFeeCurrenciesSelector = createSelector(
+  feeCurrenciesByNetworkIdSelector,
+  (feeCurrencies) => {
+    return Object.values(feeCurrencies).flat()
+  }
+)
+
 // Note this takes a networkId as parameter
 export const feeCurrenciesWithPositiveBalancesSelector = createSelector(
   feeCurrenciesSelector,
diff --git a/test/values.ts b/test/values.ts
index 1eb1a51335..c2ef3bed44 100644
--- a/test/values.ts
+++ b/test/values.ts
@@ -468,6 +468,7 @@ export const mockTokenBalances: Record<string, StoredTokenBalance> = {
     priceFetchedAt: Date.now(),
     isCashInEligible: true,
     isCashOutEligible: true,
+    isStableCoin: true,
   },
   [mockCusdTokenId]: {
     priceUsd: '1.001',
@@ -486,6 +487,7 @@ export const mockTokenBalances: Record<string, StoredTokenBalance> = {
     showZeroBalance: true,
     isCashInEligible: true,
     isCashOutEligible: true,
+    isStableCoin: true,
   },
   [mockCeloTokenId]: {
     priceUsd: '13.25085583155252100584',
@@ -521,6 +523,7 @@ export const mockTokenBalances: Record<string, StoredTokenBalance> = {
     canTransferWithComment: true,
     priceFetchedAt: Date.now(),
     isCashInEligible: true,
+    isStableCoin: true,
   },
   [mockEthTokenId]: {
     priceUsd: '1500',
@@ -535,6 +538,8 @@ export const mockTokenBalances: Record<string, StoredTokenBalance> = {
     balance: '0',
     priceFetchedAt: Date.now(),
     isNative: true,
+    isCashInEligible: true,
+    isCashOutEligible: true,
   },
   [mockUSDCTokenId]: {
     name: 'USDC coin',
@@ -547,6 +552,9 @@ export const mockTokenBalances: Record<string, StoredTokenBalance> = {
     balance: '0',
     priceUsd: '1',
     priceFetchedAt: Date.now(),
+    isStableCoin: true,
+    isCashInEligible: true,
+    isCashOutEligible: true,
   },
   [mockArbEthTokenId]: {
     name: 'Ethereum',

From 60b0d543400fb08fe413222ad7c98647cbcea830 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 30 May 2024 05:10:11 +0000
Subject: [PATCH 074/133] fix(deps): update dependency react-native-adjust to
 ^4.38.1 (#5470)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [react-native-adjust](https://togithub.com/adjust/react_native_sdk) |
[`^4.38.0` ->
`^4.38.1`](https://renovatebot.com/diffs/npm/react-native-adjust/4.38.0/4.38.1)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/react-native-adjust/4.38.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/react-native-adjust/4.38.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/react-native-adjust/4.38.0/4.38.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/react-native-adjust/4.38.0/4.38.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>adjust/react_native_sdk (react-native-adjust)</summary>

###
[`v4.38.1`](https://togithub.com/adjust/react_native_sdk/blob/HEAD/CHANGELOG.md#Version-4381-30th-April-2024)

[Compare
Source](https://togithub.com/adjust/react_native_sdk/compare/v4.38.0...v4.38.1)

##### Added

- Added sending of the additional iOS SDK observability parameters for
debugging purposes.

##### Fixed

- Removed nullability type specifier warnings
([https://github.com/adjust/ios_sdk/issues/703](https://togithub.com/adjust/ios_sdk/issues/703)).

##### Native SDKs

-   \[iOS@v4.38.2]\[ios_sdk_v4.38.2]
-   \[Android@v4.38.3]\[android_sdk_v4.38.3]

***

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ1cGRhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbIm5wbSIsInJlbm92YXRlIl19-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Satish Ravi <satish.ravi@valoraapp.com>
---
 ios/Podfile.lock | 14 +++++++-------
 package.json     |  2 +-
 yarn.lock        |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index e83e559b1c..412fd7b56f 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -4,9 +4,9 @@ PODS:
     - JWTDecode (= 3.0.1)
     - React-Core
     - SimpleKeychain (= 1.0.1)
-  - Adjust (4.38.0):
-    - Adjust/Core (= 4.38.0)
-  - Adjust/Core (4.38.0)
+  - Adjust (4.38.2):
+    - Adjust/Core (= 4.38.2)
+  - Adjust/Core (4.38.2)
   - Auth0 (2.3.2):
     - JWTDecode (~> 3.0)
     - SimpleKeychain (~> 1.0)
@@ -513,8 +513,8 @@ PODS:
   - React-jsinspector (0.71.17)
   - React-logger (0.71.17):
     - glog
-  - react-native-adjust (4.38.0):
-    - Adjust (= 4.38.0)
+  - react-native-adjust (4.38.1):
+    - Adjust (= 4.38.2)
     - React-Core
   - react-native-camera (4.2.1):
     - React-Core
@@ -1132,7 +1132,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   A0Auth0: 5ae918d2f043395f83ac26d6eb85b249bcb54634
-  Adjust: c98d85594a746ff9f2bafe424c5beb6db66cd6a8
+  Adjust: 5a0f813fe079212bed61404d1f635cc330068b4a
   Auth0: 64da28fdc5cd499aa516dc4bfd0ace8efae2c1da
   boost: 7dcd2de282d72e344012f7d6564d024930a6a440
   BVLinearGradient: 880f91a7854faff2df62518f0281afb1c60d49a3
@@ -1198,7 +1198,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: 62ec957dd5be4519b56c7965ee7156063ffcf765
   React-jsinspector: aadc7a5f156f047800ab3d51f6a10ce5b009109d
   React-logger: a41d4cad677e9726b71a45a4012431d2fb1edd80
-  react-native-adjust: 801fe33f0dc0097b0474f11d08572a89fa6602ce
+  react-native-adjust: 83114d391a4a7a438e2c4d8e8137bc7810e7076f
   react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
   react-native-compat: c741279b875109d2d9fc8da22e80c00ef91311a6
   react-native-config: 86038147314e2e6d10ea9972022aa171e6b1d4d8
diff --git a/package.json b/package.json
index e547db2fb1..0e386c5639 100644
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
     "react-async-hook": "^4.0.0",
     "react-i18next": "^14.1.1",
     "react-native": "0.71.17",
-    "react-native-adjust": "^4.38.0",
+    "react-native-adjust": "^4.38.1",
     "react-native-android-open-settings": "^1.3.0",
     "react-native-auth0": "^2.17.4",
     "react-native-bip39": "https://github.com/celo-org/react-native-bip39#65facae",
diff --git a/yarn.lock b/yarn.lock
index 9b22704e37..5554fed9a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15194,10 +15194,10 @@ react-is@^18.0.0, react-is@^18.2.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
-react-native-adjust@^4.38.0:
-  version "4.38.0"
-  resolved "https://registry.yarnpkg.com/react-native-adjust/-/react-native-adjust-4.38.0.tgz#be95875b469ed1643b68644ed5423367e063ca68"
-  integrity sha512-kNobWxemV4h+/iPCWd5fzE4cuT3rhqSaZQvPpKvLMzqxhpuCdEzaVm30T7SCs0a/StyFzlPk2D++0ktVZjt2SA==
+react-native-adjust@^4.38.1:
+  version "4.38.1"
+  resolved "https://registry.yarnpkg.com/react-native-adjust/-/react-native-adjust-4.38.1.tgz#93ae5959a624715b5b3d0c48faf8b6c66b75575d"
+  integrity sha512-+FZU0DMPJ9GUcZZNHuhqd2OVQGmfDA+x/HeehFFjshGN+IdJ2hWGaLuMi2uAB2LScLQiBo4GKNLf3NyXb3La3A==
 
 react-native-android-open-settings@^1.3.0:
   version "1.3.0"

From ed0fc0c63283e47cb2465d6ccdb1e201e40deb6d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 30 May 2024 06:52:53 +0000
Subject: [PATCH 075/133] fix(deps): update dependency
 androidx.recyclerview:recyclerview to v1.3.2 (#5494)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[androidx.recyclerview:recyclerview](https://developer.android.com/jetpack/androidx/releases/recyclerview#1.3.2)
([source](https://cs.android.com/androidx/platform/frameworks/support))
| `1.1.0` -> `1.3.2` |
[![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.recyclerview:recyclerview/1.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/androidx.recyclerview:recyclerview/1.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/androidx.recyclerview:recyclerview/1.1.0/1.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.recyclerview:recyclerview/1.1.0/1.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJncmFkbGUiLCJyZW5vdmF0ZSJdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 android/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 5ba8bee54c..d388676dfe 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -292,7 +292,7 @@ dependencies {
     implementation 'com.google.android.exoplayer:exoplayer-hls:2.17.1'
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.17.1'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'androidx.viewpager:viewpager:1.0.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.core:core:1.4.0'

From 7f7ef4d693b8451438bb9b9331e6ddb11b2e20ba Mon Sep 17 00:00:00 2001
From: Valora Bot <89419329+valora-bot@users.noreply.github.com>
Date: Thu, 30 May 2024 01:10:23 -0700
Subject: [PATCH 076/133] chore: bump app version to 1.87.0  (#5491)

Co-authored-by: runner <runner@Mac-1717036034078.local>
Co-authored-by: Jean Regisser <jean.regisser@gmail.com>
---
 android/app/build.gradle           | 2 +-
 android/gradle.properties          | 2 +-
 ios/celo.xcodeproj/project.pbxproj | 8 ++++----
 package.json                       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index d388676dfe..2619a211bb 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -150,7 +150,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode appVersionCode
-        versionName "1.86.0"
+        versionName "1.87.0"
         multiDexEnabled true
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/android/gradle.properties b/android/gradle.properties
index 83b50034a2..515ef84220 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -23,7 +23,7 @@ CELO_RELEASE_KEY_ALIAS=celo-key-alias
 
 # Setting this manually based on version number until we have this deploying via Cloud Build
 # Example: v1.5.1 deployment number 1 = 1005001001 (1 005 001 001)
-VERSION_CODE=1021071670
+VERSION_CODE=1021071671
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
diff --git a/ios/celo.xcodeproj/project.pbxproj b/ios/celo.xcodeproj/project.pbxproj
index 01c1601ddc..6ae5c3df98 100644
--- a/ios/celo.xcodeproj/project.pbxproj
+++ b/ios/celo.xcodeproj/project.pbxproj
@@ -1205,7 +1205,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 152;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
@@ -1225,7 +1225,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 1.86.0;
+				MARKETING_VERSION = 1.87.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
@@ -1257,7 +1257,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 152;
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1274,7 +1274,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 1.86.0;
+				MARKETING_VERSION = 1.87.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
diff --git a/package.json b/package.json
index 0e386c5639..4dcb7f647d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@valora/wallet",
-  "version": "1.86.0",
+  "version": "1.87.0",
   "author": "Valora Inc",
   "license": "Apache-2.0",
   "private": true,

From 7245207cdefb7b4b23b82fb8c495fefa2174d8a9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 31 May 2024 01:09:48 +0000
Subject: [PATCH 077/133] fix(deps): update dependency
 react-native-safe-area-context to ^4.10.3 (#5496)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[react-native-safe-area-context](https://togithub.com/th3rdwave/react-native-safe-area-context)
| [`^4.10.1` ->
`^4.10.3`](https://renovatebot.com/diffs/npm/react-native-safe-area-context/4.10.1/4.10.3)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/react-native-safe-area-context/4.10.3?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/react-native-safe-area-context/4.10.3?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/react-native-safe-area-context/4.10.1/4.10.3?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/react-native-safe-area-context/4.10.1/4.10.3?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>th3rdwave/react-native-safe-area-context
(react-native-safe-area-context)</summary>

###
[`v4.10.3`](https://togithub.com/th3rdwave/react-native-safe-area-context/compare/8b5d6290ef7c12970877a21ad77468f86a822a94...cdc0b97acb5344b47667c6db76f5c3f1654dbce2)

[Compare
Source](https://togithub.com/th3rdwave/react-native-safe-area-context/compare/v4.10.2...v4.10.3)

###
[`v4.10.2`](https://togithub.com/th3rdwave/react-native-safe-area-context/compare/v4.10.1...8b5d6290ef7c12970877a21ad77468f86a822a94)

[Compare
Source](https://togithub.com/th3rdwave/react-native-safe-area-context/compare/v4.10.1...v4.10.2)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: valora-bot <valorabot@valoraapp.com>
---
 ios/Podfile.lock | 4 ++--
 package.json     | 2 +-
 yarn.lock        | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 412fd7b56f..abdca65cee 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -550,7 +550,7 @@ PODS:
     - React-Core
   - react-native-randombytes (3.6.1):
     - React-Core
-  - react-native-safe-area-context (4.10.1):
+  - react-native-safe-area-context (4.10.3):
     - React-Core
   - react-native-shake (5.5.2):
     - RCT-Folly (= 2021.07.22.00)
@@ -1211,7 +1211,7 @@ SPEC CHECKSUMS:
   react-native-launch-arguments: 5f41e0abf88a15e3c5309b8875d6fd5ac43df49d
   react-native-netinfo: 076df4f9b07f6670acf4ce9a75aac8d34c2e2ccc
   react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
-  react-native-safe-area-context: dcab599c527c2d7de2d76507a523d20a0b83823d
+  react-native-safe-area-context: b01d8f42d4e62a7be5a3e69fd332e0c7e67584c7
   react-native-shake: 8036ba95a1953c9b10821bdc33f5814c5d0bcef6
   react-native-simple-toast: 1f1cc551d419bc0ab05dcb0136554006c274789d
   react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
diff --git a/package.json b/package.json
index 4dcb7f647d..a18e352ac3 100644
--- a/package.json
+++ b/package.json
@@ -175,7 +175,7 @@
     "react-native-randombytes": "^3.6.1",
     "react-native-reanimated": "^2.17.0",
     "react-native-restart-android": "^0.0.7",
-    "react-native-safe-area-context": "^4.10.1",
+    "react-native-safe-area-context": "^4.10.3",
     "react-native-screens": "^3.31.1",
     "react-native-securerandom": "^1.0.1",
     "react-native-shake": "^5.5.2",
diff --git a/yarn.lock b/yarn.lock
index 5554fed9a1..480aba32ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15453,10 +15453,10 @@ react-native-restart-android@^0.0.7:
   resolved "https://registry.yarnpkg.com/react-native-restart-android/-/react-native-restart-android-0.0.7.tgz#60bc42530ad8e54c4bfb14d462ba0c779229368d"
   integrity sha512-FxTVAgYDeS+R/PSA8vdwOg0HR5NaLo/FQTOqq0kB+KGKR3APty5Qmcz0xXGBn+Ju09ueyklsRGzPR9YmcewZgg==
 
-react-native-safe-area-context@^4.10.1:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.10.1.tgz#29fb27395ff7dfa2fa38788a27226330d73a81cc"
-  integrity sha512-w8tCuowDorUkPoWPXmhqosovBr33YsukkwYCDERZFHAxIkx6qBadYxfeoaJ91nCQKjkNzGrK5qhoNOeSIcYSpA==
+react-native-safe-area-context@^4.10.3:
+  version "4.10.3"
+  resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.10.3.tgz#ad132b64e1e7cdd043b4e82a7a2449d99f4f7630"
+  integrity sha512-nW9B0fydpJSN798awtdslamYzRqDM/FIEh80ZPDEXVYpqYNsDLpz52pMtuKyhF5aOgJlfiroQrgdOxQNFtSM8A==
 
 react-native-safe-modules@^1.0.3:
   version "1.0.3"

From 7c5ffd159fa85b38104ad543bff8145d01963343 Mon Sep 17 00:00:00 2001
From: valora-bot-crowdin
 <80050969+valora-bot-crowdin@users.noreply.github.com>
Date: Thu, 30 May 2024 19:32:54 -0700
Subject: [PATCH 078/133] chore(l10n): update translations from Crowdin (#5493)

Co-authored-by: Valora Bot <89419329+valora-bot@users.noreply.github.com>
---
 locales/de/translation.json     | 4 +++-
 locales/en-US/translation.json  | 4 +++-
 locales/es-419/translation.json | 4 +++-
 locales/fr-FR/translation.json  | 4 +++-
 locales/it-IT/translation.json  | 4 +++-
 locales/pl-PL/translation.json  | 4 +++-
 locales/pt-BR/translation.json  | 4 +++-
 locales/ru-RU/translation.json  | 4 +++-
 locales/th-TH/translation.json  | 4 +++-
 locales/tr-TR/translation.json  | 4 +++-
 locales/uk-UA/translation.json  | 4 +++-
 locales/vi-VN/translation.json  | 4 +++-
 locales/zh-CN/translation.json  | 4 +++-
 13 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/locales/de/translation.json b/locales/de/translation.json
index 4a7f6d0cdb..0513daae71 100644
--- a/locales/de/translation.json
+++ b/locales/de/translation.json
@@ -1955,7 +1955,9 @@
       "popular": "Beliebt",
       "recentlySwapped": "Kürzlich getauscht",
       "network": "{{networkName}} Netzwerk",
-      "selectNetwork": "Netzwerk"
+      "selectNetwork": "Netzwerk",
+      "stablecoins": "Stablecoins",
+      "gasTokens": "Gasgebühr-Token"
     }
   },
   "homeActions": {
diff --git a/locales/en-US/translation.json b/locales/en-US/translation.json
index e1c3471e18..180152a592 100644
--- a/locales/en-US/translation.json
+++ b/locales/en-US/translation.json
@@ -1955,7 +1955,9 @@
       "popular": "Popular",
       "recentlySwapped": "Recently swapped",
       "network": "{{networkName}} Network",
-      "selectNetwork": "Network"
+      "selectNetwork": "Network",
+      "stablecoins": "Stablecoins",
+      "gasTokens": "Gas Tokens"
     }
   },
   "homeActions": {
diff --git a/locales/es-419/translation.json b/locales/es-419/translation.json
index 5fa84037e2..77759ed63e 100644
--- a/locales/es-419/translation.json
+++ b/locales/es-419/translation.json
@@ -1955,7 +1955,9 @@
       "popular": "Popular",
       "recentlySwapped": "Intercambiado recientemente",
       "network": "Red {{networkName}}",
-      "selectNetwork": "Red"
+      "selectNetwork": "Red",
+      "stablecoins": "Stablecoins",
+      "gasTokens": "Tokens de gas"
     }
   },
   "homeActions": {
diff --git a/locales/fr-FR/translation.json b/locales/fr-FR/translation.json
index 3924271f94..2a888e67ac 100644
--- a/locales/fr-FR/translation.json
+++ b/locales/fr-FR/translation.json
@@ -1955,7 +1955,9 @@
       "popular": "Populaires",
       "recentlySwapped": "Échangés récemment",
       "network": "Réseau {{networkName}}",
-      "selectNetwork": "Réseau"
+      "selectNetwork": "Réseau",
+      "stablecoins": "Stablecoins",
+      "gasTokens": "Jetons de frais"
     }
   },
   "homeActions": {
diff --git a/locales/it-IT/translation.json b/locales/it-IT/translation.json
index 656d7b636b..a2173ff2a1 100644
--- a/locales/it-IT/translation.json
+++ b/locales/it-IT/translation.json
@@ -1955,7 +1955,9 @@
       "popular": "Popolare",
       "recentlySwapped": "Scambiato di recente",
       "network": "Rete {{networkName}}",
-      "selectNetwork": "Rete"
+      "selectNetwork": "Rete",
+      "stablecoins": "Stablecoin",
+      "gasTokens": "Token per commissioni"
     }
   },
   "homeActions": {
diff --git a/locales/pl-PL/translation.json b/locales/pl-PL/translation.json
index 21f3b81e17..7ceded7ba1 100644
--- a/locales/pl-PL/translation.json
+++ b/locales/pl-PL/translation.json
@@ -1959,7 +1959,9 @@
       "popular": "Popularne",
       "recentlySwapped": "Niedawno wymienione",
       "network": "Sieć {{networkName}}",
-      "selectNetwork": "Sieć"
+      "selectNetwork": "Sieć",
+      "stablecoins": "Stablecoiny",
+      "gasTokens": "Żetony gazowe"
     }
   },
   "homeActions": {
diff --git a/locales/pt-BR/translation.json b/locales/pt-BR/translation.json
index 05699ed24f..20a3bd5b17 100644
--- a/locales/pt-BR/translation.json
+++ b/locales/pt-BR/translation.json
@@ -1955,7 +1955,9 @@
       "popular": "Popular",
       "recentlySwapped": "Trocado recentemente",
       "network": "Rede {{networkName}}",
-      "selectNetwork": "Rede"
+      "selectNetwork": "Rede",
+      "stablecoins": "Stablecoins",
+      "gasTokens": "Tokens de gás"
     }
   },
   "homeActions": {
diff --git a/locales/ru-RU/translation.json b/locales/ru-RU/translation.json
index cf7c83445a..5f671b9b07 100644
--- a/locales/ru-RU/translation.json
+++ b/locales/ru-RU/translation.json
@@ -1959,7 +1959,9 @@
       "popular": "Популярные",
       "recentlySwapped": "Недавно обмененные",
       "network": "Сеть {{networkName}}",
-      "selectNetwork": "Сообщество"
+      "selectNetwork": "Сообщество",
+      "stablecoins": "Стабильные монеты",
+      "gasTokens": "Газовые жетоны"
     }
   },
   "homeActions": {
diff --git a/locales/th-TH/translation.json b/locales/th-TH/translation.json
index 88ac771c63..68ae9d26c7 100644
--- a/locales/th-TH/translation.json
+++ b/locales/th-TH/translation.json
@@ -1953,7 +1953,9 @@
       "popular": "ยอดนิยม",
       "recentlySwapped": "ที่สว็อปเมื่อเร็วๆ นี้",
       "network": "เครือข่าย {{networkName}}",
-      "selectNetwork": "เครือข่าย"
+      "selectNetwork": "เครือข่าย",
+      "stablecoins": "Stablecoins",
+      "gasTokens": "Gas Tokens"
     }
   },
   "homeActions": {
diff --git a/locales/tr-TR/translation.json b/locales/tr-TR/translation.json
index fe83f4c440..1616cf5438 100644
--- a/locales/tr-TR/translation.json
+++ b/locales/tr-TR/translation.json
@@ -1955,7 +1955,9 @@
       "popular": "Popüler",
       "recentlySwapped": "Yakın zamanda takas edildi",
       "network": "{{networkName}} Ağı",
-      "selectNetwork": "Ağ"
+      "selectNetwork": "Ağ",
+      "stablecoins": "Stablecoins",
+      "gasTokens": "Gaz Jetonları"
     }
   },
   "homeActions": {
diff --git a/locales/uk-UA/translation.json b/locales/uk-UA/translation.json
index e9059c0253..d65373d592 100644
--- a/locales/uk-UA/translation.json
+++ b/locales/uk-UA/translation.json
@@ -1959,7 +1959,9 @@
       "popular": "Популярні",
       "recentlySwapped": "Недавно використані у свопі",
       "network": "Мережа: {{networkName}}",
-      "selectNetwork": "Мережа"
+      "selectNetwork": "Мережа",
+      "stablecoins": "Стейблкоіни",
+      "gasTokens": "Газові жетони"
     }
   },
   "homeActions": {
diff --git a/locales/vi-VN/translation.json b/locales/vi-VN/translation.json
index 6b290f62da..282c441aa2 100644
--- a/locales/vi-VN/translation.json
+++ b/locales/vi-VN/translation.json
@@ -1953,7 +1953,9 @@
       "popular": "Thông dụng",
       "recentlySwapped": "Đã trao đổi gần đây",
       "network": "Mạng {{networkName}}",
-      "selectNetwork": "Mạng lưới"
+      "selectNetwork": "Mạng lưới",
+      "stablecoins": "Stablecoins",
+      "gasTokens": "Gas Tokens"
     }
   },
   "homeActions": {
diff --git a/locales/zh-CN/translation.json b/locales/zh-CN/translation.json
index 73fa166b27..a9a5c0a400 100644
--- a/locales/zh-CN/translation.json
+++ b/locales/zh-CN/translation.json
@@ -1953,7 +1953,9 @@
       "popular": "热门",
       "recentlySwapped": "最近交换",
       "network": "{{networkName}} 网络",
-      "selectNetwork": "网络"
+      "selectNetwork": "网络",
+      "stablecoins": "稳定币",
+      "gasTokens": "瓦斯令牌"
     }
   },
   "homeActions": {

From aa5463cdad006513ecabfbd80d151fd0a9cc3227 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 31 May 2024 03:15:15 +0000
Subject: [PATCH 079/133] fix(deps): update dependency
 androidx.swiperefreshlayout:swiperefreshlayout to v1.1.0 (#5497)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[androidx.swiperefreshlayout:swiperefreshlayout](https://developer.android.com/jetpack/androidx)
([source](http://source.android.com)) | `1.0.0` -> `1.1.0` |
[![age](https://developer.mend.io/api/mc/badges/age/maven/androidx.swiperefreshlayout:swiperefreshlayout/1.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/androidx.swiperefreshlayout:swiperefreshlayout/1.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/androidx.swiperefreshlayout:swiperefreshlayout/1.0.0/1.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/androidx.swiperefreshlayout:swiperefreshlayout/1.0.0/1.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJncmFkbGUiLCJyZW5vdmF0ZSJdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 android/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 2619a211bb..b7ccaafb12 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -281,7 +281,7 @@ dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
 
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
 
     implementation 'com.clevertap.android:clevertap-android-sdk:5.2.2'
     //For CleverTap Android SDK v3.6.4 and above add the following -

From 1bb205eaaa8af625b9a3ca2dfbdf2250b5625373 Mon Sep 17 00:00:00 2001
From: Jean Regisser <jean.regisser@gmail.com>
Date: Fri, 31 May 2024 07:46:23 +0200
Subject: [PATCH 080/133] docs: tweak connecting dapps (#5495)

---
 docs/connecting-dapps.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/connecting-dapps.md b/docs/connecting-dapps.md
index 757bc3d985..0ae00b3777 100644
--- a/docs/connecting-dapps.md
+++ b/docs/connecting-dapps.md
@@ -2,7 +2,7 @@
 
 Valora supports [WalletConnect v2](https://docs.walletconnect.com/2.0/) for connecting Dapps to Valora. [WalletConnect v1 is end-of-life](https://docs.walletconnect.com/2.0/advanced/migration-from-v1.x/overview) and not supported.
 
-If you're building a Dapp we recommend [@celo/rainbowkit-celo](https://github.com/celo-org/rainbowkit-celo) or [Web3Modal](https://github.com/WalletConnect/web3modal)to make it easy to connect your Dapp to Valora via WalletConnect. [cLabs](https://clabs.co/) supports @celo/rainbowkit-celo and it includes a [complete example](https://docs.celo.org/developer/rainbowkit-celo) to help you get started.
+If you're building a Dapp we recommend [@celo/rainbowkit-celo](https://github.com/celo-org/rainbowkit-celo) or [Web3Modal](https://github.com/WalletConnect/web3modal) to make it easy to connect your Dapp to Valora via WalletConnect. [cLabs](https://clabs.co/) supports [@celo/rainbowkit-celo](https://github.com/celo-org/rainbowkit-celo) and it includes a [complete example](https://docs.celo.org/developer/rainbowkit-celo) to help you get started.
 
 ## WalletConnect details
 

From 12bf2d23a2f00eba2aa78cccc8e02813eccac28d Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Fri, 31 May 2024 10:24:30 -0700
Subject: [PATCH 081/133] chore(renovate): set low priority for grandle
 dependencies (#5499)

### Description

Renovate recently started prioritizing gradle dependencies higher than
npm dependencies, which looks related to
https://github.com/renovatebot/renovate/discussions/29298, setting an
explicit priority to see if it helps before the latest renovate version
is used (this happened when renovate version went from 37.368.10 to
37.377.8)

### Test plan

Watch renovate after merge

### Related issues

N/A

### Backwards compatibility

N/A

### Network scalability

N/A
---
 renovate.json5 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/renovate.json5 b/renovate.json5
index 294d39bbe1..fab7e5f9c7 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -47,6 +47,11 @@
       // set default priority for dev dependencies
       prPriority: 0,
     },
+    {
+      // Low priority for gradle dependencies
+      matchManagers: ['gradle', 'gradle-wrapper'],
+      prPriority: -1,
+    },
     {
       // Group updates for @celo packages
       matchPackagePatterns: ['^@celo/'],

From a137d2556a60afba71164f78df1a108bc74e442a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 1 Jun 2024 01:39:59 +0000
Subject: [PATCH 082/133] chore(deps): update actions/checkout action to v4
 (#5502)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [actions/checkout](https://togithub.com/actions/checkout) | action |
major | `v3` -> `v4` |

---

### Release Notes

<details>
<summary>actions/checkout (actions/checkout)</summary>

###
[`v4`](https://togithub.com/actions/checkout/blob/HEAD/CHANGELOG.md#v400)

[Compare Source](https://togithub.com/actions/checkout/compare/v3...v4)

- [Support fetching without the --progress
option](https://togithub.com/actions/checkout/pull/1067)
-   [Update to node20](https://togithub.com/actions/checkout/pull/1436)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJnaXRodWItYWN0aW9ucyIsInJlbm92YXRlIl19-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/automerge-crowdin.yml          |  2 +-
 .github/workflows/automerge-translation.yml      |  2 +-
 .github/workflows/bump-app-version.yml           |  2 +-
 .github/workflows/check-translation-files-pr.yml |  2 +-
 .github/workflows/check.yml                      | 12 ++++++------
 .github/workflows/e2e-android.yml                |  2 +-
 .github/workflows/e2e-faucet-balance.yml         |  2 +-
 .github/workflows/e2e-ios.yml                    |  2 +-
 .github/workflows/test.yml                       |  2 +-
 .github/workflows/update-licenses-disclaimer.yml |  2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/automerge-crowdin.yml b/.github/workflows/automerge-crowdin.yml
index 161ad4ab31..0df4e59ef7 100644
--- a/.github/workflows/automerge-crowdin.yml
+++ b/.github/workflows/automerge-crowdin.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           secrets: |-
             VALORA_BOT_TOKEN:projects/1027349420744/secrets/VALORA_BOT_TOKEN
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/github-script@v5
         with:
           github-token: ${{ steps.google-secrets.outputs.VALORA_BOT_TOKEN }}
diff --git a/.github/workflows/automerge-translation.yml b/.github/workflows/automerge-translation.yml
index 5b2645c92d..570bd924bc 100644
--- a/.github/workflows/automerge-translation.yml
+++ b/.github/workflows/automerge-translation.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           secrets: |-
             VALORA_BOT_TOKEN:projects/1027349420744/secrets/VALORA_BOT_TOKEN
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/github-script@v5
         with:
           github-token: ${{ steps.google-secrets.outputs.VALORA_BOT_TOKEN }}
diff --git a/.github/workflows/bump-app-version.yml b/.github/workflows/bump-app-version.yml
index 896a9d98af..92dfdeb6db 100644
--- a/.github/workflows/bump-app-version.yml
+++ b/.github/workflows/bump-app-version.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: webfactory/ssh-agent@v0.9.0
         with:
           ssh-private-key: ${{ steps.google-secrets.outputs.BOT_SSH_KEY }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: main
       - uses: ./.github/actions/yarn-install
diff --git a/.github/workflows/check-translation-files-pr.yml b/.github/workflows/check-translation-files-pr.yml
index c004b2a70e..22a42913d3 100644
--- a/.github/workflows/check-translation-files-pr.yml
+++ b/.github/workflows/check-translation-files-pr.yml
@@ -15,7 +15,7 @@ jobs:
   check-translation-files:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v41
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 03bc8da1c9..b6fe2fc038 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -21,7 +21,7 @@ jobs:
     name: Vulnerabilities
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       - run: ./scripts/ci_check_vulnerabilities.sh
 
@@ -29,7 +29,7 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       - run: yarn run format:check
       - run: yarn run lint
@@ -38,28 +38,28 @@ jobs:
     name: 'yarn.lock Up-to-date'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       - run: git diff --exit-code
   licenses:
     name: Licenses
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       - run: yarn check-licenses
   knip-depcheck:
     name: Dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       - run: yarn knip:depcheck
   knip-regression:
     name: Knip Regression
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 2
       - uses: ./.github/actions/yarn-install
diff --git a/.github/workflows/e2e-android.yml b/.github/workflows/e2e-android.yml
index e72fdb44eb..c906322198 100644
--- a/.github/workflows/e2e-android.yml
+++ b/.github/workflows/e2e-android.yml
@@ -17,7 +17,7 @@ jobs:
     # If it takes longer it usually fails, so no need to pay for more
     timeout-minutes: 25
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set env
         run: |
           ANDROID_HOME="$HOME/android-tools"
diff --git a/.github/workflows/e2e-faucet-balance.yml b/.github/workflows/e2e-faucet-balance.yml
index 462ff337c9..2a9d463fd2 100644
--- a/.github/workflows/e2e-faucet-balance.yml
+++ b/.github/workflows/e2e-faucet-balance.yml
@@ -17,7 +17,7 @@ jobs:
     name: balance-and-fund
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       - name: Create E2E Fund .env File
         env:
diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
index b2d58c866a..b15f255b46 100644
--- a/.github/workflows/e2e-ios.yml
+++ b/.github/workflows/e2e-ios.yml
@@ -28,7 +28,7 @@ jobs:
         with:
           secrets: |-
             EMERGE_API_TOKEN:projects/1027349420744/secrets/EMERGE_API_TOKEN
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       # Since the e2e runners have access to the Valora branding,
       # This check ensures there are no type errors there.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2a0016bb1b..db6d02b17d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,7 +20,7 @@ jobs:
     name: Mobile
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       - name: Build
         run: yarn build
diff --git a/.github/workflows/update-licenses-disclaimer.yml b/.github/workflows/update-licenses-disclaimer.yml
index c7bcec91d7..4a724ba26e 100644
--- a/.github/workflows/update-licenses-disclaimer.yml
+++ b/.github/workflows/update-licenses-disclaimer.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: webfactory/ssh-agent@v0.9.0
         with:
           ssh-private-key: ${{ steps.google-secrets.outputs.BOT_SSH_KEY }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       - run: yarn ts-node .github/scripts/createLicenseDisclaimerPr.ts
         env:

From 2509f7936fcea679c794088d1e218488cb181bde Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 1 Jun 2024 02:22:11 +0000
Subject: [PATCH 083/133] chore(deps): update actions/cache action to v4
 (#5501)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [actions/cache](https://togithub.com/actions/cache) | action | major |
`v3` -> `v4` |

---

### Release Notes

<details>
<summary>actions/cache (actions/cache)</summary>

### [`v4`](https://togithub.com/actions/cache/compare/v3...v4)

[Compare Source](https://togithub.com/actions/cache/compare/v3...v4)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJnaXRodWItYWN0aW9ucyIsInJlbm92YXRlIl19-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/actions/yarn-install/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/yarn-install/action.yml b/.github/actions/yarn-install/action.yml
index dec4bb9e5f..58937c0eb3 100644
--- a/.github/actions/yarn-install/action.yml
+++ b/.github/actions/yarn-install/action.yml
@@ -8,7 +8,7 @@ runs:
       with:
         node-version-file: 'package.json'
         check-latest: true
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: |
           node_modules

From ad1935d0e7f83187deb9585b6010ab6618fefdeb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 1 Jun 2024 02:23:35 +0000
Subject: [PATCH 084/133] chore(deps): update actions/github-script action to
 v7 (#5503)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [actions/github-script](https://togithub.com/actions/github-script) |
action | major | `v5` -> `v7` |

---

### Release Notes

<details>
<summary>actions/github-script (actions/github-script)</summary>

### [`v7`](https://togithub.com/actions/github-script/compare/v6...v7)

[Compare
Source](https://togithub.com/actions/github-script/compare/v6...v7)

### [`v6`](https://togithub.com/actions/github-script/compare/v5...v6)

[Compare
Source](https://togithub.com/actions/github-script/compare/v5...v6)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJnaXRodWItYWN0aW9ucyIsInJlbm92YXRlIl19-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/automerge-crowdin.yml          | 2 +-
 .github/workflows/automerge-translation.yml      | 2 +-
 .github/workflows/bump-app-version.yml           | 4 ++--
 .github/workflows/update-licenses-disclaimer.yml | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/automerge-crowdin.yml b/.github/workflows/automerge-crowdin.yml
index 0df4e59ef7..ccde3558c5 100644
--- a/.github/workflows/automerge-crowdin.yml
+++ b/.github/workflows/automerge-crowdin.yml
@@ -25,7 +25,7 @@ jobs:
           secrets: |-
             VALORA_BOT_TOKEN:projects/1027349420744/secrets/VALORA_BOT_TOKEN
       - uses: actions/checkout@v4
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v7
         with:
           github-token: ${{ steps.google-secrets.outputs.VALORA_BOT_TOKEN }}
           script: |
diff --git a/.github/workflows/automerge-translation.yml b/.github/workflows/automerge-translation.yml
index 570bd924bc..de619d6922 100644
--- a/.github/workflows/automerge-translation.yml
+++ b/.github/workflows/automerge-translation.yml
@@ -24,7 +24,7 @@ jobs:
           secrets: |-
             VALORA_BOT_TOKEN:projects/1027349420744/secrets/VALORA_BOT_TOKEN
       - uses: actions/checkout@v4
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v7
         with:
           github-token: ${{ steps.google-secrets.outputs.VALORA_BOT_TOKEN }}
           script: |
diff --git a/.github/workflows/bump-app-version.yml b/.github/workflows/bump-app-version.yml
index 92dfdeb6db..84d89ca6e5 100644
--- a/.github/workflows/bump-app-version.yml
+++ b/.github/workflows/bump-app-version.yml
@@ -37,7 +37,7 @@ jobs:
       - run: yarn ts-node .github/scripts/createAppVersionPr.ts
         env:
           VALORA_BOT_TOKEN: ${{ steps.google-secrets.outputs.VALORA_BOT_TOKEN }}
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v7
         with:
           script: |
             const allowedUpdatedFiles = [
@@ -48,7 +48,7 @@ jobs:
             ]
             const script = require('.github/scripts/autoApprovePr.js')
             await script({github, context, core, allowedUpdatedFiles})
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v7
         with:
           github-token: ${{ steps.google-secrets.outputs.VALORA_BOT_TOKEN }}
           script: |
diff --git a/.github/workflows/update-licenses-disclaimer.yml b/.github/workflows/update-licenses-disclaimer.yml
index 4a724ba26e..6c37b651ad 100644
--- a/.github/workflows/update-licenses-disclaimer.yml
+++ b/.github/workflows/update-licenses-disclaimer.yml
@@ -35,13 +35,13 @@ jobs:
       - run: yarn ts-node .github/scripts/createLicenseDisclaimerPr.ts
         env:
           VALORA_BOT_TOKEN: ${{ steps.google-secrets.outputs.VALORA_BOT_TOKEN }}
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v7
         with:
           script: |
             const script = require('.github/scripts/autoApprovePr.js')
             const allowedUpdatedFiles = ['src/account/LicenseDisclaimer.txt']
             await script({github, context, core, allowedUpdatedFiles})
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v7
         with:
           github-token: ${{ steps.google-secrets.outputs.VALORA_BOT_TOKEN }}
           script: |

From eab87402cfe3713194e58e7c016d19121238160f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 1 Jun 2024 03:06:42 +0000
Subject: [PATCH 085/133] chore(deps): update actions/setup-node action to v4
 (#5504)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [actions/setup-node](https://togithub.com/actions/setup-node) | action
| major | `v3` -> `v4` |

---

### Release Notes

<details>
<summary>actions/setup-node (actions/setup-node)</summary>

### [`v4`](https://togithub.com/actions/setup-node/compare/v3...v4)

[Compare
Source](https://togithub.com/actions/setup-node/compare/v3...v4)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJnaXRodWItYWN0aW9ucyIsInJlbm92YXRlIl19-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/actions/yarn-install/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/yarn-install/action.yml b/.github/actions/yarn-install/action.yml
index 58937c0eb3..3a36a1b27e 100644
--- a/.github/actions/yarn-install/action.yml
+++ b/.github/actions/yarn-install/action.yml
@@ -3,7 +3,7 @@ description: 'Runs setup node + cache + yarn install'
 runs:
   using: 'composite'
   steps:
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       id: setup-node
       with:
         node-version-file: 'package.json'

From e020f1f6f11dc0afa050e17bc35fcbd499908906 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 1 Jun 2024 03:24:50 +0000
Subject: [PATCH 086/133] chore(deps): update actions/upload-artifact action to
 v4 (#5505)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
|
[actions/upload-artifact](https://togithub.com/actions/upload-artifact)
| action | major | `v3` -> `v4` |

---

### Release Notes

<details>
<summary>actions/upload-artifact (actions/upload-artifact)</summary>

### [`v4`](https://togithub.com/actions/upload-artifact/compare/v3...v4)

[Compare
Source](https://togithub.com/actions/upload-artifact/compare/v3...v4)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJnaXRodWItYWN0aW9ucyIsInJlbm92YXRlIl19-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/e2e-android.yml | 4 ++--
 .github/workflows/e2e-ios.yml     | 4 ++--
 .github/workflows/test.yml        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/e2e-android.yml b/.github/workflows/e2e-android.yml
index c906322198..a523a7d766 100644
--- a/.github/workflows/e2e-android.yml
+++ b/.github/workflows/e2e-android.yml
@@ -94,13 +94,13 @@ jobs:
           report_paths: 'e2e/test-results/junit.xml'
       - name: 'Upload Android E2E Artifacts'
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: android-${{ inputs.android-api-level }}-e2e-artifact
           path: e2e/artifacts
       - name: 'Upload Android E2E HTML Report'
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: android-${{ inputs.android-api-level }}-e2e-test-report
           path: e2e/test-results
diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
index b15f255b46..0d54756934 100644
--- a/.github/workflows/e2e-ios.yml
+++ b/.github/workflows/e2e-ios.yml
@@ -82,13 +82,13 @@ jobs:
           report_paths: 'e2e/test-results/junit.xml'
       - name: 'Upload iOS E2E Artifacts'
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ios-${{ inputs.ios-version }}-e2e-artifact
           path: e2e/artifacts
       - name: 'Upload iOS E2E HTML Report'
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ios-${{ inputs.ios-version }}-test-report
           path: e2e/test-results
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index db6d02b17d..7bbdcfc353 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,7 +33,7 @@ jobs:
           mkdir -p test-results/jest
           yarn test:ci
       - name: Upload Coverage Report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: coverage/lcov-report
       - name: 'Upload to Codecov'

From 2ac5b1a8bea79131912fce6e9acf074c76495909 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 1 Jun 2024 04:06:57 +0000
Subject: [PATCH 087/133] chore(deps): update codecov/codecov-action action to
 v4 (#5506)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [codecov/codecov-action](https://togithub.com/codecov/codecov-action)
| action | major | `v3` -> `v4` |

---

### Release Notes

<details>
<summary>codecov/codecov-action (codecov/codecov-action)</summary>

### [`v4`](https://togithub.com/codecov/codecov-action/compare/v3...v4)

[Compare
Source](https://togithub.com/codecov/codecov-action/compare/v3...v4)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJnaXRodWItYWN0aW9ucyIsInJlbm92YXRlIl19-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7bbdcfc353..617678a8df 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,6 +37,6 @@ jobs:
         with:
           path: coverage/lcov-report
       - name: 'Upload to Codecov'
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

From bd84e33d3683fa97c0e9e3d0c0f1595dc0483d20 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 1 Jun 2024 21:40:17 +0000
Subject: [PATCH 088/133] chore(deps): update google-github-actions/auth action
 to v2 (#5508)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
|
[google-github-actions/auth](https://togithub.com/google-github-actions/auth)
| action | major | `v1` -> `v2` |

---

### Release Notes

<details>
<summary>google-github-actions/auth
(google-github-actions/auth)</summary>

###
[`v2`](https://togithub.com/google-github-actions/auth/releases/tag/v2)

[Compare
Source](https://togithub.com/google-github-actions/auth/compare/v1...v2)

Floating v2 alias

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJnaXRodWItYWN0aW9ucyIsInJlbm92YXRlIl19-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/automerge-crowdin.yml          | 2 +-
 .github/workflows/automerge-translation.yml      | 2 +-
 .github/workflows/bump-app-version.yml           | 2 +-
 .github/workflows/e2e-ios.yml                    | 2 +-
 .github/workflows/update-licenses-disclaimer.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/automerge-crowdin.yml b/.github/workflows/automerge-crowdin.yml
index ccde3558c5..4a1dbcefde 100644
--- a/.github/workflows/automerge-crowdin.yml
+++ b/.github/workflows/automerge-crowdin.yml
@@ -14,7 +14,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: google-github-actions/auth@v1
+      - uses: google-github-actions/auth@v2
         with:
           project_id: celo-mobile-mainnet
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
diff --git a/.github/workflows/automerge-translation.yml b/.github/workflows/automerge-translation.yml
index de619d6922..08ed05b829 100644
--- a/.github/workflows/automerge-translation.yml
+++ b/.github/workflows/automerge-translation.yml
@@ -13,7 +13,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: google-github-actions/auth@v1
+      - uses: google-github-actions/auth@v2
         with:
           project_id: celo-mobile-mainnet
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
diff --git a/.github/workflows/bump-app-version.yml b/.github/workflows/bump-app-version.yml
index 84d89ca6e5..682adfa214 100644
--- a/.github/workflows/bump-app-version.yml
+++ b/.github/workflows/bump-app-version.yml
@@ -16,7 +16,7 @@ jobs:
     env:
       BRANCH_NAME: valora-bot/bump-app-version
     steps:
-      - uses: google-github-actions/auth@v1
+      - uses: google-github-actions/auth@v2
         with:
           project_id: celo-mobile-mainnet
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
index 0d54756934..bb1ab8d7db 100644
--- a/.github/workflows/e2e-ios.yml
+++ b/.github/workflows/e2e-ios.yml
@@ -16,7 +16,7 @@ jobs:
     name: iOS (${{ inputs.ios-version  }})
     runs-on: ios-e2e-group
     steps:
-      - uses: google-github-actions/auth@v1
+      - uses: google-github-actions/auth@v2
         if: ${{ env.SECRETS_AVAILABLE }}
         with:
           project_id: celo-mobile-mainnet
diff --git a/.github/workflows/update-licenses-disclaimer.yml b/.github/workflows/update-licenses-disclaimer.yml
index 6c37b651ad..3c58580b16 100644
--- a/.github/workflows/update-licenses-disclaimer.yml
+++ b/.github/workflows/update-licenses-disclaimer.yml
@@ -16,7 +16,7 @@ jobs:
     env:
       BRANCH_NAME: valora-bot/update-licenses-disclaimer
     steps:
-      - uses: google-github-actions/auth@v1
+      - uses: google-github-actions/auth@v2
         with:
           project_id: celo-mobile-mainnet
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}

From 9fe66881c03d4df1a515358df00190cd952bc5fb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 1 Jun 2024 22:21:24 +0000
Subject: [PATCH 089/133] chore(deps): update dependency macos to v14 (#5507)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [macos](https://togithub.com/actions/runner-images) | github-runner |
major | `11` -> `14` |

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJnaXRodWItYWN0aW9ucyIsInJlbm92YXRlIl19-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/bump-app-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bump-app-version.yml b/.github/workflows/bump-app-version.yml
index 682adfa214..b8409fdce7 100644
--- a/.github/workflows/bump-app-version.yml
+++ b/.github/workflows/bump-app-version.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   bump-app-version:
     # this job uses the pre-deploy script and agvtool which is only available on macos
-    runs-on: macos-11
+    runs-on: macos-14
     permissions:
       pull-requests: write
     env:

From 608ca471aed4c23b69b44ced3d198f41217ac156 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 1 Jun 2024 22:24:01 +0000
Subject: [PATCH 090/133] chore(deps): update
 google-github-actions/get-secretmanager-secrets action to v2 (#5509)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change | Pending |
|---|---|---|---|---|
|
[google-github-actions/get-secretmanager-secrets](https://togithub.com/google-github-actions/get-secretmanager-secrets)
| action | major | `v1.0.1` -> `v2.1.2` | `v2.1.3` |

---

### Release Notes

<details>
<summary>google-github-actions/get-secretmanager-secrets
(google-github-actions/get-secretmanager-secrets)</summary>

###
[`v2.1.2`](https://togithub.com/google-github-actions/get-secretmanager-secrets/releases/tag/v2.1.2)

[Compare
Source](https://togithub.com/google-github-actions/get-secretmanager-secrets/compare/v2.1.1...v2.1.2)

##### What's Changed

- Add option to export secrets as environment variables. by
[@&#8203;codiophile](https://togithub.com/codiophile) in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/289](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/289)
- Release: v2.1.2 by
[@&#8203;google-github-actions-bot](https://togithub.com/google-github-actions-bot)
in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/291](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/291)

##### New Contributors

- [@&#8203;codiophile](https://togithub.com/codiophile) made their first
contribution in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/289](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/289)

**Full Changelog**:
https://github.com/google-github-actions/get-secretmanager-secrets/compare/v2.1.1...v2.1.2

###
[`v2.1.1`](https://togithub.com/google-github-actions/get-secretmanager-secrets/releases/tag/v2.1.1)

[Compare
Source](https://togithub.com/google-github-actions/get-secretmanager-secrets/compare/v2.1.0...v2.1.1)

##### What's Changed

- security: bump undici from 5.28.2 to 5.28.3 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/282](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/282)
- security: bump undici from 5.28.3 to 5.28.4 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/284](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/284)
- Retry GETs on error by [@&#8203;glasser](https://togithub.com/glasser)
in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/285](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/285)
- Update deps by [@&#8203;sethvargo](https://togithub.com/sethvargo) in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/286](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/286)
- Release: v2.1.1 by
[@&#8203;google-github-actions-bot](https://togithub.com/google-github-actions-bot)
in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/287](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/287)

##### New Contributors

- [@&#8203;glasser](https://togithub.com/glasser) made their first
contribution in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/285](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/285)

**Full Changelog**:
https://github.com/google-github-actions/get-secretmanager-secrets/compare/v2.1.0...v2.1.1

###
[`v2.1.0`](https://togithub.com/google-github-actions/get-secretmanager-secrets/releases/tag/v2.1.0)

[Compare
Source](https://togithub.com/google-github-actions/get-secretmanager-secrets/compare/v2.0.0...v2.1.0)

##### What's Changed

- Update README and CI to use latest version by
[@&#8203;sethvargo](https://togithub.com/sethvargo) in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/279](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/279)
- Update deps by [@&#8203;sethvargo](https://togithub.com/sethvargo) in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/280](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/280)
- Release: v2.1.0 by
[@&#8203;google-github-actions-bot](https://togithub.com/google-github-actions-bot)
in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/281](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/281)

**Full Changelog**:
https://github.com/google-github-actions/get-secretmanager-secrets/compare/v2...v2.1.0

###
[`v2.0.0`](https://togithub.com/google-github-actions/get-secretmanager-secrets/releases/tag/v2.0.0)

[Compare
Source](https://togithub.com/google-github-actions/get-secretmanager-secrets/compare/v1.0.1...v2.0.0)

**:warning: This version requires Node 20 or later!**

##### What's Changed

- dependabot: only do security updates by
[@&#8203;sethvargo](https://togithub.com/sethvargo) in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/266](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/266)
- update all deps by [@&#8203;sethvargo](https://togithub.com/sethvargo)
in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/267](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/267)
- Update deps to Node 20 by
[@&#8203;sethvargo](https://togithub.com/sethvargo) in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/273](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/273)
- Drop mocha and chai by
[@&#8203;sethvargo](https://togithub.com/sethvargo) in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/274](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/274)
- Add CI for release branches by
[@&#8203;sethvargo](https://togithub.com/sethvargo) in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/275](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/275)
- Update deps by [@&#8203;sethvargo](https://togithub.com/sethvargo) in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/276](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/276)
- Release: v2.0.0 by
[@&#8203;google-github-actions-bot](https://togithub.com/google-github-actions-bot)
in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/278](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/278)

**Full Changelog**:
https://github.com/google-github-actions/get-secretmanager-secrets/compare/v1...v2.0.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJnaXRodWItYWN0aW9ucyIsInJlbm92YXRlIl19-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/automerge-crowdin.yml          | 2 +-
 .github/workflows/automerge-translation.yml      | 2 +-
 .github/workflows/bump-app-version.yml           | 2 +-
 .github/workflows/e2e-ios.yml                    | 2 +-
 .github/workflows/update-licenses-disclaimer.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/automerge-crowdin.yml b/.github/workflows/automerge-crowdin.yml
index 4a1dbcefde..b0782abaf5 100644
--- a/.github/workflows/automerge-crowdin.yml
+++ b/.github/workflows/automerge-crowdin.yml
@@ -20,7 +20,7 @@ jobs:
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
       - name: Google Secrets
         id: google-secrets
-        uses: google-github-actions/get-secretmanager-secrets@v1.0.1
+        uses: google-github-actions/get-secretmanager-secrets@v2.1.2
         with:
           secrets: |-
             VALORA_BOT_TOKEN:projects/1027349420744/secrets/VALORA_BOT_TOKEN
diff --git a/.github/workflows/automerge-translation.yml b/.github/workflows/automerge-translation.yml
index 08ed05b829..6f10038fca 100644
--- a/.github/workflows/automerge-translation.yml
+++ b/.github/workflows/automerge-translation.yml
@@ -19,7 +19,7 @@ jobs:
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
       - name: Google Secrets
         id: google-secrets
-        uses: google-github-actions/get-secretmanager-secrets@v1.0.1
+        uses: google-github-actions/get-secretmanager-secrets@v2.1.2
         with:
           secrets: |-
             VALORA_BOT_TOKEN:projects/1027349420744/secrets/VALORA_BOT_TOKEN
diff --git a/.github/workflows/bump-app-version.yml b/.github/workflows/bump-app-version.yml
index b8409fdce7..1e80e77594 100644
--- a/.github/workflows/bump-app-version.yml
+++ b/.github/workflows/bump-app-version.yml
@@ -22,7 +22,7 @@ jobs:
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
       - name: Google Secrets
         id: google-secrets
-        uses: google-github-actions/get-secretmanager-secrets@v1.0.1
+        uses: google-github-actions/get-secretmanager-secrets@v2.1.2
         with:
           secrets: |-
             BOT_SSH_KEY:projects/1027349420744/secrets/BOT_SSH_PRIVATE_KEY
diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
index bb1ab8d7db..8cb386e667 100644
--- a/.github/workflows/e2e-ios.yml
+++ b/.github/workflows/e2e-ios.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Google Secrets
         if: ${{ env.SECRETS_AVAILABLE }}
         id: google-secrets
-        uses: google-github-actions/get-secretmanager-secrets@v1.0.1
+        uses: google-github-actions/get-secretmanager-secrets@v2.1.2
         with:
           secrets: |-
             EMERGE_API_TOKEN:projects/1027349420744/secrets/EMERGE_API_TOKEN
diff --git a/.github/workflows/update-licenses-disclaimer.yml b/.github/workflows/update-licenses-disclaimer.yml
index 3c58580b16..2a31eb574a 100644
--- a/.github/workflows/update-licenses-disclaimer.yml
+++ b/.github/workflows/update-licenses-disclaimer.yml
@@ -22,7 +22,7 @@ jobs:
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
       - name: Google Secrets
         id: google-secrets
-        uses: google-github-actions/get-secretmanager-secrets@v1.0.1
+        uses: google-github-actions/get-secretmanager-secrets@v2.1.2
         with:
           secrets: |-
             BOT_SSH_KEY:projects/1027349420744/secrets/BOT_SSH_PRIVATE_KEY

From 482d39a06cb27494ac45b8f499e37264ab6ee03d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 1 Jun 2024 23:06:12 +0000
Subject: [PATCH 091/133] chore(deps): update
 google-github-actions/get-secretmanager-secrets action to v2.1.3 (#5510)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
|
[google-github-actions/get-secretmanager-secrets](https://togithub.com/google-github-actions/get-secretmanager-secrets)
| action | patch | `v2.1.2` -> `v2.1.3` |

---

### Release Notes

<details>
<summary>google-github-actions/get-secretmanager-secrets
(google-github-actions/get-secretmanager-secrets)</summary>

###
[`v2.1.3`](https://togithub.com/google-github-actions/get-secretmanager-secrets/releases/tag/v2.1.3)

[Compare
Source](https://togithub.com/google-github-actions/get-secretmanager-secrets/compare/v2.1.2...v2.1.3)

##### What's Changed

- Update deps and switch to autogen docs by
[@&#8203;sethvargo](https://togithub.com/sethvargo) in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/292](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/292)
- Add encoding option by
[@&#8203;sethvargo](https://togithub.com/sethvargo) in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/294](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/294)
- Release: v2.1.3 by
[@&#8203;google-github-actions-bot](https://togithub.com/google-github-actions-bot)
in
[https://github.com/google-github-actions/get-secretmanager-secrets/pull/295](https://togithub.com/google-github-actions/get-secretmanager-secrets/pull/295)

**Full Changelog**:
https://github.com/google-github-actions/get-secretmanager-secrets/compare/v2.1.2...v2.1.3

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJnaXRodWItYWN0aW9ucyIsInJlbm92YXRlIl19-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/automerge-crowdin.yml          | 2 +-
 .github/workflows/automerge-translation.yml      | 2 +-
 .github/workflows/bump-app-version.yml           | 2 +-
 .github/workflows/e2e-ios.yml                    | 2 +-
 .github/workflows/update-licenses-disclaimer.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/automerge-crowdin.yml b/.github/workflows/automerge-crowdin.yml
index b0782abaf5..2db5b5b47b 100644
--- a/.github/workflows/automerge-crowdin.yml
+++ b/.github/workflows/automerge-crowdin.yml
@@ -20,7 +20,7 @@ jobs:
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
       - name: Google Secrets
         id: google-secrets
-        uses: google-github-actions/get-secretmanager-secrets@v2.1.2
+        uses: google-github-actions/get-secretmanager-secrets@v2.1.3
         with:
           secrets: |-
             VALORA_BOT_TOKEN:projects/1027349420744/secrets/VALORA_BOT_TOKEN
diff --git a/.github/workflows/automerge-translation.yml b/.github/workflows/automerge-translation.yml
index 6f10038fca..10c4e9d6d7 100644
--- a/.github/workflows/automerge-translation.yml
+++ b/.github/workflows/automerge-translation.yml
@@ -19,7 +19,7 @@ jobs:
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
       - name: Google Secrets
         id: google-secrets
-        uses: google-github-actions/get-secretmanager-secrets@v2.1.2
+        uses: google-github-actions/get-secretmanager-secrets@v2.1.3
         with:
           secrets: |-
             VALORA_BOT_TOKEN:projects/1027349420744/secrets/VALORA_BOT_TOKEN
diff --git a/.github/workflows/bump-app-version.yml b/.github/workflows/bump-app-version.yml
index 1e80e77594..9d739b52a7 100644
--- a/.github/workflows/bump-app-version.yml
+++ b/.github/workflows/bump-app-version.yml
@@ -22,7 +22,7 @@ jobs:
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
       - name: Google Secrets
         id: google-secrets
-        uses: google-github-actions/get-secretmanager-secrets@v2.1.2
+        uses: google-github-actions/get-secretmanager-secrets@v2.1.3
         with:
           secrets: |-
             BOT_SSH_KEY:projects/1027349420744/secrets/BOT_SSH_PRIVATE_KEY
diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
index 8cb386e667..d4e0576d44 100644
--- a/.github/workflows/e2e-ios.yml
+++ b/.github/workflows/e2e-ios.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Google Secrets
         if: ${{ env.SECRETS_AVAILABLE }}
         id: google-secrets
-        uses: google-github-actions/get-secretmanager-secrets@v2.1.2
+        uses: google-github-actions/get-secretmanager-secrets@v2.1.3
         with:
           secrets: |-
             EMERGE_API_TOKEN:projects/1027349420744/secrets/EMERGE_API_TOKEN
diff --git a/.github/workflows/update-licenses-disclaimer.yml b/.github/workflows/update-licenses-disclaimer.yml
index 2a31eb574a..eeb9d49830 100644
--- a/.github/workflows/update-licenses-disclaimer.yml
+++ b/.github/workflows/update-licenses-disclaimer.yml
@@ -22,7 +22,7 @@ jobs:
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
       - name: Google Secrets
         id: google-secrets
-        uses: google-github-actions/get-secretmanager-secrets@v2.1.2
+        uses: google-github-actions/get-secretmanager-secrets@v2.1.3
         with:
           secrets: |-
             BOT_SSH_KEY:projects/1027349420744/secrets/BOT_SSH_PRIVATE_KEY

From 53f729ebd557d0f2b66161e72efc3a17d344f947 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 2 Jun 2024 03:02:07 +0000
Subject: [PATCH 092/133] chore(deps): update tj-actions/changed-files action
 to v43 (#5511)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change | Pending |
|---|---|---|---|---|
|
[tj-actions/changed-files](https://togithub.com/tj-actions/changed-files)
| action | major | `v41` -> `v43` | `v44` |

---

### Release Notes

<details>
<summary>tj-actions/changed-files (tj-actions/changed-files)</summary>

###
[`v43`](https://togithub.com/tj-actions/changed-files/releases/tag/v43)

[Compare
Source](https://togithub.com/tj-actions/changed-files/compare/v42...v43)

##### Changes in v43.0.1

##### What's Changed

- Upgraded to v43 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1990](https://togithub.com/tj-actions/changed-files/pull/1990)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.28 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1991](https://togithub.com/tj-actions/changed-files/pull/1991)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1992](https://togithub.com/tj-actions/changed-files/pull/1992)
- chore(deps): update typescript-eslint monorepo to v7.3.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1993](https://togithub.com/tj-actions/changed-files/pull/1993)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.29 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1994](https://togithub.com/tj-actions/changed-files/pull/1994)
- Bump
[@&#8203;typescript-eslint/parser](https://togithub.com/typescript-eslint/parser)
from 7.3.0 to 7.3.1 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/tj-actions/changed-files/pull/1996](https://togithub.com/tj-actions/changed-files/pull/1996)
- chore(deps): update dependency
[@&#8203;typescript-eslint/eslint-plugin](https://togithub.com/typescript-eslint/eslint-plugin)
to v7.3.1 by [@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1997](https://togithub.com/tj-actions/changed-files/pull/1997)
- Bump
[@&#8203;typescript-eslint/eslint-plugin](https://togithub.com/typescript-eslint/eslint-plugin)
from 7.3.0 to 7.3.1 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/tj-actions/changed-files/pull/1995](https://togithub.com/tj-actions/changed-files/pull/1995)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.30 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1998](https://togithub.com/tj-actions/changed-files/pull/1998)
- chore: update inputs.ts adding comment about fetch_depth by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/2000](https://togithub.com/tj-actions/changed-files/pull/2000)
- fix: remove warning with detecting the local git repository when using
Github's REST API by [@&#8203;jackton1](https://togithub.com/jackton1)
in
[https://github.com/tj-actions/changed-files/pull/2002](https://togithub.com/tj-actions/changed-files/pull/2002)
- chore(deps): update dependency typescript to v5.4.3 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2003](https://togithub.com/tj-actions/changed-files/pull/2003)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v43...v43.0.1

***

##### Changes in v43.0.0

##### 🔥🔥 BREAKING CHANGE 🔥🔥

- `any_{changed, modified, deleted}` outputs now return `true` when no
file/directory patterns are specified.

##### What's Changed

- Upgraded to v42.1.0 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1977](https://togithub.com/tj-actions/changed-files/pull/1977)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1979](https://togithub.com/tj-actions/changed-files/pull/1979)
- chore(deps): update dependency
[@&#8203;typescript-eslint/parser](https://togithub.com/typescript-eslint/parser)
to v7.2.0 by [@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1980](https://togithub.com/tj-actions/changed-files/pull/1980)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.26 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1981](https://togithub.com/tj-actions/changed-files/pull/1981)
- chore(deps): update dependency
[@&#8203;typescript-eslint/eslint-plugin](https://togithub.com/typescript-eslint/eslint-plugin)
to v7.2.0 by [@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1982](https://togithub.com/tj-actions/changed-files/pull/1982)
- chore(deps): update dependency
[@&#8203;types/lodash](https://togithub.com/types/lodash) to v4.17.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1983](https://togithub.com/tj-actions/changed-files/pull/1983)
- chore(deps): update peter-evans/create-pull-request action to v6.0.2
by [@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1984](https://togithub.com/tj-actions/changed-files/pull/1984)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.27 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1987](https://togithub.com/tj-actions/changed-files/pull/1987)
- feat: add support for returning true for `any_{changed, modified,
deleted}` outputs when no patterns are specified by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1988](https://togithub.com/tj-actions/changed-files/pull/1988)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1989](https://togithub.com/tj-actions/changed-files/pull/1989)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v42...v43.0.0

***

###
[`v42`](https://togithub.com/tj-actions/changed-files/releases/tag/v42)

[Compare
Source](https://togithub.com/tj-actions/changed-files/compare/v41...v42)

### Changes in v42.1.0

🚀 🚀 New Feature 🚀 🚀

- Use changed-files output to run matrix jobs by simply setting the new
`matrix` input to `true`.

This serves as an alias for setting the `json` input to `true` and the
`escape_json` input to `false`

```yml
      - name: Get changed files
        id: changed-files
        uses: tj-actions/changed-files@v42
        with:
           matrix: true
```

#### What's Changed

- Upgraded to v42.0.7 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1974](https://togithub.com/tj-actions/changed-files/pull/1974)
- feat: add matrix alias to simplify using outputs for matrix jobs by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1975](https://togithub.com/tj-actions/changed-files/pull/1975)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1976](https://togithub.com/tj-actions/changed-files/pull/1976)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v42...v42.1.0

***

### Changes in v42.0.7

#### What's Changed

- Upgraded to v42.0.6 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1968](https://togithub.com/tj-actions/changed-files/pull/1968)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.25 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1969](https://togithub.com/tj-actions/changed-files/pull/1969)
- chore(deps): update dependency typescript to v5.4.2 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1970](https://togithub.com/tj-actions/changed-files/pull/1970)
- chore: add test for detecting changed-files in a nested directory by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1972](https://togithub.com/tj-actions/changed-files/pull/1972)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1973](https://togithub.com/tj-actions/changed-files/pull/1973)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v42...v42.0.7

***

### Changes in v42.0.6

#### What's Changed

- Upgraded to v42.0.5 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1955](https://togithub.com/tj-actions/changed-files/pull/1955)
- chore(deps): update typescript-eslint monorepo to v7.1.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1956](https://togithub.com/tj-actions/changed-files/pull/1956)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.21 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1957](https://togithub.com/tj-actions/changed-files/pull/1957)
- chore(deps): update peter-evans/create-pull-request action to v6.0.1
by [@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1958](https://togithub.com/tj-actions/changed-files/pull/1958)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.22 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1959](https://togithub.com/tj-actions/changed-files/pull/1959)
- chore(deps): update tj-actions/verify-changed-files action to v19 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1960](https://togithub.com/tj-actions/changed-files/pull/1960)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.23 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1961](https://togithub.com/tj-actions/changed-files/pull/1961)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.24 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1962](https://togithub.com/tj-actions/changed-files/pull/1962)
- chore(deps): update dependency eslint-plugin-github to v4.10.2 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1963](https://togithub.com/tj-actions/changed-files/pull/1963)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1965](https://togithub.com/tj-actions/changed-files/pull/1965)
- chore(deps): update typescript-eslint monorepo to v7.1.1 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1966](https://togithub.com/tj-actions/changed-files/pull/1966)
- fix(deps): update dependency yaml to v2.4.1 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1967](https://togithub.com/tj-actions/changed-files/pull/1967)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v42...v42.0.6

***

### Changes in v42.0.5

#### What's Changed

- Upgraded to v42.0.4 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1941](https://togithub.com/tj-actions/changed-files/pull/1941)
- chore: update action.yml by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1942](https://togithub.com/tj-actions/changed-files/pull/1942)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1943](https://togithub.com/tj-actions/changed-files/pull/1943)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1944](https://togithub.com/tj-actions/changed-files/pull/1944)
- chore(deps): update typescript-eslint monorepo to v7.0.2 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1945](https://togithub.com/tj-actions/changed-files/pull/1945)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.20 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1949](https://togithub.com/tj-actions/changed-files/pull/1949)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1950](https://togithub.com/tj-actions/changed-files/pull/1950)
- chore(deps): update dependency eslint to v8.57.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1951](https://togithub.com/tj-actions/changed-files/pull/1951)
- chore: Update README.md by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1952](https://togithub.com/tj-actions/changed-files/pull/1952)
- fix(deps): update dependency yaml to v2.4.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1953](https://togithub.com/tj-actions/changed-files/pull/1953)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1954](https://togithub.com/tj-actions/changed-files/pull/1954)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v42...v42.0.5

***

### Changes in v42.0.4

#### What's Changed

- Upgraded to v42.0.3 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1939](https://togithub.com/tj-actions/changed-files/pull/1939)
- chore: update formatting by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1940](https://togithub.com/tj-actions/changed-files/pull/1940)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v42...v42.0.4

***

### Changes in v42.0.3

#### What's Changed

- Upgraded to v42.0.2 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1886](https://togithub.com/tj-actions/changed-files/pull/1886)
- chore(deps): update dependency
[@&#8203;types/uuid](https://togithub.com/types/uuid) to v9.0.8 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1887](https://togithub.com/tj-actions/changed-files/pull/1887)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.7 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1888](https://togithub.com/tj-actions/changed-files/pull/1888)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.8 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1889](https://togithub.com/tj-actions/changed-files/pull/1889)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1890](https://togithub.com/tj-actions/changed-files/pull/1890)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.9 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1892](https://togithub.com/tj-actions/changed-files/pull/1892)
- chore: fix broken matrix example links by
[@&#8203;levenleven](https://togithub.com/levenleven) in
[https://github.com/tj-actions/changed-files/pull/1891](https://togithub.com/tj-actions/changed-files/pull/1891)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.10 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1895](https://togithub.com/tj-actions/changed-files/pull/1895)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1894](https://togithub.com/tj-actions/changed-files/pull/1894)
- docs: add levenleven as a contributor for doc by
[@&#8203;allcontributors](https://togithub.com/allcontributors) in
[https://github.com/tj-actions/changed-files/pull/1893](https://togithub.com/tj-actions/changed-files/pull/1893)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1896](https://togithub.com/tj-actions/changed-files/pull/1896)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1897](https://togithub.com/tj-actions/changed-files/pull/1897)
- chore(deps): update typescript-eslint monorepo to v6.20.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1898](https://togithub.com/tj-actions/changed-files/pull/1898)
- chore: update test by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1899](https://togithub.com/tj-actions/changed-files/pull/1899)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.11 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1900](https://togithub.com/tj-actions/changed-files/pull/1900)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.12 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1901](https://togithub.com/tj-actions/changed-files/pull/1901)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.13 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1902](https://togithub.com/tj-actions/changed-files/pull/1902)
- chore(deps): update peter-evans/create-pull-request action to v6 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1903](https://togithub.com/tj-actions/changed-files/pull/1903)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.14 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1904](https://togithub.com/tj-actions/changed-files/pull/1904)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.15 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1905](https://togithub.com/tj-actions/changed-files/pull/1905)
- chore(deps): update dependency
[@&#8203;types/jest](https://togithub.com/types/jest) to v29.5.12 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1906](https://togithub.com/tj-actions/changed-files/pull/1906)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.16 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1907](https://togithub.com/tj-actions/changed-files/pull/1907)
- chore: create greetings workflow by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1909](https://togithub.com/tj-actions/changed-files/pull/1909)
- docs: add dan-hill2802 as a contributor for doc by
[@&#8203;allcontributors](https://togithub.com/allcontributors) in
[https://github.com/tj-actions/changed-files/pull/1910](https://togithub.com/tj-actions/changed-files/pull/1910)
- correct bash loop in examples by
[@&#8203;dan-hill2802](https://togithub.com/dan-hill2802) in
[https://github.com/tj-actions/changed-files/pull/1908](https://togithub.com/tj-actions/changed-files/pull/1908)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1911](https://togithub.com/tj-actions/changed-files/pull/1911)
- chore(deps): update tj-actions/verify-changed-files action to v18 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1912](https://togithub.com/tj-actions/changed-files/pull/1912)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1913](https://togithub.com/tj-actions/changed-files/pull/1913)
- chore(deps): update dependency prettier to v3.2.5 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1914](https://togithub.com/tj-actions/changed-files/pull/1914)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1915](https://togithub.com/tj-actions/changed-files/pull/1915)
- chore(deps): update typescript-eslint monorepo to v6.21.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1916](https://togithub.com/tj-actions/changed-files/pull/1916)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1917](https://togithub.com/tj-actions/changed-files/pull/1917)
- docs: add KeisukeYamashita as a contributor for doc by
[@&#8203;allcontributors](https://togithub.com/allcontributors) in
[https://github.com/tj-actions/changed-files/pull/1919](https://togithub.com/tj-actions/changed-files/pull/1919)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1920](https://togithub.com/tj-actions/changed-files/pull/1920)
- fix: broken link to matrix example workflow by
[@&#8203;KeisukeYamashita](https://togithub.com/KeisukeYamashita) in
[https://github.com/tj-actions/changed-files/pull/1918](https://togithub.com/tj-actions/changed-files/pull/1918)
- chore: update workflow-run-example.yml by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1921](https://togithub.com/tj-actions/changed-files/pull/1921)
- chore: update README.md by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1922](https://togithub.com/tj-actions/changed-files/pull/1922)
- chore(deps): update actions/setup-node action to v4.0.2 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1923](https://togithub.com/tj-actions/changed-files/pull/1923)
- chore(deps): update codacy/codacy-analysis-cli-action action to v4.4.0
by [@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1924](https://togithub.com/tj-actions/changed-files/pull/1924)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.17 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1925](https://togithub.com/tj-actions/changed-files/pull/1925)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1926](https://togithub.com/tj-actions/changed-files/pull/1926)
- chore(deps): update typescript-eslint monorepo to v7 (major) by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1927](https://togithub.com/tj-actions/changed-files/pull/1927)
- chore: update codacy-analysis.yml by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1929](https://togithub.com/tj-actions/changed-files/pull/1929)
- chore(deps): update dependency eslint-plugin-jest to v27.8.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1930](https://togithub.com/tj-actions/changed-files/pull/1930)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1931](https://togithub.com/tj-actions/changed-files/pull/1931)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.18 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1932](https://togithub.com/tj-actions/changed-files/pull/1932)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.19 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1933](https://togithub.com/tj-actions/changed-files/pull/1933)
- chore(deps): update dependency eslint-plugin-jest to v27.9.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1935](https://togithub.com/tj-actions/changed-files/pull/1935)
- chore(deps): update github artifact actions to v4 (major) by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1936](https://togithub.com/tj-actions/changed-files/pull/1936)
- fix(payload_api, git_diff): Accessing correct property in payload and
Replacing --quiet with --no-patch in git diff by
[@&#8203;codesculpture](https://togithub.com/codesculpture) in
[https://github.com/tj-actions/changed-files/pull/1934](https://togithub.com/tj-actions/changed-files/pull/1934)
- docs: add codesculpture as a contributor for code, and bug by
[@&#8203;allcontributors](https://togithub.com/allcontributors) in
[https://github.com/tj-actions/changed-files/pull/1937](https://togithub.com/tj-actions/changed-files/pull/1937)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1938](https://togithub.com/tj-actions/changed-files/pull/1938)

#### New Contributors

- [@&#8203;levenleven](https://togithub.com/levenleven) made their first
contribution in
[https://github.com/tj-actions/changed-files/pull/1891](https://togithub.com/tj-actions/changed-files/pull/1891)
- [@&#8203;dan-hill2802](https://togithub.com/dan-hill2802) made their
first contribution in
[https://github.com/tj-actions/changed-files/pull/1908](https://togithub.com/tj-actions/changed-files/pull/1908)
- [@&#8203;KeisukeYamashita](https://togithub.com/KeisukeYamashita) made
their first contribution in
[https://github.com/tj-actions/changed-files/pull/1918](https://togithub.com/tj-actions/changed-files/pull/1918)
- [@&#8203;codesculpture](https://togithub.com/codesculpture) made their
first contribution in
[https://github.com/tj-actions/changed-files/pull/1934](https://togithub.com/tj-actions/changed-files/pull/1934)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v42...v42.0.3

***

### Changes in v42.0.2

#### What's Changed

- Upgraded to v42.0.1 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1884](https://togithub.com/tj-actions/changed-files/pull/1884)
- feat: enhance error handling for non-git directories by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1885](https://togithub.com/tj-actions/changed-files/pull/1885)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v42...v42.0.2

***

### Changes in v42.0.1

#### What's Changed

- Upgraded to v42 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1874](https://togithub.com/tj-actions/changed-files/pull/1874)
- chore(deps): update tj-actions/eslint-changed-files action to v23 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1875](https://togithub.com/tj-actions/changed-files/pull/1875)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1876](https://togithub.com/tj-actions/changed-files/pull/1876)
- chore: update README.md by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1877](https://togithub.com/tj-actions/changed-files/pull/1877)
- chore: rename example worflows from test to example by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1878](https://togithub.com/tj-actions/changed-files/pull/1878)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1879](https://togithub.com/tj-actions/changed-files/pull/1879)
- chore(deps): update dependency ts-jest to v29.1.2 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1880](https://togithub.com/tj-actions/changed-files/pull/1880)
- chore(deps): update typescript-eslint monorepo to v6.19.1 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1881](https://togithub.com/tj-actions/changed-files/pull/1881)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.11.6 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1883](https://togithub.com/tj-actions/changed-files/pull/1883)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v42...v42.0.1

***

### Changes in v42.0.0

#### 🔥🔥 BREAKING CHANGE 🔥🔥

- Input file patterns that end with a `/` would now match all sub-files
within the directory without requiring you to specify the globstar
pattern.

#####

```yaml
...
      - name: Get changed files
        id: changed-files
        uses: tj-actions/changed-files@v42
        with:
          files: 'dir/'  # Would also be the same as dir/**
```

#### What's Changed

- Upgraded to v41.1.2 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/1869](https://togithub.com/tj-actions/changed-files/pull/1869)
- chore(deps): update dependency prettier to v3.2.4 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/1871](https://togithub.com/tj-actions/changed-files/pull/1871)
- fix: update input warning by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1870](https://togithub.com/tj-actions/changed-files/pull/1870)
- rename: unsupported REST API inputs constant name by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1872](https://togithub.com/tj-actions/changed-files/pull/1872)
- feat: add support for include/exclude all nested files when a
directory is specified and ends with a slash by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/1873](https://togithub.com/tj-actions/changed-files/pull/1873)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v41...v42.0.0

***

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJnaXRodWItYWN0aW9ucyIsInJlbm92YXRlIl19-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/check-translation-files-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check-translation-files-pr.yml b/.github/workflows/check-translation-files-pr.yml
index 22a42913d3..b5baced8c2 100644
--- a/.github/workflows/check-translation-files-pr.yml
+++ b/.github/workflows/check-translation-files-pr.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v43
         with:
           files: |
             locales/*/translation.json

From 5c2710cd54239212324be53c4f70d410d08314a6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 2 Jun 2024 06:55:03 +0000
Subject: [PATCH 093/133] fix(deps): update dependency @reduxjs/toolkit to
 ^2.2.5 (#5512)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [@reduxjs/toolkit](https://redux-toolkit.js.org)
([source](https://togithub.com/reduxjs/redux-toolkit)) | [`^2.2.3` ->
`^2.2.5`](https://renovatebot.com/diffs/npm/@reduxjs%2ftoolkit/2.2.3/2.2.5)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/@reduxjs%2ftoolkit/2.2.5?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@reduxjs%2ftoolkit/2.2.5?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@reduxjs%2ftoolkit/2.2.3/2.2.5?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@reduxjs%2ftoolkit/2.2.3/2.2.5?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>reduxjs/redux-toolkit (@&#8203;reduxjs/toolkit)</summary>

###
[`v2.2.5`](https://togithub.com/reduxjs/redux-toolkit/releases/tag/v2.2.5)

[Compare
Source](https://togithub.com/reduxjs/redux-toolkit/compare/v2.2.4...v2.2.5)

This **bugfix release** fixes an issue in the recent
`createEntityAdapter` sorting perf improvements that could (in specific
cases) cause Immer to throw an error when trying to read a plain JS
value instead of a proxy-wrapped value.

#### What's Changed

- Fix missed spot where use of `current` may fail if the value is not a
draft by [@&#8203;markerikson](https://togithub.com/markerikson) in
[https://github.com/reduxjs/redux-toolkit/pull/4412](https://togithub.com/reduxjs/redux-toolkit/pull/4412)

**Full Changelog**:
https://github.com/reduxjs/redux-toolkit/compare/v2.2.4...v2.2.5

###
[`v2.2.4`](https://togithub.com/reduxjs/redux-toolkit/compare/v2.2.3...72b3ac65a2adc510280f19ec6689aebbf2bf1df4)

[Compare
Source](https://togithub.com/reduxjs/redux-toolkit/compare/v2.2.3...v2.2.4)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index a18e352ac3..f2785f6081 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "@react-navigation/material-top-tabs": "^5.3.19",
     "@react-navigation/native": "^6.1.17",
     "@react-navigation/native-stack": "^6.9.26",
-    "@reduxjs/toolkit": "^2.2.3",
+    "@reduxjs/toolkit": "^2.2.5",
     "@segment/analytics-react-native": "^2.19.1",
     "@segment/analytics-react-native-plugin-adjust": "^0.7.0",
     "@segment/analytics-react-native-plugin-clevertap": "^1.1.0",
diff --git a/yarn.lock b/yarn.lock
index 480aba32ed..834423ba66 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3174,15 +3174,15 @@
   resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.2.1.tgz#9403f51c17cae37edf870c6bc0c81c1ece5ccef8"
   integrity sha512-1dgmkh+3so0+LlBWRhGA33ua4MYr7tUOj+a9Si28vUi0IUFNbff1T3sgpeDJI/LaC75bBYnQ0A3wXjn0OrRNBA==
 
-"@reduxjs/toolkit@^2.2.3":
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-2.2.3.tgz#5ce71cbf162f98c5dafb49bd3f1e11c5486ab9c4"
-  integrity sha512-76dll9EnJXg4EVcI5YNxZA/9hSAmZsFqzMmNRHvIlzw2WS/twfcVX3ysYrWGJMClwEmChQFC4yRq74tn6fdzRA==
+"@reduxjs/toolkit@^2.2.5":
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-2.2.5.tgz#c0d2d8482ef80722bebe015ff05b06c34bfb6e0d"
+  integrity sha512-aeFA/s5NCG7NoJe/MhmwREJxRkDs0ZaSqt0MxhWUrwCf1UQXpwR87RROJEql0uAkLI6U7snBOYOcKw83ew3FPg==
   dependencies:
     immer "^10.0.3"
     redux "^5.0.1"
     redux-thunk "^3.1.0"
-    reselect "^5.0.1"
+    reselect "^5.1.0"
 
 "@scure/base@~1.1.0", "@scure/base@~1.1.2", "@scure/base@~1.1.4":
   version "1.1.5"
@@ -16047,10 +16047,10 @@ reselect@^4.0.0, reselect@^4.1.8:
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524"
   integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==
 
-reselect@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-5.1.0.tgz#c479139ab9dd91be4d9c764a7f3868210ef8cd21"
-  integrity sha512-aw7jcGLDpSgNDyWBQLv2cedml85qd95/iszJjN988zX1t7AVRJi19d9kto5+W7oCfQ94gyo40dVbT6g2k4/kXg==
+reselect@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-5.1.1.tgz#c766b1eb5d558291e5e550298adb0becc24bb72e"
+  integrity sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==
 
 resolve-alpn@^1.2.0:
   version "1.2.1"

From 8897ac74ce491b7ca8b1020baa2e2210ac5e3136 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 2 Jun 2024 07:44:02 +0000
Subject: [PATCH 094/133] chore(deps): update tj-actions/changed-files action
 to v44 (#5514)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
|
[tj-actions/changed-files](https://togithub.com/tj-actions/changed-files)
| action | major | `v43` -> `v44` |

---

### Release Notes

<details>
<summary>tj-actions/changed-files (tj-actions/changed-files)</summary>

###
[`v44`](https://togithub.com/tj-actions/changed-files/releases/tag/v44)

[Compare
Source](https://togithub.com/tj-actions/changed-files/compare/v43...v44)

##### Changes in v44.5.2

##### What's Changed

- Upgraded to v44.5.1 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2108](https://togithub.com/tj-actions/changed-files/pull/2108)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2109](https://togithub.com/tj-actions/changed-files/pull/2109)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2110](https://togithub.com/tj-actions/changed-files/pull/2110)
- chore(deps): update typescript-eslint monorepo to v7.11.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2111](https://togithub.com/tj-actions/changed-files/pull/2111)
- chore(deps): update dependency ts-jest to v29.1.4 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2112](https://togithub.com/tj-actions/changed-files/pull/2112)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.12.13 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2115](https://togithub.com/tj-actions/changed-files/pull/2115)
- fix: warning with fetch_missing_history_max_retries using REST API by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/2114](https://togithub.com/tj-actions/changed-files/pull/2114)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v44...v44.5.2

***

##### Changes in v44.5.1

##### What's Changed

- chore(deps): update dependency ts-jest to v29.1.3 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2100](https://togithub.com/tj-actions/changed-files/pull/2100)
- Upgraded to v44.5.0 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2101](https://togithub.com/tj-actions/changed-files/pull/2101)
- fix(deps): update dependency micromatch to v4.0.6 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2102](https://togithub.com/tj-actions/changed-files/pull/2102)
- fix(deps): update dependency micromatch to v4.0.7 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2103](https://togithub.com/tj-actions/changed-files/pull/2103)
- fix: bug detecting previous tag when workflow is rerun by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/2107](https://togithub.com/tj-actions/changed-files/pull/2107)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v44...v44.5.1

***

##### Changes in v44.5.0

##### What's Changed

- Upgraded to v44.4.0 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2086](https://togithub.com/tj-actions/changed-files/pull/2086)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2088](https://togithub.com/tj-actions/changed-files/pull/2088)
- chore(deps): update typescript-eslint monorepo to v7.9.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2091](https://togithub.com/tj-actions/changed-files/pull/2091)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.12.12 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2092](https://togithub.com/tj-actions/changed-files/pull/2092)
- chore(deps): update dependency
[@&#8203;types/lodash](https://togithub.com/types/lodash) to v4.17.3 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2094](https://togithub.com/tj-actions/changed-files/pull/2094)
- chore(deps): update dependency
[@&#8203;types/lodash](https://togithub.com/types/lodash) to v4.17.4 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2095](https://togithub.com/tj-actions/changed-files/pull/2095)
- chore(deps): update typescript-eslint monorepo to v7.10.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2097](https://togithub.com/tj-actions/changed-files/pull/2097)
- feat: add support for providing patterns to match tags by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/2098](https://togithub.com/tj-actions/changed-files/pull/2098)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2099](https://togithub.com/tj-actions/changed-files/pull/2099)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v44...v44.5.0

***

##### Changes in v44.4.0

##### What's Changed

- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2057](https://togithub.com/tj-actions/changed-files/pull/2057)
- Upgraded to v44.3.0 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2058](https://togithub.com/tj-actions/changed-files/pull/2058)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2059](https://togithub.com/tj-actions/changed-files/pull/2059)
- feat: reduce the default `fetch_depth` from 50 to 25 and increase
`fetch_missing_history_max_retries` by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/2060](https://togithub.com/tj-actions/changed-files/pull/2060)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2061](https://togithub.com/tj-actions/changed-files/pull/2061)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2062](https://togithub.com/tj-actions/changed-files/pull/2062)
- chore(deps): update typescript-eslint monorepo to v7.7.1 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2063](https://togithub.com/tj-actions/changed-files/pull/2063)
- chore(deps): update peter-evans/create-pull-request action to v6.0.5
by [@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2064](https://togithub.com/tj-actions/changed-files/pull/2064)
- chore(deps): update dependency eslint-plugin-jest to v28.3.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2067](https://togithub.com/tj-actions/changed-files/pull/2067)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2068](https://togithub.com/tj-actions/changed-files/pull/2068)
- chore(deps): update tj-actions/eslint-changed-files action to v25 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2069](https://togithub.com/tj-actions/changed-files/pull/2069)
- fix(deps): update dependency yaml to v2.4.2 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2070](https://togithub.com/tj-actions/changed-files/pull/2070)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2071](https://togithub.com/tj-actions/changed-files/pull/2071)
- chore(deps): update typescript-eslint monorepo to v7.8.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2072](https://togithub.com/tj-actions/changed-files/pull/2072)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2073](https://togithub.com/tj-actions/changed-files/pull/2073)
- chore(deps-dev): bump
[@&#8203;types/node](https://togithub.com/types/node) from 20.12.7 to
20.12.8 by [@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/tj-actions/changed-files/pull/2074](https://togithub.com/tj-actions/changed-files/pull/2074)
- chore(deps): update dependency eslint-plugin-jest to v28.4.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2075](https://togithub.com/tj-actions/changed-files/pull/2075)
- chore(deps): update dependency eslint-plugin-jest to v28.5.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2077](https://togithub.com/tj-actions/changed-files/pull/2077)
- fix(deps): update dependency
[@&#8203;octokit/rest](https://togithub.com/octokit/rest) to v20.1.1 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2076](https://togithub.com/tj-actions/changed-files/pull/2076)
- chore(deps): update dependency
[@&#8203;types/lodash](https://togithub.com/types/lodash) to v4.17.1 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2078](https://togithub.com/tj-actions/changed-files/pull/2078)
- chore(deps): update tj-actions/verify-changed-files action to v20 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2079](https://togithub.com/tj-actions/changed-files/pull/2079)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2080](https://togithub.com/tj-actions/changed-files/pull/2080)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.12.9 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2081](https://togithub.com/tj-actions/changed-files/pull/2081)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.12.10 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2082](https://togithub.com/tj-actions/changed-files/pull/2082)
- chore(deps): update codacy/codacy-analysis-cli-action action to v4.4.1
by [@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2083](https://togithub.com/tj-actions/changed-files/pull/2083)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.12.11 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2084](https://togithub.com/tj-actions/changed-files/pull/2084)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v44.3.0...v44.4.0

***

##### Changes in v44.3.0

##### What's Changed

- Upgraded to v44.2.0 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2054](https://togithub.com/tj-actions/changed-files/pull/2054)
- fix: add a fallback value for the max number for retries to fetch
missing history by [@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/2055](https://togithub.com/tj-actions/changed-files/pull/2055)
- feat: add support for returning posix path separator on windows by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/2056](https://togithub.com/tj-actions/changed-files/pull/2056)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v44.2.0...v44.3.0

***

##### Changes in v44.2.0

##### What's Changed

- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2049](https://togithub.com/tj-actions/changed-files/pull/2049)
- Upgraded to v44.1.0 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2050](https://togithub.com/tj-actions/changed-files/pull/2050)
- feat: add support for specifying the max number for retries to fetch
missing history by [@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/2052](https://togithub.com/tj-actions/changed-files/pull/2052)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2053](https://togithub.com/tj-actions/changed-files/pull/2053)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v44.1.0...v44.2.0

***

##### Changes in v44.1.0

##### What's Changed

- Upgraded to v44.0.1 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2037](https://togithub.com/tj-actions/changed-files/pull/2037)
- chore(deps): update dependency typescript to v5.4.5 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2038](https://togithub.com/tj-actions/changed-files/pull/2038)
- chore(deps): update peter-evans/create-pull-request action to v6.0.3
by [@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2040](https://togithub.com/tj-actions/changed-files/pull/2040)
- chore(deps): update dependency
[@&#8203;types/micromatch](https://togithub.com/types/micromatch) to
v4.0.7 by [@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2041](https://togithub.com/tj-actions/changed-files/pull/2041)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2042](https://togithub.com/tj-actions/changed-files/pull/2042)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2043](https://togithub.com/tj-actions/changed-files/pull/2043)
- chore(deps): update typescript-eslint monorepo to v7.7.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2046](https://togithub.com/tj-actions/changed-files/pull/2046)
- chore(deps): update peter-evans/create-pull-request action to v6.0.4
by [@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2048](https://togithub.com/tj-actions/changed-files/pull/2048)
- feat: add option to exclude submodules when detecting changes by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/2047](https://togithub.com/tj-actions/changed-files/pull/2047)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v44.0.1...v44.1.0

***

##### Changes in v44.0.1

##### What's Changed

- Upgraded to v44 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2017](https://togithub.com/tj-actions/changed-files/pull/2017)
- chore(deps): update tj-actions/eslint-changed-files action to v24 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2019](https://togithub.com/tj-actions/changed-files/pull/2019)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.12.2 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2020](https://togithub.com/tj-actions/changed-files/pull/2020)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2021](https://togithub.com/tj-actions/changed-files/pull/2021)
- chore(deps): update typescript-eslint monorepo to v7.5.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2022](https://togithub.com/tj-actions/changed-files/pull/2022)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.12.3 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2023](https://togithub.com/tj-actions/changed-files/pull/2023)
- fix(deps): update dependency
[@&#8203;octokit/rest](https://togithub.com/octokit/rest) to v20.1.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2024](https://togithub.com/tj-actions/changed-files/pull/2024)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.12.4 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2025](https://togithub.com/tj-actions/changed-files/pull/2025)
- chore(deps): update dependency typescript to v5.4.4 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2027](https://togithub.com/tj-actions/changed-files/pull/2027)
- chore(deps): bump undici from 5.28.3 to 5.28.4 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/tj-actions/changed-files/pull/2026](https://togithub.com/tj-actions/changed-files/pull/2026)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.12.5 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2028](https://togithub.com/tj-actions/changed-files/pull/2028)
- chore(deps): update dependency eslint-plugin-jest to v28 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2030](https://togithub.com/tj-actions/changed-files/pull/2030)
- chore(deps): update dependency eslint-plugin-jest to v28.1.1 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2031](https://togithub.com/tj-actions/changed-files/pull/2031)
- chore(deps): update dependency eslint-plugin-jest to v28.2.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2032](https://togithub.com/tj-actions/changed-files/pull/2032)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2033](https://togithub.com/tj-actions/changed-files/pull/2033)
- chore(deps): update typescript-eslint monorepo to v7.6.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2034](https://togithub.com/tj-actions/changed-files/pull/2034)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.12.6 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2035](https://togithub.com/tj-actions/changed-files/pull/2035)
- chore(deps): update dependency
[@&#8203;types/node](https://togithub.com/types/node) to v20.12.7 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2036](https://togithub.com/tj-actions/changed-files/pull/2036)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v44...v44.0.1

***

##### Changes in v44.0.0

##### 🔥🔥 BREAKING CHANGE 🔥🔥

##### Overview

We've made a significant update to how pull requests (PRs) from forked
repositories are processed. This improvement not only streamlines the
handling of such PRs but also fixes a previously identified issue.

##### Before the Change

Previously, when you created a pull request from a forked repository,
any files changed in the target branch after the PR creation would
erroneously appear as part of the PR's changed files. This made it
difficult to distinguish between the actual changes introduced by the PR
and subsequent changes made directly to the target branch.

##### What Has Changed

With this update, a pull request from a fork will now **only** include
the files that were explicitly changed in the fork. This ensures that
the list of changed files in a PR accurately reflects the contributions
from the fork, without being muddled by unrelated changes to the target
branch.

***

##### What's Changed

- Upgraded to v43.0.1 by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2004](https://togithub.com/tj-actions/changed-files/pull/2004)
- chore(deps): lock file maintenance by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2005](https://togithub.com/tj-actions/changed-files/pull/2005)
- chore(deps): update typescript-eslint monorepo to v7.4.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/tj-actions/changed-files/pull/2006](https://togithub.com/tj-actions/changed-files/pull/2006)
- fix: bug with prs from forks returning incorrect set of changed files
by [@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/2007](https://togithub.com/tj-actions/changed-files/pull/2007)
- fix: check for setting remote urls for forks by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/2009](https://togithub.com/tj-actions/changed-files/pull/2009)
- fix: update to add the fork remote by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/2010](https://togithub.com/tj-actions/changed-files/pull/2010)
- fix: update previous sha for forks by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/2011](https://togithub.com/tj-actions/changed-files/pull/2011)
- fix: ensure the fork remote doesn't exists before creating it by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/2012](https://togithub.com/tj-actions/changed-files/pull/2012)
- chore: update description of other_deleted_files output by
[@&#8203;tonyejack1](https://togithub.com/tonyejack1) in
[https://github.com/tj-actions/changed-files/pull/2008](https://togithub.com/tj-actions/changed-files/pull/2008)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2013](https://togithub.com/tj-actions/changed-files/pull/2013)
- remove: unused code by
[@&#8203;jackton1](https://togithub.com/jackton1) in
[https://github.com/tj-actions/changed-files/pull/2014](https://togithub.com/tj-actions/changed-files/pull/2014)
- chore: update description of outputs removing asterisks by
[@&#8203;tonyejack1](https://togithub.com/tonyejack1) in
[https://github.com/tj-actions/changed-files/pull/2015](https://togithub.com/tj-actions/changed-files/pull/2015)
- Updated README.md by
[@&#8203;tj-actions-bot](https://togithub.com/tj-actions-bot) in
[https://github.com/tj-actions/changed-files/pull/2016](https://togithub.com/tj-actions/changed-files/pull/2016)

##### New Contributors

- [@&#8203;tonyejack1](https://togithub.com/tonyejack1) made their first
contribution in
[https://github.com/tj-actions/changed-files/pull/2008](https://togithub.com/tj-actions/changed-files/pull/2008)

**Full Changelog**:
https://github.com/tj-actions/changed-files/compare/v43.0.1...v44.0.0

***

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJnaXRodWItYWN0aW9ucyIsInJlbm92YXRlIl19-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/check-translation-files-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check-translation-files-pr.yml b/.github/workflows/check-translation-files-pr.yml
index b5baced8c2..83d27d2cd6 100644
--- a/.github/workflows/check-translation-files-pr.yml
+++ b/.github/workflows/check-translation-files-pr.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v43
+        uses: tj-actions/changed-files@v44
         with:
           files: |
             locales/*/translation.json

From cade2d5efbfe9f65d68c1a3285d721e2a07fbcbb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 05:32:00 +0000
Subject: [PATCH 095/133] fix(deps): update dependency fp-ts to v2.16.6 (#5515)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [fp-ts](https://togithub.com/gcanti/fp-ts) | [`2.16.5` ->
`2.16.6`](https://renovatebot.com/diffs/npm/fp-ts/2.16.5/2.16.6) |
[![age](https://developer.mend.io/api/mc/badges/age/npm/fp-ts/2.16.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/fp-ts/2.16.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/fp-ts/2.16.5/2.16.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/fp-ts/2.16.5/2.16.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>gcanti/fp-ts (fp-ts)</summary>

###
[`v2.16.6`](https://togithub.com/gcanti/fp-ts/blob/HEAD/CHANGELOG.md#2166)

[Compare
Source](https://togithub.com/gcanti/fp-ts/compare/2.16.5...89a772e95e414acee679f42f56527606f7b61f30)

**Polish**

Allow dependencies to be widen when using orLeft
[#&#8203;1938](https://togithub.com/gcanti/fp-ts/issues/1938)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f2785f6081..5ac361e371 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "dot-prop-immutable": "^2.1.1",
     "ethereumjs-util": "^7.1.5",
     "fast-levenshtein": "^3.0.0",
-    "fp-ts": "2.16.5",
+    "fp-ts": "2.16.6",
     "futoin-hkdf": "^1.5.3",
     "fuzzysort": "^2.0.4",
     "i18next": "^23.11.2",
diff --git a/yarn.lock b/yarn.lock
index 834423ba66..7750b22e41 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9723,10 +9723,10 @@ fp-ts@2.1.1:
   resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.1.1.tgz#c910544499d7c959351bb4260ee7c44a544084c1"
   integrity sha512-YcWhMdDCFCja0MmaDroTgNu+NWWrrnUEn92nvDgrtVy9Z71YFnhNVIghoHPt8gs82ijoMzFGeWKvArbyICiJgw==
 
-fp-ts@2.16.5:
-  version "2.16.5"
-  resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.16.5.tgz#d79b97168aeafcf9612f18bbc017f513ecb20ac9"
-  integrity sha512-N8T8PwMSeTKKtkm9lkj/zSTAnPC/aJIIrQhnHxxkL0KLsRCNUPANksJOlMXxcKKCo7H1ORP3No9EMD+fP0tsdA==
+fp-ts@2.16.6:
+  version "2.16.6"
+  resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.16.6.tgz#9d63c5b2a06355d627ae94c37a5cffda5c455d24"
+  integrity sha512-v7w209VPj4L6pPn/ftFRJu31Oa8QagwcVw7BZmLCUWU4AQoc954rX9ogSIahDf67Pg+GjPbkW/Kn9XWnlWJG0g==
 
 fragment-cache@^0.2.1:
   version "0.2.1"

From 6ca8f1effa85138740b95acebc6bdfeddc402dfe Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 06:14:42 +0000
Subject: [PATCH 096/133] chore(deps): update mikepenz/action-junit-report
 action to v4 (#5516)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
|
[mikepenz/action-junit-report](https://togithub.com/mikepenz/action-junit-report)
| action | major | `v3` -> `v4` |

---

### Release Notes

<details>
<summary>mikepenz/action-junit-report
(mikepenz/action-junit-report)</summary>

###
[`v4`](https://togithub.com/mikepenz/action-junit-report/releases/tag/v4)

[Compare
Source](https://togithub.com/mikepenz/action-junit-report/compare/v3...v4)

-   no changes

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJnaXRodWItYWN0aW9ucyIsInJlbm92YXRlIl19-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/e2e-android.yml | 2 +-
 .github/workflows/e2e-ios.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e-android.yml b/.github/workflows/e2e-android.yml
index a523a7d766..1409314b92 100644
--- a/.github/workflows/e2e-android.yml
+++ b/.github/workflows/e2e-android.yml
@@ -88,7 +88,7 @@ jobs:
           --device-boot-args="-snapshot ci_boot"
       - name: Publish Android JUnit Report
         if: always()
-        uses: mikepenz/action-junit-report@v3
+        uses: mikepenz/action-junit-report@v4
         with:
           check_name: Android (${{ inputs.android-api-level }}) e2e Test Report
           report_paths: 'e2e/test-results/junit.xml'
diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
index d4e0576d44..b3a05f1de8 100644
--- a/.github/workflows/e2e-ios.yml
+++ b/.github/workflows/e2e-ios.yml
@@ -76,7 +76,7 @@ jobs:
         timeout-minutes: 45
       - name: Publish iOS JUnit Report
         if: always()
-        uses: mikepenz/action-junit-report@v3
+        uses: mikepenz/action-junit-report@v4
         with:
           check_name: iOS (${{ inputs.ios-version }}) e2e Test Report
           report_paths: 'e2e/test-results/junit.xml'

From 5e7d91940a2684699a9fd6e53b73e2ee829acde3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 06:59:18 +0000
Subject: [PATCH 097/133] fix(deps): update dependency i18next to ^23.11.5
 (#5517)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [i18next](https://www.i18next.com)
([source](https://togithub.com/i18next/i18next)) | [`^23.11.2` ->
`^23.11.5`](https://renovatebot.com/diffs/npm/i18next/23.11.2/23.11.5) |
[![age](https://developer.mend.io/api/mc/badges/age/npm/i18next/23.11.5?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/i18next/23.11.5?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/i18next/23.11.2/23.11.5?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/i18next/23.11.2/23.11.5?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>i18next/i18next (i18next)</summary>

###
[`v23.11.5`](https://togithub.com/i18next/i18next/blob/HEAD/CHANGELOG.md#23115)

[Compare
Source](https://togithub.com/i18next/i18next/compare/v23.11.4...v23.11.5)

- perf: use Array.isArray()
[2193](https://togithub.com/i18next/i18next/pull/2193)
- perf: trim keys once
[2194](https://togithub.com/i18next/i18next/pull/2194)

###
[`v23.11.4`](https://togithub.com/i18next/i18next/blob/HEAD/CHANGELOG.md#23114)

[Compare
Source](https://togithub.com/i18next/i18next/compare/v23.11.3...v23.11.4)

- perf(interpolator): use object deconstruction
[2181](https://togithub.com/i18next/i18next/pull/2181)

###
[`v23.11.3`](https://togithub.com/i18next/i18next/blob/HEAD/CHANGELOG.md#23113)

[Compare
Source](https://togithub.com/i18next/i18next/compare/v23.11.2...v23.11.3)

- fix: Unsupported language is automatically added to preload option
[2178](https://togithub.com/i18next/i18next/issues/2178)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 5ac361e371..f4256ebbe3 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "fp-ts": "2.16.6",
     "futoin-hkdf": "^1.5.3",
     "fuzzysort": "^2.0.4",
-    "i18next": "^23.11.2",
+    "i18next": "^23.11.5",
     "ibantools": "^4.5.1",
     "intl-pluralrules": "^2.0.1",
     "io-ts": "2.0.1",
diff --git a/yarn.lock b/yarn.lock
index 7750b22e41..2751483c14 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10541,10 +10541,10 @@ husky@^3.0.0:
     run-node "^1.0.0"
     slash "^3.0.0"
 
-i18next@^23.11.2:
-  version "23.11.2"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.11.2.tgz#4c0e8192a9ba230fe7dc68b76459816ab601826e"
-  integrity sha512-qMBm7+qT8jdpmmDw/kQD16VpmkL9BdL+XNAK5MNbNFaf1iQQq35ZbPrSlqmnNPOSUY4m342+c0t0evinF5l7sA==
+i18next@^23.11.5:
+  version "23.11.5"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.11.5.tgz#d71eb717a7e65498d87d0594f2664237f9e361ef"
+  integrity sha512-41pvpVbW9rhZPk5xjCX2TPJi2861LEig/YRhUkY+1FQ2IQPS0bKUDYnEqY8XPPbB48h1uIwLnP9iiEfuSl20CA==
   dependencies:
     "@babel/runtime" "^7.23.2"
 

From 503247108ebc0936fabf62fc0666114f532cda21 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 01:32:11 +0000
Subject: [PATCH 098/133] fix(deps): update dependency
 react-native-safe-area-context to ^4.10.4 (#5518)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[react-native-safe-area-context](https://togithub.com/th3rdwave/react-native-safe-area-context)
| [`^4.10.3` ->
`^4.10.4`](https://renovatebot.com/diffs/npm/react-native-safe-area-context/4.10.3/4.10.4)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/react-native-safe-area-context/4.10.4?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/react-native-safe-area-context/4.10.4?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/react-native-safe-area-context/4.10.3/4.10.4?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/react-native-safe-area-context/4.10.3/4.10.4?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>th3rdwave/react-native-safe-area-context
(react-native-safe-area-context)</summary>

###
[`v4.10.4`](https://togithub.com/th3rdwave/react-native-safe-area-context/compare/v4.10.3...a3986db563088760cf640380fa4728c99c3d544d)

[Compare
Source](https://togithub.com/th3rdwave/react-native-safe-area-context/compare/v4.10.3...v4.10.4)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zODguMSIsInVwZGF0ZWRJblZlciI6IjM3LjM4OC4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: valora-bot <valorabot@valoraapp.com>
---
 ios/Podfile.lock | 4 ++--
 package.json     | 2 +-
 yarn.lock        | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index abdca65cee..a2443982b9 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -550,7 +550,7 @@ PODS:
     - React-Core
   - react-native-randombytes (3.6.1):
     - React-Core
-  - react-native-safe-area-context (4.10.3):
+  - react-native-safe-area-context (4.10.4):
     - React-Core
   - react-native-shake (5.5.2):
     - RCT-Folly (= 2021.07.22.00)
@@ -1211,7 +1211,7 @@ SPEC CHECKSUMS:
   react-native-launch-arguments: 5f41e0abf88a15e3c5309b8875d6fd5ac43df49d
   react-native-netinfo: 076df4f9b07f6670acf4ce9a75aac8d34c2e2ccc
   react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
-  react-native-safe-area-context: b01d8f42d4e62a7be5a3e69fd332e0c7e67584c7
+  react-native-safe-area-context: 399a5859f6acbdf67f671c69b53113f535f3b5b0
   react-native-shake: 8036ba95a1953c9b10821bdc33f5814c5d0bcef6
   react-native-simple-toast: 1f1cc551d419bc0ab05dcb0136554006c274789d
   react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
diff --git a/package.json b/package.json
index f4256ebbe3..fc4b0f70f8 100644
--- a/package.json
+++ b/package.json
@@ -175,7 +175,7 @@
     "react-native-randombytes": "^3.6.1",
     "react-native-reanimated": "^2.17.0",
     "react-native-restart-android": "^0.0.7",
-    "react-native-safe-area-context": "^4.10.3",
+    "react-native-safe-area-context": "^4.10.4",
     "react-native-screens": "^3.31.1",
     "react-native-securerandom": "^1.0.1",
     "react-native-shake": "^5.5.2",
diff --git a/yarn.lock b/yarn.lock
index 2751483c14..00627875e2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15453,10 +15453,10 @@ react-native-restart-android@^0.0.7:
   resolved "https://registry.yarnpkg.com/react-native-restart-android/-/react-native-restart-android-0.0.7.tgz#60bc42530ad8e54c4bfb14d462ba0c779229368d"
   integrity sha512-FxTVAgYDeS+R/PSA8vdwOg0HR5NaLo/FQTOqq0kB+KGKR3APty5Qmcz0xXGBn+Ju09ueyklsRGzPR9YmcewZgg==
 
-react-native-safe-area-context@^4.10.3:
-  version "4.10.3"
-  resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.10.3.tgz#ad132b64e1e7cdd043b4e82a7a2449d99f4f7630"
-  integrity sha512-nW9B0fydpJSN798awtdslamYzRqDM/FIEh80ZPDEXVYpqYNsDLpz52pMtuKyhF5aOgJlfiroQrgdOxQNFtSM8A==
+react-native-safe-area-context@^4.10.4:
+  version "4.10.4"
+  resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.10.4.tgz#2c13448a99fc85f05e7e94549a986ff06fce2a6f"
+  integrity sha512-rkpI8TALvWfTcCgsxWsVrlxycbCawjnkURocH0JqYT5jr4jZcOG9oAevgEL6EKiyhtGi/l73ZKWr55Im0eTTRg==
 
 react-native-safe-modules@^1.0.3:
   version "1.0.3"

From 56b5b22a72fc491553f84aacfda36d0fb9f5b8c9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 02:14:51 +0000
Subject: [PATCH 099/133] fix(deps): update dependency react-i18next to ^14.1.2
 (#5519)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [react-i18next](https://togithub.com/i18next/react-i18next) |
[`^14.1.1` ->
`^14.1.2`](https://renovatebot.com/diffs/npm/react-i18next/14.1.1/14.1.2)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/react-i18next/14.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/react-i18next/14.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/react-i18next/14.1.1/14.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/react-i18next/14.1.1/14.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>i18next/react-i18next (react-i18next)</summary>

###
[`v14.1.2`](https://togithub.com/i18next/react-i18next/blob/HEAD/CHANGELOG.md#1412)

[Compare
Source](https://togithub.com/i18next/react-i18next/compare/v14.1.1...v14.1.2)

- bring back internal interpolationOverride handling for Trans component
(if there are childrens), fixes
[1754](https://togithub.com/i18next/react-i18next/issues/1754)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zODguMSIsInVwZGF0ZWRJblZlciI6IjM3LjM4OC4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fc4b0f70f8..ba3660d3e8 100644
--- a/package.json
+++ b/package.json
@@ -143,7 +143,7 @@
     "qrcode": "^1.5.3",
     "react": "18.3.1",
     "react-async-hook": "^4.0.0",
-    "react-i18next": "^14.1.1",
+    "react-i18next": "^14.1.2",
     "react-native": "0.71.17",
     "react-native-adjust": "^4.38.1",
     "react-native-android-open-settings": "^1.3.0",
diff --git a/yarn.lock b/yarn.lock
index 00627875e2..ed70409325 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15171,10 +15171,10 @@ react-freeze@^1.0.0:
   resolved "https://registry.yarnpkg.com/react-freeze/-/react-freeze-1.0.0.tgz#b21c65fe1783743007c8c9a2952b1c8879a77354"
   integrity sha512-yQaiOqDmoKqks56LN9MTgY06O0qQHgV4FUrikH357DydArSZHQhl0BJFqGKIZoTqi8JizF9Dxhuk1FIZD6qCaw==
 
-react-i18next@^14.1.1:
-  version "14.1.1"
-  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-14.1.1.tgz#3d942a99866555ae3552c40f9fddfa061e29d7f3"
-  integrity sha512-QSiKw+ihzJ/CIeIYWrarCmXJUySHDwQr5y8uaNIkbxoGRm/5DukkxZs+RPla79IKyyDPzC/DRlgQCABHtrQuQQ==
+react-i18next@^14.1.2:
+  version "14.1.2"
+  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-14.1.2.tgz#cd57a755f25a32a5fcc3dbe546cf3cc62b4f3ebd"
+  integrity sha512-FSIcJy6oauJbGEXfhUgVeLzvWBhIBIS+/9c6Lj4niwKZyGaGb4V4vUbATXSlsHJDXXB+ociNxqFNiFuV1gmoqg==
   dependencies:
     "@babel/runtime" "^7.23.9"
     html-parse-stringify "^3.0.1"

From e696beebf208b595fc5c4a0a381def25cb77cb82 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 00:18:43 +0000
Subject: [PATCH 100/133] fix(deps): update dependency
 react-native-gesture-handler to ^2.16.2 (#5520)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[react-native-gesture-handler](https://togithub.com/software-mansion/react-native-gesture-handler)
| [`^2.16.0` ->
`^2.16.2`](https://renovatebot.com/diffs/npm/react-native-gesture-handler/2.16.0/2.16.2)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/react-native-gesture-handler/2.16.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/react-native-gesture-handler/2.16.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/react-native-gesture-handler/2.16.0/2.16.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/react-native-gesture-handler/2.16.0/2.16.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>software-mansion/react-native-gesture-handler
(react-native-gesture-handler)</summary>

###
[`v2.16.2`](https://togithub.com/software-mansion/react-native-gesture-handler/releases/tag/2.16.2)

[Compare
Source](https://togithub.com/software-mansion/react-native-gesture-handler/compare/2.16.1...2.16.2)

##### 🐛 Bug fixes

- Revert "Change `.web` files to default and add `.native`
([#&#8203;2835](https://togithub.com/software-mansion/react-native-gesture-handler/issues/2835))"
by [@&#8203;m-bert](https://togithub.com/m-bert) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2896](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2896)

##### 🔢 Miscellaneous

- Add examples to Gestures section in docs by
[@&#8203;xnameTM](https://togithub.com/xnameTM) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2876](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2876)
- Fix missing styles in gestures' InteractiveExamples by
[@&#8203;patrycjakalinska](https://togithub.com/patrycjakalinska) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2897](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2897)

**Full Changelog**:
https://github.com/software-mansion/react-native-gesture-handler/compare/2.16.1...2.16.2

###
[`v2.16.1`](https://togithub.com/software-mansion/react-native-gesture-handler/releases/tag/2.16.1)

[Compare
Source](https://togithub.com/software-mansion/react-native-gesture-handler/compare/2.16.0...2.16.1)

#### 🐛 Bug fixes

- Fix remote debugger detection in bridgeless mode by
[@&#8203;piaskowyk](https://togithub.com/piaskowyk) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2864](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2864)
- Fix `manualActivation` on web by
[@&#8203;m-bert](https://togithub.com/m-bert) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2869](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2869)
- Fix old Gesture Handler API integration with Reaniamted by
[@&#8203;piaskowyk](https://togithub.com/piaskowyk) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2881](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2881)
- \[Web] Fix incorrect `startX` and `startY` values in `Pan` by
[@&#8203;m-bert](https://togithub.com/m-bert) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2871](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2871)
- \[Web] Add `minVelocity` to `Pan` custom activation criteria by
[@&#8203;m-bert](https://togithub.com/m-bert) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2884](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2884)

#### 👍 Improvements

- Add `TypeDoc` to new API by
[@&#8203;m-bert](https://togithub.com/m-bert) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2874](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2874)

#### 🔢 Miscellaneous

- Bump Gesture Handler version in documentation by
[@&#8203;m-bert](https://togithub.com/m-bert) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2838](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2838)
- Change `.web` files to default and add `.native` by
[@&#8203;m-bert](https://togithub.com/m-bert) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2835](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2835)
- Bump `typescript` version in example by
[@&#8203;m-bert](https://togithub.com/m-bert) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2848](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2848)
- Disable flipper on CI by [@&#8203;m-bert](https://togithub.com/m-bert)
in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2843](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2843)
- Update supported RN versions by
[@&#8203;m-bert](https://togithub.com/m-bert) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2849](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2849)
- Add state flow charts to Gesture Handler's documentation. by
[@&#8203;latekvo](https://togithub.com/latekvo) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2817](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2817)
- Fix `cancell` typo by [@&#8203;m-bert](https://togithub.com/m-bert) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2854](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2854)
- Minor TS changes by [@&#8203;m-bert](https://togithub.com/m-bert) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2872](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2872)
- Add automatic og:image generation to docs by
[@&#8203;xnameTM](https://togithub.com/xnameTM) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2851](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2851)
- Fix typo in og:image generation by
[@&#8203;kacperkapusciak](https://togithub.com/kacperkapusciak) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2880](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2880)
- Bump React Native in FabricExample to 0.74 by
[@&#8203;m-bert](https://togithub.com/m-bert) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2877](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2877)
- Update yarn setup in the repository by
[@&#8203;j-piasecki](https://togithub.com/j-piasecki) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2882](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2882)
- Release 2.16.1 by
[@&#8203;j-piasecki](https://togithub.com/j-piasecki) in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2883](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2883)

#### New Contributors

- [@&#8203;xnameTM](https://togithub.com/xnameTM) made their first
contribution in
[https://github.com/software-mansion/react-native-gesture-handler/pull/2851](https://togithub.com/software-mansion/react-native-gesture-handler/pull/2851)

**Full Changelog**:
https://github.com/software-mansion/react-native-gesture-handler/compare/2.16.0...2.16.1

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zODguMSIsInVwZGF0ZWRJblZlciI6IjM3LjM4OC4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: valora-bot <valorabot@valoraapp.com>
---
 ios/Podfile.lock | 4 ++--
 package.json     | 2 +-
 yarn.lock        | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index a2443982b9..8e346f97c0 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -699,7 +699,7 @@ PODS:
     - RNFBApp
   - RNFS (2.20.0):
     - React-Core
-  - RNGestureHandler (2.16.0):
+  - RNGestureHandler (2.16.2):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - RNImageCropPicker (0.40.3):
@@ -1246,7 +1246,7 @@ SPEC CHECKSUMS:
   RNFBMessaging: 15439cf96be05b47d95334052afc306eac89c2ce
   RNFBRemoteConfig: 37959d81004ff1232f26276d02655c992b1ce715
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
-  RNGestureHandler: 69d0a928253547ef857a7be4f453220b9c472e07
+  RNGestureHandler: d678f94a8f74de70ce3d9f5d23eb0f97b686e943
   RNImageCropPicker: e7ab6fb43d2fc3e84651e786ef4a080d63b0ed3d
   RNKeychain: f1b48665a4646f61191eb048c4c05c58d9a7596f
   RNLocalize: e8694475db034bf601e17bd3dfa8986565e769eb
diff --git a/package.json b/package.json
index ba3660d3e8..c811b37a95 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
     "react-native-fast-crypto": "^2.0.0",
     "react-native-fast-image": "^8.6.3",
     "react-native-fs": "^2.20.0",
-    "react-native-gesture-handler": "^2.16.0",
+    "react-native-gesture-handler": "^2.16.2",
     "react-native-get-random-values": "^1.11.0",
     "react-native-haptic-feedback": "^2.2.0",
     "react-native-image-crop-picker": "^0.40.3",
diff --git a/yarn.lock b/yarn.lock
index ed70409325..528dc34393 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15317,10 +15317,10 @@ react-native-fs@*, react-native-fs@^2.14.1, react-native-fs@^2.20.0:
     base-64 "^0.1.0"
     utf8 "^3.0.0"
 
-react-native-gesture-handler@^2.16.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.16.0.tgz#45a00b5988e74ebc58f130c8d1443319c8e678db"
-  integrity sha512-1hFkx7RIfeJSyTQQ0Nkv4icFVZ5+XjQkd47OgZMBFzoB7ecL+nFSz8KLi3OCWOhq+nbHpSPlSG5VF3CQNCJpWA==
+react-native-gesture-handler@^2.16.2:
+  version "2.16.2"
+  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.16.2.tgz#032bd2a07334292d7f6cff1dc9d1ec928f72e26d"
+  integrity sha512-vGFlrDKlmyI+BT+FemqVxmvO7nqxU33cgXVsn6IKAFishvlG3oV2Ds67D5nPkHMea8T+s1IcuMm0bF8ntZtAyg==
   dependencies:
     "@egjs/hammerjs" "^2.0.17"
     hoist-non-react-statics "^3.3.0"

From 4d84bec5bfac1544b62ed50c9d72f1eb49bfb02f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 01:06:16 +0000
Subject: [PATCH 101/133] fix(deps): update dependency react-native-qrcode-svg
 to ^6.3.1 (#5521)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[react-native-qrcode-svg](https://togithub.com/awesomejerry/react-native-qrcode-svg)
| [`^6.3.0` ->
`^6.3.1`](https://renovatebot.com/diffs/npm/react-native-qrcode-svg/6.3.0/6.3.1)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/react-native-qrcode-svg/6.3.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/react-native-qrcode-svg/6.3.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/react-native-qrcode-svg/6.3.0/6.3.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/react-native-qrcode-svg/6.3.0/6.3.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>awesomejerry/react-native-qrcode-svg
(react-native-qrcode-svg)</summary>

###
[`v6.3.1`](https://togithub.com/awesomejerry/react-native-qrcode-svg/compare/4418564a4f77e086c9cd80f6a6673906cab15ac9...9c26c99f07a852d98d28486647f5e8e16b754a5c)

[Compare
Source](https://togithub.com/awesomejerry/react-native-qrcode-svg/compare/4418564a4f77e086c9cd80f6a6673906cab15ac9...9c26c99f07a852d98d28486647f5e8e16b754a5c)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zODguMSIsInVwZGF0ZWRJblZlciI6IjM3LjM4OC4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c811b37a95..b0fdb226a7 100644
--- a/package.json
+++ b/package.json
@@ -171,7 +171,7 @@
     "react-native-persona": "^2.2.23",
     "react-native-picker-select": "^9.1.3",
     "react-native-platform-touchable": "^1.1.1",
-    "react-native-qrcode-svg": "^6.3.0",
+    "react-native-qrcode-svg": "^6.3.1",
     "react-native-randombytes": "^3.6.1",
     "react-native-reanimated": "^2.17.0",
     "react-native-restart-android": "^0.0.7",
diff --git a/yarn.lock b/yarn.lock
index 528dc34393..47fc3f479f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15420,10 +15420,10 @@ react-native-platform-touchable@^1.1.1:
   resolved "https://registry.yarnpkg.com/react-native-platform-touchable/-/react-native-platform-touchable-1.1.1.tgz#fde4acc65eea585d28b164d0c3716a42129a68e4"
   integrity sha1-/eSsxl7qWF0osWTQw3FqQhKaaOQ=
 
-react-native-qrcode-svg@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/react-native-qrcode-svg/-/react-native-qrcode-svg-6.3.0.tgz#2b03826b7bd0c95d9c3fb669cb0fb5091f98d687"
-  integrity sha512-DUjgCRs2vaHSoLMVYoc7Oc8cL7CNUdvQmvtSmIurp/VBJ1DJkJlTQjeSxMoMWAjnnK4oFjjjA9+F4AJQL2f5Zw==
+react-native-qrcode-svg@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/react-native-qrcode-svg/-/react-native-qrcode-svg-6.3.1.tgz#373cac6956fce93aac4325d62615b7c1891e2633"
+  integrity sha512-A6NoYnxzG7CXAzwPXfqCkwJpTIlmhpV+woflNBBXrxUdX4NeB83iKMs5F1kdx5IOIwsrQUbCrpnJWarCqg1X2Q==
   dependencies:
     prop-types "^15.8.0"
     qrcode "^1.5.1"

From d8c68cac74a9b949cbc644664321c839cdf2d645 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 01:52:25 +0000
Subject: [PATCH 102/133] fix(deps): update dependency react-native-share to
 ^10.2.1 (#5522)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[react-native-share](https://react-native-share.github.io/react-native-share/)
([source](https://togithub.com/react-native-community/react-native-share))
| [`^10.2.0` ->
`^10.2.1`](https://renovatebot.com/diffs/npm/react-native-share/10.2.0/10.2.1)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/react-native-share/10.2.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/react-native-share/10.2.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/react-native-share/10.2.0/10.2.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/react-native-share/10.2.0/10.2.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>react-native-community/react-native-share
(react-native-share)</summary>

###
[`v10.2.1`](https://togithub.com/react-native-share/react-native-share/releases/tag/v10.2.1)

[Compare
Source](https://togithub.com/react-native-community/react-native-share/compare/v10.2.0...v10.2.1)

##### Bug Fixes

- **codegen:** move codegen spec file from outside of src to src
([#&#8203;1528](https://togithub.com/react-native-community/react-native-share/issues/1528))
([b02da4d](https://togithub.com/react-native-community/react-native-share/commit/b02da4d5ecd308773eb0a86664e27a05e1135ff9))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zODguMSIsInVwZGF0ZWRJblZlciI6IjM3LjM4OC4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: valora-bot <valorabot@valoraapp.com>
---
 ios/Podfile.lock | 4 ++--
 package.json     | 2 +-
 yarn.lock        | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 8e346f97c0..9493de45a9 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -760,7 +760,7 @@ PODS:
     - React-Core
     - React-hermes
     - Sentry/HybridSDK (= 8.24.0)
-  - RNShare (10.2.0):
+  - RNShare (10.2.1):
     - React-Core
   - RNSVG (15.3.0):
     - React-Core
@@ -1257,7 +1257,7 @@ SPEC CHECKSUMS:
   RNScreens: 93ae3be2f119d955620f9bbb39ad372adb53b7a9
   RNSecureRandom: ff25041dd065a945810ca01a2bcd06f8d141b81d
   RNSentry: 7ae2a06a5563de39ec09dcb1e751ac0c67f1883c
-  RNShare: 554a91f5cfbe4adac4cfe3654826ee8b299fe365
+  RNShare: 0fad69ae2d71de9d1f7b9a43acf876886a6cb99c
   RNSVG: a48668fd382115bc89761ce291a81c4ca5f2fd2e
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
diff --git a/package.json b/package.json
index b0fdb226a7..5722211218 100644
--- a/package.json
+++ b/package.json
@@ -179,7 +179,7 @@
     "react-native-screens": "^3.31.1",
     "react-native-securerandom": "^1.0.1",
     "react-native-shake": "^5.5.2",
-    "react-native-share": "^10.2.0",
+    "react-native-share": "^10.2.1",
     "react-native-simple-toast": "^3.3.1",
     "react-native-skeleton-placeholder": "^5.2.4",
     "react-native-sms-retriever": "^1.1.1",
diff --git a/yarn.lock b/yarn.lock
index 47fc3f479f..da1b518188 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15484,10 +15484,10 @@ react-native-shake@^5.5.2:
   resolved "https://registry.yarnpkg.com/react-native-shake/-/react-native-shake-5.5.2.tgz#1e73cfb3dcefc9980f604d08a87cdc6ba3f3a479"
   integrity sha512-GWQc/2h33u3ma2bBUEFG4sEQXfSmu2azEF1bUaqu+d0TeAT3vvmxpw3u6k7Z9XiZk4uRJ+NCVifx4JTHF5n67g==
 
-react-native-share@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/react-native-share/-/react-native-share-10.2.0.tgz#83a52911f9b47d1476f022ecdf0351dc0c863b5b"
-  integrity sha512-dn6FNoEADHdeAkBihIN4ewyxc5PO0MmvFzaSsTsLCwOs7VrX8rBNbGDE5iMP3Anz+SY7YInW2UuxVttBzii6wg==
+react-native-share@^10.2.1:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/react-native-share/-/react-native-share-10.2.1.tgz#baf94848c2acee6e52f6b28e05c47fa5fa9402be"
+  integrity sha512-Z2LWGYWH7raM4H6Oauttv1tEhaB43XSWJAN8iS6oaSG9CnyrUBeYFF4QpU1AH5RgNeylXQdN8CtbizCHHt6coQ==
 
 react-native-simple-toast@^3.3.1:
   version "3.3.1"

From 06853c1712e118fcec06afa3339f533e567062f9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 05:21:30 +0000
Subject: [PATCH 103/133] fix(deps): update dependency react-redux to ^9.1.2
 (#5523)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [react-redux](https://togithub.com/reduxjs/react-redux) | [`^9.1.1` ->
`^9.1.2`](https://renovatebot.com/diffs/npm/react-redux/9.1.1/9.1.2) |
[![age](https://developer.mend.io/api/mc/badges/age/npm/react-redux/9.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/react-redux/9.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/react-redux/9.1.1/9.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/react-redux/9.1.1/9.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>reduxjs/react-redux (react-redux)</summary>

###
[`v9.1.2`](https://togithub.com/reduxjs/react-redux/compare/v9.1.1...eec5f9b320e2d4787af83b599a0c517fef4b510f)

[Compare
Source](https://togithub.com/reduxjs/react-redux/compare/v9.1.1...v9.1.2)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zODguMSIsInVwZGF0ZWRJblZlciI6IjM3LjM4OC4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 5722211218..fc71dfe09c 100644
--- a/package.json
+++ b/package.json
@@ -189,7 +189,7 @@
     "react-native-url-polyfill": "^2.0.0",
     "react-native-video": "^6.1.2",
     "react-native-webview": "^13.8.6",
-    "react-redux": "^9.1.1",
+    "react-redux": "^9.1.2",
     "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
     "redux-persist-fs-storage": "^1.3.0",
diff --git a/yarn.lock b/yarn.lock
index da1b518188..664e41a741 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15607,10 +15607,10 @@ react-native@0.71.17:
     whatwg-fetch "^3.0.0"
     ws "^6.2.2"
 
-react-redux@^9.1.1:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-9.1.1.tgz#852ec13084bd7375e26db697d2fc9027ffada204"
-  integrity sha512-5ynfGDzxxsoV73+4czQM56qF43vsmgJsO22rmAvU5tZT2z5Xow/A2uhhxwXuGTxgdReF3zcp7A80gma2onRs1A==
+react-redux@^9.1.2:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-9.1.2.tgz#deba38c64c3403e9abd0c3fbeab69ffd9d8a7e4b"
+  integrity sha512-0OA4dhM1W48l3uzmv6B7TXPCGmokUU4p1M44DGN2/D9a1FjVPukVjER1PcPX97jIg6aUeLq1XJo1IpfbgULn0w==
   dependencies:
     "@types/use-sync-external-store" "^0.0.3"
     use-sync-external-store "^1.0.0"

From aaeca63320319233d1241d3fe2f06de9f2b35fae Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 06:00:57 +0000
Subject: [PATCH 104/133] fix(deps): update fiatconnect packages (#5524)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[@fiatconnect/fiatconnect-sdk](https://togithub.com/fiatconnect/fiatconnect-sdk)
| [`^0.5.42` ->
`^0.5.52`](https://renovatebot.com/diffs/npm/@fiatconnect%2ffiatconnect-sdk/0.5.42/0.5.52)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/@fiatconnect%2ffiatconnect-sdk/0.5.52?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@fiatconnect%2ffiatconnect-sdk/0.5.52?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@fiatconnect%2ffiatconnect-sdk/0.5.42/0.5.52?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@fiatconnect%2ffiatconnect-sdk/0.5.42/0.5.52?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[@fiatconnect/fiatconnect-types](https://togithub.com/fiatconnect/fiatconnect-types)
| [`^13.3.4` ->
`^13.3.8`](https://renovatebot.com/diffs/npm/@fiatconnect%2ffiatconnect-types/13.3.4/13.3.8)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/@fiatconnect%2ffiatconnect-types/13.3.8?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@fiatconnect%2ffiatconnect-types/13.3.8?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@fiatconnect%2ffiatconnect-types/13.3.4/13.3.8?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@fiatconnect%2ffiatconnect-types/13.3.4/13.3.8?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>fiatconnect/fiatconnect-sdk
(@&#8203;fiatconnect/fiatconnect-sdk)</summary>

###
[`v0.5.52`](https://togithub.com/fiatconnect/fiatconnect-sdk/releases/tag/v0.5.52)

[Compare
Source](https://togithub.com/fiatconnect/fiatconnect-sdk/compare/v0.5.51...v0.5.52)

##### Bug Fixes

- **deps:** update dependency ethers to ^6.12.2
([#&#8203;287](https://togithub.com/fiatconnect/fiatconnect-sdk/issues/287))
([789215c](https://togithub.com/fiatconnect/fiatconnect-sdk/commit/789215c5e1f75b5a5e1b88b49448a4c9232c5d5c))

###
[`v0.5.51`](https://togithub.com/fiatconnect/fiatconnect-sdk/releases/tag/v0.5.51)

[Compare
Source](https://togithub.com/fiatconnect/fiatconnect-sdk/compare/v0.5.50...v0.5.51)

##### Bug Fixes

- **deps:** update dependency
[@&#8203;fiatconnect/fiatconnect-types](https://togithub.com/fiatconnect/fiatconnect-types)
to ^13.3.8
([#&#8203;283](https://togithub.com/fiatconnect/fiatconnect-sdk/issues/283))
([6f42815](https://togithub.com/fiatconnect/fiatconnect-sdk/commit/6f428159576603b9b74382bf3b083ca980a5f65f))

###
[`v0.5.50`](https://togithub.com/fiatconnect/fiatconnect-sdk/releases/tag/v0.5.50)

[Compare
Source](https://togithub.com/fiatconnect/fiatconnect-sdk/compare/v0.5.49...v0.5.50)

##### Bug Fixes

- **deps:** update dependency zod to ^3.23.8
([#&#8203;282](https://togithub.com/fiatconnect/fiatconnect-sdk/issues/282))
([5ec0871](https://togithub.com/fiatconnect/fiatconnect-sdk/commit/5ec0871359c437ce3aabc9d5342d7e4291001843))

###
[`v0.5.49`](https://togithub.com/fiatconnect/fiatconnect-sdk/releases/tag/v0.5.49)

[Compare
Source](https://togithub.com/fiatconnect/fiatconnect-sdk/compare/v0.5.48...v0.5.49)

##### Bug Fixes

- **deps:** update dependency zod to ^3.23.7
([#&#8203;281](https://togithub.com/fiatconnect/fiatconnect-sdk/issues/281))
([77baea8](https://togithub.com/fiatconnect/fiatconnect-sdk/commit/77baea8fe08c624d0bd218c72acb158a82478690))

###
[`v0.5.48`](https://togithub.com/fiatconnect/fiatconnect-sdk/releases/tag/v0.5.48)

[Compare
Source](https://togithub.com/fiatconnect/fiatconnect-sdk/compare/v0.5.47...v0.5.48)

##### Bug Fixes

- **deps:** update dependency
[@&#8203;fiatconnect/fiatconnect-types](https://togithub.com/fiatconnect/fiatconnect-types)
to ^13.3.7
([#&#8203;280](https://togithub.com/fiatconnect/fiatconnect-sdk/issues/280))
([80af09d](https://togithub.com/fiatconnect/fiatconnect-sdk/commit/80af09dee047eb374c8e884e5ca6d3de21c3ecde))

###
[`v0.5.47`](https://togithub.com/fiatconnect/fiatconnect-sdk/releases/tag/v0.5.47)

[Compare
Source](https://togithub.com/fiatconnect/fiatconnect-sdk/compare/v0.5.46...v0.5.47)

##### Bug Fixes

- **deps:** update dependency zod to ^3.23.6
([#&#8203;279](https://togithub.com/fiatconnect/fiatconnect-sdk/issues/279))
([685820b](https://togithub.com/fiatconnect/fiatconnect-sdk/commit/685820b08be59a791a378ad902da36d0cbeaf4a5))

###
[`v0.5.46`](https://togithub.com/fiatconnect/fiatconnect-sdk/releases/tag/v0.5.46)

[Compare
Source](https://togithub.com/fiatconnect/fiatconnect-sdk/compare/v0.5.45...v0.5.46)

##### Bug Fixes

- **deps:** update dependency
[@&#8203;fiatconnect/fiatconnect-types](https://togithub.com/fiatconnect/fiatconnect-types)
to ^13.3.6
([#&#8203;278](https://togithub.com/fiatconnect/fiatconnect-sdk/issues/278))
([e12899c](https://togithub.com/fiatconnect/fiatconnect-sdk/commit/e12899c04537d61569a5a29c742041c7697bec21))

###
[`v0.5.45`](https://togithub.com/fiatconnect/fiatconnect-sdk/releases/tag/v0.5.45)

[Compare
Source](https://togithub.com/fiatconnect/fiatconnect-sdk/compare/v0.5.44...v0.5.45)

##### Bug Fixes

- **deps:** update dependency ethers to ^6.12.1
([#&#8203;277](https://togithub.com/fiatconnect/fiatconnect-sdk/issues/277))
([5a13eac](https://togithub.com/fiatconnect/fiatconnect-sdk/commit/5a13eac6730b5a253ef546f37f44d5fb0510832e))

###
[`v0.5.44`](https://togithub.com/fiatconnect/fiatconnect-sdk/releases/tag/v0.5.44)

[Compare
Source](https://togithub.com/fiatconnect/fiatconnect-sdk/compare/v0.5.43...v0.5.44)

##### Bug Fixes

- **deps:** update dependency
[@&#8203;fiatconnect/fiatconnect-types](https://togithub.com/fiatconnect/fiatconnect-types)
to ^13.3.5
([#&#8203;276](https://togithub.com/fiatconnect/fiatconnect-sdk/issues/276))
([c5b3660](https://togithub.com/fiatconnect/fiatconnect-sdk/commit/c5b366072ce97c7c35e8c57534c425d9167207d1))

###
[`v0.5.43`](https://togithub.com/fiatconnect/fiatconnect-sdk/releases/tag/v0.5.43)

[Compare
Source](https://togithub.com/fiatconnect/fiatconnect-sdk/compare/v0.5.42...v0.5.43)

##### Bug Fixes

- **deps:** update dependency zod to ^3.23.5
([#&#8203;275](https://togithub.com/fiatconnect/fiatconnect-sdk/issues/275))
([074a824](https://togithub.com/fiatconnect/fiatconnect-sdk/commit/074a8249373ef3840288579d0a25b8168b6be6c3))

</details>

<details>
<summary>fiatconnect/fiatconnect-types
(@&#8203;fiatconnect/fiatconnect-types)</summary>

###
[`v13.3.8`](https://togithub.com/fiatconnect/fiatconnect-types/releases/tag/v13.3.8)

[Compare
Source](https://togithub.com/fiatconnect/fiatconnect-types/compare/v13.3.7...v13.3.8)

##### Bug Fixes

- **deps:** update dependency zod to ^3.23.8
([#&#8203;242](https://togithub.com/fiatconnect/fiatconnect-types/issues/242))
([7ecd97c](https://togithub.com/fiatconnect/fiatconnect-types/commit/7ecd97c041cd8bbf5c71003a674af0ea9f44b723))

###
[`v13.3.7`](https://togithub.com/fiatconnect/fiatconnect-types/releases/tag/v13.3.7)

[Compare
Source](https://togithub.com/fiatconnect/fiatconnect-types/compare/v13.3.6...v13.3.7)

##### Bug Fixes

- **deps:** update dependency zod to ^3.23.7
([#&#8203;241](https://togithub.com/fiatconnect/fiatconnect-types/issues/241))
([962a0a9](https://togithub.com/fiatconnect/fiatconnect-types/commit/962a0a9de0f3386320843df2ca96faa7017be3ea))

###
[`v13.3.6`](https://togithub.com/fiatconnect/fiatconnect-types/releases/tag/v13.3.6)

[Compare
Source](https://togithub.com/fiatconnect/fiatconnect-types/compare/v13.3.5...v13.3.6)

##### Bug Fixes

- **deps:** update dependency zod to ^3.23.6
([#&#8203;240](https://togithub.com/fiatconnect/fiatconnect-types/issues/240))
([25993ed](https://togithub.com/fiatconnect/fiatconnect-types/commit/25993ede19999f74053c8383e8035b3532b7dd8e))

###
[`v13.3.5`](https://togithub.com/fiatconnect/fiatconnect-types/releases/tag/v13.3.5)

[Compare
Source](https://togithub.com/fiatconnect/fiatconnect-types/compare/v13.3.4...v13.3.5)

##### Bug Fixes

- **deps:** update dependency zod to ^3.23.5
([#&#8203;239](https://togithub.com/fiatconnect/fiatconnect-types/issues/239))
([3f7295a](https://togithub.com/fiatconnect/fiatconnect-types/commit/3f7295ac1a45a83a99c2d70689346228aa03a52f))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zODguMSIsInVwZGF0ZWRJblZlciI6IjM3LjM4OC4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  4 ++--
 yarn.lock    | 40 ++++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index fc71dfe09c..c515096599 100644
--- a/package.json
+++ b/package.json
@@ -80,8 +80,8 @@
     "@celo/wallet-rpc": "^3.2.0",
     "@coinbase/cbpay-js": "^2.1.0",
     "@crowdin/ota-client": "^0.7.0",
-    "@fiatconnect/fiatconnect-sdk": "^0.5.42",
-    "@fiatconnect/fiatconnect-types": "^13.3.4",
+    "@fiatconnect/fiatconnect-sdk": "^0.5.52",
+    "@fiatconnect/fiatconnect-types": "^13.3.8",
     "@gorhom/bottom-sheet": "^4.6.3",
     "@json-rpc-tools/utils": "^1.7.6",
     "@noble/secp256k1": "^1.7.1",
diff --git a/yarn.lock b/yarn.lock
index 664e41a741..0416907420 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1944,27 +1944,27 @@
   resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-5.5.3.tgz#18e3af6b8eae7984072bbeb0c0858474d7c4cefe"
   integrity sha512-R11tGE6yIFwqpaIqcfkcg7AICXzFg14+5h5v0TfF/9+RMDL6jhzCy/pxHVOfbALGdtVYdt6JdR21tuxEgl34dw==
 
-"@fiatconnect/fiatconnect-sdk@^0.5.42":
-  version "0.5.42"
-  resolved "https://registry.yarnpkg.com/@fiatconnect/fiatconnect-sdk/-/fiatconnect-sdk-0.5.42.tgz#d4732b3d88a923fe388b7aac9a03f4d2a1af03ea"
-  integrity sha512-w+FTU7VK2voKGk3STGGMx3jBCp2vE7bGtENn9CzQQfHrwdapUaqtZZB2TSKy8e9VkmbPpMcL0jx2YVyMolmKBA==
+"@fiatconnect/fiatconnect-sdk@^0.5.52":
+  version "0.5.52"
+  resolved "https://registry.yarnpkg.com/@fiatconnect/fiatconnect-sdk/-/fiatconnect-sdk-0.5.52.tgz#f0d81a0122029c361e11ac97fc40497212a4b95e"
+  integrity sha512-VzX1rRFy8t/bEWUsUqMMcrOsMod2mbSRjIeIsvx0O0Y+GzUFnBljgnUMAKe0jmbOMTxOiUhWAybrWVT4MBZ8Xw==
   dependencies:
     "@badrap/result" "^0.2.13"
-    "@fiatconnect/fiatconnect-types" "^13.3.4"
+    "@fiatconnect/fiatconnect-types" "^13.3.8"
     cross-fetch "^4.0.0"
-    ethers "^6.12.0"
+    ethers "^6.12.2"
     fetch-cookie "^3.0.1"
     siwe "^2.3.2"
     tough-cookie "^4.0.0"
     tslib "^2.6.2"
-    zod "^3.23.4"
+    zod "^3.23.8"
 
-"@fiatconnect/fiatconnect-types@^13.3.4":
-  version "13.3.4"
-  resolved "https://registry.yarnpkg.com/@fiatconnect/fiatconnect-types/-/fiatconnect-types-13.3.4.tgz#21ab8fb95a555913bdbbd453ec784b6062905d57"
-  integrity sha512-OtDOn2W/BqofV9Uxm0HR43rAq25tNRgoblNgqb9M4qh1A+NjA5AhCnPCd5yVVSTFoSKo9ciSydFGEgym1+y8ew==
+"@fiatconnect/fiatconnect-types@^13.3.8":
+  version "13.3.8"
+  resolved "https://registry.yarnpkg.com/@fiatconnect/fiatconnect-types/-/fiatconnect-types-13.3.8.tgz#9f358a39b79ec9c640305e5f5a74fc6cef0bff38"
+  integrity sha512-SL3CMrrikxI1rnNjfisQ/M27XgH9Tz4PuNOILIk9LmSoYvWAzVNY+i4su3IiBnT/DrAHvibcYc7JFWV9LQlAOw==
   dependencies:
-    zod "^3.23.4"
+    zod "^3.23.8"
 
 "@flatten-js/interval-tree@^1.1.2":
   version "1.1.3"
@@ -9136,10 +9136,10 @@ ethers@^5.0.13, ethers@^5.5.4, ethers@^5.7.2:
     "@ethersproject/web" "5.7.1"
     "@ethersproject/wordlists" "5.7.0"
 
-ethers@^6.12.0:
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.12.0.tgz#b0c2ce207ae5a3b5125be966e32ffea7c1f2481a"
-  integrity sha512-zL5NlOTjML239gIvtVJuaSk0N9GQLi1Hom3ZWUszE5lDTQE/IVB62mrPkQ2W1bGcZwVGSLaetQbWNQSvI4rGDQ==
+ethers@^6.12.2:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.13.0.tgz#f342958d0f622cf06559f59fbccdc1d30fa64f50"
+  integrity sha512-+yyQQQWEntY5UVbCv++guA14RRVFm1rSnO1GoLFdrK7/XRWMoktNgyG9UjwxrQqGBfGyFKknNZ81YpUS2emCgg==
   dependencies:
     "@adraffy/ens-normalize" "1.10.1"
     "@noble/curves" "1.2.0"
@@ -19757,7 +19757,7 @@ zod@3.22.4:
   resolved "https://registry.yarnpkg.com/zod/-/zod-3.22.4.tgz#f31c3a9386f61b1f228af56faa9255e845cf3fff"
   integrity sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==
 
-zod@^3.23.4:
-  version "3.23.4"
-  resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.4.tgz#c63805b2f39e10d4ab3d55eb3c8cdb472c79dfb1"
-  integrity sha512-/AtWOKbBgjzEYYQRNfoGKHObgfAZag6qUJX1VbHo2PRBgS+wfWagEY2mizjfyAPcGesrJOcx/wcl0L9WnVrHFw==
+zod@^3.23.8:
+  version "3.23.8"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d"
+  integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==

From 7645413d58a916d401d78cbe89a3fe39ffdc282d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 21:02:29 +0000
Subject: [PATCH 105/133] chore(deps): update dependency prettier to v3.3.0
 (#5525)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [prettier](https://prettier.io)
([source](https://togithub.com/prettier/prettier)) | [`3.2.5` ->
`3.3.0`](https://renovatebot.com/diffs/npm/prettier/3.2.5/3.3.0) |
[![age](https://developer.mend.io/api/mc/badges/age/npm/prettier/3.3.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/prettier/3.3.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/prettier/3.2.5/3.3.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/prettier/3.2.5/3.3.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>prettier/prettier (prettier)</summary>

###
[`v3.3.0`](https://togithub.com/prettier/prettier/blob/HEAD/CHANGELOG.md#330)

[Compare
Source](https://togithub.com/prettier/prettier/compare/3.2.5...3.3.0)

[diff](https://togithub.com/prettier/prettier/compare/3.2.5...3.3.0)

🔗 [Release Notes](https://prettier.io/blog/2024/06/01/3.3.0.html)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these
updates again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zODguMSIsInVwZGF0ZWRJblZlciI6IjM3LjM4OC4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 4 ++--
 yarn.lock    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index c515096599..7dd6d929e8 100644
--- a/package.json
+++ b/package.json
@@ -279,7 +279,7 @@
     "mockdate": "^3.0.5",
     "patch-package": "^6.2.2",
     "pixelmatch": "^5.2.1",
-    "prettier": "3.2.5",
+    "prettier": "3.3.0",
     "prettier-plugin-java": "^2.6.0",
     "react-devtools": "^4.26.0",
     "react-native-dotenv": "^3.2.0",
@@ -307,7 +307,7 @@
     "**/extend": "^3.0.2",
     "**/cross-fetch": "^4.0.0",
     "bignumber.js": "^9.1.2",
-    "prettier": "3.2.5",
+    "prettier": "3.3.0",
     "@types/prettier": "^3.0.0",
     "eslint-utils": "^3.0.0",
     "set-value": "^4.1.0",
diff --git a/yarn.lock b/yarn.lock
index 0416907420..00f75d7ad6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14798,10 +14798,10 @@ prettier-plugin-java@^2.6.0:
     lodash "4.17.21"
     prettier "3.2.5"
 
-prettier@*, prettier@3.2.5:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368"
-  integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==
+prettier@*, prettier@3.2.5, prettier@3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.0.tgz#d173ea0524a691d4c0b1181752f2b46724328cdf"
+  integrity sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==
 
 pretty-format@^24.9.0:
   version "24.9.0"

From 7491836494c235c64daf2bf176babaf370a43d2b Mon Sep 17 00:00:00 2001
From: Valora Bot <89419329+valora-bot@users.noreply.github.com>
Date: Thu, 6 Jun 2024 14:47:15 -0700
Subject: [PATCH 106/133] chore: update licenses and disclaimer (#5526)

Co-authored-by: valora-bot <valorabot@valoraapp.com>
---
 src/account/LicenseDisclaimer.txt | 591 +++---------------------------
 1 file changed, 56 insertions(+), 535 deletions(-)

diff --git a/src/account/LicenseDisclaimer.txt b/src/account/LicenseDisclaimer.txt
index 290e0c62c1..bd077ab245 100644
--- a/src/account/LicenseDisclaimer.txt
+++ b/src/account/LicenseDisclaimer.txt
@@ -16971,7 +16971,7 @@ MIT, ISC, BSD-2-Clause, BSD-3-Clause, Apache-2.0
 
 ## Bundled dependencies
 
-### @angular/compiler@v17.1.2
+### @angular/compiler@v18.0.0
 
 > Angular - the compiler library
 
@@ -16981,7 +16981,7 @@ Author: angular
 
 ----------------------------------------
 
-### @babel/code-frame@v7.23.5
+### @babel/code-frame@v7.24.6
 
 > Generate errors that contain a code frame that point to source locations.
 
@@ -17015,7 +17015,7 @@ Author: The Babel Team (https://babel.dev/team)
 
 ----------------------------------------
 
-### @babel/helper-validator-identifier@v7.22.20
+### @babel/helper-validator-identifier@v7.24.6
 
 > Validate identifier/keywords name
 
@@ -17048,7 +17048,7 @@ Author: The Babel Team (https://babel.dev/team)
 
 ----------------------------------------
 
-### @babel/highlight@v7.23.4
+### @babel/highlight@v7.24.6
 
 > Syntax highlight JavaScript strings for output in terminals.
 
@@ -17082,7 +17082,7 @@ Author: The Babel Team (https://babel.dev/team)
 
 ----------------------------------------
 
-### @babel/parser@v7.23.9
+### @babel/parser@v7.24.6
 
 > A JavaScript parser
 
@@ -17141,7 +17141,9 @@ License: MIT
 
 ----------------------------------------
 
-### @glimmer/syntax@v0.88.1
+### @glimmer/syntax@v0.92.0
+
+License: MIT
 
 > Copyright (c) 2015 Tilde, Inc.
 >
@@ -17165,7 +17167,7 @@ License: MIT
 
 ----------------------------------------
 
-### @glimmer/util@v0.88.1
+### @glimmer/util@v0.92.0
 
 > Common utilities used in Glimmer
 
@@ -17193,7 +17195,7 @@ License: MIT
 
 ----------------------------------------
 
-### @glimmer/wire-format@v0.88.1
+### @glimmer/wire-format@v0.92.0
 
 License: MIT
 
@@ -17408,11 +17410,12 @@ Author: Alex Bell <alex@bellandwhistle.net>
 
 ----------------------------------------
 
-### @typescript-eslint/types@v6.20.0
+### @typescript-eslint/types@v7.10.0
 
 > Types for the TypeScript-ESTree AST spec
 
 License: MIT
+Homepage: <https://typescript-eslint.io>
 Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
 
 > MIT License
@@ -17439,11 +17442,12 @@ Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
 
 ----------------------------------------
 
-### @typescript-eslint/typescript-estree@v6.20.0
+### @typescript-eslint/typescript-estree@v7.10.0
 
 > A parser that converts TypeScript source code into an ESTree compatible form
 
 License: BSD-2-Clause
+Homepage: <https://typescript-eslint.io/packages/typescript-estree>
 Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
 
 > TypeScript ESTree
@@ -17537,7 +17541,7 @@ Repository: <https://github.com/acornjs/acorn-jsx>
 
 ----------------------------------------
 
-### angular-estree-parser@v9.0.0
+### angular-estree-parser@v10.0.3
 
 > A parser that converts Angular source code into an ESTree-compatible form
 
@@ -17620,25 +17624,6 @@ Author: Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
 ----------------------------------------
 
-### ansi-styles@v3.2.1
-
-> ANSI escape codes for styling strings in the terminal
-
-License: MIT
-Author: Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-> MIT License
->
-> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
->
-> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
->
-> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-----------------------------------------
-
 ### bail@v1.0.5
 
 > Throw a given error
@@ -17673,73 +17658,7 @@ Contributors:
 
 ----------------------------------------
 
-### balanced-match@v1.0.2
-
-> Match balanced character pairs, like "{" and "}"
-
-License: MIT
-Homepage: <https://github.com/juliangruber/balanced-match>
-Repository: <git://github.com/juliangruber/balanced-match.git>
-Author: Julian Gruber <mail@juliangruber.com> (http://juliangruber.com)
-
-> (MIT)
->
-> Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
->
-> Permission is hereby granted, free of charge, to any person obtaining a copy of
-> this software and associated documentation files (the "Software"), to deal in
-> the Software without restriction, including without limitation the rights to
-> use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-> of the Software, and to permit persons to whom the Software is furnished to do
-> so, subject to the following conditions:
->
-> The above copyright notice and this permission notice shall be included in all
-> copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-> SOFTWARE.
-
-----------------------------------------
-
-### brace-expansion@v1.1.11
-
-> Brace expansion as known from sh/bash
-
-License: MIT
-Homepage: <https://github.com/juliangruber/brace-expansion>
-Repository: <git://github.com/juliangruber/brace-expansion.git>
-Author: Julian Gruber <mail@juliangruber.com> (http://juliangruber.com)
-
-> MIT License
->
-> Copyright (c) 2013 Julian Gruber <julian@juliangruber.com>
->
-> Permission is hereby granted, free of charge, to any person obtaining a copy
-> of this software and associated documentation files (the "Software"), to deal
-> in the Software without restriction, including without limitation the rights
-> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-> copies of the Software, and to permit persons to whom the Software is
-> furnished to do so, subject to the following conditions:
->
-> The above copyright notice and this permission notice shall be included in all
-> copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-> SOFTWARE.
-
-----------------------------------------
-
-### braces@v3.0.2
+### braces@v3.0.3
 
 > Bash-like brace expansion, implemented in JavaScript. Safer than other brace expansion libs, with complete support for the Bash 4.3 braces specification, without sacrificing speed.
 
@@ -17755,7 +17674,7 @@ Contributors:
 
 > The MIT License (MIT)
 >
-> Copyright (c) 2014-2018, Jon Schlinkert.
+> Copyright (c) 2014-present, Jon Schlinkert.
 >
 > Permission is hereby granted, free of charge, to any person obtaining a copy
 > of this software and associated documentation files (the "Software"), to deal
@@ -18016,56 +17935,6 @@ Contributors:
 
 ----------------------------------------
 
-### color-convert@v1.9.3
-
-> Plain color conversion functions
-
-License: MIT
-Author: Heather Arthur <fayearthur@gmail.com>
-
-> Copyright (c) 2011-2016 Heather Arthur <fayearthur@gmail.com>
->
-> Permission is hereby granted, free of charge, to any person obtaining
-> a copy of this software and associated documentation files (the
-> "Software"), to deal in the Software without restriction, including
-> without limitation the rights to use, copy, modify, merge, publish,
-> distribute, sublicense, and/or sell copies of the Software, and to
-> permit persons to whom the Software is furnished to do so, subject to
-> the following conditions:
->
-> The above copyright notice and this permission notice shall be
-> included in all copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-> EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-> MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-> NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-> LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-> OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-> WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-----------------------------------------
-
-### color-name@v1.1.3
-
-> A list of color names and its values
-
-License: MIT
-Homepage: <https://github.com/dfcreative/color-name>
-Repository: <git@github.com:dfcreative/color-name.git>
-Author: DY <dfcreative@gmail.com>
-
-> The MIT License (MIT)
-> Copyright (c) 2015 Dmitry Ivanov
-> 
-> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-> 
-> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-> 
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-----------------------------------------
-
 ### common-path-prefix@v3.0.0
 
 > Computes the longest prefix string that is common to each path, excluding the base component
@@ -18092,35 +17961,6 @@ Author: Mark Wubben (https://novemberborn.net/)
 
 ----------------------------------------
 
-### concat-map@v0.0.1
-
-> concatenative mapdashery
-
-License: MIT
-Repository: <git://github.com/substack/node-concat-map.git>
-Author: James Halliday <mail@substack.net> (http://substack.net)
-
-> This software is released under the MIT license:
->
-> Permission is hereby granted, free of charge, to any person obtaining a copy of
-> this software and associated documentation files (the "Software"), to deal in
-> the Software without restriction, including without limitation the rights to
-> use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-> the Software, and to permit persons to whom the Software is furnished to do so,
-> subject to the following conditions:
->
-> The above copyright notice and this permission notice shall be included in all
-> copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-> FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-> COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-> IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-> CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-----------------------------------------
-
 ### dashify@v2.0.0
 
 > Convert a camelcase or space-separated string to a dash-separated string. ~12 sloc, fast, supports diacritics.
@@ -18157,44 +17997,42 @@ Contributors:
 
 ----------------------------------------
 
-### diff@v5.1.0
+### diff@v5.2.0
 
-> A javascript text diff implementation.
+> A JavaScript text diff implementation.
 
 License: BSD-3-Clause
 Repository: <git://github.com/kpdecker/jsdiff.git>
 
-> Software License Agreement (BSD License)
+> BSD 3-Clause License
 >
 > Copyright (c) 2009-2015, Kevin Decker <kpdecker@gmail.com>
->
 > All rights reserved.
 >
-> Redistribution and use of this software in source and binary forms, with or without modification,
-> are permitted provided that the following conditions are met:
+> Redistribution and use in source and binary forms, with or without
+> modification, are permitted provided that the following conditions are met:
 >
-> * Redistributions of source code must retain the above
->   copyright notice, this list of conditions and the
->   following disclaimer.
+> 1. Redistributions of source code must retain the above copyright notice, this
+>    list of conditions and the following disclaimer.
 >
-> * Redistributions in binary form must reproduce the above
->   copyright notice, this list of conditions and the
->   following disclaimer in the documentation and/or other
->   materials provided with the distribution.
+> 2. Redistributions in binary form must reproduce the above copyright notice,
+>    this list of conditions and the following disclaimer in the documentation
+>    and/or other materials provided with the distribution.
 >
-> * Neither the name of Kevin Decker nor the names of its
->   contributors may be used to endorse or promote products
->   derived from this software without specific prior
->   written permission.
+> 3. Neither the name of the copyright holder nor the names of its
+>    contributors may be used to endorse or promote products derived from
+>    this software without specific prior written permission.
 >
-> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-> IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-> FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-> CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-> DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-> DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-> IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-> OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+> IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+> DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+> FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+> DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+> SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+> OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+> OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ----------------------------------------
 
@@ -18264,37 +18102,6 @@ Author: Mathias Bynens (https://mathiasbynens.be/)
 
 ----------------------------------------
 
-### escape-string-regexp@v1.0.5
-
-> Escape RegExp special characters
-
-License: MIT
-Author: Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-> The MIT License (MIT)
->
-> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
->
-> Permission is hereby granted, free of charge, to any person obtaining a copy
-> of this software and associated documentation files (the "Software"), to deal
-> in the Software without restriction, including without limitation the rights
-> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-> copies of the Software, and to permit persons to whom the Software is
-> furnished to do so, subject to the following conditions:
->
-> The above copyright notice and this permission notice shall be included in
-> all copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-> THE SOFTWARE.
-
-----------------------------------------
-
 ### escape-string-regexp@v5.0.0
 
 > Escape RegExp special characters
@@ -18314,7 +18121,7 @@ Author: Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
 ----------------------------------------
 
-### espree@v10.0.0
+### espree@v10.0.1
 
 > An Esprima-compatible JavaScript parser built on Acorn
 
@@ -18474,7 +18281,7 @@ Author: Matteo Collina <hello@matteocollina.com>
 
 ----------------------------------------
 
-### file-entry-cache@v7.0.2
+### file-entry-cache@v9.0.0
 
 > Super simple cache for file metadata, useful for process that work o a given series of files and that only need to repeat the job on the changed ones since the previous run of the process
 
@@ -18505,7 +18312,7 @@ Author: Jared Wray (https://jaredwray.com)
 
 ----------------------------------------
 
-### fill-range@v7.0.1
+### fill-range@v7.1.1
 
 > Fill in a range of numbers or letters, optionally passing an increment or `step` to use, or create a regex-compatible range with `options.toRegex`
 
@@ -18582,7 +18389,7 @@ Author: Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
 ----------------------------------------
 
-### flat-cache@v3.2.0
+### flat-cache@v5.0.0
 
 > A stupidly simple key/value storage using files to persist some data
 
@@ -18613,7 +18420,7 @@ Author: Jared Wray (https://jaredwray.com)
 
 ----------------------------------------
 
-### flatted@v3.2.9
+### flatted@v3.3.1
 
 > A super light and fast circular JSON parser.
 
@@ -18675,7 +18482,7 @@ Contributors:
 
 ----------------------------------------
 
-### flow-parser@v0.226.0
+### flow-parser@v0.236.0
 
 > JavaScript parser written in OCaml. Produces ESTree AST
 
@@ -18686,60 +18493,6 @@ Author: Flow Team <flow@fb.com>
 
 ----------------------------------------
 
-### fs.realpath@v1.0.0
-
-> Use node's fs.realpath, but fall back to the JS implementation if the native one fails
-
-License: ISC
-Repository: <git+https://github.com/isaacs/fs.realpath.git>
-Author: Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)
-
-> The ISC License
->
-> Copyright (c) Isaac Z. Schlueter and Contributors
->
-> Permission to use, copy, modify, and/or distribute this software for any
-> purpose with or without fee is hereby granted, provided that the above
-> copyright notice and this permission notice appear in all copies.
->
-> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-> IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
->
-> ----
->
-> This library bundles a version of the `fs.realpath` and `fs.realpathSync`
-> methods from Node.js v0.10 under the terms of the Node.js MIT license.
->
-> Node's license follows, also included at the header of `old.js` which contains
-> the licensed code:
->
->   Copyright Joyent, Inc. and other Node contributors.
->
->   Permission is hereby granted, free of charge, to any person obtaining a
->   copy of this software and associated documentation files (the "Software"),
->   to deal in the Software without restriction, including without limitation
->   the rights to use, copy, modify, merge, publish, distribute, sublicense,
->   and/or sell copies of the Software, and to permit persons to whom the
->   Software is furnished to do so, subject to the following conditions:
->
->   The above copyright notice and this permission notice shall be included in
->   all copies or substantial portions of the Software.
->
->   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
->   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
->   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
->   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
->   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
->   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
->   DEALINGS IN THE SOFTWARE.
-
-----------------------------------------
-
 ### get-east-asian-width@v1.2.0
 
 > Determine the East Asian Width of a Unicode character
@@ -18778,38 +18531,6 @@ Author: Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
 ----------------------------------------
 
-### glob@v7.2.3
-
-> a little globber
-
-License: ISC
-Repository: <git://github.com/isaacs/node-glob.git>
-Author: Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)
-
-> The ISC License
->
-> Copyright (c) Isaac Z. Schlueter and Contributors
->
-> Permission to use, copy, modify, and/or distribute this software for any
-> purpose with or without fee is hereby granted, provided that the above
-> copyright notice and this permission notice appear in all copies.
->
-> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-> IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
->
-> ## Glob Logo
->
-> Glob's logo created by Tanya Brassie <http://tanyabrassie.com/>, licensed
-> under a Creative Commons Attribution-ShareAlike 4.0 International License
-> https://creativecommons.org/licenses/by-sa/4.0/
-
-----------------------------------------
-
 ### glob-parent@v5.1.2
 
 > Extract the non-magic parent path from a glob string.
@@ -18870,25 +18591,6 @@ Repository: <https://github.com/graphql/graphql-js.git>
 
 ----------------------------------------
 
-### has-flag@v3.0.0
-
-> Check if argv has a specific flag
-
-License: MIT
-Author: Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-> MIT License
->
-> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
->
-> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
->
-> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-----------------------------------------
-
 ### ignore@v5.3.1
 
 > Ignore is a manager and filter for .gitignore rules, the one used by eslint, gitbook and many others.
@@ -18921,7 +18623,7 @@ Author: kael
 
 ----------------------------------------
 
-### import-meta-resolve@v4.0.0
+### import-meta-resolve@v4.1.0
 
 > Resolve things like Node.js — ponyfill for `import.meta.resolve`
 
@@ -19060,33 +18762,6 @@ Author: Dominic Tarr <dominic.tarr@gmail.com> (dominictarr.com)
 
 ----------------------------------------
 
-### inflight@v1.0.6
-
-> Add callbacks to requests in flight to avoid async duplication
-
-License: ISC
-Homepage: <https://github.com/isaacs/inflight>
-Repository: <https://github.com/npm/inflight.git>
-Author: Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)
-
-> The ISC License
->
-> Copyright (c) Isaac Z. Schlueter
->
-> Permission to use, copy, modify, and/or distribute this software for any
-> purpose with or without fee is hereby granted, provided that the above
-> copyright notice and this permission notice appear in all copies.
->
-> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-> IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-----------------------------------------
-
 ### inherits@v2.0.4
 
 > Browser-friendly inheritance fully compatible with standard node.js inherits()
@@ -19843,7 +19518,7 @@ Repository: <git@github.com:teambition/merge2.git>
 
 ----------------------------------------
 
-### meriyah@v4.3.9
+### meriyah@v4.4.3
 
 > A 100% compliant, self-hosted javascript parser with high focus on both performance and stability
 
@@ -19864,7 +19539,7 @@ Contributors:
 
 ----------------------------------------
 
-### micromatch@v4.0.5
+### micromatch@v4.0.7
 
 > Glob matching for javascript/node.js. A replacement and faster alternative to minimatch and multimatch.
 
@@ -19912,32 +19587,6 @@ Contributors:
 
 ----------------------------------------
 
-### minimatch@v3.1.2
-
-> a glob matcher in javascript
-
-License: ISC
-Repository: <git://github.com/isaacs/minimatch.git>
-Author: Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)
-
-> The ISC License
->
-> Copyright (c) Isaac Z. Schlueter and Contributors
->
-> Permission to use, copy, modify, and/or distribute this software for any
-> purpose with or without fee is hereby granted, provided that the above
-> copyright notice and this permission notice appear in all copies.
->
-> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-> IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-----------------------------------------
-
 ### minimist@v1.2.8
 
 > parse argument options
@@ -20029,32 +19678,6 @@ Author: Andrey Sitnik <andrey@sitnik.ru>
 
 ----------------------------------------
 
-### once@v1.4.0
-
-> Run a function exactly one time
-
-License: ISC
-Repository: <git://github.com/isaacs/once>
-Author: Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)
-
-> The ISC License
->
-> Copyright (c) Isaac Z. Schlueter and Contributors
->
-> Permission to use, copy, modify, and/or distribute this software for any
-> purpose with or without fee is hereby granted, provided that the above
-> copyright notice and this permission notice appear in all copies.
->
-> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-> IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-----------------------------------------
-
 ### p-limit@v4.0.0
 
 > Run multiple promise-returning & async functions with limited concurrency
@@ -20165,37 +19788,6 @@ Author: Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
 ----------------------------------------
 
-### path-is-absolute@v1.0.1
-
-> Node.js 0.12 path.isAbsolute() ponyfill
-
-License: MIT
-Author: Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-> The MIT License (MIT)
->
-> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
->
-> Permission is hereby granted, free of charge, to any person obtaining a copy
-> of this software and associated documentation files (the "Software"), to deal
-> in the Software without restriction, including without limitation the rights
-> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-> copies of the Software, and to permit persons to whom the Software is
-> furnished to do so, subject to the following conditions:
->
-> The above copyright notice and this permission notice shall be included in
-> all copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-> THE SOFTWARE.
-
-----------------------------------------
-
 ### picocolors@v1.0.0
 
 > The tiniest and the fastest library for terminal output formatting with ANSI colors
@@ -20305,7 +19897,7 @@ Author: typicode
 
 ----------------------------------------
 
-### postcss@v8.4.33
+### postcss@v8.4.38
 
 > Tool for transforming styles with JS plugins
 
@@ -20667,31 +20259,6 @@ Author: Matteo Collina <hello@matteocollina.com>
 
 ----------------------------------------
 
-### rimraf@v3.0.2
-
-> A deep deletion module for node (like `rm -rf`)
-
-License: ISC
-Author: Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)
-
-> The ISC License
->
-> Copyright (c) Isaac Z. Schlueter and Contributors
->
-> Permission to use, copy, modify, and/or distribute this software for any
-> purpose with or without fee is hereby granted, provided that the above
-> copyright notice and this permission notice appear in all copies.
->
-> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-> IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-----------------------------------------
-
 ### run-parallel@v1.2.0
 
 > Run an array of functions in parallel
@@ -20743,12 +20310,12 @@ Author: Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
 ----------------------------------------
 
-### semver@v7.5.4
+### semver@v7.6.2
 
 > The semantic version parser used by npm.
 
 License: ISC
-Repository: <https://github.com/npm/node-semver.git>
+Repository: <git+https://github.com/npm/node-semver.git>
 Author: GitHub Inc.
 
 > The ISC License
@@ -20907,25 +20474,6 @@ Author: Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
 ----------------------------------------
 
-### supports-color@v5.5.0
-
-> Detect whether a terminal supports color
-
-License: MIT
-Author: Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-> MIT License
->
-> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
->
-> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
->
-> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-----------------------------------------
-
 ### to-fast-properties@v4.0.0
 
 > Force V8 to use fast properties for an object
@@ -21060,13 +20608,13 @@ Contributors:
 
 ----------------------------------------
 
-### ts-api-utils@v1.0.3
+### ts-api-utils@v1.3.0
 
-> Utility functions for working with TypeScript's API. Successor to the wonderful tsutils.
+> Utility functions for working with TypeScript's API. Successor to the wonderful tsutils. 🛠️️
 
 License: MIT
 Repository: <https://github.com/JoshuaKGoldberg/ts-api-utils>
-Author: Josh Goldberg <npm@joshuakgoldberg.com>
+Author: JoshuaKGoldberg <npm@joshuakgoldberg.com>
 
 > # MIT License
 >
@@ -21091,7 +20639,7 @@ Author: Josh Goldberg <npm@joshuakgoldberg.com>
 
 ----------------------------------------
 
-### typescript@v5.3.3
+### typescript@v5.4.5
 
 > TypeScript is a language for application scale JavaScript development
 
@@ -21650,33 +21198,6 @@ Contributors:
 
 ----------------------------------------
 
-### wrappy@v1.0.2
-
-> Callback wrapping utility
-
-License: ISC
-Homepage: <https://github.com/npm/wrappy>
-Repository: <https://github.com/npm/wrappy>
-Author: Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)
-
-> The ISC License
->
-> Copyright (c) Isaac Z. Schlueter and Contributors
->
-> Permission to use, copy, modify, and/or distribute this software for any
-> purpose with or without fee is hereby granted, provided that the above
-> copyright notice and this permission notice appear in all copies.
->
-> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-> IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-----------------------------------------
-
 ### xtend@v4.0.2
 
 > extend like a boss

From d88d03c03914b8b07a55bab60c4b22cdd99bed6c Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Mon, 10 Jun 2024 18:52:12 -0700
Subject: [PATCH 107/133] ci: fix vulnerability check and e2e tests (#5530)

### Description

Resolves the [audit
advisory](https://github.com/advisories/GHSA-grv7-fg5c-xmjg) for braces.

Updates e2e tests for Fiat Connect from #5532.
- Increase wait time for tx feed item to appear (60s doesn't seem
enough)
- Remove back photo ID, which persona doesn't seem to request now

### Test plan

Tested in CI.

### Related issues

N/A

### Backwards compatibility

Yes

### Network scalability

N/A

---------

Co-authored-by: Satish Ravi <satish.ravi@valoraapp.com>
---
 e2e/src/usecases/FiatConnectTransferOut.js | 11 +--
 package.json                               |  3 +-
 yarn.lock                                  | 91 +++-------------------
 3 files changed, 20 insertions(+), 85 deletions(-)

diff --git a/e2e/src/usecases/FiatConnectTransferOut.js b/e2e/src/usecases/FiatConnectTransferOut.js
index e8897ef40c..85c6f984e8 100644
--- a/e2e/src/usecases/FiatConnectTransferOut.js
+++ b/e2e/src/usecases/FiatConnectTransferOut.js
@@ -106,7 +106,7 @@ async function onboardAndBeginTransferOut(token, fundingAmount, cashOutAmount) {
   // For now the balance only updates when the home screen is visible
   await waitFor(element(by.text(`${fundingAmount} cUSD`))) // need a balance to withdraw
     .toBeVisible()
-    .withTimeout(60000) // in case funding tx is still pending. balance must be updated before amount can be selected.
+    .withTimeout(120000) // in case funding tx is still pending. balance must be updated before amount can be selected.
 
   await navigateToFiatExchangeScreen()
 
@@ -238,12 +238,13 @@ export const fiatConnectKycTransferOut = () => {
     // Manually wait for Take Photo button to appear, withTimeout didn't work
     await sleep(10000)
 
-    // License photo back
-    await element(by.label('Take photo')).tap()
-    await element(by.text('Use this photo')).tap()
+    // License photo back -- personal stopped requesting back photo, commenting
+    // for now to unblock CI
+    // await element(by.label('Take photo')).tap()
+    // await element(by.text('Use this photo')).tap()
 
     // Manually wait for Take Photo button to appear, withTimeout didn't work
-    await sleep(10000)
+    // await sleep(10000)
 
     // License photo barcode
     await element(by.label('Take photo')).tap()
diff --git a/package.json b/package.json
index 7dd6d929e8..1a6f178930 100644
--- a/package.json
+++ b/package.json
@@ -343,7 +343,8 @@
     "crypto-js": "^4.2.0",
     "browserify-sign": "^4.2.3",
     "follow-redirects": "^1.15.6",
-    "redux": "^5.0.1"
+    "redux": "^5.0.1",
+    "braces": "^3.0.3"
   },
   "detox": {
     "testRunner": {
diff --git a/yarn.lock b/yarn.lock
index 00f75d7ad6..13621a6da6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5851,11 +5851,6 @@ arr-diff@^4.0.0:
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
   integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
-arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
@@ -6500,28 +6495,12 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^2.3.1, braces@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
-braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+braces@^2.3.1, braces@^2.3.2, braces@^3.0.2, braces@^3.0.3, braces@~3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
@@ -9354,7 +9333,7 @@ extend-shallow@^2.0.1:
   dependencies:
     is-extendable "^0.1.0"
 
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
   integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
@@ -9518,20 +9497,10 @@ file-uri-to-path@1.0.0:
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -12278,7 +12247,7 @@ keyvaluestorage-interface@^1.0.0:
   resolved "https://registry.yarnpkg.com/keyvaluestorage-interface/-/keyvaluestorage-interface-1.0.0.tgz#13ebdf71f5284ad54be94bd1ad9ed79adad515ff"
   integrity sha512-8t6Q3TclQ4uZynJY9IGr2+SsIGwK9JHcO6ootkHCGA0CrQCRy+VkouYNO2xicET6b9al7QKzpebNow+gkpCL8g==
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+kind-of@^3.0.2, kind-of@^3.0.3:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
@@ -15976,12 +15945,7 @@ rename-overwrite@^5.0.0:
     "@zkochan/rimraf" "^2.1.2"
     fs-extra "10.1.0"
 
-repeat-element@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
-  integrity sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=
-
-repeat-string@^1.5.2, repeat-string@^1.6.1:
+repeat-string@^1.5.2:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
@@ -16730,22 +16694,6 @@ slice-ansi@^7.0.0:
     ansi-styles "^6.2.1"
     is-fullwidth-code-point "^5.0.0"
 
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
-  dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
-
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
-  dependencies:
-    kind-of "^3.2.0"
-
 snapdragon@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
@@ -16885,13 +16833,6 @@ split-on-first@^1.0.0:
   resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
   integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
 
-split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
-  dependencies:
-    extend-shallow "^3.0.0"
-
 split2@^3.0.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f"
@@ -17587,14 +17528,6 @@ to-readable-stream@^1.0.0:
   resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
   integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
 
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"

From 1db955ae0c9a6e4a08ef80a773de2e99464bbde8 Mon Sep 17 00:00:00 2001
From: Valora Bot <89419329+valora-bot@users.noreply.github.com>
Date: Mon, 10 Jun 2024 19:42:53 -0700
Subject: [PATCH 108/133] chore: update licenses and disclaimer (#5533)

Co-authored-by: valora-bot <valorabot@valoraapp.com>
---
 src/account/LicenseDisclaimer.txt | 56 +++++++++++++++----------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/account/LicenseDisclaimer.txt b/src/account/LicenseDisclaimer.txt
index bd077ab245..c2acf03a10 100644
--- a/src/account/LicenseDisclaimer.txt
+++ b/src/account/LicenseDisclaimer.txt
@@ -6538,11 +6538,11 @@ SOFTWARE.
 
 -----
 
-The following software may be included in this product: braces, clone-deep, normalize-path. A copy of the source code may be downloaded from https://github.com/micromatch/braces.git (braces), https://github.com/jonschlinkert/clone-deep.git (clone-deep), https://github.com/jonschlinkert/normalize-path.git (normalize-path). This software contains the following license and notice below:
+The following software may be included in this product: braces, fill-range, is-number, is-primitive, micromatch, mixin-deep, set-value. A copy of the source code may be downloaded from https://github.com/micromatch/braces.git (braces), https://github.com/jonschlinkert/fill-range.git (fill-range), https://github.com/jonschlinkert/is-number.git (is-number), https://github.com/jonschlinkert/is-primitive.git (is-primitive), https://github.com/micromatch/micromatch.git (micromatch), https://github.com/jonschlinkert/mixin-deep.git (mixin-deep), https://github.com/jonschlinkert/set-value.git (set-value). This software contains the following license and notice below:
 
 The MIT License (MIT)
 
-Copyright (c) 2014-2018, Jon Schlinkert.
+Copyright (c) 2014-present, Jon Schlinkert.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -7926,6 +7926,32 @@ THE SOFTWARE.
 
 -----
 
+The following software may be included in this product: clone-deep, normalize-path. A copy of the source code may be downloaded from https://github.com/jonschlinkert/clone-deep.git (clone-deep), https://github.com/jonschlinkert/normalize-path.git (normalize-path). This software contains the following license and notice below:
+
+The MIT License (MIT)
+
+Copyright (c) 2014-2018, Jon Schlinkert.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+-----
+
 The following software may be included in this product: color. A copy of the source code may be downloaded from https://github.com/Qix-/color.git. This software contains the following license and notice below:
 
 Copyright (c) 2012 Heather Arthur
@@ -11209,32 +11235,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 -----
 
-The following software may be included in this product: fill-range, is-number, is-primitive, micromatch, mixin-deep, set-value. A copy of the source code may be downloaded from https://github.com/jonschlinkert/fill-range.git (fill-range), https://github.com/jonschlinkert/is-number.git (is-number), https://github.com/jonschlinkert/is-primitive.git (is-primitive), https://github.com/micromatch/micromatch.git (micromatch), https://github.com/jonschlinkert/mixin-deep.git (mixin-deep), https://github.com/jonschlinkert/set-value.git (set-value). This software contains the following license and notice below:
-
-The MIT License (MIT)
-
-Copyright (c) 2014-present, Jon Schlinkert.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
------
-
 The following software may be included in this product: finalhandler. A copy of the source code may be downloaded from https://github.com/pillarjs/finalhandler.git. This software contains the following license and notice below:
 
 (The MIT License)

From 08976bb28d0034428787a6944b861d384a1a85d0 Mon Sep 17 00:00:00 2001
From: Jacob Waterman <jacobrwaterman@gmail.com>
Date: Mon, 10 Jun 2024 20:55:28 -0700
Subject: [PATCH 109/133] feat(earn): Handle gas subsidies for withdraw and
 claim rewards (#5500)

### Description

Statsig config change:
https://console.statsig.com/4plizaPmWwPL21ASV4QAO0/dynamic_configs/earn_stablecoin_config/preview/raCrXQsnCm2BhABjUkcz2


TODO:
* swap in the syndicate RPC url when the feature flag is on
* fine tune the gas paddings

### Test plan

unit tests added

### Related issues

https://linear.app/valora/issue/ACT-1194/use-syndicate-rpc-node

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)

---------

Co-authored-by: Satish Ravi <satish.ravi@valoraapp.com>
---
 src/earn/prepareTransactions.test.ts  | 319 +++++++++++++++-----------
 src/earn/prepareTransactions.ts       |  71 ++----
 src/earn/simulateTransactions.test.ts | 121 ++++++++++
 src/earn/simulateTransactions.ts      |  58 +++++
 src/statsig/constants.ts              |   2 +
 5 files changed, 384 insertions(+), 187 deletions(-)
 create mode 100644 src/earn/simulateTransactions.test.ts
 create mode 100644 src/earn/simulateTransactions.ts

diff --git a/src/earn/prepareTransactions.test.ts b/src/earn/prepareTransactions.test.ts
index 7ab6abd0d3..6a9ef5dcc0 100644
--- a/src/earn/prepareTransactions.test.ts
+++ b/src/earn/prepareTransactions.test.ts
@@ -1,5 +1,4 @@
 import BigNumber from 'bignumber.js'
-import { FetchMock } from 'jest-fetch-mock/types'
 import aaveIncentivesV3Abi from 'src/abis/AaveIncentivesV3'
 import aavePool from 'src/abis/AavePoolV3'
 import erc20 from 'src/abis/IERC20'
@@ -7,6 +6,7 @@ import {
   prepareSupplyTransactions,
   prepareWithdrawAndClaimTransactions,
 } from 'src/earn/prepareTransactions'
+import { simulateTransactions } from 'src/earn/simulateTransactions'
 import { getDynamicConfigParams, getFeatureGate } from 'src/statsig'
 import { StatsigDynamicConfigs, StatsigFeatureGates } from 'src/statsig/types'
 import { TokenBalance } from 'src/tokens/slice'
@@ -50,6 +50,7 @@ jest.mock('viem', () => ({
   ...jest.requireActual('viem'),
   encodeFunctionData: jest.fn(),
 }))
+jest.mock('src/earn/simulateTransactions')
 
 describe('prepareTransactions', () => {
   beforeEach(() => {
@@ -73,37 +74,26 @@ describe('prepareTransactions', () => {
       }
       throw new Error(`Unexpected feature gate: ${featureGate}`)
     })
+    jest.mocked(simulateTransactions).mockResolvedValue([
+      {
+        status: 'success',
+        blockNumber: '1',
+        gasNeeded: 3000,
+        gasUsed: 2800,
+        gasPrice: '1',
+      },
+      {
+        status: 'success',
+        blockNumber: '1',
+        gasNeeded: 50000,
+        gasUsed: 49800,
+        gasPrice: '1',
+      },
+    ])
   })
 
   describe('prepareSupplyTransactions', () => {
-    const mockFetch = fetch as FetchMock
-    beforeEach(() => {
-      mockFetch.resetMocks()
-    })
-
     it('prepares transactions with approve and supply if not already approved', async () => {
-      mockFetch.mockResponseOnce(
-        JSON.stringify({
-          status: 'OK',
-          simulatedTransactions: [
-            {
-              status: 'success',
-              blockNumber: '1',
-              gasNeeded: 3000,
-              gasUsed: 2800,
-              gasPrice: '1',
-            },
-            {
-              status: 'success',
-              blockNumber: '1',
-              gasNeeded: 50000,
-              gasUsed: 49800,
-              gasPrice: '1',
-            },
-          ],
-        })
-      )
-
       const result = await prepareSupplyTransactions({
         amount: '5',
         token: mockToken,
@@ -156,27 +146,6 @@ describe('prepareTransactions', () => {
       })
     })
     it('prepares fees from the cloud function for approve and supply when subsidizing gas fees', async () => {
-      mockFetch.mockResponseOnce(
-        JSON.stringify({
-          status: 'OK',
-          simulatedTransactions: [
-            {
-              status: 'success',
-              blockNumber: '1',
-              gasNeeded: 3000,
-              gasUsed: 2800,
-              gasPrice: '1',
-            },
-            {
-              status: 'success',
-              blockNumber: '1',
-              gasNeeded: 50000,
-              gasUsed: 49800,
-              gasPrice: '1',
-            },
-          ],
-        })
-      )
       jest.mocked(getFeatureGate).mockImplementation((featureGate) => {
         if (featureGate === StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES) {
           return true
@@ -240,20 +209,15 @@ describe('prepareTransactions', () => {
 
     it('prepares transactions with supply if already approved', async () => {
       jest.spyOn(publicClient[Network.Arbitrum], 'readContract').mockResolvedValue(BigInt(5e6))
-      mockFetch.mockResponseOnce(
-        JSON.stringify({
-          status: 'OK',
-          simulatedTransactions: [
-            {
-              status: 'success',
-              blockNumber: '1',
-              gasNeeded: 50000,
-              gasUsed: 49800,
-              gasPrice: '1',
-            },
-          ],
-        })
-      )
+      jest.mocked(simulateTransactions).mockResolvedValueOnce([
+        {
+          status: 'success',
+          blockNumber: '1',
+          gasNeeded: 50000,
+          gasUsed: 49800,
+          gasPrice: '1',
+        },
+      ])
 
       const result = await prepareSupplyTransactions({
         amount: '5',
@@ -296,83 +260,6 @@ describe('prepareTransactions', () => {
         isGasSubsidized: false,
       })
     })
-
-    it('throws if simulate transactions sends a non 200 response', async () => {
-      mockFetch.mockResponseOnce(
-        JSON.stringify({
-          status: 'ERROR',
-          error: 'something went wrong',
-        }),
-        { status: 500 }
-      )
-
-      await expect(
-        prepareSupplyTransactions({
-          amount: '5',
-          token: mockToken,
-          walletAddress: '0x1234',
-          feeCurrencies: [mockFeeCurrency],
-          poolContractAddress: '0x5678',
-        })
-      ).rejects.toThrow('Failed to simulate transactions')
-    })
-
-    it('throws if supply transaction simulation status is failure', async () => {
-      mockFetch.mockResponseOnce(
-        JSON.stringify({
-          status: 'OK',
-          simulatedTransactions: [
-            {
-              status: 'success',
-              blockNumber: '1',
-              gasNeeded: 3000,
-              gasUsed: 2800,
-              gasPrice: '1',
-            },
-            {
-              status: 'failure',
-            },
-          ],
-        })
-      )
-
-      await expect(
-        prepareSupplyTransactions({
-          amount: '5',
-          token: mockToken,
-          walletAddress: '0x1234',
-          feeCurrencies: [mockFeeCurrency],
-          poolContractAddress: '0x5678',
-        })
-      ).rejects.toThrow('Failed to simulate supply transaction')
-    })
-
-    it('throws if simulated transactions length does not match base transactions length', async () => {
-      mockFetch.mockResponseOnce(
-        JSON.stringify({
-          status: 'OK',
-          simulatedTransactions: [
-            {
-              status: 'success',
-              blockNumber: '1',
-              gasNeeded: 3000,
-              gasUsed: 2800,
-              gasPrice: '1',
-            },
-          ],
-        })
-      )
-
-      await expect(
-        prepareSupplyTransactions({
-          amount: '5',
-          token: mockToken,
-          walletAddress: '0x1234',
-          feeCurrencies: [mockFeeCurrency],
-          poolContractAddress: '0x5678',
-        })
-      ).rejects.toThrow('Expected 2 simulated transactions, got 1')
-    })
   })
 
   describe('prepareWithdrawAndClaimTransactions', () => {
@@ -473,5 +360,157 @@ describe('prepareTransactions', () => {
         feeCurrencies: [mockFeeCurrency],
       })
     })
+    describe('when gas fees are subsidized', () => {
+      beforeEach(() => {
+        jest.mocked(getDynamicConfigParams).mockImplementation(({ configName, defaultValues }) => {
+          if (configName === StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG) {
+            return { ...defaultValues, withdrawGasPadding: 100, rewardsGasPadding: 200 }
+          }
+          return defaultValues
+        })
+        jest.mocked(getFeatureGate).mockImplementation((featureGate) => {
+          if (featureGate === StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES) {
+            return true
+          }
+          throw new Error(`Unexpected feature gate: ${featureGate}`)
+        })
+      })
+      it('prepares withdraw and claim transactions with gas fees added from the simulated transaction', async () => {
+        jest.mocked(simulateTransactions).mockResolvedValue([
+          {
+            status: 'success',
+            blockNumber: '1',
+            gasNeeded: 3000,
+            gasUsed: 2800,
+            gasPrice: '1',
+          },
+          {
+            status: 'success',
+            blockNumber: '1',
+            gasNeeded: 50000,
+            gasUsed: 49600,
+            gasPrice: '1',
+          },
+          {
+            status: 'success',
+            blockNumber: '1',
+            gasNeeded: 50000,
+            gasUsed: 49600,
+            gasPrice: '1',
+          },
+        ])
+        const rewards = [
+          {
+            amount: '0.002',
+            tokenInfo: mockArbArbTokenBalance,
+          },
+          {
+            amount: '0.003',
+            tokenInfo: mockToken,
+          },
+        ]
+        const result = await prepareWithdrawAndClaimTransactions({
+          amount: '5',
+          token: mockToken,
+          walletAddress: '0x1234',
+          feeCurrencies: [mockFeeCurrency],
+          rewards,
+          poolTokenAddress: '0x5678',
+        })
+
+        const expectedTransactions = [
+          {
+            from: '0x1234',
+            to: networkConfig.arbAavePoolV3ContractAddress,
+            data: '0xencodedData',
+            gas: BigInt(3100),
+            _estimatedGasUse: BigInt(2800),
+          },
+          {
+            from: '0x1234',
+            to: networkConfig.arbAaveIncentivesV3ContractAddress,
+            data: '0xencodedData',
+            gas: BigInt(50200),
+            _estimatedGasUse: BigInt(49600),
+          },
+          {
+            from: '0x1234',
+            to: networkConfig.arbAaveIncentivesV3ContractAddress,
+            data: '0xencodedData',
+            gas: BigInt(50200),
+            _estimatedGasUse: BigInt(49600),
+          },
+        ]
+        expect(result).toEqual({
+          type: 'possible',
+          feeCurrency: mockFeeCurrency,
+          transactions: expectedTransactions,
+        })
+        expect(encodeFunctionData).toHaveBeenCalledTimes(3)
+        expect(encodeFunctionData).toHaveBeenCalledWith({
+          abi: aavePool,
+          functionName: 'withdraw',
+          args: [mockTokenAddress, BigInt(5e6), '0x1234'],
+        })
+        expect(encodeFunctionData).toHaveBeenCalledWith({
+          abi: aaveIncentivesV3Abi,
+          functionName: 'claimRewardsToSelf',
+          args: [['0x5678'], BigInt(2e15), mockArbArbAddress],
+        })
+        expect(encodeFunctionData).toHaveBeenCalledWith({
+          abi: aaveIncentivesV3Abi,
+          functionName: 'claimRewardsToSelf',
+          args: [['0x5678'], BigInt(3000), mockTokenAddress],
+        })
+        expect(prepareTransactions).toHaveBeenCalledWith({
+          baseTransactions: expectedTransactions,
+          feeCurrencies: [mockFeeCurrency],
+        })
+      })
+      it('prepares only withdraw transaction if no rewards', async () => {
+        jest.mocked(simulateTransactions).mockResolvedValue([
+          {
+            status: 'success',
+            blockNumber: '1',
+            gasNeeded: 3000,
+            gasUsed: 2800,
+            gasPrice: '1',
+          },
+        ])
+        const result = await prepareWithdrawAndClaimTransactions({
+          amount: '5',
+          token: mockToken,
+          walletAddress: '0x1234',
+          feeCurrencies: [mockFeeCurrency],
+          rewards: [],
+          poolTokenAddress: '0x5678',
+        })
+
+        const expectedTransactions = [
+          {
+            from: '0x1234',
+            to: networkConfig.arbAavePoolV3ContractAddress,
+            data: '0xencodedData',
+            gas: BigInt(3100),
+            _estimatedGasUse: BigInt(2800),
+          },
+        ]
+        expect(result).toEqual({
+          type: 'possible',
+          feeCurrency: mockFeeCurrency,
+          transactions: expectedTransactions,
+        })
+        expect(encodeFunctionData).toHaveBeenCalledTimes(1)
+        expect(encodeFunctionData).toHaveBeenCalledWith({
+          abi: aavePool,
+          functionName: 'withdraw',
+          args: [mockTokenAddress, BigInt(5e6), '0x1234'],
+        })
+        expect(prepareTransactions).toHaveBeenCalledWith({
+          baseTransactions: expectedTransactions,
+          feeCurrencies: [mockFeeCurrency],
+        })
+      })
+    })
   })
 })
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 7990910b91..83e47dd7c2 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -3,6 +3,7 @@ import { useAsyncCallback } from 'react-async-hook'
 import aaveIncentivesV3Abi from 'src/abis/AaveIncentivesV3'
 import aavePool from 'src/abis/AavePoolV3'
 import erc20 from 'src/abis/IERC20'
+import { simulateTransactions } from 'src/earn/simulateTransactions'
 import { RewardsInfo } from 'src/earn/types'
 import { getDynamicConfigParams, getFeatureGate } from 'src/statsig'
 import { DynamicConfigs } from 'src/statsig/constants'
@@ -10,7 +11,6 @@ import { StatsigDynamicConfigs, StatsigFeatureGates } from 'src/statsig/types'
 import { TokenBalance } from 'src/tokens/slice'
 import Logger from 'src/utils/Logger'
 import { ensureError } from 'src/utils/ensureError'
-import { fetchWithTimeout } from 'src/utils/fetchWithTimeout'
 import { publicClient } from 'src/viem'
 import { TransactionRequest, prepareTransactions } from 'src/viem/prepareTransactions'
 import networkConfig, { networkIdToNetwork } from 'src/web3/networkConfig'
@@ -18,17 +18,6 @@ import { Address, encodeFunctionData, isAddress, parseUnits } from 'viem'
 
 const TAG = 'earn/prepareTransactions'
 
-type SimulatedTransactionResponse = {
-  status: 'OK'
-  simulatedTransactions: {
-    status: 'success' | 'failure'
-    blockNumber: string
-    gasNeeded: number
-    gasUsed: number
-    gasPrice: string
-  }[]
-}
-
 export async function prepareSupplyTransactions({
   amount,
   token,
@@ -88,40 +77,13 @@ export async function prepareSupplyTransactions({
 
   baseTransactions.push(supplyTx)
 
-  const response = await fetchWithTimeout(networkConfig.simulateTransactionsUrl, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      transactions: baseTransactions,
-      networkId: token.networkId,
-    }),
+  const simulatedTransactions = await simulateTransactions({
+    baseTransactions,
+    networkId: token.networkId,
   })
 
-  if (!response.ok) {
-    throw new Error(
-      `Failed to simulate transactions. status ${response.status}, text: ${await response.text()}`
-    )
-  }
-
-  // extract fee of the supply transaction and set gas fields
-  const { simulatedTransactions }: SimulatedTransactionResponse = await response.json()
-
-  if (simulatedTransactions.length !== baseTransactions.length) {
-    throw new Error(
-      `Expected ${baseTransactions.length} simulated transactions, got ${simulatedTransactions.length}, response: ${JSON.stringify(simulatedTransactions)}`
-    )
-  }
-
   const supplySimulatedTx = simulatedTransactions[simulatedTransactions.length - 1]
 
-  if (supplySimulatedTx.status !== 'success') {
-    throw new Error(
-      `Failed to simulate supply transaction. response: ${JSON.stringify(simulatedTransactions)}`
-    )
-  }
-
   const { depositGasPadding, approveGasPadding } = getDynamicConfigParams(
     DynamicConfigs[StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG]
   )
@@ -135,11 +97,6 @@ export async function prepareSupplyTransactions({
   if (isGasSubsidized && baseTransactions.length > 1) {
     // extract fee of the approve transaction and set gas fields
     const approveSimulatedTx = simulatedTransactions[0]
-    if (approveSimulatedTx.status !== 'success') {
-      throw new Error(
-        `Failed to simulate approve transaction. response: ${JSON.stringify(simulatedTransactions)}`
-      )
-    }
     baseTransactions[0].gas = BigInt(approveSimulatedTx.gasNeeded) + BigInt(approveGasPadding)
     baseTransactions[0]._estimatedGasUse = BigInt(approveSimulatedTx.gasUsed)
   }
@@ -225,6 +182,26 @@ export async function prepareWithdrawAndClaimTransactions({
     })
   })
 
+  const isGasSubsidized = getFeatureGate(StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES)
+
+  if (isGasSubsidized) {
+    const simulatedTransactions = await simulateTransactions({
+      baseTransactions,
+      networkId: token.networkId,
+    })
+
+    const { withdrawGasPadding, rewardsGasPadding } = getDynamicConfigParams(
+      DynamicConfigs[StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG]
+    )
+
+    baseTransactions.forEach((tx, index) => {
+      const simulatedTx = simulatedTransactions[index]
+      tx.gas =
+        BigInt(simulatedTx.gasNeeded) + BigInt(index === 0 ? withdrawGasPadding : rewardsGasPadding)
+      tx._estimatedGasUse = BigInt(simulatedTx.gasUsed)
+    })
+  }
+
   return prepareTransactions({
     feeCurrencies,
     baseTransactions,
diff --git a/src/earn/simulateTransactions.test.ts b/src/earn/simulateTransactions.test.ts
new file mode 100644
index 0000000000..47df78921e
--- /dev/null
+++ b/src/earn/simulateTransactions.test.ts
@@ -0,0 +1,121 @@
+import { FetchMock } from 'jest-fetch-mock'
+import { simulateTransactions } from 'src/earn/simulateTransactions'
+import { NetworkId } from 'src/transactions/types'
+import { TransactionRequest } from 'src/viem/prepareTransactions'
+import networkConfig from 'src/web3/networkConfig'
+
+const mockBaseTransactions: TransactionRequest[] = [
+  {
+    from: '0x123',
+    to: '0x456',
+    data: '0xencodedData',
+  },
+  {
+    from: '0x456',
+    to: '0x789',
+    data: '0xencodedData',
+  },
+]
+
+const mockSimulatedTransactions = [
+  {
+    status: 'success',
+    blockNumber: '1',
+    gasNeeded: 3000,
+    gasUsed: 2800,
+    gasPrice: '1',
+  },
+  {
+    status: 'success',
+    blockNumber: '1',
+    gasNeeded: 50000,
+    gasUsed: 49800,
+    gasPrice: '1',
+  },
+]
+
+describe('simulateTransactions', () => {
+  const mockFetch = fetch as FetchMock
+  beforeEach(() => {
+    mockFetch.resetMocks()
+  })
+
+  it('should fetch simulated transactions', async () => {
+    mockFetch.mockResponseOnce(
+      JSON.stringify({
+        status: 'OK',
+        simulatedTransactions: mockSimulatedTransactions,
+      })
+    )
+    const simulatedTransactions = await simulateTransactions({
+      baseTransactions: mockBaseTransactions,
+      networkId: NetworkId['arbitrum-sepolia'],
+    })
+    expect(mockFetch).toHaveBeenCalledWith(
+      networkConfig.simulateTransactionsUrl,
+      expect.objectContaining({
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          transactions: mockBaseTransactions,
+          networkId: NetworkId['arbitrum-sepolia'],
+        }),
+      })
+    )
+    expect(simulatedTransactions).toEqual(mockSimulatedTransactions)
+  })
+  it('should throw an error if the response is not ok', async () => {
+    mockFetch.mockResponseOnce(
+      JSON.stringify({
+        status: 'ERROR',
+        error: 'something went wrong',
+      }),
+      { status: 500 }
+    )
+    await expect(
+      simulateTransactions({
+        baseTransactions: mockBaseTransactions,
+        networkId: NetworkId['arbitrum-sepolia'],
+      })
+    ).rejects.toThrow(
+      'Failed to simulate transactions. status 500, text: {"status":"ERROR","error":"something went wrong"}'
+    )
+  })
+  it('should throw an error if the number of simulated transactions does not match the number of base transactions', async () => {
+    mockFetch.mockResponseOnce(
+      JSON.stringify({
+        status: 'OK',
+        simulatedTransactions: mockSimulatedTransactions.slice(0, 1),
+      })
+    )
+    await expect(
+      simulateTransactions({
+        baseTransactions: mockBaseTransactions,
+        networkId: NetworkId['arbitrum-sepolia'],
+      })
+    ).rejects.toThrow(
+      'Expected 2 simulated transactions, got 1, response: [{"status":"success","blockNumber":"1","gasNeeded":3000,"gasUsed":2800,"gasPrice":"1"}]'
+    )
+  })
+  it('should throw an error if a simulated transaction is not successful', async () => {
+    mockFetch.mockResponseOnce(
+      JSON.stringify({
+        status: 'OK',
+        simulatedTransactions: [
+          mockSimulatedTransactions[0],
+          { ...mockSimulatedTransactions[1], status: 'failure' },
+        ],
+      })
+    )
+    await expect(
+      simulateTransactions({
+        baseTransactions: mockBaseTransactions,
+        networkId: NetworkId['arbitrum-sepolia'],
+      })
+    ).rejects.toThrow(
+      'Failed to simulate transaction for base transaction {"from":"0x456","to":"0x789","data":"0xencodedData"}. response: {"status":"failure","blockNumber":"1","gasNeeded":50000,"gasUsed":49800,"gasPrice":"1"}'
+    )
+  })
+})
diff --git a/src/earn/simulateTransactions.ts b/src/earn/simulateTransactions.ts
new file mode 100644
index 0000000000..0db6760def
--- /dev/null
+++ b/src/earn/simulateTransactions.ts
@@ -0,0 +1,58 @@
+import { NetworkId } from 'src/transactions/types'
+import { fetchWithTimeout } from 'src/utils/fetchWithTimeout'
+import { TransactionRequest } from 'src/viem/prepareTransactions'
+import networkConfig from 'src/web3/networkConfig'
+
+type SimulatedTransactionResponse = {
+  status: 'OK'
+  simulatedTransactions: {
+    status: 'success' | 'failure'
+    blockNumber: string
+    gasNeeded: number
+    gasUsed: number
+    gasPrice: string
+  }[]
+}
+
+export async function simulateTransactions({
+  baseTransactions,
+  networkId,
+}: {
+  baseTransactions: TransactionRequest[]
+  networkId: NetworkId
+}) {
+  const response = await fetchWithTimeout(networkConfig.simulateTransactionsUrl, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify({
+      transactions: baseTransactions,
+      networkId,
+    }),
+  })
+
+  if (!response.ok) {
+    throw new Error(
+      `Failed to simulate transactions. status ${response.status}, text: ${await response.text()}`
+    )
+  }
+
+  const { simulatedTransactions }: SimulatedTransactionResponse = await response.json()
+
+  if (simulatedTransactions.length !== baseTransactions.length) {
+    throw new Error(
+      `Expected ${baseTransactions.length} simulated transactions, got ${simulatedTransactions.length}, response: ${JSON.stringify(simulatedTransactions)}`
+    )
+  }
+
+  simulatedTransactions.forEach((tx, i) => {
+    if (tx.status !== 'success') {
+      throw new Error(
+        `Failed to simulate transaction for base transaction ${JSON.stringify(baseTransactions[i])}. response: ${JSON.stringify(tx)}`
+      )
+    }
+  })
+
+  return simulatedTransactions
+}
diff --git a/src/statsig/constants.ts b/src/statsig/constants.ts
index 7c63c2ee25..54365f2daf 100644
--- a/src/statsig/constants.ts
+++ b/src/statsig/constants.ts
@@ -145,6 +145,8 @@ export const DynamicConfigs = {
       providerTermsAndConditionsUrl: '',
       depositGasPadding: 0,
       approveGasPadding: 0,
+      withdrawGasPadding: 0,
+      rewardsGasPadding: 0,
       moreAavePoolsUrl: '',
     },
   },

From 3495de3e348264be6648e7f795358aeddf310958 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 11 Jun 2024 14:08:40 +0000
Subject: [PATCH 110/133] chore(deps): update dependency prettier to v3.3.1
 (#5527)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [prettier](https://prettier.io)
([source](https://togithub.com/prettier/prettier)) | [`3.3.0` ->
`3.3.1`](https://renovatebot.com/diffs/npm/prettier/3.3.0/3.3.1) |
[![age](https://developer.mend.io/api/mc/badges/age/npm/prettier/3.3.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/prettier/3.3.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/prettier/3.3.0/3.3.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/prettier/3.3.0/3.3.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>prettier/prettier (prettier)</summary>

###
[`v3.3.1`](https://togithub.com/prettier/prettier/blob/HEAD/CHANGELOG.md#331)

[Compare
Source](https://togithub.com/prettier/prettier/compare/3.3.0...3.3.1)

[diff](https://togithub.com/prettier/prettier/compare/3.3.0...3.3.1)

##### Preserve empty lines in front matter
([#&#8203;16347](https://togithub.com/prettier/prettier/pull/16347) by
[@&#8203;fisker](https://togithub.com/fisker))

<!-- prettier-ignore -->

```markdown
<!-- Input -->
---
foo:
  - bar1

  - bar2

  - bar3
---
Markdown

<!-- Prettier 3.3.0 -->

---
foo:
  - bar1
  - bar2
  - bar3
---

Markdown

<!-- Prettier 3.3.1 -->
---
foo:
  - bar1

  - bar2

  - bar3
---

Markdown
```

##### Preserve explicit language in front matter
([#&#8203;16348](https://togithub.com/prettier/prettier/pull/16348) by
[@&#8203;fisker](https://togithub.com/fisker))

<!-- prettier-ignore -->

```markdown
<!-- Input -->
---yaml
title: Hello
slug: home
---

<!-- Prettier 3.3.0 -->
---
title: Hello
slug: home
---

<!-- Prettier 3.3.1 -->
---yaml
title: Hello
slug: home
---
```

##### Avoid line breaks in import attributes
([#&#8203;16349](https://togithub.com/prettier/prettier/pull/16349) by
[@&#8203;fisker](https://togithub.com/fisker))

<!-- prettier-ignore -->

```jsx
// Input
import something from "./some-very-very-very-very-very-very-very-very-long-path.json" with { type: "json" };

// Prettier 3.3.0
import something from "./some-very-very-very-very-very-very-very-very-long-path.json" with { type:
  "json" };

// Prettier 3.3.1
import something from "./some-very-very-very-very-very-very-very-very-long-path.json" with { type: "json" };
```

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these
updates again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zOTMuMCIsInVwZGF0ZWRJblZlciI6IjM3LjM5My4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 4 ++--
 yarn.lock    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 1a6f178930..6313036b8f 100644
--- a/package.json
+++ b/package.json
@@ -279,7 +279,7 @@
     "mockdate": "^3.0.5",
     "patch-package": "^6.2.2",
     "pixelmatch": "^5.2.1",
-    "prettier": "3.3.0",
+    "prettier": "3.3.1",
     "prettier-plugin-java": "^2.6.0",
     "react-devtools": "^4.26.0",
     "react-native-dotenv": "^3.2.0",
@@ -307,7 +307,7 @@
     "**/extend": "^3.0.2",
     "**/cross-fetch": "^4.0.0",
     "bignumber.js": "^9.1.2",
-    "prettier": "3.3.0",
+    "prettier": "3.3.1",
     "@types/prettier": "^3.0.0",
     "eslint-utils": "^3.0.0",
     "set-value": "^4.1.0",
diff --git a/yarn.lock b/yarn.lock
index 13621a6da6..b8c39e55cb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14767,10 +14767,10 @@ prettier-plugin-java@^2.6.0:
     lodash "4.17.21"
     prettier "3.2.5"
 
-prettier@*, prettier@3.2.5, prettier@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.0.tgz#d173ea0524a691d4c0b1181752f2b46724328cdf"
-  integrity sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==
+prettier@*, prettier@3.2.5, prettier@3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.1.tgz#e68935518dd90bb7ec4821ba970e68f8de16e1ac"
+  integrity sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==
 
 pretty-format@^24.9.0:
   version "24.9.0"

From 1002cbd392e662400250d6616fdad5519e956876 Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Wed, 12 Jun 2024 05:45:59 +1200
Subject: [PATCH 111/133] fix(send): Fix bug where you can't send max amount
 (#5529)

### Description

When pressing the max button a user would always get the error saying to
enter a lower amount, this fixes it.

Explanation
[here](https://valora-app.slack.com/archives/C02KBT0DAHJ/p1718034648230829).

### Test plan

CI

### Related issues

- N/A

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [X] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)

Co-authored-by: Tom McGuire <Mcgtom10@gmail.com>
---
 src/send/EnterAmount.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/send/EnterAmount.tsx b/src/send/EnterAmount.tsx
index bbc841add5..3ec7e83d7a 100644
--- a/src/send/EnterAmount.tsx
+++ b/src/send/EnterAmount.tsx
@@ -265,7 +265,7 @@ function EnterAmount({
     return () => clearTimeout(debouncedRefreshTransactions)
   }, [tokenAmount, token])
 
-  const isAmountLessThanBalance = tokenAmount && tokenAmount.lt(token.balance)
+  const isAmountLessThanBalance = tokenAmount && tokenAmount.lte(token.balance)
   const showLowerAmountError = !isAmountLessThanBalance && !disableBalanceCheck
   const showMaxAmountWarning =
     !showLowerAmountError &&

From afe7f47791fc99efe85d92c51dcd793b88e0e4c6 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Tue, 11 Jun 2024 15:29:02 -0700
Subject: [PATCH 112/133] fix(earn): navigate to earn info screen from CTA
 (#5534)

### Description

Looks like this was missed when adding the screen

### Test plan

CI, manually ensuring the cta navigates to the info screen

### Related issues

N/A

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/earn/EarnCta.test.tsx | 7 +++----
 src/earn/EarnCta.tsx      | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/earn/EarnCta.test.tsx b/src/earn/EarnCta.test.tsx
index c396729f1e..96e0bf9485 100644
--- a/src/earn/EarnCta.test.tsx
+++ b/src/earn/EarnCta.test.tsx
@@ -6,6 +6,7 @@ import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import EarnCta from 'src/earn/EarnCta'
 import { fetchAavePoolInfo } from 'src/earn/poolInfo'
 import { navigate } from 'src/navigator/NavigationService'
+import { Screens } from 'src/navigator/Screens'
 import { NetworkId } from 'src/transactions/types'
 import { createMockStore } from 'test/utils'
 import { mockArbUsdcTokenId, mockTokenBalances } from 'test/values'
@@ -61,7 +62,7 @@ describe('EarnCta', () => {
     )
   })
 
-  it('navigates to EarnEnterAmount when pressed', async () => {
+  it('navigates to EarnInfoScreen when pressed', async () => {
     const { getByTestId } = render(
       <Provider store={createStore()}>
         <EarnCta depositTokenId={mockArbUsdcTokenId} />
@@ -74,8 +75,6 @@ describe('EarnCta', () => {
       providerId: 'aave-v3',
       networkId: NetworkId['arbitrum-sepolia'],
     })
-    expect(navigate).toHaveBeenCalledWith('EarnEnterAmount', {
-      tokenId: mockArbUsdcTokenId,
-    })
+    expect(navigate).toHaveBeenCalledWith(Screens.EarnInfoScreen, { tokenId: mockArbUsdcTokenId })
   })
 })
diff --git a/src/earn/EarnCta.tsx b/src/earn/EarnCta.tsx
index d7c26fdcfa..e91bee9fee 100644
--- a/src/earn/EarnCta.tsx
+++ b/src/earn/EarnCta.tsx
@@ -45,7 +45,7 @@ export default function EarnCta({ depositTokenId }: { depositTokenId: string })
             providerId: PROVIDER_ID,
             networkId: depositToken.networkId,
           })
-          navigate(Screens.EarnEnterAmount, { tokenId: depositTokenId })
+          navigate(Screens.EarnInfoScreen, { tokenId: depositTokenId })
         }}
         testID="EarnCta"
       >

From 2966d8669e56d55b58b9303164e59f2876840cc3 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Tue, 11 Jun 2024 17:27:01 -0700
Subject: [PATCH 113/133] fix(earn-info): bottom to button padding on iPhone SE
 (#5535)

### Description

Small layout fix PR for iPhone SE

| iPhone SE Before | iPhone SE After |
| ------ | ------ |
|
![](https://github.com/valora-inc/wallet/assets/26950305/1b149ad1-6b9e-4938-af9f-aae0ea78ba32
"iPhone SE Before") |
![](https://github.com/valora-inc/wallet/assets/26950305/e28bc462-ab96-4b16-89e9-c05d5754d5cb
"iPhone SE After") |

### Test plan

- [x] Tested locally on iOS
- [x] Tested locally on Android

### Related issues

- Fixes ACT-1192

### Backwards compatibility

Yes

### Network scalability

N/A

---------

Co-authored-by: Satish Ravi <satish.ravi@valoraapp.com>
---
 src/earn/EarnInfoScreen.tsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/earn/EarnInfoScreen.tsx b/src/earn/EarnInfoScreen.tsx
index 71cb3d7806..fb7a84794d 100644
--- a/src/earn/EarnInfoScreen.tsx
+++ b/src/earn/EarnInfoScreen.tsx
@@ -2,7 +2,7 @@ import { useHeaderHeight } from '@react-navigation/elements'
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import React, { ReactElement } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Platform, ScrollView, StyleSheet, Text, View } from 'react-native'
+import { ScrollView, StyleSheet, Text, View } from 'react-native'
 import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context'
 import { EarnEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
@@ -61,15 +61,12 @@ export default function EarnInfoScreen({ route }: Props) {
 
   const headerHeight = useHeaderHeight()
   const { bottom } = useSafeAreaInsets()
-  const insetsStyle = Platform.OS === 'android' && {
+  const insetsStyle = {
     paddingBottom: Math.max(bottom, Spacing.Regular16),
   }
 
   return (
-    <SafeAreaView
-      style={[styles.safeAreaContainer, { paddingTop: headerHeight }]}
-      edges={['bottom']}
-    >
+    <SafeAreaView style={[styles.safeAreaContainer, { paddingTop: headerHeight }]} edges={[]}>
       <ScrollView>
         <Text style={styles.title}>{t('earnFlow.earnInfo.title')}</Text>
         <View style={styles.detailsContainer}>

From 9e62fc709a6d547239e68d0224f36ee7a60c3022 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 16:05:31 +0000
Subject: [PATCH 114/133] chore(deps): update dependency prettier to v3.3.2
 (#5536)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [prettier](https://prettier.io)
([source](https://togithub.com/prettier/prettier)) | [`3.3.1` ->
`3.3.2`](https://renovatebot.com/diffs/npm/prettier/3.3.1/3.3.2) |
[![age](https://developer.mend.io/api/mc/badges/age/npm/prettier/3.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/prettier/3.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/prettier/3.3.1/3.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/prettier/3.3.1/3.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>prettier/prettier (prettier)</summary>

###
[`v3.3.2`](https://togithub.com/prettier/prettier/blob/HEAD/CHANGELOG.md#332)

[Compare
Source](https://togithub.com/prettier/prettier/compare/3.3.1...3.3.2)

[diff](https://togithub.com/prettier/prettier/compare/3.3.1...3.3.2)

##### Fix handlebars path expressions starts with `@`
([#&#8203;16358](https://togithub.com/prettier/prettier/pull/16358) by
[@&#8203;Princeyadav05](https://togithub.com/Princeyadav05))

<!-- prettier-ignore -->

```hbs
{{! Input }}
<div>{{@&#8203;x.y.z}}</div>

{{! Prettier 3.3.1 }}
<div>{{@&#8203;x}}</div>

{{! Prettier 3.3.2 }}
<div>{{@&#8203;x.y.z}}</div>
```

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these
updates again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zOTMuMCIsInVwZGF0ZWRJblZlciI6IjM3LjM5My4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 4 ++--
 yarn.lock    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 6313036b8f..0990bcaf25 100644
--- a/package.json
+++ b/package.json
@@ -279,7 +279,7 @@
     "mockdate": "^3.0.5",
     "patch-package": "^6.2.2",
     "pixelmatch": "^5.2.1",
-    "prettier": "3.3.1",
+    "prettier": "3.3.2",
     "prettier-plugin-java": "^2.6.0",
     "react-devtools": "^4.26.0",
     "react-native-dotenv": "^3.2.0",
@@ -307,7 +307,7 @@
     "**/extend": "^3.0.2",
     "**/cross-fetch": "^4.0.0",
     "bignumber.js": "^9.1.2",
-    "prettier": "3.3.1",
+    "prettier": "3.3.2",
     "@types/prettier": "^3.0.0",
     "eslint-utils": "^3.0.0",
     "set-value": "^4.1.0",
diff --git a/yarn.lock b/yarn.lock
index b8c39e55cb..76e4907119 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14767,10 +14767,10 @@ prettier-plugin-java@^2.6.0:
     lodash "4.17.21"
     prettier "3.2.5"
 
-prettier@*, prettier@3.2.5, prettier@3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.1.tgz#e68935518dd90bb7ec4821ba970e68f8de16e1ac"
-  integrity sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==
+prettier@*, prettier@3.2.5, prettier@3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.2.tgz#03ff86dc7c835f2d2559ee76876a3914cec4a90a"
+  integrity sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==
 
 pretty-format@^24.9.0:
   version "24.9.0"

From d651f53a01069560f38a46a5795c3169b6fff208 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 12 Jun 2024 10:51:05 -0700
Subject: [PATCH 115/133] build(deps): upgrade wallet connect deps (#5531)

### Description

Upgrades WalletConnect dependencies to the latest.

### Test plan

- [x] Tested in CI

### Related issues

N/A

### Backwards compatibility

Yes

### Network scalability

N/A
---
 ios/Podfile.lock          |   4 +-
 package.json              |  10 +--
 test/RootStateSchema.json |   1 +
 yarn.lock                 | 177 +++++++++++++++++++++++++++++---------
 4 files changed, 144 insertions(+), 48 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 9493de45a9..7171dcd6f8 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -524,7 +524,7 @@ PODS:
     - React-Core
   - react-native-camera/RN (4.2.1):
     - React-Core
-  - react-native-compat (2.12.2):
+  - react-native-compat (2.13.2):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - react-native-config (1.5.1):
@@ -1200,7 +1200,7 @@ SPEC CHECKSUMS:
   React-logger: a41d4cad677e9726b71a45a4012431d2fb1edd80
   react-native-adjust: 83114d391a4a7a438e2c4d8e8137bc7810e7076f
   react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
-  react-native-compat: c741279b875109d2d9fc8da22e80c00ef91311a6
+  react-native-compat: 5b81b2d5f3f6be5e149ad2d3af3b9fc03f07f9d3
   react-native-config: 86038147314e2e6d10ea9972022aa171e6b1d4d8
   react-native-contacts: fd1614c74777089ebb6b0a0e3847dd78130ef9f4
   react-native-cookies: 672b2431ca44da2e2942af086d0c83aae42b989a
diff --git a/package.json b/package.json
index 0990bcaf25..2c51fdfd81 100644
--- a/package.json
+++ b/package.json
@@ -116,9 +116,9 @@
     "@toruslabs/constants": "^13.3.0",
     "@toruslabs/fetch-node-details": "^13.3.0",
     "@toruslabs/torus.js": "^12.2.0",
-    "@walletconnect/react-native-compat": "^2.12.2",
-    "@walletconnect/utils": "^2.12.2",
-    "@walletconnect/web3wallet": "^1.11.2",
+    "@walletconnect/react-native-compat": "^2.13.2",
+    "@walletconnect/utils": "^2.13.2",
+    "@walletconnect/web3wallet": "^1.12.2",
     "Base64": "^1.3.0",
     "bignumber.js": "^9.1.2",
     "clevertap-react-native": "^2.2.1",
@@ -245,8 +245,8 @@
     "@valora/eslint-config-typescript": "^1.0.2",
     "@valora/resolve-kit": "^1.0.1",
     "@walletconnect/legacy-types": "^2.0.0",
-    "@walletconnect/sign-client": "^2.11.3",
-    "@walletconnect/types": "^2.11.3",
+    "@walletconnect/sign-client": "^2.13.2",
+    "@walletconnect/types": "^2.13.2",
     "ajv": "^8.10.0",
     "babel-jest": "^29.2.1",
     "babel-plugin-module-resolver": "^4.1.0",
diff --git a/test/RootStateSchema.json b/test/RootStateSchema.json
index cf4b8cf24e..f879206b1f 100644
--- a/test/RootStateSchema.json
+++ b/test/RootStateSchema.json
@@ -2973,6 +2973,7 @@
                 "expiryTimestamp",
                 "id",
                 "optionalNamespaces",
+                "pairingTopic",
                 "proposer",
                 "relays",
                 "requiredNamespaces"
diff --git a/yarn.lock b/yarn.lock
index 76e4907119..58a503f842 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3676,7 +3676,7 @@
     "@stablelib/constant-time" "^1.0.1"
     "@stablelib/wipe" "^1.0.1"
 
-"@stablelib/random@^1.0.1", "@stablelib/random@^1.0.2":
+"@stablelib/random@1.0.2", "@stablelib/random@^1.0.1", "@stablelib/random@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@stablelib/random/-/random-1.0.2.tgz#2dece393636489bf7e19c51229dd7900eddf742c"
   integrity sha512-rIsE83Xpb7clHPVRlBj8qNe5L8ISQOzjghYQm/dZ7VaM2KHYwMW5adjQjrzTZCchFnNCNhkwtnOBa9HTMJCI8w==
@@ -3712,7 +3712,7 @@
   resolved "https://registry.yarnpkg.com/@stablelib/wipe/-/wipe-1.0.1.tgz#d21401f1d59ade56a62e139462a97f104ed19a36"
   integrity sha512-WfqfX/eXGiAd3RJe4VU2snh/ZPwtSjLG4ynQ/vYzvghTh7dHFcI1wl+nrkWG6lGhukOxOsUHfv8dUXr58D0ayg==
 
-"@stablelib/x25519@^1.0.3":
+"@stablelib/x25519@1.0.3", "@stablelib/x25519@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@stablelib/x25519/-/x25519-1.0.3.tgz#13c8174f774ea9f3e5e42213cbf9fc68a3c7b7fd"
   integrity sha512-KnTbKmUhPhHavzobclVJQG5kuivH+qDLpe84iRqX3CLrKp881cF160JvXJ+hjn1aMyCwYOKeIZefIH/P5cJoRw==
@@ -5331,7 +5331,30 @@
     events "^3.3.0"
     isomorphic-unfetch "^3.1.0"
 
-"@walletconnect/core@2.12.2", "@walletconnect/core@^2.10.1":
+"@walletconnect/core@2.13.2":
+  version "2.13.2"
+  resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.13.2.tgz#8f83a12afdbfd23f04a045caf0efd9cbf8af8063"
+  integrity sha512-t1miHox71hh7tUrYFhLzNkm67wSS4kwVWO2jpwY5aHOoqkFpDSjb3A3nr+Adjrz4ZNxpObLJutQpApqkgwisjw==
+  dependencies:
+    "@walletconnect/heartbeat" "1.2.2"
+    "@walletconnect/jsonrpc-provider" "1.0.14"
+    "@walletconnect/jsonrpc-types" "1.0.4"
+    "@walletconnect/jsonrpc-utils" "1.0.8"
+    "@walletconnect/jsonrpc-ws-connection" "1.0.14"
+    "@walletconnect/keyvaluestorage" "1.1.1"
+    "@walletconnect/logger" "2.1.2"
+    "@walletconnect/relay-api" "1.0.10"
+    "@walletconnect/relay-auth" "1.0.4"
+    "@walletconnect/safe-json" "1.0.2"
+    "@walletconnect/time" "1.0.2"
+    "@walletconnect/types" "2.13.2"
+    "@walletconnect/utils" "2.13.2"
+    events "3.3.0"
+    isomorphic-unfetch "3.1.0"
+    lodash.isequal "4.5.0"
+    uint8arrays "3.1.0"
+
+"@walletconnect/core@^2.10.1":
   version "2.12.2"
   resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.12.2.tgz#12bd568b90daed876e58ebcc098c12843a3321e6"
   integrity sha512-7Adv/b3pp9F42BkvReaaM4KS8NEvlkS7AMtwO3uF/o6aRMKtcfTJq9/jgWdKJh4RP8pPRTRFjCw6XQ/RZtT4aQ==
@@ -5361,7 +5384,7 @@
   dependencies:
     tslib "1.14.1"
 
-"@walletconnect/events@^1.0.1":
+"@walletconnect/events@1.0.1", "@walletconnect/events@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@walletconnect/events/-/events-1.0.1.tgz#2b5f9c7202019e229d7ccae1369a9e86bda7816c"
   integrity sha512-NPTqaoi0oPBVNuLv7qPaJazmGHs5JGyO8eEAk5VGKmJzDR7AHzD4k6ilox5kxk1iwiOnFopBOOMLs86Oa76HpQ==
@@ -5378,6 +5401,15 @@
     "@walletconnect/time" "^1.0.2"
     tslib "1.14.1"
 
+"@walletconnect/heartbeat@1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@walletconnect/heartbeat/-/heartbeat-1.2.2.tgz#e8dc5179db7769950c6f9cf59b23516d9b95227d"
+  integrity sha512-uASiRmC5MwhuRuf05vq4AT48Pq8RMi876zV8rr8cV969uTOzWdB/k+Lj5yI2PBtB1bGQisGen7MM1GcZlQTBXw==
+  dependencies:
+    "@walletconnect/events" "^1.0.1"
+    "@walletconnect/time" "^1.0.2"
+    events "^3.3.0"
+
 "@walletconnect/jsonrpc-provider@1.0.13":
   version "1.0.13"
   resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-provider/-/jsonrpc-provider-1.0.13.tgz#9a74da648d015e1fffc745f0c7d629457f53648b"
@@ -5387,6 +5419,15 @@
     "@walletconnect/safe-json" "^1.0.2"
     tslib "1.14.1"
 
+"@walletconnect/jsonrpc-provider@1.0.14":
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-provider/-/jsonrpc-provider-1.0.14.tgz#696f3e3b6d728b361f2e8b853cfc6afbdf2e4e3e"
+  integrity sha512-rtsNY1XqHvWj0EtITNeuf8PHMvlCLiS3EjQL+WOkxEOA4KPxsohFnBDeyPYiNm4ZvkQdLnece36opYidmtbmow==
+  dependencies:
+    "@walletconnect/jsonrpc-utils" "^1.0.8"
+    "@walletconnect/safe-json" "^1.0.2"
+    events "^3.3.0"
+
 "@walletconnect/jsonrpc-types@1.0.3", "@walletconnect/jsonrpc-types@^1.0.2", "@walletconnect/jsonrpc-types@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-types/-/jsonrpc-types-1.0.3.tgz#65e3b77046f1a7fa8347ae02bc1b841abe6f290c"
@@ -5395,6 +5436,14 @@
     keyvaluestorage-interface "^1.0.0"
     tslib "1.14.1"
 
+"@walletconnect/jsonrpc-types@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-types/-/jsonrpc-types-1.0.4.tgz#ce1a667d79eadf2a2d9d002c152ceb68739c230c"
+  integrity sha512-P6679fG/M+wuWg9TY8mh6xFSdYnFyFjwFelxyISxMDrlbXokorEVXYOxiqEbrU3x1BmBoCAJJ+vtEaEoMlpCBQ==
+  dependencies:
+    events "^3.3.0"
+    keyvaluestorage-interface "^1.0.0"
+
 "@walletconnect/jsonrpc-utils@1.0.8", "@walletconnect/jsonrpc-utils@^1.0.6", "@walletconnect/jsonrpc-utils@^1.0.8":
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-utils/-/jsonrpc-utils-1.0.8.tgz#82d0cc6a5d6ff0ecc277cb35f71402c91ad48d72"
@@ -5414,7 +5463,7 @@
     events "^3.3.0"
     ws "^7.5.1"
 
-"@walletconnect/keyvaluestorage@^1.1.1":
+"@walletconnect/keyvaluestorage@1.1.1", "@walletconnect/keyvaluestorage@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@walletconnect/keyvaluestorage/-/keyvaluestorage-1.1.1.tgz#dd2caddabfbaf80f6b8993a0704d8b83115a1842"
   integrity sha512-V7ZQq2+mSxAq7MrRqDxanTzu2RcElfK1PfNYiaVnJgJ7Q7G7hTVwF8voIBx92qsRyGHZihrwNPHuZd1aKkd0rA==
@@ -5438,14 +5487,21 @@
     "@walletconnect/safe-json" "^1.0.2"
     pino "7.11.0"
 
-"@walletconnect/react-native-compat@^2.12.2":
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/@walletconnect/react-native-compat/-/react-native-compat-2.12.2.tgz#3dd9e75124d7cea30c02bc0f3fcfede01e241f2e"
-  integrity sha512-NChpoZwftMDSy6xH0hc1d2eCvlm0Tx8BQSMtHKFaOpbxxreB90UDmbubqNIPywAGinM/1isgen0i0yvLpHRLRg==
+"@walletconnect/react-native-compat@^2.13.2":
+  version "2.13.2"
+  resolved "https://registry.yarnpkg.com/@walletconnect/react-native-compat/-/react-native-compat-2.13.2.tgz#791f6bcd1a18a72d41385ec7199b0ad58cf76156"
+  integrity sha512-5y/RDbFD92Clrk28oYNrPgk5p7LJKdP1UUoq/tJnjTbl2oxQYg9ECy8P7AHkZrwm0JWa1PvxDv4sasmKFMNerw==
   dependencies:
     events "3.3.0"
-    fast-text-encoding "^1.0.6"
-    react-native-url-polyfill "^2.0.0"
+    fast-text-encoding "1.0.6"
+    react-native-url-polyfill "2.0.0"
+
+"@walletconnect/relay-api@1.0.10":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@walletconnect/relay-api/-/relay-api-1.0.10.tgz#5aef3cd07c21582b968136179aa75849dcc65499"
+  integrity sha512-tqrdd4zU9VBNqUaXXQASaexklv6A54yEyQQEXYOCr+Jz8Ket0dmPBDyg19LVSNUN2cipAghQc45/KVmfFJ0cYw==
+  dependencies:
+    "@walletconnect/jsonrpc-types" "^1.0.2"
 
 "@walletconnect/relay-api@^1.0.9":
   version "1.0.9"
@@ -5455,7 +5511,7 @@
     "@walletconnect/jsonrpc-types" "^1.0.2"
     tslib "1.14.1"
 
-"@walletconnect/relay-auth@^1.0.4":
+"@walletconnect/relay-auth@1.0.4", "@walletconnect/relay-auth@^1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@walletconnect/relay-auth/-/relay-auth-1.0.4.tgz#0b5c55c9aa3b0ef61f526ce679f3ff8a5c4c2c7c"
   integrity sha512-kKJcS6+WxYq5kshpPaxGHdwf5y98ZwbfuS4EE/NkQzqrDFm5Cj+dP8LofzWvjrrLkZq7Afy7WrQMXdLy8Sx7HQ==
@@ -5467,36 +5523,36 @@
     tslib "1.14.1"
     uint8arrays "^3.0.0"
 
-"@walletconnect/safe-json@^1.0.1", "@walletconnect/safe-json@^1.0.2":
+"@walletconnect/safe-json@1.0.2", "@walletconnect/safe-json@^1.0.1", "@walletconnect/safe-json@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@walletconnect/safe-json/-/safe-json-1.0.2.tgz#7237e5ca48046e4476154e503c6d3c914126fa77"
   integrity sha512-Ogb7I27kZ3LPC3ibn8ldyUr5544t3/STow9+lzz7Sfo808YD7SBWk7SAsdBFlYgP2zDRy2hS3sKRcuSRM0OTmA==
   dependencies:
     tslib "1.14.1"
 
-"@walletconnect/sign-client@2.12.2", "@walletconnect/sign-client@^2.11.3":
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.12.2.tgz#10cddcba3740f726149c33ef1a9040a808d65e08"
-  integrity sha512-cM0ualXj6nVvLqS4BDNRk+ZWR+lubcsz/IHreH+3wYrQ2sV+C0fN6ctrd7MMGZss0C0qacWCx0pm62ZBuoKvqA==
+"@walletconnect/sign-client@2.13.2", "@walletconnect/sign-client@^2.13.2":
+  version "2.13.2"
+  resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.13.2.tgz#ab7b78c3dec4172a69fe09885a8e6542b634992a"
+  integrity sha512-KIjAYwEkjR55uy0eZTRbKKxiLpC/hZYmjZEQf2stcTVuTOes5q3aZDlHXFHrVWn8b0pl7k0BqcDDNGklU7Xaew==
   dependencies:
-    "@walletconnect/core" "2.12.2"
-    "@walletconnect/events" "^1.0.1"
-    "@walletconnect/heartbeat" "1.2.1"
+    "@walletconnect/core" "2.13.2"
+    "@walletconnect/events" "1.0.1"
+    "@walletconnect/heartbeat" "1.2.2"
     "@walletconnect/jsonrpc-utils" "1.0.8"
-    "@walletconnect/logger" "^2.1.2"
-    "@walletconnect/time" "^1.0.2"
-    "@walletconnect/types" "2.12.2"
-    "@walletconnect/utils" "2.12.2"
-    events "^3.3.0"
+    "@walletconnect/logger" "2.1.2"
+    "@walletconnect/time" "1.0.2"
+    "@walletconnect/types" "2.13.2"
+    "@walletconnect/utils" "2.13.2"
+    events "3.3.0"
 
-"@walletconnect/time@^1.0.2":
+"@walletconnect/time@1.0.2", "@walletconnect/time@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@walletconnect/time/-/time-1.0.2.tgz#6c5888b835750ecb4299d28eecc5e72c6d336523"
   integrity sha512-uzdd9woDcJ1AaBZRhqy5rNC9laqWGErfc4dxA9a87mPdKOgWMD85mcFo9dIYIts/Jwocfwn07EC6EzclKubk/g==
   dependencies:
     tslib "1.14.1"
 
-"@walletconnect/types@2.12.2", "@walletconnect/types@^2.11.3":
+"@walletconnect/types@2.12.2":
   version "2.12.2"
   resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.12.2.tgz#8b64a2015a0a96972d28acb2ff317a9a994abfdb"
   integrity sha512-9CmwTlPbrFTzayTL9q7xM7s3KTJkS6kYFtH2m1/fHFgALs6pIUjf1qAx1TF2E4tv7SEzLAIzU4NqgYUt2vWXTg==
@@ -5508,7 +5564,19 @@
     "@walletconnect/logger" "^2.0.1"
     events "^3.3.0"
 
-"@walletconnect/utils@2.12.2", "@walletconnect/utils@^2.10.1", "@walletconnect/utils@^2.12.2":
+"@walletconnect/types@2.13.2", "@walletconnect/types@^2.13.2":
+  version "2.13.2"
+  resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.13.2.tgz#2b371b25dee1b8920b753a860eb10afe68efcc81"
+  integrity sha512-rcomCPp1dwslIZC/e01BLSWC6to2TFM4I1QbAo7kaqh6xTVN9rCtGfdaNi0RbtfBhCEULFvc18v33r/wR0iAPQ==
+  dependencies:
+    "@walletconnect/events" "1.0.1"
+    "@walletconnect/heartbeat" "1.2.2"
+    "@walletconnect/jsonrpc-types" "1.0.4"
+    "@walletconnect/keyvaluestorage" "1.1.1"
+    "@walletconnect/logger" "2.1.2"
+    events "3.3.0"
+
+"@walletconnect/utils@2.12.2", "@walletconnect/utils@^2.10.1":
   version "2.12.2"
   resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.12.2.tgz#a2c349d4effef7c1c5e72e74a5483d8dfbb10918"
   integrity sha512-zf50HeS3SfoLv1N9GPl2IXTZ9TsXfet4usVAsZmX9P6/Xzq7d/7QakjVQCHH/Wk1O9XkcsfeoZoUhRxoMJ5uJw==
@@ -5528,28 +5596,48 @@
     query-string "7.1.3"
     uint8arrays "^3.1.0"
 
-"@walletconnect/web3wallet@^1.11.2":
-  version "1.11.2"
-  resolved "https://registry.yarnpkg.com/@walletconnect/web3wallet/-/web3wallet-1.11.2.tgz#0c6af495518a92036b0bb72a39e54bc10127b541"
-  integrity sha512-jrxXmZyg+czkHXg4d0jdhxajjfbgPvS9dW4UzdGdz12dXsX7CFgZxz+LWc/oakhLyngUtwHtyBlgaFWxamS3AQ==
+"@walletconnect/utils@2.13.2", "@walletconnect/utils@^2.13.2":
+  version "2.13.2"
+  resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.13.2.tgz#9b4c00005ef3c82438313f44e7126a6a5ab7670e"
+  integrity sha512-wDu+g/lWO93dVrntWgxwiX6XeuCHD9kxMWLEtyGZ7AmWHZv3U1Z8EWIU/e9kv4yBQxmHN3b0DhcrowfcMF3YOA==
+  dependencies:
+    "@stablelib/chacha20poly1305" "1.0.1"
+    "@stablelib/hkdf" "1.0.1"
+    "@stablelib/random" "1.0.2"
+    "@stablelib/sha256" "1.0.1"
+    "@stablelib/x25519" "1.0.3"
+    "@walletconnect/relay-api" "1.0.10"
+    "@walletconnect/safe-json" "1.0.2"
+    "@walletconnect/time" "1.0.2"
+    "@walletconnect/types" "2.13.2"
+    "@walletconnect/window-getters" "1.0.1"
+    "@walletconnect/window-metadata" "1.0.1"
+    detect-browser "5.3.0"
+    query-string "7.1.3"
+    uint8arrays "3.1.0"
+
+"@walletconnect/web3wallet@^1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@walletconnect/web3wallet/-/web3wallet-1.12.2.tgz#eebf8d5682623a05d95c378e8b449bf534f3f4b1"
+  integrity sha512-j4rnhU3rwXGWyrwpME+mRD5f/wsiqO7lX6CkxM0zmORHLcMhfNFnU6MEIkPhJDE9KgDxRfpw8kqbLyiSeml14g==
   dependencies:
     "@walletconnect/auth-client" "2.1.2"
-    "@walletconnect/core" "2.12.2"
-    "@walletconnect/jsonrpc-provider" "1.0.13"
+    "@walletconnect/core" "2.13.2"
+    "@walletconnect/jsonrpc-provider" "1.0.14"
     "@walletconnect/jsonrpc-utils" "1.0.8"
     "@walletconnect/logger" "2.1.2"
-    "@walletconnect/sign-client" "2.12.2"
-    "@walletconnect/types" "2.12.2"
-    "@walletconnect/utils" "2.12.2"
+    "@walletconnect/sign-client" "2.13.2"
+    "@walletconnect/types" "2.13.2"
+    "@walletconnect/utils" "2.13.2"
 
-"@walletconnect/window-getters@^1.0.1":
+"@walletconnect/window-getters@1.0.1", "@walletconnect/window-getters@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@walletconnect/window-getters/-/window-getters-1.0.1.tgz#f36d1c72558a7f6b87ecc4451fc8bd44f63cbbdc"
   integrity sha512-vHp+HqzGxORPAN8gY03qnbTMnhqIwjeRJNOMOAzePRg4xVEEE2WvYsI9G2NMjOknA8hnuYbU3/hwLcKbjhc8+Q==
   dependencies:
     tslib "1.14.1"
 
-"@walletconnect/window-metadata@^1.0.1":
+"@walletconnect/window-metadata@1.0.1", "@walletconnect/window-metadata@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@walletconnect/window-metadata/-/window-metadata-1.0.1.tgz#2124f75447b7e989e4e4e1581d55d25bc75f7be5"
   integrity sha512-9koTqyGrM2cqFRW517BPY/iEtUDx2r1+Pwwu5m7sJ7ka79wi3EyqhqcICk/yDmv6jAS1rjKgTKXlEhanYjijcA==
@@ -9432,7 +9520,7 @@ fast-safe-stringify@^2.0.7:
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
   integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
 
-fast-text-encoding@^1.0.6:
+fast-text-encoding@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867"
   integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==
@@ -15496,7 +15584,7 @@ react-native-tab-view@^2.16.0:
   resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-2.16.0.tgz#cae72c7084394bd328fac5fefb86cd966df37a86"
   integrity sha512-ac2DmT7+l13wzIFqtbfXn4wwfgtPoKzWjjZyrK1t+T8sdemuUvD4zIt+UImg03fu3s3VD8Wh/fBrIdcqQyZJWg==
 
-react-native-url-polyfill@^2.0.0:
+react-native-url-polyfill@2.0.0, react-native-url-polyfill@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/react-native-url-polyfill/-/react-native-url-polyfill-2.0.0.tgz#db714520a2985cff1d50ab2e66279b9f91ffd589"
   integrity sha512-My330Do7/DvKnEvwQc0WdcBnFPploYKp9CYlefDXzIdEaA+PAhDYllkvGeEroEzvc4Kzzj2O4yVdz8v6fjRvhA==
@@ -17946,6 +18034,13 @@ uglifyjs-webpack-plugin@^0.4.6:
     uglify-js "^2.8.29"
     webpack-sources "^1.0.1"
 
+uint8arrays@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-3.1.0.tgz#8186b8eafce68f28bd29bd29d683a311778901e2"
+  integrity sha512-ei5rfKtoRO8OyOIor2Rz5fhzjThwIHJZ3uyDPnDHTXbP0aMQ1RN/6AI5B5d9dBxJOU+BvOAk7ZQ1xphsX8Lrog==
+  dependencies:
+    multiformats "^9.4.2"
+
 uint8arrays@^3.0.0, uint8arrays@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-3.1.1.tgz#2d8762acce159ccd9936057572dade9459f65ae0"

From 73aad1aa8d94ece615b227bdc65db831f6167037 Mon Sep 17 00:00:00 2001
From: Valora Bot <89419329+valora-bot@users.noreply.github.com>
Date: Wed, 12 Jun 2024 16:49:44 -0700
Subject: [PATCH 116/133] chore: update licenses and disclaimer (#5538)

Co-authored-by: valora-bot <valorabot@valoraapp.com>
Co-authored-by: Tom McGuire <Mcgtom10@gmail.com>
---
 src/account/LicenseDisclaimer.txt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/account/LicenseDisclaimer.txt b/src/account/LicenseDisclaimer.txt
index c2acf03a10..52d91e9bda 100644
--- a/src/account/LicenseDisclaimer.txt
+++ b/src/account/LicenseDisclaimer.txt
@@ -16971,7 +16971,7 @@ MIT, ISC, BSD-2-Clause, BSD-3-Clause, Apache-2.0
 
 ## Bundled dependencies
 
-### @angular/compiler@v18.0.0
+### @angular/compiler@v18.0.2
 
 > Angular - the compiler library
 
@@ -16981,7 +16981,7 @@ Author: angular
 
 ----------------------------------------
 
-### @babel/code-frame@v7.24.6
+### @babel/code-frame@v7.24.7
 
 > Generate errors that contain a code frame that point to source locations.
 
@@ -17015,7 +17015,7 @@ Author: The Babel Team (https://babel.dev/team)
 
 ----------------------------------------
 
-### @babel/helper-validator-identifier@v7.24.6
+### @babel/helper-validator-identifier@v7.24.7
 
 > Validate identifier/keywords name
 
@@ -17048,7 +17048,7 @@ Author: The Babel Team (https://babel.dev/team)
 
 ----------------------------------------
 
-### @babel/highlight@v7.24.6
+### @babel/highlight@v7.24.7
 
 > Syntax highlight JavaScript strings for output in terminals.
 
@@ -17082,7 +17082,7 @@ Author: The Babel Team (https://babel.dev/team)
 
 ----------------------------------------
 
-### @babel/parser@v7.24.6
+### @babel/parser@v7.24.7
 
 > A JavaScript parser
 
@@ -17410,7 +17410,7 @@ Author: Alex Bell <alex@bellandwhistle.net>
 
 ----------------------------------------
 
-### @typescript-eslint/types@v7.10.0
+### @typescript-eslint/types@v7.13.0
 
 > Types for the TypeScript-ESTree AST spec
 
@@ -17442,7 +17442,7 @@ Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
 
 ----------------------------------------
 
-### @typescript-eslint/typescript-estree@v7.10.0
+### @typescript-eslint/typescript-estree@v7.13.0
 
 > A parser that converts TypeScript source code into an ESTree compatible form
 
@@ -18482,7 +18482,7 @@ Contributors:
 
 ----------------------------------------
 
-### flow-parser@v0.236.0
+### flow-parser@v0.237.2
 
 > JavaScript parser written in OCaml. Produces ESTree AST
 
@@ -19518,7 +19518,7 @@ Repository: <git@github.com:teambition/merge2.git>
 
 ----------------------------------------
 
-### meriyah@v4.4.3
+### meriyah@v4.5.0
 
 > A 100% compliant, self-hosted javascript parser with high focus on both performance and stability
 
@@ -19788,7 +19788,7 @@ Author: Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
 ----------------------------------------
 
-### picocolors@v1.0.0
+### picocolors@v1.0.1
 
 > The tiniest and the fastest library for terminal output formatting with ANSI colors
 

From bb5e6613f49e8b827c60425efd3c2b7907737b19 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 10:32:50 -0700
Subject: [PATCH 117/133] fix(deps): update dependency
 @react-native-picker/picker to ^2.7.7 (#5539)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[@react-native-picker/picker](https://togithub.com/react-native-picker/picker)
| [`^2.7.6` ->
`^2.7.7`](https://renovatebot.com/diffs/npm/@react-native-picker%2fpicker/2.7.6/2.7.7)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/@react-native-picker%2fpicker/2.7.7?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@react-native-picker%2fpicker/2.7.7?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@react-native-picker%2fpicker/2.7.6/2.7.7?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@react-native-picker%2fpicker/2.7.6/2.7.7?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>react-native-picker/picker
(@&#8203;react-native-picker/picker)</summary>

###
[`v2.7.7`](https://togithub.com/react-native-picker/picker/releases/tag/v2.7.7)

[Compare
Source](https://togithub.com/react-native-picker/picker/compare/v2.7.6...v2.7.7)

##### Bug Fixes

- resolve android crash issue if props are undefined
([#&#8203;571](https://togithub.com/react-native-picker/picker/issues/571))
([243ead2](https://togithub.com/react-native-picker/picker/commit/243ead2e226ea5441a7091beccc903e804922c18))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zOTMuMCIsInVwZGF0ZWRJblZlciI6IjM3LjM5My4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: valora-bot <valorabot@valoraapp.com>
---
 ios/Podfile.lock |   4 +-
 package.json     |   2 +-
 yarn.lock        | 124 ++++++-----------------------------------------
 3 files changed, 17 insertions(+), 113 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 7171dcd6f8..ad08870237 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -658,7 +658,7 @@ PODS:
     - React-Core
   - RNCMaskedView (0.3.1):
     - React-Core
-  - RNCPicker (2.7.6):
+  - RNCPicker (2.7.7):
     - React-Core
   - RNDeviceInfo (10.13.2):
     - React-Core
@@ -1234,7 +1234,7 @@ SPEC CHECKSUMS:
   RNCAsyncStorage: 826b603ae9c0f88b5ac4e956801f755109fa4d5c
   RNCClipboard: 0a720adef5ec193aa0e3de24c3977222c7e52a37
   RNCMaskedView: 090213d32d8b3bb83a4dcb7d12c18f0152591906
-  RNCPicker: f58e790450cb0a74c09dd1c677bd1de41a5741b9
+  RNCPicker: b7873ba797dc586bfaf3307d737cbdc620a9ff3e
   RNDeviceInfo: 42aadf1282ffa0a88dc38a504a7be145eb010dfa
   RNExitApp: 00036cabe7bacbb413d276d5520bf74ba39afa6a
   RNFastImage: 5c9c9fed9c076e521b3f509fe79e790418a544e8
diff --git a/package.json b/package.json
index 2c51fdfd81..ce57c0e04d 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "@react-native-firebase/messaging": "19.1.0",
     "@react-native-firebase/remote-config": "19.1.0",
     "@react-native-masked-view/masked-view": "^0.3.1",
-    "@react-native-picker/picker": "^2.7.6",
+    "@react-native-picker/picker": "^2.7.7",
     "@react-navigation/bottom-tabs": "^6.5.20",
     "@react-navigation/devtools": "^6.0.26",
     "@react-navigation/elements": "^1.3.30",
diff --git a/yarn.lock b/yarn.lock
index 58a503f842..53cff6eebc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3044,10 +3044,10 @@
   resolved "https://registry.yarnpkg.com/@react-native-masked-view/masked-view/-/masked-view-0.3.1.tgz#5bd76f17004a6ccbcec03856893777ee91f23d29"
   integrity sha512-uVm8U6nwFIlUd1iDIB5cS+lDadApKR+l8k4k84d9hn+GN4lzAIJhUZ9syYX7c022MxNgAlbxoFLt0pqKoyaAGg==
 
-"@react-native-picker/picker@^2.7.6":
-  version "2.7.6"
-  resolved "https://registry.yarnpkg.com/@react-native-picker/picker/-/picker-2.7.6.tgz#fda996742f6878660277b995e878711641e778f4"
-  integrity sha512-Cs3PxRmE2vu6TofM9vt9TV8ZYFOtEPSupNxwoorH9lpkKM9HGG8QwK2i29KOEoODpUbtudKHUTtqhMZSuX9pgA==
+"@react-native-picker/picker@^2.7.7":
+  version "2.7.7"
+  resolved "https://registry.yarnpkg.com/@react-native-picker/picker/-/picker-2.7.7.tgz#6e19c3a72a482be015f5194794e6c14efe8762e8"
+  integrity sha512-CTHthVmx8ujlH/u5AnxLQfsheh/DoEbo+Kbx0HGTlbKVLC1eZ4Kr9jXIIUcwB7JEgOXifdZIPQCsoTc/7GQ0ag==
 
 "@react-native/assets@1.0.0":
   version "1.0.0"
@@ -3712,7 +3712,7 @@
   resolved "https://registry.yarnpkg.com/@stablelib/wipe/-/wipe-1.0.1.tgz#d21401f1d59ade56a62e139462a97f104ed19a36"
   integrity sha512-WfqfX/eXGiAd3RJe4VU2snh/ZPwtSjLG4ynQ/vYzvghTh7dHFcI1wl+nrkWG6lGhukOxOsUHfv8dUXr58D0ayg==
 
-"@stablelib/x25519@1.0.3", "@stablelib/x25519@^1.0.3":
+"@stablelib/x25519@1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@stablelib/x25519/-/x25519-1.0.3.tgz#13c8174f774ea9f3e5e42213cbf9fc68a3c7b7fd"
   integrity sha512-KnTbKmUhPhHavzobclVJQG5kuivH+qDLpe84iRqX3CLrKp881cF160JvXJ+hjn1aMyCwYOKeIZefIH/P5cJoRw==
@@ -5331,7 +5331,7 @@
     events "^3.3.0"
     isomorphic-unfetch "^3.1.0"
 
-"@walletconnect/core@2.13.2":
+"@walletconnect/core@2.13.2", "@walletconnect/core@^2.10.1":
   version "2.13.2"
   resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.13.2.tgz#8f83a12afdbfd23f04a045caf0efd9cbf8af8063"
   integrity sha512-t1miHox71hh7tUrYFhLzNkm67wSS4kwVWO2jpwY5aHOoqkFpDSjb3A3nr+Adjrz4ZNxpObLJutQpApqkgwisjw==
@@ -5354,29 +5354,6 @@
     lodash.isequal "4.5.0"
     uint8arrays "3.1.0"
 
-"@walletconnect/core@^2.10.1":
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.12.2.tgz#12bd568b90daed876e58ebcc098c12843a3321e6"
-  integrity sha512-7Adv/b3pp9F42BkvReaaM4KS8NEvlkS7AMtwO3uF/o6aRMKtcfTJq9/jgWdKJh4RP8pPRTRFjCw6XQ/RZtT4aQ==
-  dependencies:
-    "@walletconnect/heartbeat" "1.2.1"
-    "@walletconnect/jsonrpc-provider" "1.0.13"
-    "@walletconnect/jsonrpc-types" "1.0.3"
-    "@walletconnect/jsonrpc-utils" "1.0.8"
-    "@walletconnect/jsonrpc-ws-connection" "1.0.14"
-    "@walletconnect/keyvaluestorage" "^1.1.1"
-    "@walletconnect/logger" "^2.1.2"
-    "@walletconnect/relay-api" "^1.0.9"
-    "@walletconnect/relay-auth" "^1.0.4"
-    "@walletconnect/safe-json" "^1.0.2"
-    "@walletconnect/time" "^1.0.2"
-    "@walletconnect/types" "2.12.2"
-    "@walletconnect/utils" "2.12.2"
-    events "^3.3.0"
-    isomorphic-unfetch "3.1.0"
-    lodash.isequal "4.5.0"
-    uint8arrays "^3.1.0"
-
 "@walletconnect/environment@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@walletconnect/environment/-/environment-1.0.1.tgz#1d7f82f0009ab821a2ba5ad5e5a7b8ae3b214cd7"
@@ -5392,16 +5369,7 @@
     keyvaluestorage-interface "^1.0.0"
     tslib "1.14.1"
 
-"@walletconnect/heartbeat@1.2.1", "@walletconnect/heartbeat@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@walletconnect/heartbeat/-/heartbeat-1.2.1.tgz#afaa3a53232ae182d7c9cff41c1084472d8f32e9"
-  integrity sha512-yVzws616xsDLJxuG/28FqtZ5rzrTA4gUjdEMTbWB5Y8V1XHRmqq4efAxCw5ie7WjbXFSUyBHaWlMR+2/CpQC5Q==
-  dependencies:
-    "@walletconnect/events" "^1.0.1"
-    "@walletconnect/time" "^1.0.2"
-    tslib "1.14.1"
-
-"@walletconnect/heartbeat@1.2.2":
+"@walletconnect/heartbeat@1.2.2", "@walletconnect/heartbeat@^1.2.1":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@walletconnect/heartbeat/-/heartbeat-1.2.2.tgz#e8dc5179db7769950c6f9cf59b23516d9b95227d"
   integrity sha512-uASiRmC5MwhuRuf05vq4AT48Pq8RMi876zV8rr8cV969uTOzWdB/k+Lj5yI2PBtB1bGQisGen7MM1GcZlQTBXw==
@@ -5410,15 +5378,6 @@
     "@walletconnect/time" "^1.0.2"
     events "^3.3.0"
 
-"@walletconnect/jsonrpc-provider@1.0.13":
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-provider/-/jsonrpc-provider-1.0.13.tgz#9a74da648d015e1fffc745f0c7d629457f53648b"
-  integrity sha512-K73EpThqHnSR26gOyNEL+acEex3P7VWZe6KE12ZwKzAt2H4e5gldZHbjsu2QR9cLeJ8AXuO7kEMOIcRv1QEc7g==
-  dependencies:
-    "@walletconnect/jsonrpc-utils" "^1.0.8"
-    "@walletconnect/safe-json" "^1.0.2"
-    tslib "1.14.1"
-
 "@walletconnect/jsonrpc-provider@1.0.14":
   version "1.0.14"
   resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-provider/-/jsonrpc-provider-1.0.14.tgz#696f3e3b6d728b361f2e8b853cfc6afbdf2e4e3e"
@@ -5428,15 +5387,7 @@
     "@walletconnect/safe-json" "^1.0.2"
     events "^3.3.0"
 
-"@walletconnect/jsonrpc-types@1.0.3", "@walletconnect/jsonrpc-types@^1.0.2", "@walletconnect/jsonrpc-types@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-types/-/jsonrpc-types-1.0.3.tgz#65e3b77046f1a7fa8347ae02bc1b841abe6f290c"
-  integrity sha512-iIQ8hboBl3o5ufmJ8cuduGad0CQm3ZlsHtujv9Eu16xq89q+BG7Nh5VLxxUgmtpnrePgFkTwXirCTkwJH1v+Yw==
-  dependencies:
-    keyvaluestorage-interface "^1.0.0"
-    tslib "1.14.1"
-
-"@walletconnect/jsonrpc-types@1.0.4":
+"@walletconnect/jsonrpc-types@1.0.4", "@walletconnect/jsonrpc-types@^1.0.2", "@walletconnect/jsonrpc-types@^1.0.3":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-types/-/jsonrpc-types-1.0.4.tgz#ce1a667d79eadf2a2d9d002c152ceb68739c230c"
   integrity sha512-P6679fG/M+wuWg9TY8mh6xFSdYnFyFjwFelxyISxMDrlbXokorEVXYOxiqEbrU3x1BmBoCAJJ+vtEaEoMlpCBQ==
@@ -5463,7 +5414,7 @@
     events "^3.3.0"
     ws "^7.5.1"
 
-"@walletconnect/keyvaluestorage@1.1.1", "@walletconnect/keyvaluestorage@^1.1.1":
+"@walletconnect/keyvaluestorage@1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@walletconnect/keyvaluestorage/-/keyvaluestorage-1.1.1.tgz#dd2caddabfbaf80f6b8993a0704d8b83115a1842"
   integrity sha512-V7ZQq2+mSxAq7MrRqDxanTzu2RcElfK1PfNYiaVnJgJ7Q7G7hTVwF8voIBx92qsRyGHZihrwNPHuZd1aKkd0rA==
@@ -5479,7 +5430,7 @@
   dependencies:
     "@walletconnect/jsonrpc-types" "^1.0.2"
 
-"@walletconnect/logger@2.1.2", "@walletconnect/logger@^2.0.1", "@walletconnect/logger@^2.1.2":
+"@walletconnect/logger@2.1.2", "@walletconnect/logger@^2.0.1":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/@walletconnect/logger/-/logger-2.1.2.tgz#813c9af61b96323a99f16c10089bfeb525e2a272"
   integrity sha512-aAb28I3S6pYXZHQm5ESB+V6rDqIYfsnHaQyzFbwUUBFY4H0OXx/YtTl8lvhUNhMMfb9UxbwEBS253TlXUYJWSw==
@@ -5503,15 +5454,7 @@
   dependencies:
     "@walletconnect/jsonrpc-types" "^1.0.2"
 
-"@walletconnect/relay-api@^1.0.9":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@walletconnect/relay-api/-/relay-api-1.0.9.tgz#f8c2c3993dddaa9f33ed42197fc9bfebd790ecaf"
-  integrity sha512-Q3+rylJOqRkO1D9Su0DPE3mmznbAalYapJ9qmzDgK28mYF9alcP3UwG/og5V7l7CFOqzCLi7B8BvcBUrpDj0Rg==
-  dependencies:
-    "@walletconnect/jsonrpc-types" "^1.0.2"
-    tslib "1.14.1"
-
-"@walletconnect/relay-auth@1.0.4", "@walletconnect/relay-auth@^1.0.4":
+"@walletconnect/relay-auth@1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@walletconnect/relay-auth/-/relay-auth-1.0.4.tgz#0b5c55c9aa3b0ef61f526ce679f3ff8a5c4c2c7c"
   integrity sha512-kKJcS6+WxYq5kshpPaxGHdwf5y98ZwbfuS4EE/NkQzqrDFm5Cj+dP8LofzWvjrrLkZq7Afy7WrQMXdLy8Sx7HQ==
@@ -5552,18 +5495,6 @@
   dependencies:
     tslib "1.14.1"
 
-"@walletconnect/types@2.12.2":
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.12.2.tgz#8b64a2015a0a96972d28acb2ff317a9a994abfdb"
-  integrity sha512-9CmwTlPbrFTzayTL9q7xM7s3KTJkS6kYFtH2m1/fHFgALs6pIUjf1qAx1TF2E4tv7SEzLAIzU4NqgYUt2vWXTg==
-  dependencies:
-    "@walletconnect/events" "^1.0.1"
-    "@walletconnect/heartbeat" "1.2.1"
-    "@walletconnect/jsonrpc-types" "1.0.3"
-    "@walletconnect/keyvaluestorage" "^1.1.1"
-    "@walletconnect/logger" "^2.0.1"
-    events "^3.3.0"
-
 "@walletconnect/types@2.13.2", "@walletconnect/types@^2.13.2":
   version "2.13.2"
   resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.13.2.tgz#2b371b25dee1b8920b753a860eb10afe68efcc81"
@@ -5576,27 +5507,7 @@
     "@walletconnect/logger" "2.1.2"
     events "3.3.0"
 
-"@walletconnect/utils@2.12.2", "@walletconnect/utils@^2.10.1":
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.12.2.tgz#a2c349d4effef7c1c5e72e74a5483d8dfbb10918"
-  integrity sha512-zf50HeS3SfoLv1N9GPl2IXTZ9TsXfet4usVAsZmX9P6/Xzq7d/7QakjVQCHH/Wk1O9XkcsfeoZoUhRxoMJ5uJw==
-  dependencies:
-    "@stablelib/chacha20poly1305" "1.0.1"
-    "@stablelib/hkdf" "1.0.1"
-    "@stablelib/random" "^1.0.2"
-    "@stablelib/sha256" "1.0.1"
-    "@stablelib/x25519" "^1.0.3"
-    "@walletconnect/relay-api" "^1.0.9"
-    "@walletconnect/safe-json" "^1.0.2"
-    "@walletconnect/time" "^1.0.2"
-    "@walletconnect/types" "2.12.2"
-    "@walletconnect/window-getters" "^1.0.1"
-    "@walletconnect/window-metadata" "^1.0.1"
-    detect-browser "5.3.0"
-    query-string "7.1.3"
-    uint8arrays "^3.1.0"
-
-"@walletconnect/utils@2.13.2", "@walletconnect/utils@^2.13.2":
+"@walletconnect/utils@2.13.2", "@walletconnect/utils@^2.10.1", "@walletconnect/utils@^2.13.2":
   version "2.13.2"
   resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.13.2.tgz#9b4c00005ef3c82438313f44e7126a6a5ab7670e"
   integrity sha512-wDu+g/lWO93dVrntWgxwiX6XeuCHD9kxMWLEtyGZ7AmWHZv3U1Z8EWIU/e9kv4yBQxmHN3b0DhcrowfcMF3YOA==
@@ -5637,7 +5548,7 @@
   dependencies:
     tslib "1.14.1"
 
-"@walletconnect/window-metadata@1.0.1", "@walletconnect/window-metadata@^1.0.1":
+"@walletconnect/window-metadata@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@walletconnect/window-metadata/-/window-metadata-1.0.1.tgz#2124f75447b7e989e4e4e1581d55d25bc75f7be5"
   integrity sha512-9koTqyGrM2cqFRW517BPY/iEtUDx2r1+Pwwu5m7sJ7ka79wi3EyqhqcICk/yDmv6jAS1rjKgTKXlEhanYjijcA==
@@ -18034,20 +17945,13 @@ uglifyjs-webpack-plugin@^0.4.6:
     uglify-js "^2.8.29"
     webpack-sources "^1.0.1"
 
-uint8arrays@3.1.0:
+uint8arrays@3.1.0, uint8arrays@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-3.1.0.tgz#8186b8eafce68f28bd29bd29d683a311778901e2"
   integrity sha512-ei5rfKtoRO8OyOIor2Rz5fhzjThwIHJZ3uyDPnDHTXbP0aMQ1RN/6AI5B5d9dBxJOU+BvOAk7ZQ1xphsX8Lrog==
   dependencies:
     multiformats "^9.4.2"
 
-uint8arrays@^3.0.0, uint8arrays@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-3.1.1.tgz#2d8762acce159ccd9936057572dade9459f65ae0"
-  integrity sha512-+QJa8QRnbdXVpHYjLoTpJIdCTiw9Ir62nocClWuXIq2JIh4Uta0cQsTSpFL678p2CN8B+XSApwcU+pQEqVpKWg==
-  dependencies:
-    multiformats "^9.4.2"
-
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"

From ea9f8fdc41b225e9774f16953691823400f2eb9d Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Thu, 13 Jun 2024 12:33:30 -0700
Subject: [PATCH 118/133] chore: add feature gate for cab in onboarding (#5541)

### Description

Adds a feature gate for using CAB (Cloud Account Backup) screens in
onboarding:
[Statsig](https://console.statsig.com/4plizaPmWwPL21ASV4QAO0/gates/show_cab_in_onboarding).

### Test plan

N/A

### Related issues

- Fixes ACT-1231

### Backwards compatibility

Yes

### Network scalability

N/A
---
 src/statsig/constants.ts | 1 +
 src/statsig/types.ts     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/statsig/constants.ts b/src/statsig/constants.ts
index 54365f2daf..1ccbdcc8c2 100644
--- a/src/statsig/constants.ts
+++ b/src/statsig/constants.ts
@@ -30,6 +30,7 @@ export const FeatureGates = {
   [StatsigFeatureGates.SHOW_STABLECOIN_EARN]: false,
   [StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES]: false,
   [StatsigFeatureGates.SHOW_CASH_IN_TOKEN_FILTERS]: false,
+  [StatsigFeatureGates.SHOW_CAB_IN_ONBOARDING]: false,
 } satisfies { [key in StatsigFeatureGates]: boolean }
 
 export const ExperimentConfigs = {
diff --git a/src/statsig/types.ts b/src/statsig/types.ts
index 07a86d0979..adcd5c3f37 100644
--- a/src/statsig/types.ts
+++ b/src/statsig/types.ts
@@ -33,6 +33,7 @@ export enum StatsigFeatureGates {
   SHOW_STABLECOIN_EARN = 'show_stablecoin_earn',
   SUBSIDIZE_STABLECOIN_EARN_GAS_FEES = 'subsidize_stablecoin_earn_gas_fees',
   SHOW_CASH_IN_TOKEN_FILTERS = 'show_cash_in_token_filters',
+  SHOW_CAB_IN_ONBOARDING = 'show_cab_in_onboarding',
 }
 
 export enum StatsigExperiments {

From 880f24d9c14584215b6d1e3ad8ab16de49bacb09 Mon Sep 17 00:00:00 2001
From: Joe Bergeron <jbergero@alum.mit.edu>
Date: Thu, 13 Jun 2024 16:04:58 -0400
Subject: [PATCH 119/133] fix(points): Update swap points copy (#5543)

### Description

Updates a bit of copy for the swap points activity to be correct!

### Test plan

<!-- Demonstrate the change is solid, or why it doesn't need testing.
Example: add any manual testing steps or scenarios (if not obvious),
screenshots / videos if the pull request changes the user interface.
-->

### Related issues

- Fixes #[issue number here]

### Backwards compatibility

<!-- Brief explanation of why these changes are/are not backwards
compatible. -->

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 locales/base/translation.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locales/base/translation.json b/locales/base/translation.json
index 9456eed2c7..d53786f861 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -2340,8 +2340,8 @@
         "title": "Swap assets",
         "bottomSheet": {
           "title": "Swap assets",
-          "body": "This space will be used to give all the details needed for this. Maybe minimum amount to swap. \n\nEarn {{pointsValue}} points whenever you swap an asset using {{appName}}.",
-          "cta": "Go to swap"
+          "body": "Earn {{pointsValue}} points every time you swap an asset using {{appName}}. \n\nTap below to start swapping and earning!",
+          "cta": "Start a swap"
         }
       },
       "moreComing": {

From 5109c13d89631bef5593f4a06d8af9d996b35f29 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Thu, 13 Jun 2024 15:36:44 -0700
Subject: [PATCH 120/133] feat(viem): support using valora rpc endpoint if gas
 is subsidized (#5542)

### Description

In preparation for using syndicate's rpc node for earn transactions when
gas is subsidized, update the viem functions to use a different rpc
endpoint for both estimating gas and submitting transaction

### Test plan

CI, a follow up PR will have comprehensive testing

### Related issues

- Part of ACT-1194

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/send/saga.test.ts                |  6 ++---
 src/swap/saga.test.ts                |  2 +-
 src/viem/getLockableWallet.test.ts   | 17 ++++++++----
 src/viem/getLockableWallet.ts        | 22 +++++++++++++---
 src/viem/index.ts                    | 11 ++++++++
 src/viem/prepareTransactions.test.ts | 39 +++++++++++++++++++++++++++-
 src/viem/prepareTransactions.ts      | 22 ++++++++++++----
 src/viem/saga.test.ts                |  2 +-
 src/viem/saga.ts                     |  8 ++++--
 src/web3/contracts.test.ts           | 20 ++++++++++++++
 src/web3/contracts.ts                | 17 ++++++++----
 src/web3/networkConfig.ts            | 10 +++++++
 12 files changed, 149 insertions(+), 27 deletions(-)

diff --git a/src/send/saga.test.ts b/src/send/saga.test.ts
index a9393c775c..e3f940b866 100644
--- a/src/send/saga.test.ts
+++ b/src/send/saga.test.ts
@@ -139,7 +139,7 @@ describe(sendPaymentSaga, () => {
       await expectSaga(sendPaymentSaga, { ...sendAction, fromModal })
         .withState(createMockStore({}).getState())
         .provide(createDefaultProviders())
-        .call(getViemWallet, networkConfig.viemChain.celo)
+        .call(getViemWallet, networkConfig.viemChain.celo, false)
         .put(
           addStandbyTransaction({
             __typename: 'TokenTransferV3',
@@ -182,7 +182,7 @@ describe(sendPaymentSaga, () => {
     await expectSaga(sendPaymentSaga, { ...sendAction, tokenId: mockCeloTokenId })
       .withState(createMockStore({}).getState())
       .provide(createDefaultProviders())
-      .call(getViemWallet, networkConfig.viemChain.celo)
+      .call(getViemWallet, networkConfig.viemChain.celo, false)
       .put(
         addStandbyTransaction({
           __typename: 'TokenTransferV3',
@@ -245,7 +245,7 @@ describe(sendPaymentSaga, () => {
         [matchers.call.fn(mockViemWallet.sendRawTransaction), throwError(new Error('tx failed'))],
         ...createDefaultProviders(),
       ])
-      .call(getViemWallet, networkConfig.viemChain.celo)
+      .call(getViemWallet, networkConfig.viemChain.celo, false)
       .put(sendPaymentFailure())
       .put(showError(ErrorMessages.SEND_PAYMENT_FAILED))
       .not.put.actionType(TransactionActions.ADD_STANDBY_TRANSACTION)
diff --git a/src/swap/saga.test.ts b/src/swap/saga.test.ts
index 1f1c8702f4..c7b8df40e2 100644
--- a/src/swap/saga.test.ts
+++ b/src/swap/saga.test.ts
@@ -286,7 +286,7 @@ describe(swapSubmitSaga, () => {
   function createDefaultProviders(network: Network) {
     let callCount = 0
     const defaultProviders: (EffectProviders | StaticProvider)[] = [
-      [matchers.call(getViemWallet, networkConfig.viemChain[network]), mockViemWallet],
+      [matchers.call(getViemWallet, networkConfig.viemChain[network], false), mockViemWallet],
       [matchers.call.fn(getTransactionCount), 10],
       [matchers.call.fn(getConnectedUnlockedAccount), mockAccount],
       [
diff --git a/src/viem/getLockableWallet.test.ts b/src/viem/getLockableWallet.test.ts
index dbbf0a8afb..69a3531f87 100644
--- a/src/viem/getLockableWallet.test.ts
+++ b/src/viem/getLockableWallet.test.ts
@@ -23,18 +23,25 @@ jest.mock('src/viem', () => {
       celo: 'celoTransport',
       ethereum: 'ethereumTransport',
     },
+    valoraViemTransports: {
+      celo: 'celoValoraTransport',
+    },
   }
 })
 
 describe('getTransport', () => {
   it.each([
-    [celoAlfajores, 'celoTransport'],
-    [ethereumSepolia, 'ethereumTransport'],
-  ])('returns correct transport for $s', (chain, expectedTransport) => {
-    expect(getTransport(chain)).toEqual(expectedTransport)
+    [celoAlfajores, false, 'celoTransport'],
+    [celoAlfajores, true, 'celoValoraTransport'],
+    [ethereumSepolia, false, 'ethereumTransport'],
+  ])('returns correct transport for $s', (chain, useValora, expectedTransport) => {
+    expect(getTransport({ chain, useValora })).toEqual(expectedTransport)
   })
   it('throws if chain not found', () => {
-    expect(() => getTransport(ethereumGoerli)).toThrow()
+    expect(() => getTransport({ chain: ethereumGoerli })).toThrow()
+  })
+  it('throws if valora transport not found', () => {
+    expect(() => getTransport({ chain: ethereumSepolia, useValora: true })).toThrow()
   })
 })
 
diff --git a/src/viem/getLockableWallet.ts b/src/viem/getLockableWallet.ts
index ef45216f7c..c6b2a74666 100644
--- a/src/viem/getLockableWallet.ts
+++ b/src/viem/getLockableWallet.ts
@@ -1,6 +1,6 @@
 import { Network } from 'src/transactions/types'
 import Logger from 'src/utils/Logger'
-import { viemTransports } from 'src/viem'
+import { valoraViemTransports, viemTransports } from 'src/viem'
 import { KeychainLock } from 'src/web3/KeychainLock'
 import networkConfig from 'src/web3/networkConfig'
 import {
@@ -27,13 +27,26 @@ import { Prettify } from 'viem/chains'
 
 const TAG = 'viem/getLockableWallet'
 
-export function getTransport(chain: Chain): Transport {
+export function getTransport({
+  chain,
+  useValora,
+}: {
+  chain: Chain
+  useValora?: boolean
+}): Transport {
   const result = Object.entries(networkConfig.viemChain).find(
     ([_, viemChain]) => chain === viemChain
   )
   if (!result) {
     throw new Error(`No network defined for viem chain ${chain}, cannot create wallet`)
   }
+  if (useValora) {
+    const valoraTransport = valoraViemTransports[result[0] as keyof typeof valoraViemTransports]
+    if (!valoraTransport) {
+      throw new Error(`No valora transport defined for network ${result[0]}, cannot create wallet`)
+    }
+    return valoraTransport
+  }
   return viemTransports[result[0] as Network]
 }
 
@@ -60,7 +73,8 @@ type Actions<
 export default function getLockableViemWallet(
   lock: KeychainLock,
   chain: Chain,
-  privateKey: Address
+  privateKey: Address,
+  useValoraTransport: boolean = false
 ): ViemWallet {
   const account = privateKeyToAccount(privateKey)
   Logger.debug(TAG, `getting viem wallet for ${account.address} on ${chain.name}`)
@@ -72,7 +86,7 @@ export default function getLockableViemWallet(
 
   return createWalletClient({
     chain,
-    transport: getTransport(chain),
+    transport: getTransport({ chain, useValora: useValoraTransport }),
     account,
   }).extend((client): Actions<Chain, PrivateKeyAccount> => {
     return {
diff --git a/src/viem/index.ts b/src/viem/index.ts
index bf1d7b5d0d..06ef87fe59 100644
--- a/src/viem/index.ts
+++ b/src/viem/index.ts
@@ -48,6 +48,10 @@ export const viemTransports: Record<Network, Transport> = {
   }),
 }
 
+export const valoraViemTransports = {
+  [Network.Arbitrum]: http(networkConfig.valoraRpcUrl.arbitrum),
+} satisfies Partial<Record<Network, Transport>>
+
 export const publicClient = {
   [Network.Celo]: createPublicClient({
     chain: networkConfig.viemChain.celo,
@@ -74,3 +78,10 @@ export const publicClient = {
     transport: viemTransports[Network.Base],
   }),
 }
+
+export const valoraPublicClient = {
+  [Network.Arbitrum]: createPublicClient({
+    chain: networkConfig.viemChain.arbitrum,
+    transport: valoraViemTransports[Network.Arbitrum],
+  }),
+}
diff --git a/src/viem/prepareTransactions.test.ts b/src/viem/prepareTransactions.test.ts
index b6580ea96e..ab17884982 100644
--- a/src/viem/prepareTransactions.test.ts
+++ b/src/viem/prepareTransactions.test.ts
@@ -4,7 +4,7 @@ import stableToken from 'src/abis/StableToken'
 import { TokenBalanceWithAddress } from 'src/tokens/slice'
 import { Network, NetworkId } from 'src/transactions/types'
 import { estimateFeesPerGas } from 'src/viem/estimateFeesPerGas'
-import { publicClient } from 'src/viem/index'
+import { publicClient, valoraPublicClient } from 'src/viem/index'
 import {
   TransactionRequest,
   getEstimatedGasFee,
@@ -43,6 +43,17 @@ jest.mock('viem/actions', () => ({
   ...jest.requireActual('viem/actions'),
   estimateGas: jest.fn(),
 }))
+jest.mock('src/viem/index', () => ({
+  publicClient: {
+    celo: {} as unknown as jest.Mocked<(typeof publicClient)[Network.Celo]>,
+    arbitrum: {} as unknown as jest.Mocked<(typeof publicClient)[Network.Arbitrum]>,
+    ethereum: {} as unknown as jest.Mocked<(typeof publicClient)[Network.Ethereum]>,
+  },
+  valoraPublicClient: {
+    celo: {} as unknown as jest.Mocked<(typeof publicClient)[Network.Celo]>,
+    arbitrum: {} as unknown as jest.Mocked<(typeof publicClient)[Network.Arbitrum]>,
+  },
+}))
 
 beforeEach(() => {
   jest.clearAllMocks()
@@ -839,6 +850,32 @@ describe('prepareTransactions module', () => {
         },
       ])
     })
+    it.each([
+      { client: 'valora public', expectedClient: valoraPublicClient },
+      { client: 'public', expectedClient: publicClient },
+    ])('uses the $client client for estimating gas', async ({ client, expectedClient }) => {
+      mocked(estimateFeesPerGas).mockResolvedValue({
+        maxFeePerGas: BigInt(10),
+        maxPriorityFeePerGas: BigInt(2),
+        baseFeePerGas: BigInt(5),
+      })
+      mocked(estimateGas).mockResolvedValue(BigInt(123))
+      await tryEstimateTransactions(
+        [{ from: '0x123' }],
+        { ...mockFeeCurrencies[0], networkId: NetworkId['arbitrum-sepolia'] },
+        client === 'valora public'
+      )
+      expect(estimateGas).toHaveBeenCalledWith(expectedClient[Network.Arbitrum], expect.anything())
+    })
+    it('throws if no valora public client exists', async () => {
+      await expect(
+        tryEstimateTransactions(
+          [{ from: '0x123' }],
+          { ...mockFeeCurrencies[0], networkId: NetworkId['ethereum-sepolia'] },
+          true
+        )
+      ).rejects.toThrowError('Valora transport not available for network ethereum')
+    })
   })
   describe('getMaxGasFee', () => {
     it('adds gas times maxFeePerGas', () => {
diff --git a/src/viem/prepareTransactions.ts b/src/viem/prepareTransactions.ts
index d2be8d783a..d84a2257c4 100644
--- a/src/viem/prepareTransactions.ts
+++ b/src/viem/prepareTransactions.ts
@@ -11,8 +11,8 @@ import {
 import { getTokenId } from 'src/tokens/utils'
 import { NetworkId } from 'src/transactions/types'
 import Logger from 'src/utils/Logger'
+import { publicClient, valoraPublicClient } from 'src/viem'
 import { estimateFeesPerGas } from 'src/viem/estimateFeesPerGas'
-import { publicClient } from 'src/viem/index'
 import { networkIdToNetwork } from 'src/web3/networkConfig'
 import {
   Address,
@@ -196,12 +196,20 @@ export async function tryEstimateTransaction({
 
 export async function tryEstimateTransactions(
   baseTransactions: TransactionRequest[],
-  feeCurrency: TokenBalance
+  feeCurrency: TokenBalance,
+  useValoraTransport: boolean = false
 ) {
   const transactions: TransactionRequest[] = []
 
   const network = networkIdToNetwork[feeCurrency.networkId]
-  const client = publicClient[network]
+
+  if (useValoraTransport && !(network in valoraPublicClient)) {
+    throw new Error(`Valora transport not available for network ${network}`)
+  }
+
+  const client = useValoraTransport
+    ? valoraPublicClient[network as keyof typeof valoraPublicClient]
+    : publicClient[network]
   const feeCurrencyAddress = getFeeCurrencyAddress(feeCurrency)
   const { maxFeePerGas, maxPriorityFeePerGas, baseFeePerGas } = await estimateFeesPerGas(
     client,
@@ -261,7 +269,7 @@ export async function tryEstimateTransactions(
  * @param decreasedAmountGasFeeMultiplier
  * @param baseTransactions
  * @param throwOnSpendTokenAmountExceedsBalance
- * @param isGasSubsidized - This flag should only be set to true if all of the baseTransactions already have gas estimates, aka the 'gas' and '_estimatedGasUse' fields have been manually set
+ * @param isGasSubsidized
  */
 export async function prepareTransactions({
   feeCurrencies,
@@ -306,7 +314,11 @@ export async function prepareTransactions({
       // No balance, try next fee currency
       continue
     }
-    const estimatedTransactions = await tryEstimateTransactions(baseTransactions, feeCurrency)
+    const estimatedTransactions = await tryEstimateTransactions(
+      baseTransactions,
+      feeCurrency,
+      isGasSubsidized
+    )
     if (!estimatedTransactions) {
       // Not enough balance to pay for gas, try next fee currency
       continue
diff --git a/src/viem/saga.test.ts b/src/viem/saga.test.ts
index 2d9c7d363e..601c20281b 100644
--- a/src/viem/saga.test.ts
+++ b/src/viem/saga.test.ts
@@ -118,7 +118,7 @@ describe('sendPreparedTransactions', () => {
     )
       .withState(createMockStore({}).getState())
       .provide(createDefaultProviders())
-      .call(getViemWallet, networkConfig.viemChain.celo)
+      .call(getViemWallet, networkConfig.viemChain.celo, false)
       .put(
         addStandbyTransaction({
           ...mockStandbyTransactions[0],
diff --git a/src/viem/saga.ts b/src/viem/saga.ts
index e5906843c7..dc139a2a9f 100644
--- a/src/viem/saga.ts
+++ b/src/viem/saga.ts
@@ -28,6 +28,9 @@ const TAG = 'viem/saga'
  * @param {number} createBaseStandbyTransactions - functions that create the
  * standby transactions, each element corresponding to the prepared transaction
  * of the matching index
+ * @param {boolean} isGasSubsidized - an optional boolean that indicates whether
+ * gas is subsidized for the transaction, which means a valora rpc node will be
+ * used instead of the default alchemy rpc node
  */
 export function* sendPreparedTransactions(
   serializablePreparedTransactions: SerializableTransactionRequest[],
@@ -35,7 +38,8 @@ export function* sendPreparedTransactions(
   createBaseStandbyTransactions: ((
     transactionHash: string,
     feeCurrencyId?: string
-  ) => BaseStandbyTransaction)[]
+  ) => BaseStandbyTransaction)[],
+  isGasSubsidized: boolean = false
 ) {
   if (serializablePreparedTransactions.length !== createBaseStandbyTransactions.length) {
     throw new Error('Mismatch in number of prepared transactions and standby transaction creators')
@@ -46,7 +50,7 @@ export function* sendPreparedTransactions(
     throw new Error(`No matching network found for network id: ${networkId}`)
   }
 
-  const wallet = yield* call(getViemWallet, networkConfig.viemChain[network])
+  const wallet = yield* call(getViemWallet, networkConfig.viemChain[network], isGasSubsidized)
   if (!wallet.account) {
     // this should never happen
     throw new Error('No account found in the wallet')
diff --git a/src/web3/contracts.test.ts b/src/web3/contracts.test.ts
index fd26a215c4..e6ece108c0 100644
--- a/src/web3/contracts.test.ts
+++ b/src/web3/contracts.test.ts
@@ -75,5 +75,25 @@ describe('getViemWallet', () => {
     // Verifying that the wallet is cached
     await expectSaga(getViemWallet, celo).returns('foo').run()
     expect(getLockableViemWallet).toHaveBeenCalledTimes(1)
+
+    // get a wallet with valora transport and ensure it is not from the cache
+    await expectSaga(getViemWallet, celo, true)
+      .provide([
+        [select(walletAddressSelector), '0x123'],
+        [call(listStoredAccounts), [{ address: '0x123', createdAt: date }]],
+        [call(getPasswordSaga, '0x123', true, false), 'password'],
+        [
+          call(getStoredPrivateKey, { address: '0x123', createdAt: new Date() }, 'password'),
+          'password',
+        ],
+      ])
+      .returns('foo')
+      .run()
+
+    expect(getLockableViemWallet).toHaveBeenCalledTimes(2)
+
+    // Verifying that the valora transport wallet is cached
+    await expectSaga(getViemWallet, celo, true).returns('foo').run()
+    expect(getLockableViemWallet).toHaveBeenCalledTimes(2)
   })
 })
diff --git a/src/web3/contracts.ts b/src/web3/contracts.ts
index 68a77f7ffd..d24f5d701e 100644
--- a/src/web3/contracts.ts
+++ b/src/web3/contracts.ts
@@ -38,6 +38,7 @@ let wallet: KeychainWallet | undefined
 let contractKit: ContractKit | undefined
 
 const viemWallets = new Map<Chain, ViemWallet>()
+const valoraViemWallets = new Map<Chain, ViemWallet>()
 
 const keychainLock = new KeychainLock()
 const initContractKitLock = new Lock()
@@ -122,9 +123,10 @@ async function waitForContractKit(tries: number) {
 
 // This code assumes that the account for walletAddress already exists in the Keychain
 // which is a responsibility currently handled by KeychainWallet
-export function* getViemWallet(chain: Chain) {
-  if (viemWallets.has(chain)) {
-    return viemWallets.get(chain) as ViemWallet
+export function* getViemWallet(chain: Chain, useValoraTransport?: boolean) {
+  const walletsCache = useValoraTransport ? valoraViemWallets : viemWallets
+  if (walletsCache.has(chain)) {
+    return walletsCache.get(chain) as ViemWallet
   }
   const walletAddress = yield* select(walletAddressSelector)
   if (!walletAddress) {
@@ -140,9 +142,14 @@ export function* getViemWallet(chain: Chain) {
   if (!privateKey) {
     throw new Error(`Private key not found for account ${walletAddress}`)
   }
-  const wallet = getLockableViemWallet(keychainLock, chain, privateKey as Address)
+  const wallet = getLockableViemWallet(
+    keychainLock,
+    chain,
+    privateKey as Address,
+    useValoraTransport
+  )
   Logger.debug(`${TAG}@getViemWallet`, `Initialized wallet with account: ${wallet.account}`)
-  viemWallets.set(chain, wallet)
+  walletsCache.set(chain, wallet)
   return wallet
 }
 
diff --git a/src/web3/networkConfig.ts b/src/web3/networkConfig.ts
index 3e47891671..129ec15a60 100644
--- a/src/web3/networkConfig.ts
+++ b/src/web3/networkConfig.ts
@@ -94,6 +94,7 @@ interface NetworkConfig {
   arbAavePoolV3ContractAddress: Address
   arbAaveIncentivesV3ContractAddress: Address
   aaveArbUsdcTokenId: string
+  valoraRpcUrl: Record<Network.Arbitrum, string>
 }
 
 const ALCHEMY_ETHEREUM_RPC_URL_STAGING = 'https://eth-sepolia.g.alchemy.com/v2/'
@@ -281,6 +282,9 @@ const GET_POINTS_BALANCE_MAINNET = `${CLOUD_FUNCTIONS_MAINNET}/getPointsBalance`
 const SIMULATE_TRANSACTIONS_ALFAJORES = `${CLOUD_FUNCTIONS_STAGING}/simulateTransactions`
 const SIMULATE_TRANSACTIONS_MAINNET = `${CLOUD_FUNCTIONS_MAINNET}/simulateTransactions`
 
+const VALORA_ARBITRUM_RPC_URL_STAGING = `${CLOUD_FUNCTIONS_STAGING}/rpc/${NetworkId['arbitrum-sepolia']}`
+const VALORA_ARBITRUM_RPC_URL_MAINNET = `${CLOUD_FUNCTIONS_MAINNET}/rpc/${NetworkId['arbitrum-one']}`
+
 const networkConfigs: { [testnet: string]: NetworkConfig } = {
   [Testnets.alfajores]: {
     networkId: '44787',
@@ -379,6 +383,9 @@ const networkConfigs: { [testnet: string]: NetworkConfig } = {
     arbAavePoolV3ContractAddress: ARB_AAVE_POOL_V3_CONTRACT_ADDRESS_STAGING,
     arbAaveIncentivesV3ContractAddress: ARB_AAVE_INCENTIVES_V3_CONTRACT_ADDRESS_STAGING,
     aaveArbUsdcTokenId: AAVE_ARB_USDC_TOKEN_ID_STAGING,
+    valoraRpcUrl: {
+      [Network.Arbitrum]: VALORA_ARBITRUM_RPC_URL_STAGING,
+    },
   },
   [Testnets.mainnet]: {
     networkId: '42220',
@@ -476,6 +483,9 @@ const networkConfigs: { [testnet: string]: NetworkConfig } = {
     arbAavePoolV3ContractAddress: ARB_AAVE_POOL_V3_CONTRACT_ADDRESS_MAINNET,
     arbAaveIncentivesV3ContractAddress: ARB_AAVE_INCENTIVES_V3_CONTRACT_ADDRESS_MAINNET,
     aaveArbUsdcTokenId: AAVE_ARB_USDC_TOKEN_ID_MAINNET,
+    valoraRpcUrl: {
+      [Network.Arbitrum]: VALORA_ARBITRUM_RPC_URL_MAINNET,
+    },
   },
 }
 

From 4e20864665a27bbf383690f7e80e2ba8a7a5a421 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Thu, 13 Jun 2024 17:42:20 -0700
Subject: [PATCH 121/133] chore: adjust learn account key images and button
 styles (#5544)

### Description

Adjust the button styles to match the new learn account key education:
[Figma](https://www.figma.com/design/mthUlChSbWXXxLe2AV13Wd/Onboarding-2024?node-id=1-3&t=6oAJf921pKwnPmPe-0).

| iOS Before | iOS After |
| ----- | ----- |
| <video
src="https://github.com/valora-inc/wallet/assets/26950305/f5e5fb71-8d60-432e-a641-e15c480c680f"
/> | <video
src="https://github.com/valora-inc/wallet/assets/26950305/1b745c68-e016-499c-9bb2-6f0c1c86c566"
/> |

Related Branding PR:
https://github.com/valora-inc/valora-app-branding/pull/33

### Test plan

- [x] Tested locally on iOS
- [x] Tested locally on Android

### Related issues

- Fixes ACT-1220

### Backwards compatibility

Yes

### Network scalability

N/A
---
 scripts/sync_branding.sh                      |   2 +-
 src/account/Education.tsx                     |  26 ++--
 .../AccountKeyEducation.test.tsx.snap         | 145 +++++++++---------
 .../__snapshots__/Education.test.tsx.snap     | 139 +++++++++--------
 .../__snapshots__/GoldEducation.test.tsx.snap | 145 +++++++++---------
 5 files changed, 235 insertions(+), 222 deletions(-)

diff --git a/scripts/sync_branding.sh b/scripts/sync_branding.sh
index d18e281e6b..29b026ffaf 100755
--- a/scripts/sync_branding.sh
+++ b/scripts/sync_branding.sh
@@ -21,7 +21,7 @@ echo $mobile_root
 cd "$mobile_root"
 
 # Please update the sha when valora branding updates are needed
-valora_branding_sha=c02f48b2582f63b13ccfe74d7f61364835206791
+valora_branding_sha=5df16830b1a6ef7f4ede64f2b14637c9257a781f
 
 if [[ "$branding" == "valora" ]]; then
   # prevents git from asking credentials
diff --git a/src/account/Education.tsx b/src/account/Education.tsx
index 70e522f010..557f2a49be 100644
--- a/src/account/Education.tsx
+++ b/src/account/Education.tsx
@@ -14,7 +14,7 @@ import { NativeSafeAreaViewProps, SafeAreaView } from 'react-native-safe-area-co
 import { OnboardingEvents } from 'src/analytics/Events'
 import { ScrollDirection } from 'src/analytics/types'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
-import Button, { BtnTypes } from 'src/components/Button'
+import Button, { BtnSizes, BtnTypes } from 'src/components/Button'
 import Pagination from 'src/components/Pagination'
 import BackChevron from 'src/icons/BackChevron'
 import Times from 'src/icons/Times'
@@ -160,15 +160,15 @@ const Education = (props: Props) => {
           dotStyle={dotStyle}
           activeDotStyle={activeDotStyle}
         />
-        <Button
-          testID="Education/progressButton"
-          onPress={nextStep}
-          text={currentIndex === stepInfo.length - 1 ? finalButtonText : buttonText}
-          type={currentIndex === stepInfo.length - 1 ? finalButtonType : buttonType}
-          touchableStyle={
-            currentIndex === stepInfo.length - 1 ? { backgroundColor: '#EEB93C' } : undefined
-          }
-        />
+        <View style={styles.buttonContainer}>
+          <Button
+            testID="Education/progressButton"
+            onPress={nextStep}
+            text={currentIndex === stepInfo.length - 1 ? finalButtonText : buttonText}
+            type={currentIndex === stepInfo.length - 1 ? finalButtonType : buttonType}
+            size={BtnSizes.FULL}
+          />
+        </View>
       </View>
     </SafeAreaView>
   )
@@ -186,9 +186,6 @@ const styles = StyleSheet.create({
   },
   container: {
     flex: 1,
-    flexWrap: 'wrap',
-    alignItems: 'center',
-    justifyContent: 'center',
     paddingBottom: 24,
   },
   heading: {
@@ -228,6 +225,9 @@ const styles = StyleSheet.create({
   pagination: {
     paddingBottom: variables.contentPadding,
   },
+  buttonContainer: {
+    paddingHorizontal: variables.contentPadding,
+  },
 })
 
 export default Education
diff --git a/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap b/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap
index 3ad8c1b07a..3e4e875ccf 100644
--- a/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap
+++ b/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap
@@ -105,10 +105,7 @@ exports[`AccountKeyEducation renders correctly 1`] = `
   <View
     style={
       {
-        "alignItems": "center",
         "flex": 1,
-        "flexWrap": "wrap",
-        "justifyContent": "center",
         "paddingBottom": 24,
       }
     }
@@ -476,96 +473,104 @@ exports[`AccountKeyEducation renders correctly 1`] = `
     </View>
     <View
       style={
-        [
-          {
-            "flexDirection": "row",
-          },
-          undefined,
-        ]
+        {
+          "paddingHorizontal": 16,
+        }
       }
     >
       <View
         style={
           [
             {
-              "overflow": "hidden",
-            },
-            {
-              "borderRadius": 100,
+              "flexDirection": "column",
             },
+            undefined,
           ]
         }
       >
         <View
-          accessibilityState={
-            {
-              "busy": undefined,
-              "checked": undefined,
-              "disabled": undefined,
-              "expanded": undefined,
-              "selected": undefined,
-            }
-          }
-          accessibilityValue={
-            {
-              "max": undefined,
-              "min": undefined,
-              "now": undefined,
-              "text": undefined,
-            }
-          }
-          accessible={true}
-          focusable={true}
-          nativeBackgroundAndroid={
-            {
-              "attribute": "selectableItemBackground",
-              "rippleRadius": undefined,
-              "type": "ThemeAttrAndroid",
-            }
-          }
-          onClick={[Function]}
-          onResponderGrant={[Function]}
-          onResponderMove={[Function]}
-          onResponderRelease={[Function]}
-          onResponderTerminate={[Function]}
-          onResponderTerminationRequest={[Function]}
-          onStartShouldSetResponder={[Function]}
           style={
             [
               {
-                "alignItems": "center",
-                "backgroundColor": "#F8F9F9",
-                "borderColor": "#E6E6E6",
+                "overflow": "hidden",
+              },
+              {
                 "borderRadius": 100,
-                "borderWidth": 1,
-                "flexDirection": "row",
-                "height": 48,
-                "justifyContent": "center",
-                "minWidth": 120,
-                "opacity": 1,
-                "paddingHorizontal": 24,
-                "paddingVertical": 5,
               },
-              undefined,
             ]
           }
-          testID="Education/progressButton"
         >
-          <Text
-            maxFontSizeMultiplier={1}
-            style={
+          <View
+            accessibilityState={
+              {
+                "busy": undefined,
+                "checked": undefined,
+                "disabled": undefined,
+                "expanded": undefined,
+                "selected": undefined,
+              }
+            }
+            accessibilityValue={
               {
-                "color": "#2E3338",
-                "fontFamily": "Inter-SemiBold",
-                "fontSize": 16,
-                "lineHeight": 24,
-                "marginLeft": 0,
-                "marginRight": 0,
+                "max": undefined,
+                "min": undefined,
+                "now": undefined,
+                "text": undefined,
               }
             }
+            accessible={true}
+            focusable={true}
+            nativeBackgroundAndroid={
+              {
+                "attribute": "selectableItemBackground",
+                "rippleRadius": undefined,
+                "type": "ThemeAttrAndroid",
+              }
+            }
+            onClick={[Function]}
+            onResponderGrant={[Function]}
+            onResponderMove={[Function]}
+            onResponderRelease={[Function]}
+            onResponderTerminate={[Function]}
+            onResponderTerminationRequest={[Function]}
+            onStartShouldSetResponder={[Function]}
+            style={
+              [
+                {
+                  "alignItems": "center",
+                  "backgroundColor": "#F8F9F9",
+                  "borderColor": "#E6E6E6",
+                  "borderRadius": 100,
+                  "borderWidth": 1,
+                  "flexDirection": "row",
+                  "flexGrow": 1,
+                  "height": 48,
+                  "justifyContent": "center",
+                  "opacity": 1,
+                  "paddingHorizontal": 24,
+                  "paddingVertical": 5,
+                },
+                undefined,
+              ]
+            }
+            testID="Education/progressButton"
           >
-            next
-          </Text>
+            <Text
+              maxFontSizeMultiplier={1}
+              style={
+                {
+                  "color": "#2E3338",
+                  "fontFamily": "Inter-SemiBold",
+                  "fontSize": 16,
+                  "lineHeight": 24,
+                  "marginLeft": 0,
+                  "marginRight": 0,
+                }
+              }
+            >
+              next
+            </Text>
+          </View>
         </View>
       </View>
     </View>
diff --git a/src/account/__snapshots__/Education.test.tsx.snap b/src/account/__snapshots__/Education.test.tsx.snap
index 3f6445701d..0a0e6859e1 100644
--- a/src/account/__snapshots__/Education.test.tsx.snap
+++ b/src/account/__snapshots__/Education.test.tsx.snap
@@ -105,10 +105,7 @@ exports[`Education renders correctly 1`] = `
   <View
     style={
       {
-        "alignItems": "center",
         "flex": 1,
-        "flexWrap": "wrap",
-        "justifyContent": "center",
         "paddingBottom": 24,
       }
     }
@@ -183,95 +180,101 @@ exports[`Education renders correctly 1`] = `
     </RCTScrollView>
     <View
       style={
-        [
-          {
-            "flexDirection": "row",
-          },
-          undefined,
-        ]
+        {
+          "paddingHorizontal": 16,
+        }
       }
     >
       <View
         style={
           [
             {
-              "overflow": "hidden",
-            },
-            {
-              "borderRadius": 100,
+              "flexDirection": "column",
             },
+            undefined,
           ]
         }
       >
         <View
-          accessibilityState={
-            {
-              "busy": undefined,
-              "checked": undefined,
-              "disabled": undefined,
-              "expanded": undefined,
-              "selected": undefined,
-            }
-          }
-          accessibilityValue={
-            {
-              "max": undefined,
-              "min": undefined,
-              "now": undefined,
-              "text": undefined,
-            }
-          }
-          accessible={true}
-          focusable={true}
-          nativeBackgroundAndroid={
-            {
-              "attribute": "selectableItemBackground",
-              "rippleRadius": undefined,
-              "type": "ThemeAttrAndroid",
-            }
-          }
-          onClick={[Function]}
-          onResponderGrant={[Function]}
-          onResponderMove={[Function]}
-          onResponderRelease={[Function]}
-          onResponderTerminate={[Function]}
-          onResponderTerminationRequest={[Function]}
-          onStartShouldSetResponder={[Function]}
           style={
             [
               {
-                "alignItems": "center",
-                "backgroundColor": "#2E3338",
-                "flexDirection": "row",
-                "height": 48,
-                "justifyContent": "center",
-                "minWidth": 120,
-                "opacity": 1,
-                "paddingHorizontal": 24,
-                "paddingVertical": 5,
+                "overflow": "hidden",
               },
               {
-                "backgroundColor": "#EEB93C",
+                "borderRadius": 100,
               },
             ]
           }
-          testID="Education/progressButton"
         >
-          <Text
-            maxFontSizeMultiplier={1}
-            style={
+          <View
+            accessibilityState={
+              {
+                "busy": undefined,
+                "checked": undefined,
+                "disabled": undefined,
+                "expanded": undefined,
+                "selected": undefined,
+              }
+            }
+            accessibilityValue={
+              {
+                "max": undefined,
+                "min": undefined,
+                "now": undefined,
+                "text": undefined,
+              }
+            }
+            accessible={true}
+            focusable={true}
+            nativeBackgroundAndroid={
               {
-                "color": "#FFFFFF",
-                "fontFamily": "Inter-SemiBold",
-                "fontSize": 16,
-                "lineHeight": 24,
-                "marginLeft": 0,
-                "marginRight": 0,
+                "attribute": "selectableItemBackground",
+                "rippleRadius": undefined,
+                "type": "ThemeAttrAndroid",
               }
             }
+            onClick={[Function]}
+            onResponderGrant={[Function]}
+            onResponderMove={[Function]}
+            onResponderRelease={[Function]}
+            onResponderTerminate={[Function]}
+            onResponderTerminationRequest={[Function]}
+            onStartShouldSetResponder={[Function]}
+            style={
+              [
+                {
+                  "alignItems": "center",
+                  "backgroundColor": "#2E3338",
+                  "flexDirection": "row",
+                  "flexGrow": 1,
+                  "height": 48,
+                  "justifyContent": "center",
+                  "opacity": 1,
+                  "paddingHorizontal": 24,
+                  "paddingVertical": 5,
+                },
+                undefined,
+              ]
+            }
+            testID="Education/progressButton"
           >
-            Done
-          </Text>
+            <Text
+              maxFontSizeMultiplier={1}
+              style={
+                {
+                  "color": "#FFFFFF",
+                  "fontFamily": "Inter-SemiBold",
+                  "fontSize": 16,
+                  "lineHeight": 24,
+                  "marginLeft": 0,
+                  "marginRight": 0,
+                }
+              }
+            >
+              Done
+            </Text>
+          </View>
         </View>
       </View>
     </View>
diff --git a/src/account/__snapshots__/GoldEducation.test.tsx.snap b/src/account/__snapshots__/GoldEducation.test.tsx.snap
index bdeb0927c9..5e5e1e934e 100644
--- a/src/account/__snapshots__/GoldEducation.test.tsx.snap
+++ b/src/account/__snapshots__/GoldEducation.test.tsx.snap
@@ -105,10 +105,7 @@ exports[`renders correctly 1`] = `
   <View
     style={
       {
-        "alignItems": "center",
         "flex": 1,
-        "flexWrap": "wrap",
-        "justifyContent": "center",
         "paddingBottom": 24,
       }
     }
@@ -476,96 +473,104 @@ exports[`renders correctly 1`] = `
     </View>
     <View
       style={
-        [
-          {
-            "flexDirection": "row",
-          },
-          undefined,
-        ]
+        {
+          "paddingHorizontal": 16,
+        }
       }
     >
       <View
         style={
           [
             {
-              "overflow": "hidden",
-            },
-            {
-              "borderRadius": 100,
+              "flexDirection": "column",
             },
+            undefined,
           ]
         }
       >
         <View
-          accessibilityState={
-            {
-              "busy": undefined,
-              "checked": undefined,
-              "disabled": undefined,
-              "expanded": undefined,
-              "selected": undefined,
-            }
-          }
-          accessibilityValue={
-            {
-              "max": undefined,
-              "min": undefined,
-              "now": undefined,
-              "text": undefined,
-            }
-          }
-          accessible={true}
-          focusable={true}
-          nativeBackgroundAndroid={
-            {
-              "attribute": "selectableItemBackground",
-              "rippleRadius": undefined,
-              "type": "ThemeAttrAndroid",
-            }
-          }
-          onClick={[Function]}
-          onResponderGrant={[Function]}
-          onResponderMove={[Function]}
-          onResponderRelease={[Function]}
-          onResponderTerminate={[Function]}
-          onResponderTerminationRequest={[Function]}
-          onStartShouldSetResponder={[Function]}
           style={
             [
               {
-                "alignItems": "center",
-                "backgroundColor": "#F8F9F9",
-                "borderColor": "#E6E6E6",
+                "overflow": "hidden",
+              },
+              {
                 "borderRadius": 100,
-                "borderWidth": 1,
-                "flexDirection": "row",
-                "height": 48,
-                "justifyContent": "center",
-                "minWidth": 120,
-                "opacity": 1,
-                "paddingHorizontal": 24,
-                "paddingVertical": 5,
               },
-              undefined,
             ]
           }
-          testID="Education/progressButton"
         >
-          <Text
-            maxFontSizeMultiplier={1}
-            style={
+          <View
+            accessibilityState={
+              {
+                "busy": undefined,
+                "checked": undefined,
+                "disabled": undefined,
+                "expanded": undefined,
+                "selected": undefined,
+              }
+            }
+            accessibilityValue={
               {
-                "color": "#2E3338",
-                "fontFamily": "Inter-SemiBold",
-                "fontSize": 16,
-                "lineHeight": 24,
-                "marginLeft": 0,
-                "marginRight": 0,
+                "max": undefined,
+                "min": undefined,
+                "now": undefined,
+                "text": undefined,
               }
             }
+            accessible={true}
+            focusable={true}
+            nativeBackgroundAndroid={
+              {
+                "attribute": "selectableItemBackground",
+                "rippleRadius": undefined,
+                "type": "ThemeAttrAndroid",
+              }
+            }
+            onClick={[Function]}
+            onResponderGrant={[Function]}
+            onResponderMove={[Function]}
+            onResponderRelease={[Function]}
+            onResponderTerminate={[Function]}
+            onResponderTerminationRequest={[Function]}
+            onStartShouldSetResponder={[Function]}
+            style={
+              [
+                {
+                  "alignItems": "center",
+                  "backgroundColor": "#F8F9F9",
+                  "borderColor": "#E6E6E6",
+                  "borderRadius": 100,
+                  "borderWidth": 1,
+                  "flexDirection": "row",
+                  "flexGrow": 1,
+                  "height": 48,
+                  "justifyContent": "center",
+                  "opacity": 1,
+                  "paddingHorizontal": 24,
+                  "paddingVertical": 5,
+                },
+                undefined,
+              ]
+            }
+            testID="Education/progressButton"
           >
-            next
-          </Text>
+            <Text
+              maxFontSizeMultiplier={1}
+              style={
+                {
+                  "color": "#2E3338",
+                  "fontFamily": "Inter-SemiBold",
+                  "fontSize": 16,
+                  "lineHeight": 24,
+                  "marginLeft": 0,
+                  "marginRight": 0,
+                }
+              }
+            >
+              next
+            </Text>
+          </View>
         </View>
       </View>
     </View>

From 744a35f8b23a74e88020726fd1eeef259091ada4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 14 Jun 2024 00:55:11 +0000
Subject: [PATCH 122/133] fix(deps): update dependency
 @fiatconnect/fiatconnect-sdk to ^0.5.54 (#5546)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[@fiatconnect/fiatconnect-sdk](https://togithub.com/fiatconnect/fiatconnect-sdk)
| [`^0.5.52` ->
`^0.5.54`](https://renovatebot.com/diffs/npm/@fiatconnect%2ffiatconnect-sdk/0.5.52/0.5.54)
|
[![age](https://developer.mend.io/api/mc/badges/age/npm/@fiatconnect%2ffiatconnect-sdk/0.5.54?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@fiatconnect%2ffiatconnect-sdk/0.5.54?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@fiatconnect%2ffiatconnect-sdk/0.5.52/0.5.54?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@fiatconnect%2ffiatconnect-sdk/0.5.52/0.5.54?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>fiatconnect/fiatconnect-sdk
(@&#8203;fiatconnect/fiatconnect-sdk)</summary>

###
[`v0.5.54`](https://togithub.com/fiatconnect/fiatconnect-sdk/releases/tag/v0.5.54)

[Compare
Source](https://togithub.com/fiatconnect/fiatconnect-sdk/compare/v0.5.53...v0.5.54)

##### Bug Fixes

- **deps:** update dependency tslib to ^2.6.3
([#&#8203;289](https://togithub.com/fiatconnect/fiatconnect-sdk/issues/289))
([f4eff56](https://togithub.com/fiatconnect/fiatconnect-sdk/commit/f4eff56e08829fcc6b9ce7ec3715d676535c341b))

###
[`v0.5.53`](https://togithub.com/fiatconnect/fiatconnect-sdk/releases/tag/v0.5.53)

[Compare
Source](https://togithub.com/fiatconnect/fiatconnect-sdk/compare/v0.5.52...v0.5.53)

##### Bug Fixes

- **deps:** update dependency ethers to ^6.13.0
([#&#8203;288](https://togithub.com/fiatconnect/fiatconnect-sdk/issues/288))
([75b9415](https://togithub.com/fiatconnect/fiatconnect-sdk/commit/75b9415720fe9e2f8df0afb58ef83ac3aa8498a8))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone
America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/valora-inc/wallet).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zOTMuMCIsInVwZGF0ZWRJblZlciI6IjM3LjM5My4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index ce57c0e04d..abe625f732 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "@celo/wallet-rpc": "^3.2.0",
     "@coinbase/cbpay-js": "^2.1.0",
     "@crowdin/ota-client": "^0.7.0",
-    "@fiatconnect/fiatconnect-sdk": "^0.5.52",
+    "@fiatconnect/fiatconnect-sdk": "^0.5.54",
     "@fiatconnect/fiatconnect-types": "^13.3.8",
     "@gorhom/bottom-sheet": "^4.6.3",
     "@json-rpc-tools/utils": "^1.7.6",
diff --git a/yarn.lock b/yarn.lock
index 53cff6eebc..bce007014f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1944,19 +1944,19 @@
   resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-5.5.3.tgz#18e3af6b8eae7984072bbeb0c0858474d7c4cefe"
   integrity sha512-R11tGE6yIFwqpaIqcfkcg7AICXzFg14+5h5v0TfF/9+RMDL6jhzCy/pxHVOfbALGdtVYdt6JdR21tuxEgl34dw==
 
-"@fiatconnect/fiatconnect-sdk@^0.5.52":
-  version "0.5.52"
-  resolved "https://registry.yarnpkg.com/@fiatconnect/fiatconnect-sdk/-/fiatconnect-sdk-0.5.52.tgz#f0d81a0122029c361e11ac97fc40497212a4b95e"
-  integrity sha512-VzX1rRFy8t/bEWUsUqMMcrOsMod2mbSRjIeIsvx0O0Y+GzUFnBljgnUMAKe0jmbOMTxOiUhWAybrWVT4MBZ8Xw==
+"@fiatconnect/fiatconnect-sdk@^0.5.54":
+  version "0.5.54"
+  resolved "https://registry.yarnpkg.com/@fiatconnect/fiatconnect-sdk/-/fiatconnect-sdk-0.5.54.tgz#ed91db1baa18a7978f50ab818c032cbc24ba9213"
+  integrity sha512-MnJiJD8ZuBoZufAgO1pwteJ4hmBsL9MBmbmt7OejDkxEOT5VXb7tKjdIfC8cnUay+sxoCenbPhNvDOsi3D+Leg==
   dependencies:
     "@badrap/result" "^0.2.13"
     "@fiatconnect/fiatconnect-types" "^13.3.8"
     cross-fetch "^4.0.0"
-    ethers "^6.12.2"
+    ethers "^6.13.0"
     fetch-cookie "^3.0.1"
     siwe "^2.3.2"
     tough-cookie "^4.0.0"
-    tslib "^2.6.2"
+    tslib "^2.6.3"
     zod "^3.23.8"
 
 "@fiatconnect/fiatconnect-types@^13.3.8":
@@ -9114,7 +9114,7 @@ ethers@^5.0.13, ethers@^5.5.4, ethers@^5.7.2:
     "@ethersproject/web" "5.7.1"
     "@ethersproject/wordlists" "5.7.0"
 
-ethers@^6.12.2:
+ethers@^6.13.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.13.0.tgz#f342958d0f622cf06559f59fbccdc1d30fa64f50"
   integrity sha512-+yyQQQWEntY5UVbCv++guA14RRVFm1rSnO1GoLFdrK7/XRWMoktNgyG9UjwxrQqGBfGyFKknNZ81YpUS2emCgg==
@@ -17685,10 +17685,10 @@ tslib@2.4.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
 
-tslib@^2.0.1, tslib@^2.5.3, tslib@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
-  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+tslib@^2.0.1, tslib@^2.5.3, tslib@^2.6.2, tslib@^2.6.3:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
+  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
 
 tsutils@^3.21.0:
   version "3.21.0"

From 6655a79dcce4eb4f3fafe40d2ffa7924ded63ea1 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Thu, 13 Jun 2024 18:05:55 -0700
Subject: [PATCH 123/133] feat(earn): enable gas subsidy for transactions
 (#5545)

### Description

Based on the feature gate, enable gas subsidy when preparing and
submitting earn transactions. Also dropped tenderly simulation for gas
estimation because we can use syndicate's rpc for this instead of
alchemy and they should succeed even without enough amount for gas.

### Test plan

CI, manually by enabling feature gate (and overriding the rpc url with
syndicate's url as the proxy isn't ready yet) and trying deposit and
withdraw from wallets with no or low ETH and ensured gas is covered.


https://github.com/valora-inc/wallet/assets/5062591/4d4688bb-c89e-4661-b976-8558e1bbd1c0



https://github.com/valora-inc/wallet/assets/5062591/9d63e052-b7a6-4ee1-a955-d3c88056bad0



### Related issues

- Fixes ACT-1194

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/earn/prepareTransactions.test.ts | 239 +++------------------------
 src/earn/prepareTransactions.ts      |  27 +--
 src/earn/saga.test.ts                |  36 +++-
 src/earn/saga.ts                     |   8 +-
 4 files changed, 58 insertions(+), 252 deletions(-)

diff --git a/src/earn/prepareTransactions.test.ts b/src/earn/prepareTransactions.test.ts
index 6a9ef5dcc0..f2bc10118e 100644
--- a/src/earn/prepareTransactions.test.ts
+++ b/src/earn/prepareTransactions.test.ts
@@ -64,7 +64,7 @@ describe('prepareTransactions', () => {
     jest.mocked(encodeFunctionData).mockReturnValue('0xencodedData')
     jest.mocked(getDynamicConfigParams).mockImplementation(({ configName, defaultValues }) => {
       if (configName === StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG) {
-        return { ...defaultValues, depositGasPadding: 100, approveGasPadding: 200 }
+        return { ...defaultValues, depositGasPadding: 100 }
       }
       return defaultValues
     })
@@ -93,7 +93,7 @@ describe('prepareTransactions', () => {
   })
 
   describe('prepareSupplyTransactions', () => {
-    it('prepares transactions with approve and supply if not already approved', async () => {
+    it('prepares transactions with approve and supply if not already approved with gas subsidy off', async () => {
       const result = await prepareSupplyTransactions({
         amount: '5',
         token: mockToken,
@@ -145,69 +145,8 @@ describe('prepareTransactions', () => {
         isGasSubsidized: false,
       })
     })
-    it('prepares fees from the cloud function for approve and supply when subsidizing gas fees', async () => {
-      jest.mocked(getFeatureGate).mockImplementation((featureGate) => {
-        if (featureGate === StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES) {
-          return true
-        }
-        throw new Error(`Unexpected feature gate: ${featureGate}`)
-      })
-
-      const result = await prepareSupplyTransactions({
-        amount: '5',
-        token: mockToken,
-        walletAddress: '0x1234',
-        feeCurrencies: [mockFeeCurrency],
-        poolContractAddress: '0x5678',
-      })
-
-      const expectedTransactions = [
-        {
-          from: '0x1234',
-          to: mockTokenAddress,
-          data: '0xencodedData',
-          gas: BigInt(3200),
-          _estimatedGasUse: BigInt(2800),
-        },
-        {
-          from: '0x1234',
-          to: '0x5678',
-          data: '0xencodedData',
-          gas: BigInt(50100),
-          _estimatedGasUse: BigInt(49800),
-        },
-      ]
-      expect(result).toEqual({
-        type: 'possible',
-        feeCurrency: mockFeeCurrency,
-        transactions: expectedTransactions,
-      })
-      expect(publicClient[Network.Arbitrum].readContract).toHaveBeenCalledWith({
-        address: mockTokenAddress,
-        abi: erc20.abi,
-        functionName: 'allowance',
-        args: ['0x1234', '0x5678'],
-      })
-      expect(encodeFunctionData).toHaveBeenNthCalledWith(1, {
-        abi: erc20.abi,
-        functionName: 'approve',
-        args: ['0x5678', BigInt(5e6)],
-      })
-      expect(encodeFunctionData).toHaveBeenNthCalledWith(2, {
-        abi: aavePool,
-        functionName: 'supply',
-        args: [mockTokenAddress, BigInt(5e6), '0x1234', 0],
-      })
-      expect(prepareTransactions).toHaveBeenCalledWith({
-        baseTransactions: expectedTransactions,
-        feeCurrencies: [mockFeeCurrency],
-        spendToken: mockToken,
-        spendTokenAmount: new BigNumber(5),
-        isGasSubsidized: true,
-      })
-    })
 
-    it('prepares transactions with supply if already approved', async () => {
+    it('prepares transactions with supply if already approved with gas subsidy on', async () => {
       jest.spyOn(publicClient[Network.Arbitrum], 'readContract').mockResolvedValue(BigInt(5e6))
       jest.mocked(simulateTransactions).mockResolvedValueOnce([
         {
@@ -218,6 +157,12 @@ describe('prepareTransactions', () => {
           gasPrice: '1',
         },
       ])
+      jest.mocked(getFeatureGate).mockImplementation((featureGate) => {
+        if (featureGate === StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES) {
+          return true
+        }
+        throw new Error(`Unexpected feature gate: ${featureGate}`)
+      })
 
       const result = await prepareSupplyTransactions({
         amount: '5',
@@ -257,13 +202,19 @@ describe('prepareTransactions', () => {
         feeCurrencies: [mockFeeCurrency],
         spendToken: mockToken,
         spendTokenAmount: new BigNumber(5),
-        isGasSubsidized: false,
+        isGasSubsidized: true,
       })
     })
   })
 
   describe('prepareWithdrawAndClaimTransactions', () => {
-    it('prepares withdraw and claim transactions', async () => {
+    it('prepares withdraw and claim transactions with gas subsidy on', async () => {
+      jest.mocked(getFeatureGate).mockImplementation((featureGate) => {
+        if (featureGate === StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES) {
+          return true
+        }
+        throw new Error(`Unexpected feature gate: ${featureGate}`)
+      })
       const rewards = [
         {
           amount: '0.002',
@@ -324,10 +275,11 @@ describe('prepareTransactions', () => {
       expect(prepareTransactions).toHaveBeenCalledWith({
         baseTransactions: expectedTransactions,
         feeCurrencies: [mockFeeCurrency],
+        isGasSubsidized: true,
       })
     })
 
-    it('prepares only withdraw transaction if no rewards', async () => {
+    it('prepares only withdraw transaction if no rewards with gas subsidy off', async () => {
       const result = await prepareWithdrawAndClaimTransactions({
         amount: '5',
         token: mockToken,
@@ -358,158 +310,7 @@ describe('prepareTransactions', () => {
       expect(prepareTransactions).toHaveBeenCalledWith({
         baseTransactions: expectedTransactions,
         feeCurrencies: [mockFeeCurrency],
-      })
-    })
-    describe('when gas fees are subsidized', () => {
-      beforeEach(() => {
-        jest.mocked(getDynamicConfigParams).mockImplementation(({ configName, defaultValues }) => {
-          if (configName === StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG) {
-            return { ...defaultValues, withdrawGasPadding: 100, rewardsGasPadding: 200 }
-          }
-          return defaultValues
-        })
-        jest.mocked(getFeatureGate).mockImplementation((featureGate) => {
-          if (featureGate === StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES) {
-            return true
-          }
-          throw new Error(`Unexpected feature gate: ${featureGate}`)
-        })
-      })
-      it('prepares withdraw and claim transactions with gas fees added from the simulated transaction', async () => {
-        jest.mocked(simulateTransactions).mockResolvedValue([
-          {
-            status: 'success',
-            blockNumber: '1',
-            gasNeeded: 3000,
-            gasUsed: 2800,
-            gasPrice: '1',
-          },
-          {
-            status: 'success',
-            blockNumber: '1',
-            gasNeeded: 50000,
-            gasUsed: 49600,
-            gasPrice: '1',
-          },
-          {
-            status: 'success',
-            blockNumber: '1',
-            gasNeeded: 50000,
-            gasUsed: 49600,
-            gasPrice: '1',
-          },
-        ])
-        const rewards = [
-          {
-            amount: '0.002',
-            tokenInfo: mockArbArbTokenBalance,
-          },
-          {
-            amount: '0.003',
-            tokenInfo: mockToken,
-          },
-        ]
-        const result = await prepareWithdrawAndClaimTransactions({
-          amount: '5',
-          token: mockToken,
-          walletAddress: '0x1234',
-          feeCurrencies: [mockFeeCurrency],
-          rewards,
-          poolTokenAddress: '0x5678',
-        })
-
-        const expectedTransactions = [
-          {
-            from: '0x1234',
-            to: networkConfig.arbAavePoolV3ContractAddress,
-            data: '0xencodedData',
-            gas: BigInt(3100),
-            _estimatedGasUse: BigInt(2800),
-          },
-          {
-            from: '0x1234',
-            to: networkConfig.arbAaveIncentivesV3ContractAddress,
-            data: '0xencodedData',
-            gas: BigInt(50200),
-            _estimatedGasUse: BigInt(49600),
-          },
-          {
-            from: '0x1234',
-            to: networkConfig.arbAaveIncentivesV3ContractAddress,
-            data: '0xencodedData',
-            gas: BigInt(50200),
-            _estimatedGasUse: BigInt(49600),
-          },
-        ]
-        expect(result).toEqual({
-          type: 'possible',
-          feeCurrency: mockFeeCurrency,
-          transactions: expectedTransactions,
-        })
-        expect(encodeFunctionData).toHaveBeenCalledTimes(3)
-        expect(encodeFunctionData).toHaveBeenCalledWith({
-          abi: aavePool,
-          functionName: 'withdraw',
-          args: [mockTokenAddress, BigInt(5e6), '0x1234'],
-        })
-        expect(encodeFunctionData).toHaveBeenCalledWith({
-          abi: aaveIncentivesV3Abi,
-          functionName: 'claimRewardsToSelf',
-          args: [['0x5678'], BigInt(2e15), mockArbArbAddress],
-        })
-        expect(encodeFunctionData).toHaveBeenCalledWith({
-          abi: aaveIncentivesV3Abi,
-          functionName: 'claimRewardsToSelf',
-          args: [['0x5678'], BigInt(3000), mockTokenAddress],
-        })
-        expect(prepareTransactions).toHaveBeenCalledWith({
-          baseTransactions: expectedTransactions,
-          feeCurrencies: [mockFeeCurrency],
-        })
-      })
-      it('prepares only withdraw transaction if no rewards', async () => {
-        jest.mocked(simulateTransactions).mockResolvedValue([
-          {
-            status: 'success',
-            blockNumber: '1',
-            gasNeeded: 3000,
-            gasUsed: 2800,
-            gasPrice: '1',
-          },
-        ])
-        const result = await prepareWithdrawAndClaimTransactions({
-          amount: '5',
-          token: mockToken,
-          walletAddress: '0x1234',
-          feeCurrencies: [mockFeeCurrency],
-          rewards: [],
-          poolTokenAddress: '0x5678',
-        })
-
-        const expectedTransactions = [
-          {
-            from: '0x1234',
-            to: networkConfig.arbAavePoolV3ContractAddress,
-            data: '0xencodedData',
-            gas: BigInt(3100),
-            _estimatedGasUse: BigInt(2800),
-          },
-        ]
-        expect(result).toEqual({
-          type: 'possible',
-          feeCurrency: mockFeeCurrency,
-          transactions: expectedTransactions,
-        })
-        expect(encodeFunctionData).toHaveBeenCalledTimes(1)
-        expect(encodeFunctionData).toHaveBeenCalledWith({
-          abi: aavePool,
-          functionName: 'withdraw',
-          args: [mockTokenAddress, BigInt(5e6), '0x1234'],
-        })
-        expect(prepareTransactions).toHaveBeenCalledWith({
-          baseTransactions: expectedTransactions,
-          feeCurrencies: [mockFeeCurrency],
-        })
+        isGasSubsidized: false,
       })
     })
   })
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 83e47dd7c2..84496bc5a4 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -84,7 +84,7 @@ export async function prepareSupplyTransactions({
 
   const supplySimulatedTx = simulatedTransactions[simulatedTransactions.length - 1]
 
-  const { depositGasPadding, approveGasPadding } = getDynamicConfigParams(
+  const { depositGasPadding } = getDynamicConfigParams(
     DynamicConfigs[StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG]
   )
 
@@ -94,12 +94,6 @@ export async function prepareSupplyTransactions({
   baseTransactions[baseTransactions.length - 1]._estimatedGasUse = BigInt(supplySimulatedTx.gasUsed)
 
   const isGasSubsidized = getFeatureGate(StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES)
-  if (isGasSubsidized && baseTransactions.length > 1) {
-    // extract fee of the approve transaction and set gas fields
-    const approveSimulatedTx = simulatedTransactions[0]
-    baseTransactions[0].gas = BigInt(approveSimulatedTx.gasNeeded) + BigInt(approveGasPadding)
-    baseTransactions[0]._estimatedGasUse = BigInt(approveSimulatedTx.gasUsed)
-  }
 
   return prepareTransactions({
     feeCurrencies,
@@ -184,26 +178,9 @@ export async function prepareWithdrawAndClaimTransactions({
 
   const isGasSubsidized = getFeatureGate(StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES)
 
-  if (isGasSubsidized) {
-    const simulatedTransactions = await simulateTransactions({
-      baseTransactions,
-      networkId: token.networkId,
-    })
-
-    const { withdrawGasPadding, rewardsGasPadding } = getDynamicConfigParams(
-      DynamicConfigs[StatsigDynamicConfigs.EARN_STABLECOIN_CONFIG]
-    )
-
-    baseTransactions.forEach((tx, index) => {
-      const simulatedTx = simulatedTransactions[index]
-      tx.gas =
-        BigInt(simulatedTx.gasNeeded) + BigInt(index === 0 ? withdrawGasPadding : rewardsGasPadding)
-      tx._estimatedGasUse = BigInt(simulatedTx.gasUsed)
-    })
-  }
-
   return prepareTransactions({
     feeCurrencies,
     baseTransactions,
+    isGasSubsidized,
   })
 }
diff --git a/src/earn/saga.test.ts b/src/earn/saga.test.ts
index 887961ff30..38fd301921 100644
--- a/src/earn/saga.test.ts
+++ b/src/earn/saga.test.ts
@@ -18,6 +18,8 @@ import {
 } from 'src/earn/slice'
 import { navigateHome } from 'src/navigator/NavigationService'
 import { CANCELLED_PIN_INPUT } from 'src/pincode/authentication'
+import { getFeatureGate } from 'src/statsig'
+import { StatsigFeatureGates } from 'src/statsig/types'
 import { fetchTokenBalances } from 'src/tokens/slice'
 import { Network, NetworkId, TokenTransactionTypeV2 } from 'src/transactions/types'
 import { publicClient } from 'src/viem'
@@ -54,6 +56,8 @@ jest.mock('src/transactions/types', () => {
   }
 })
 
+jest.mock('src/statsig')
+
 const mockTxReceipt1 = {
   status: 'success',
   blockNumber: BigInt(1234),
@@ -92,6 +96,7 @@ describe('depositSubmitSaga', () => {
   }
 
   const mockStandbyHandler = jest.fn()
+  const mockIsGasSubsidizedCheck = jest.fn() // a mock to ensure sendPreparedTransactions is called with the correct isGasSubsidized value
 
   const sagaProviders: StaticProvider[] = [
     [
@@ -100,7 +105,8 @@ describe('depositSubmitSaga', () => {
     ],
     [
       matchers.call.fn(sendPreparedTransactions),
-      dynamic(({ args: [txs, _networkId, standbyHandlers] }) => {
+      dynamic(({ args: [txs, _networkId, standbyHandlers, isGasSubsidized] }) => {
+        mockIsGasSubsidizedCheck(isGasSubsidized)
         if (txs.length === 1) {
           mockStandbyHandler(standbyHandlers[0]('0x2'))
           return ['0x2']
@@ -207,9 +213,13 @@ describe('depositSubmitSaga', () => {
 
   beforeEach(() => {
     jest.clearAllMocks()
+    jest.mocked(getFeatureGate).mockReturnValue(false)
   })
 
-  it('sends approve and deposit transactions, navigates home and dispatches the success action', async () => {
+  it('sends approve and deposit transactions, navigates home and dispatches the success action (gas subsidy on)', async () => {
+    jest
+      .mocked(getFeatureGate)
+      .mockImplementation((gate) => gate === StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES)
     await expectSaga(depositSubmitSaga, {
       type: depositStart.type,
       payload: {
@@ -242,9 +252,11 @@ describe('depositSubmitSaga', () => {
       ...expectedAnalyticsProps,
       ...expectedCumulativeGasAnalyticsProperties,
     })
+    expect(mockIsGasSubsidizedCheck).toHaveBeenCalledWith(true)
+    expect(mockIsGasSubsidizedCheck).not.toHaveBeenCalledWith(false)
   })
 
-  it('sends only deposit transaction, navigates home and dispatches the success action', async () => {
+  it('sends only deposit transaction, navigates home and dispatches the success action (gas subsidy off)', async () => {
     await expectSaga(depositSubmitSaga, {
       type: depositStart.type,
       payload: {
@@ -275,6 +287,8 @@ describe('depositSubmitSaga', () => {
       gasFeeUsd: 2.787555,
       gasUsed: 371674,
     })
+    expect(mockIsGasSubsidizedCheck).toHaveBeenCalledWith(false)
+    expect(mockIsGasSubsidizedCheck).not.toHaveBeenCalledWith(true)
   })
 
   it('dispatches cancel action if pin input is cancelled and does not navigate home', async () => {
@@ -406,11 +420,13 @@ describe('withdrawSubmitSaga', () => {
   }
 
   const mockStandbyHandler = jest.fn()
+  const mockIsGasSubsidizedCheck = jest.fn() // a mock to ensure sendPreparedTransactions is called with the correct isGasSubsidized value
 
   const sagaProviders: StaticProvider[] = [
     [
       matchers.call.fn(sendPreparedTransactions),
-      dynamic(({ args: [txs, _networkId, standbyHandlers] }) => {
+      dynamic(({ args: [txs, _networkId, standbyHandlers, isGasSubsidized] }) => {
+        mockIsGasSubsidizedCheck(isGasSubsidized)
         if (txs.length === 1) {
           mockStandbyHandler(standbyHandlers[0]('0x1'))
           return ['0x1']
@@ -487,9 +503,10 @@ describe('withdrawSubmitSaga', () => {
 
   beforeEach(() => {
     jest.clearAllMocks()
+    jest.mocked(getFeatureGate).mockReturnValue(false)
   })
 
-  it('sends withdraw and claim transactions, navigates home and dispatches the success action', async () => {
+  it('sends withdraw and claim transactions, navigates home and dispatches the success action (gas subsidy off)', async () => {
     await expectSaga(withdrawSubmitSaga, {
       type: withdrawStart.type,
       payload: {
@@ -520,9 +537,14 @@ describe('withdrawSubmitSaga', () => {
       EarnEvents.earn_withdraw_submit_success,
       expectedAnalyticsPropsWithRewards
     )
+    expect(mockIsGasSubsidizedCheck).toHaveBeenCalledWith(false)
+    expect(mockIsGasSubsidizedCheck).not.toHaveBeenCalledWith(true)
   })
 
-  it('sends only withdraw if there are no rewards', async () => {
+  it('sends only withdraw if there are no rewards (gas subsidy on)', async () => {
+    jest
+      .mocked(getFeatureGate)
+      .mockImplementation((gate) => gate === StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES)
     await expectSaga(withdrawSubmitSaga, {
       type: withdrawStart.type,
       payload: {
@@ -551,6 +573,8 @@ describe('withdrawSubmitSaga', () => {
       EarnEvents.earn_withdraw_submit_success,
       expectedAnalyticsPropsNoRewards
     )
+    expect(mockIsGasSubsidizedCheck).toHaveBeenCalledWith(true)
+    expect(mockIsGasSubsidizedCheck).not.toHaveBeenCalledWith(false)
   })
 
   it('dispatches cancel action if pin input is cancelled and does not navigate home', async () => {
diff --git a/src/earn/saga.ts b/src/earn/saga.ts
index 5539d32a89..2e3d1f152b 100644
--- a/src/earn/saga.ts
+++ b/src/earn/saga.ts
@@ -18,6 +18,8 @@ import {
 import { DepositInfo, WithdrawInfo } from 'src/earn/types'
 import { navigateHome } from 'src/navigator/NavigationService'
 import { CANCELLED_PIN_INPUT } from 'src/pincode/authentication'
+import { getFeatureGate } from 'src/statsig'
+import { StatsigFeatureGates } from 'src/statsig/types'
 import { vibrateError } from 'src/styles/hapticFeedback'
 import { getTokenInfo } from 'src/tokens/saga'
 import { tokensByIdSelector } from 'src/tokens/selectors'
@@ -173,7 +175,8 @@ export function* depositSubmitSaga(action: PayloadAction<DepositInfo>) {
       sendPreparedTransactions,
       serializablePreparedTransactions,
       networkId,
-      createDepositStandbyTxHandlers
+      createDepositStandbyTxHandlers,
+      getFeatureGate(StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES)
     )
     txHashes.forEach((txHash, i) => {
       trackedTxs[i].txHash = txHash
@@ -332,7 +335,8 @@ export function* withdrawSubmitSaga(action: PayloadAction<WithdrawInfo>) {
       sendPreparedTransactions,
       serializablePreparedTransactions,
       networkId,
-      createWithdrawStandbyTxHandlers
+      createWithdrawStandbyTxHandlers,
+      getFeatureGate(StatsigFeatureGates.SUBSIDIZE_STABLECOIN_EARN_GAS_FEES)
     )
 
     Logger.debug(

From 14e4c618e81b59d7c06833b58f5b53650206f725 Mon Sep 17 00:00:00 2001
From: Satish Ravi <satish.ravi@valoraapp.com>
Date: Thu, 13 Jun 2024 18:49:06 -0700
Subject: [PATCH 124/133] fix(earn): show loading states when tx is prepared
 and submitted (#5547)

### Description

- EarnEnterAmount - show spinner on button when tx is prepared
- EarnCollectScreen - disable button when showing spinner

### Test plan

| Screen | Before | After |
|--------|--------|--------|
| EnterAmount | <video
src="https://github.com/valora-inc/wallet/assets/5062591/00f97cd6-7701-426a-bc31-b06dcb3ad76a"
/> | <video
src="https://github.com/valora-inc/wallet/assets/5062591/f88ed460-c104-4532-a7e1-4b512ba9056e"
/> |
| Collect | <video
src="https://github.com/valora-inc/wallet/assets/5062591/12291d60-0f48-49b8-a234-78902d7ee3ef"
/> | <video
src="https://github.com/valora-inc/wallet/assets/5062591/22a0ec65-fe47-458b-b637-21f9f110b737"
/> |


### Related issues

N/A

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/earn/EarnCollectScreen.test.tsx | 12 +++++++++++-
 src/earn/EarnCollectScreen.tsx      |  3 ++-
 src/earn/EarnEnterAmount.test.tsx   | 27 +++++++++++++++++++++++++++
 src/earn/EarnEnterAmount.tsx        |  6 ++++++
 src/earn/prepareTransactions.ts     |  1 +
 5 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/src/earn/EarnCollectScreen.test.tsx b/src/earn/EarnCollectScreen.test.tsx
index 967fd1478e..c616160059 100644
--- a/src/earn/EarnCollectScreen.test.tsx
+++ b/src/earn/EarnCollectScreen.test.tsx
@@ -372,7 +372,7 @@ describe('EarnCollectScreen', () => {
 
   it('disables cta and shows loading spinner when withdraw is submitted', async () => {
     const store = createMockStore({ tokens: mockStoreTokens, earn: { withdrawStatus: 'loading' } })
-    const { getByTestId } = render(
+    const { getByTestId, queryByTestId } = render(
       <Provider store={store}>
         <MockedNavigator
           component={EarnCollectScreen}
@@ -384,6 +384,16 @@ describe('EarnCollectScreen', () => {
       </Provider>
     )
 
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/RewardsLoading')).toBeFalsy()
+    })
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/ApyLoading')).toBeFalsy()
+    })
+    await waitFor(() => {
+      expect(queryByTestId('EarnCollect/GasLoading')).toBeFalsy()
+    })
+
     expect(getByTestId('EarnCollectScreen/CTA')).toBeDisabled()
     expect(getByTestId('EarnCollectScreen/CTA')).toContainElement(getByTestId('Button/Loading'))
   })
diff --git a/src/earn/EarnCollectScreen.tsx b/src/earn/EarnCollectScreen.tsx
index e313f41ec7..93375c24e8 100644
--- a/src/earn/EarnCollectScreen.tsx
+++ b/src/earn/EarnCollectScreen.tsx
@@ -92,7 +92,8 @@ export default function EarnCollectScreen({ route }: Props) {
     asyncRewardsInfo.error ||
     asyncPreparedTransactions.loading ||
     asyncPreparedTransactions.error ||
-    asyncPreparedTransactions.result?.type !== 'possible'
+    asyncPreparedTransactions.result?.type !== 'possible' ||
+    withdrawStatus === 'loading'
 
   const { maxFeeAmount, feeCurrency } = getFeeCurrencyAndAmounts(asyncPreparedTransactions.result)
   let feeSection = <GasFeeLoading />
diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index b0e0e830f7..13f0883951 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -86,6 +86,7 @@ jest.mocked(usePrepareSupplyTransactions).mockReturnValue({
   refreshPreparedTransactions: refreshPreparedTransactionsSpy,
   clearPreparedTransactions: jest.fn(),
   prepareTransactionError: undefined,
+  isPreparingTransactions: false,
 })
 
 const params = {
@@ -153,6 +154,7 @@ describe('EarnEnterAmount', () => {
       refreshPreparedTransactions: jest.fn(),
       clearPreparedTransactions: jest.fn(),
       prepareTransactionError: undefined,
+      isPreparingTransactions: false,
     })
     const { getByTestId, getByText } = render(
       <Provider store={store}>
@@ -186,6 +188,7 @@ describe('EarnEnterAmount', () => {
       refreshPreparedTransactions: jest.fn(),
       clearPreparedTransactions: jest.fn(),
       prepareTransactionError: undefined,
+      isPreparingTransactions: false,
     })
     const { getByTestId, getByText } = render(
       <Provider store={store}>
@@ -215,4 +218,28 @@ describe('EarnEnterAmount', () => {
       expect(getByText('earnFlow.addCryptoBottomSheet.description')).toBeVisible()
     )
   })
+
+  it('should show loading spinner when preparing transaction', async () => {
+    jest.mocked(usePrepareSupplyTransactions).mockReturnValue({
+      prepareTransactionsResult: undefined,
+      refreshPreparedTransactions: jest.fn(),
+      clearPreparedTransactions: jest.fn(),
+      prepareTransactionError: undefined,
+      isPreparingTransactions: true,
+    })
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <MockedNavigator component={EarnEnterAmount} params={params} />
+      </Provider>
+    )
+
+    fireEvent.changeText(getByTestId('EarnEnterAmount/TokenAmountInput'), '8')
+
+    await waitFor(() =>
+      expect(getByTestId('EarnEnterAmount/Continue')).toContainElement(
+        getByTestId('Button/Loading')
+      )
+    )
+    expect(getByTestId('EarnEnterAmount/Continue')).toBeDisabled()
+  })
 })
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index 4cb1b843ef..c8e82ff8a9 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -61,6 +61,7 @@ type ProceedComponentProps = Omit<ProceedArgs, 'tokenAmount'> & {
   onPressInfo(): void
   disabled: boolean
   tokenAmount: BigNumber | null
+  loading: boolean
 }
 
 function EarnEnterAmount({ route }: Props) {
@@ -90,6 +91,7 @@ function EarnEnterAmount({ route }: Props) {
     refreshPreparedTransactions,
     clearPreparedTransactions,
     prepareTransactionError,
+    isPreparingTransactions,
   } = usePrepareSupplyTransactions()
 
   const walletAddress = useSelector(walletAddressSelector)
@@ -363,6 +365,7 @@ function EarnEnterAmount({ route }: Props) {
           onPressProceed={onPressContinue}
           onPressInfo={onPressInfo}
           disabled={disabled}
+          loading={isPreparingTransactions}
         />
         <KeyboardSpacer />
       </KeyboardAwareScrollView>
@@ -393,6 +396,7 @@ function EarnProceed({
   disabled,
   onPressProceed,
   onPressInfo,
+  loading,
 }: ProceedComponentProps) {
   const { t } = useTranslation()
 
@@ -407,6 +411,8 @@ function EarnProceed({
         style={styles.continueButton}
         size={BtnSizes.FULL}
         disabled={disabled}
+        showLoading={loading}
+        testID="EarnEnterAmount/Continue"
       />
       <View style={styles.row}>
         <Text style={styles.infoText}>{t('earnFlow.enterAmount.info')}</Text>
diff --git a/src/earn/prepareTransactions.ts b/src/earn/prepareTransactions.ts
index 84496bc5a4..955a2bee2d 100644
--- a/src/earn/prepareTransactions.ts
+++ b/src/earn/prepareTransactions.ts
@@ -120,6 +120,7 @@ export function usePrepareSupplyTransactions() {
     refreshPreparedTransactions: prepareTransactions.execute,
     clearPreparedTransactions: prepareTransactions.reset,
     prepareTransactionError: prepareTransactions.error,
+    isPreparingTransactions: prepareTransactions.loading,
   }
 }
 

From 9fb1a3a1efce4f4c23ebc5fd04b3d7b180c47c17 Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Fri, 14 Jun 2024 14:40:29 +1200
Subject: [PATCH 125/133] feat(onboarding): Keyless Backup Setup Fail in
 Onboarding Flow (#5537)

### Description

Added origin param to decide whether CAB flow was entered from
Onboarding or Settings. The first screen that this param is passed to is
SignInWithEmail, since that is the first CAB screen that is hit during
onboarding.

### Test plan

Unit tests added.

**Manual:**
Screen:
![Simulator Screenshot - iPhone 14 Pro - 2024-06-12 at 12 31
28](https://github.com/valora-inc/wallet/assets/140328381/c3b35555-cd21-4e0b-a28e-b529856bd428)

Recovery phrase:


https://github.com/valora-inc/wallet/assets/140328381/7e17e02b-620d-4045-9e23-1e9065e52d4a


Skip:


https://github.com/valora-inc/wallet/assets/140328381/313c348c-9b48-4ad8-9be1-f0adc7c09981


### Related issues

- Fixes #ACT-1222

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [X] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 locales/base/translation.json                 |  3 +-
 src/analytics/Events.tsx                      |  1 +
 src/analytics/Properties.tsx                  |  4 +-
 src/analytics/docs.ts                         |  1 +
 src/keylessBackup/KeylessBackupIntro.test.tsx |  3 ++
 src/keylessBackup/KeylessBackupIntro.tsx      |  6 ++-
 .../KeylessBackupPhoneCodeInput.tsx           |  1 +
 src/keylessBackup/KeylessBackupPhoneInput.tsx |  4 +-
 .../KeylessBackupProgress.test.tsx            | 52 ++++++++++++++++--
 src/keylessBackup/KeylessBackupProgress.tsx   | 54 +++++++++++++++----
 src/keylessBackup/SignInWithEmail.tsx         |  4 +-
 src/navigator/types.tsx                       |  5 ++
 .../registration/ImportSelect.test.tsx        |  2 +
 src/onboarding/registration/ImportSelect.tsx  |  6 ++-
 14 files changed, 125 insertions(+), 21 deletions(-)

diff --git a/locales/base/translation.json b/locales/base/translation.json
index d53786f861..7f8de91caa 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -129,7 +129,8 @@
         "title": "Backup unavailable",
         "body": "You can set up wallet backup later or protect your account now by saving your recovery phrase.",
         "later": "I'll set up backup later",
-        "manual": "Save recovery phrase"
+        "manual": "Save recovery phrase",
+        "skip": "Skip (not recommended)"
       }
     },
     "restore": {
diff --git a/src/analytics/Events.tsx b/src/analytics/Events.tsx
index 82e710a80c..e1ce5e963b 100644
--- a/src/analytics/Events.tsx
+++ b/src/analytics/Events.tsx
@@ -112,6 +112,7 @@ export enum KeylessBackupEvents {
   cab_progress_completed_continue = 'cab_progress_completed_continue',
   cab_progress_failed_later = 'cab_progress_failed_later',
   cab_progress_failed_manual = 'cab_progress_failed_manual',
+  cab_progress_failed_skip_onboarding = 'cab_progress_failed_skip_onboarding',
   cab_post_encrypted_mnemonic_failed = 'cab_post_encrypted_mnemonic_failed',
   cab_torus_keyshare_timeout = 'cab_torus_keyshare_timeout',
   cab_handle_keyless_backup_failed = 'cab_handle_keyless_backup_failed',
diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 7b22f7d793..a125e92037 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -64,6 +64,7 @@ import { SerializableRewardsInfo } from 'src/earn/types'
 import { ProviderSelectionAnalyticsData } from 'src/fiatExchanges/types'
 import { CICOFlow, FiatExchangeFlow, PaymentMethod } from 'src/fiatExchanges/utils'
 import { HomeActionName, NotificationBannerCTATypes, NotificationType } from 'src/home/types'
+import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
 import { KeylessBackupFlow, KeylessBackupStatus } from 'src/keylessBackup/types'
 import { LocalCurrencyCode } from 'src/localCurrency/consts'
 import { NftOrigin } from 'src/nfts/types'
@@ -264,7 +265,8 @@ interface KeylessBackupEventsProperties {
   [KeylessBackupEvents.cab_issue_valora_keyshare_error]: CommonKeylessBackupProps
   [KeylessBackupEvents.cab_progress_completed_continue]: undefined
   [KeylessBackupEvents.cab_progress_failed_later]: undefined
-  [KeylessBackupEvents.cab_progress_failed_manual]: undefined
+  [KeylessBackupEvents.cab_progress_failed_manual]: { origin: KeylessBackupOrigin }
+  [KeylessBackupEvents.cab_progress_failed_skip_onboarding]: undefined
   [KeylessBackupEvents.cab_post_encrypted_mnemonic_failed]: {
     backupAlreadyExists: boolean
   }
diff --git a/src/analytics/docs.ts b/src/analytics/docs.ts
index 2e3039957c..f66107d86e 100644
--- a/src/analytics/docs.ts
+++ b/src/analytics/docs.ts
@@ -144,6 +144,7 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [KeylessBackupEvents.cab_progress_completed_continue]: ``,
   [KeylessBackupEvents.cab_progress_failed_later]: ``,
   [KeylessBackupEvents.cab_progress_failed_manual]: ``,
+  [KeylessBackupEvents.cab_progress_failed_skip_onboarding]: ``,
   [KeylessBackupEvents.cab_post_encrypted_mnemonic_failed]: ``,
   [KeylessBackupEvents.cab_torus_keyshare_timeout]: ``,
   [KeylessBackupEvents.cab_handle_keyless_backup_failed]: `When keyless backup fails to generate store encrypted mnemonic for setup or fails to retrieve and decrypt mnemonic for restore`,
diff --git a/src/keylessBackup/KeylessBackupIntro.test.tsx b/src/keylessBackup/KeylessBackupIntro.test.tsx
index 0246dc86cc..4e0f168dfd 100644
--- a/src/keylessBackup/KeylessBackupIntro.test.tsx
+++ b/src/keylessBackup/KeylessBackupIntro.test.tsx
@@ -3,6 +3,7 @@ import React from 'react'
 import { KeylessBackupEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import KeylessBackupIntro from 'src/keylessBackup/KeylessBackupIntro'
+import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
 import { KeylessBackupFlow } from 'src/keylessBackup/types'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -30,6 +31,7 @@ describe('KeylessBackupIntro', () => {
       })
       expect(navigate).toHaveBeenCalledWith(Screens.SignInWithEmail, {
         keylessBackupFlow: KeylessBackupFlow.Setup,
+        origin: KeylessBackupOrigin.Settings,
       })
     })
 
@@ -68,6 +70,7 @@ describe('KeylessBackupIntro', () => {
       })
       expect(navigate).toHaveBeenCalledWith(Screens.SignInWithEmail, {
         keylessBackupFlow: KeylessBackupFlow.Restore,
+        origin: KeylessBackupOrigin.Settings,
       })
     })
   })
diff --git a/src/keylessBackup/KeylessBackupIntro.tsx b/src/keylessBackup/KeylessBackupIntro.tsx
index 41c04c3cf8..3bc80756b8 100644
--- a/src/keylessBackup/KeylessBackupIntro.tsx
+++ b/src/keylessBackup/KeylessBackupIntro.tsx
@@ -10,6 +10,7 @@ import CancelButton from 'src/components/CancelButton'
 import Card from 'src/components/Card'
 import TextButton from 'src/components/TextButton'
 import EnvelopeIcon from 'src/keylessBackup/EnvelopeIcon'
+import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
 import SmartphoneIcon from 'src/keylessBackup/SmartphoneIcon'
 import { KeylessBackupFlow } from 'src/keylessBackup/types'
 import { emptyHeader } from 'src/navigator/Headers'
@@ -84,7 +85,10 @@ function KeylessBackupIntro({ route }: Props) {
         testID="keylessBackupIntro/Continue"
         onPress={() => {
           ValoraAnalytics.track(KeylessBackupEvents.cab_intro_continue, { keylessBackupFlow })
-          navigate(Screens.SignInWithEmail, { keylessBackupFlow })
+          navigate(Screens.SignInWithEmail, {
+            keylessBackupFlow,
+            origin: KeylessBackupOrigin.Settings,
+          })
         }}
         text={isSetup ? t('continue') : t('next')}
         size={BtnSizes.FULL}
diff --git a/src/keylessBackup/KeylessBackupPhoneCodeInput.tsx b/src/keylessBackup/KeylessBackupPhoneCodeInput.tsx
index 941685c4ee..51e43969d7 100644
--- a/src/keylessBackup/KeylessBackupPhoneCodeInput.tsx
+++ b/src/keylessBackup/KeylessBackupPhoneCodeInput.tsx
@@ -116,6 +116,7 @@ function KeylessBackupPhoneCodeInput({
         onSuccess={() => {
           navigate(Screens.KeylessBackupProgress, {
             keylessBackupFlow: route.params.keylessBackupFlow,
+            origin: route.params.origin,
           })
         }}
         title={<Text style={styles.title}>{t('phoneVerificationInput.title')}</Text>}
diff --git a/src/keylessBackup/KeylessBackupPhoneInput.tsx b/src/keylessBackup/KeylessBackupPhoneInput.tsx
index f30f11ceec..a721262545 100644
--- a/src/keylessBackup/KeylessBackupPhoneInput.tsx
+++ b/src/keylessBackup/KeylessBackupPhoneInput.tsx
@@ -28,7 +28,7 @@ type Props = NativeStackScreenProps<StackParamList, Screens.KeylessBackupPhoneIn
 
 function KeylessBackupPhoneInput({ route }: Props) {
   const { t } = useTranslation()
-  const { selectedCountryCodeAlpha2, keylessBackupFlow } = route.params
+  const { selectedCountryCodeAlpha2, keylessBackupFlow, origin } = route.params
   const cachedNumber = useSelector(e164NumberSelector)
   const cachedCountryCallingCode = useSelector(defaultCountryCodeSelector)
   const countries = useMemo(() => new Countries(i18n.language), [i18n.language])
@@ -78,6 +78,7 @@ function KeylessBackupPhoneInput({ route }: Props) {
         navigate(Screens.KeylessBackupPhoneInput, {
           keylessBackupFlow,
           selectedCountryCodeAlpha2: countryCodeAlpha2,
+          origin,
         })
       },
     })
@@ -90,6 +91,7 @@ function KeylessBackupPhoneInput({ route }: Props) {
     navigate(Screens.KeylessBackupPhoneCodeInput, {
       keylessBackupFlow,
       e164Number: phoneNumberInfo.e164Number,
+      origin,
     })
   }
 
diff --git a/src/keylessBackup/KeylessBackupProgress.test.tsx b/src/keylessBackup/KeylessBackupProgress.test.tsx
index 652fe1ff84..5a62c90d31 100644
--- a/src/keylessBackup/KeylessBackupProgress.test.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.test.tsx
@@ -3,7 +3,7 @@ import * as React from 'react'
 import { Provider } from 'react-redux'
 import { KeylessBackupEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
-import KeylessBackupProgress from 'src/keylessBackup/KeylessBackupProgress'
+import KeylessBackupProgress, { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
 import { keylessBackupAcceptZeroBalance, keylessBackupBail } from 'src/keylessBackup/slice'
 import { KeylessBackupFlow, KeylessBackupStatus } from 'src/keylessBackup/types'
 import { ensurePincode, navigate, navigateHome } from 'src/navigator/NavigationService'
@@ -40,9 +40,13 @@ function createStore(keylessBackupStatus: KeylessBackupStatus, zeroBalance = fal
   })
 }
 
-function getProps(flow: KeylessBackupFlow = KeylessBackupFlow.Setup) {
+function getProps(
+  flow: KeylessBackupFlow = KeylessBackupFlow.Setup,
+  origin: KeylessBackupOrigin = KeylessBackupOrigin.Settings
+) {
   return getMockStackScreenProps(Screens.KeylessBackupProgress, {
     keylessBackupFlow: flow,
+    origin,
   })
 }
 
@@ -115,7 +119,49 @@ describe('KeylessBackupProgress', () => {
 
       expect(ValoraAnalytics.track).toHaveBeenCalledTimes(1)
       expect(ValoraAnalytics.track).toHaveBeenCalledWith(
-        KeylessBackupEvents.cab_progress_failed_manual
+        KeylessBackupEvents.cab_progress_failed_manual,
+        { origin: KeylessBackupOrigin.Settings }
+      )
+    })
+    it('navigates to recovery phrase on failure when coming from onboarding', async () => {
+      jest.mocked(ensurePincode).mockResolvedValueOnce(true)
+      const { getByTestId } = render(
+        <Provider store={createStore(KeylessBackupStatus.Failed)}>
+          <KeylessBackupProgress
+            {...getProps(KeylessBackupFlow.Setup, KeylessBackupOrigin.Onboarding)}
+          />
+        </Provider>
+      )
+      expect(getByTestId('KeylessBackupProgress/ManualOnboarding')).toBeTruthy()
+      fireEvent.press(getByTestId('KeylessBackupProgress/ManualOnboarding'))
+
+      await waitFor(() => expect(navigate).toHaveBeenCalledTimes(1))
+      expect(navigate).toHaveBeenCalledWith(Screens.AccountKeyEducation)
+
+      expect(ValoraAnalytics.track).toHaveBeenCalledTimes(1)
+      expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+        KeylessBackupEvents.cab_progress_failed_manual,
+        { origin: KeylessBackupOrigin.Onboarding }
+      )
+    })
+    it('navigates to CYA on failure when coming from onboarding', async () => {
+      jest.mocked(ensurePincode).mockResolvedValueOnce(true)
+      const { getByTestId } = render(
+        <Provider store={createStore(KeylessBackupStatus.Failed)}>
+          <KeylessBackupProgress
+            {...getProps(KeylessBackupFlow.Setup, KeylessBackupOrigin.Onboarding)}
+          />
+        </Provider>
+      )
+      expect(getByTestId('KeylessBackupProgress/Skip')).toBeTruthy()
+      fireEvent.press(getByTestId('KeylessBackupProgress/Skip'))
+
+      await waitFor(() => expect(navigate).toHaveBeenCalledTimes(1))
+      expect(navigate).toHaveBeenCalledWith(Screens.ChooseYourAdventure)
+
+      expect(ValoraAnalytics.track).toHaveBeenCalledTimes(1)
+      expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+        KeylessBackupEvents.cab_progress_failed_skip_onboarding
       )
     })
   })
diff --git a/src/keylessBackup/KeylessBackupProgress.tsx b/src/keylessBackup/KeylessBackupProgress.tsx
index 3bb2083b04..32a0100da2 100644
--- a/src/keylessBackup/KeylessBackupProgress.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.tsx
@@ -32,12 +32,18 @@ import Logger from 'src/utils/Logger'
 
 const TAG = 'keylessBackup/KeylessBackupProgress'
 
+export enum KeylessBackupOrigin {
+  Onboarding = 'Onboarding',
+  Settings = 'Settings',
+}
+
 function KeylessBackupProgress({
   route,
   navigation,
 }: NativeStackScreenProps<StackParamList, Screens.KeylessBackupProgress>) {
   const keylessBackupStatus = useSelector(keylessBackupStatusSelector)
   const { t } = useTranslation()
+  const { keylessBackupFlow, origin } = route.params
 
   const onPressHelp = () => {
     ValoraAnalytics.track(KeylessBackupEvents.cab_restore_failed_help)
@@ -55,7 +61,7 @@ function KeylessBackupProgress({
     navigation.setOptions({
       headerRight: () =>
         keylessBackupStatus === KeylessBackupStatus.Failed &&
-        route.params.keylessBackupFlow === KeylessBackupFlow.Restore && (
+        keylessBackupFlow === KeylessBackupFlow.Restore && (
           <TopBarTextButton
             title={t('keylessBackupStatus.restore.failed.help')}
             testID="KeylessBackupRestoreHelp"
@@ -66,10 +72,10 @@ function KeylessBackupProgress({
     })
   })
 
-  if (route.params.keylessBackupFlow === KeylessBackupFlow.Restore) {
+  if (keylessBackupFlow === KeylessBackupFlow.Restore) {
     return <Restore />
   } else {
-    return <Setup />
+    return <Setup origin={origin} />
   }
 }
 
@@ -250,17 +256,19 @@ function Restore() {
   }
 }
 
-function Setup() {
+function Setup({ origin }: { origin: KeylessBackupOrigin }) {
   const keylessBackupStatus = useSelector(keylessBackupStatusSelector)
   const { t } = useTranslation()
 
+  const navigatedFromSettings = origin === KeylessBackupOrigin.Settings
+
   const onPressContinue = () => {
     ValoraAnalytics.track(KeylessBackupEvents.cab_progress_completed_continue)
     navigateHome()
   }
 
   const onPressManual = async () => {
-    ValoraAnalytics.track(KeylessBackupEvents.cab_progress_failed_manual)
+    ValoraAnalytics.track(KeylessBackupEvents.cab_progress_failed_manual, { origin })
     try {
       const pinIsCorrect = await ensurePincode()
       if (pinIsCorrect) {
@@ -276,6 +284,16 @@ function Setup() {
     navigate(Screens.Settings)
   }
 
+  const onPressManualOnboarding = () => {
+    ValoraAnalytics.track(KeylessBackupEvents.cab_progress_failed_manual, { origin })
+    navigate(Screens.AccountKeyEducation)
+  }
+
+  const onPressSkip = () => {
+    ValoraAnalytics.track(KeylessBackupEvents.cab_progress_failed_skip_onboarding)
+    navigate(Screens.ChooseYourAdventure)
+  }
+
   switch (keylessBackupStatus) {
     case KeylessBackupStatus.InProgress: {
       return renderInProgressState(t('keylessBackupStatus.setup.inProgress.title'))
@@ -311,18 +329,32 @@ function Setup() {
             <Text style={styles.body}>{t('keylessBackupStatus.setup.failed.body')}</Text>
           </View>
           <Button
-            testID="KeylessBackupProgress/Later"
-            onPress={onPressLater}
-            text={t('keylessBackupStatus.setup.failed.later')}
+            testID={
+              navigatedFromSettings
+                ? 'KeylessBackupProgress/Later'
+                : 'KeylessBackupProgress/ManualOnboarding'
+            }
+            onPress={navigatedFromSettings ? onPressLater : onPressManualOnboarding}
+            text={t(
+              navigatedFromSettings
+                ? 'keylessBackupStatus.setup.failed.later'
+                : 'keylessBackupStatus.setup.failed.manual'
+            )}
             size={BtnSizes.FULL}
             type={BtnTypes.PRIMARY}
             style={styles.button}
             touchableStyle={styles.buttonTouchable}
           />
           <Button
-            testID="KeylessBackupProgress/Manual"
-            onPress={onPressManual}
-            text={t('keylessBackupStatus.setup.failed.manual')}
+            testID={
+              navigatedFromSettings ? 'KeylessBackupProgress/Manual' : 'KeylessBackupProgress/Skip'
+            }
+            onPress={navigatedFromSettings ? onPressManual : onPressSkip}
+            text={t(
+              navigatedFromSettings
+                ? 'keylessBackupStatus.setup.failed.manual'
+                : 'keylessBackupStatus.setup.failed.skip'
+            )}
             size={BtnSizes.FULL}
             type={BtnTypes.SECONDARY}
             style={styles.button}
diff --git a/src/keylessBackup/SignInWithEmail.tsx b/src/keylessBackup/SignInWithEmail.tsx
index 3405f9cd71..1d56a77a23 100644
--- a/src/keylessBackup/SignInWithEmail.tsx
+++ b/src/keylessBackup/SignInWithEmail.tsx
@@ -28,7 +28,7 @@ function SignInWithEmail({ route }: Props) {
   const { t } = useTranslation()
   const dispatch = useDispatch()
   const { authorize, getCredentials, clearCredentials } = useAuth0()
-  const { keylessBackupFlow } = route.params
+  const { keylessBackupFlow, origin } = route.params
   const [loading, setLoading] = useState(false)
 
   const onPressGoogle = async () => {
@@ -57,7 +57,7 @@ function SignInWithEmail({ route }: Props) {
       if (!credentials.idToken) {
         throw new Error('got an empty token from auth0')
       }
-      navigate(Screens.KeylessBackupPhoneInput, { keylessBackupFlow })
+      navigate(Screens.KeylessBackupPhoneInput, { keylessBackupFlow, origin })
       dispatch(googleSignInCompleted({ idToken: credentials.idToken }))
       ValoraAnalytics.track(KeylessBackupEvents.cab_sign_in_with_google_success, {
         keylessBackupFlow,
diff --git a/src/navigator/types.tsx b/src/navigator/types.tsx
index bc64f309e0..892852dc1a 100644
--- a/src/navigator/types.tsx
+++ b/src/navigator/types.tsx
@@ -8,6 +8,7 @@ import FiatConnectQuote from 'src/fiatExchanges/quotes/FiatConnectQuote'
 import { CICOFlow, FiatExchangeFlow, SimplexQuote } from 'src/fiatExchanges/utils'
 import { Props as KycLandingProps } from 'src/fiatconnect/KycLanding'
 import { FiatAccount } from 'src/fiatconnect/slice'
+import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
 import { KeylessBackupFlow } from 'src/keylessBackup/types'
 import { Screens } from 'src/navigator/Screens'
 import { Nft } from 'src/nfts/types'
@@ -136,13 +137,16 @@ export type StackParamList = {
   [Screens.KeylessBackupPhoneCodeInput]: {
     keylessBackupFlow: KeylessBackupFlow
     e164Number: string
+    origin: KeylessBackupOrigin
   }
   [Screens.KeylessBackupPhoneInput]: {
     keylessBackupFlow: KeylessBackupFlow
     selectedCountryCodeAlpha2?: string
+    origin: KeylessBackupOrigin
   }
   [Screens.KeylessBackupProgress]: {
     keylessBackupFlow: KeylessBackupFlow
+    origin: KeylessBackupOrigin
   }
   [Screens.KeylessBackupIntro]: {
     keylessBackupFlow: KeylessBackupFlow
@@ -260,6 +264,7 @@ export type StackParamList = {
   [Screens.Settings]: { promptConfirmRemovalModal?: boolean } | undefined
   [Screens.SignInWithEmail]: {
     keylessBackupFlow: KeylessBackupFlow
+    origin: KeylessBackupOrigin
   }
   [Screens.Spend]: undefined
   [Screens.StoreWipeRecoveryScreen]: undefined
diff --git a/src/onboarding/registration/ImportSelect.test.tsx b/src/onboarding/registration/ImportSelect.test.tsx
index abac180549..f8653a68dc 100644
--- a/src/onboarding/registration/ImportSelect.test.tsx
+++ b/src/onboarding/registration/ImportSelect.test.tsx
@@ -2,6 +2,7 @@ import { fireEvent, render } from '@testing-library/react-native'
 import * as React from 'react'
 import 'react-native'
 import { Provider } from 'react-redux'
+import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
 import { KeylessBackupFlow } from 'src/keylessBackup/types'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -37,6 +38,7 @@ describe('ImportSelect', () => {
     fireEvent.press(getByTestId('ImportSelect/CloudBackup'))
     expect(navigate).toHaveBeenCalledWith(Screens.SignInWithEmail, {
       keylessBackupFlow: KeylessBackupFlow.Restore,
+      origin: KeylessBackupOrigin.Onboarding,
     })
   })
 
diff --git a/src/onboarding/registration/ImportSelect.tsx b/src/onboarding/registration/ImportSelect.tsx
index 070f2b296e..d385cf3dd3 100644
--- a/src/onboarding/registration/ImportSelect.tsx
+++ b/src/onboarding/registration/ImportSelect.tsx
@@ -11,6 +11,7 @@ import Card from 'src/components/Card'
 import Touchable from 'src/components/Touchable'
 import CloudCheck from 'src/icons/CloudCheck'
 import Lock from 'src/icons/Lock'
+import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
 import { KeylessBackupFlow } from 'src/keylessBackup/types'
 import { nuxNavigationOptions } from 'src/navigator/Headers'
 import { navigate, navigateClearingStack } from 'src/navigator/NavigationService'
@@ -91,7 +92,10 @@ export default function ImportSelect({ navigation }: Props) {
             description={t('importSelect.emailAndPhone.description')}
             icon={<CloudCheck color={colors.successDark} />}
             onPress={() =>
-              navigate(Screens.SignInWithEmail, { keylessBackupFlow: KeylessBackupFlow.Restore })
+              navigate(Screens.SignInWithEmail, {
+                keylessBackupFlow: KeylessBackupFlow.Restore,
+                origin: KeylessBackupOrigin.Onboarding,
+              })
             }
             testID="ImportSelect/CloudBackup"
           />

From fd2a94001864780208cb5c0bf8f0eed60948e70d Mon Sep 17 00:00:00 2001
From: Valora Bot <89419329+valora-bot@users.noreply.github.com>
Date: Fri, 14 Jun 2024 01:20:11 -0700
Subject: [PATCH 126/133] chore: bump app version to 1.88.0  (#5549)

Co-authored-by: Anka <runner@Mac-1718341613265.local>
---
 android/app/build.gradle           | 2 +-
 android/gradle.properties          | 2 +-
 ios/celo.xcodeproj/project.pbxproj | 8 ++++----
 package.json                       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index b7ccaafb12..976f83d4ea 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -150,7 +150,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode appVersionCode
-        versionName "1.87.0"
+        versionName "1.88.0"
         multiDexEnabled true
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/android/gradle.properties b/android/gradle.properties
index 515ef84220..6b100d2f78 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -23,7 +23,7 @@ CELO_RELEASE_KEY_ALIAS=celo-key-alias
 
 # Setting this manually based on version number until we have this deploying via Cloud Build
 # Example: v1.5.1 deployment number 1 = 1005001001 (1 005 001 001)
-VERSION_CODE=1021071671
+VERSION_CODE=1021071672
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
diff --git a/ios/celo.xcodeproj/project.pbxproj b/ios/celo.xcodeproj/project.pbxproj
index 6ae5c3df98..1fac6d3417 100644
--- a/ios/celo.xcodeproj/project.pbxproj
+++ b/ios/celo.xcodeproj/project.pbxproj
@@ -1205,7 +1205,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 152;
+				CURRENT_PROJECT_VERSION = 153;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
@@ -1225,7 +1225,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 1.87.0;
+				MARKETING_VERSION = 1.88.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
@@ -1257,7 +1257,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 152;
+				CURRENT_PROJECT_VERSION = 153;
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1274,7 +1274,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 1.87.0;
+				MARKETING_VERSION = 1.88.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
diff --git a/package.json b/package.json
index abe625f732..2a384ba0b1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@valora/wallet",
-  "version": "1.87.0",
+  "version": "1.88.0",
   "author": "Valora Inc",
   "license": "Apache-2.0",
   "private": true,

From add658763529726f0c65dc2f496d41e3900870ed Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Sat, 15 Jun 2024 10:27:26 +1200
Subject: [PATCH 127/133] chore: Move KeylessBackupOrigin to types file (#5550)

### Description

Addressing this comment:
https://github.com/valora-inc/wallet/pull/5537#discussion_r1639173777

### Test plan

CI

### Related issues

- Fixes #ACT-1222

### Backwards compatibility

Yes

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [X] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/analytics/Properties.tsx                      |  7 +++++--
 src/keylessBackup/KeylessBackupIntro.test.tsx     |  3 +--
 src/keylessBackup/KeylessBackupIntro.tsx          |  3 +--
 src/keylessBackup/KeylessBackupProgress.test.tsx  |  8 ++++++--
 src/keylessBackup/KeylessBackupProgress.tsx       | 11 +++++------
 src/keylessBackup/types.ts                        |  5 +++++
 src/navigator/types.tsx                           |  3 +--
 src/onboarding/registration/ImportSelect.test.tsx |  3 +--
 src/onboarding/registration/ImportSelect.tsx      |  3 +--
 9 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index a125e92037..ea05617fa5 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -64,8 +64,11 @@ import { SerializableRewardsInfo } from 'src/earn/types'
 import { ProviderSelectionAnalyticsData } from 'src/fiatExchanges/types'
 import { CICOFlow, FiatExchangeFlow, PaymentMethod } from 'src/fiatExchanges/utils'
 import { HomeActionName, NotificationBannerCTATypes, NotificationType } from 'src/home/types'
-import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
-import { KeylessBackupFlow, KeylessBackupStatus } from 'src/keylessBackup/types'
+import {
+  KeylessBackupFlow,
+  KeylessBackupOrigin,
+  KeylessBackupStatus,
+} from 'src/keylessBackup/types'
 import { LocalCurrencyCode } from 'src/localCurrency/consts'
 import { NftOrigin } from 'src/nfts/types'
 import { NotificationReceiveState } from 'src/notifications/types'
diff --git a/src/keylessBackup/KeylessBackupIntro.test.tsx b/src/keylessBackup/KeylessBackupIntro.test.tsx
index 4e0f168dfd..4faa49bc90 100644
--- a/src/keylessBackup/KeylessBackupIntro.test.tsx
+++ b/src/keylessBackup/KeylessBackupIntro.test.tsx
@@ -3,8 +3,7 @@ import React from 'react'
 import { KeylessBackupEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import KeylessBackupIntro from 'src/keylessBackup/KeylessBackupIntro'
-import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
-import { KeylessBackupFlow } from 'src/keylessBackup/types'
+import { KeylessBackupFlow, KeylessBackupOrigin } from 'src/keylessBackup/types'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import MockedNavigator from 'test/MockedNavigator'
diff --git a/src/keylessBackup/KeylessBackupIntro.tsx b/src/keylessBackup/KeylessBackupIntro.tsx
index 3bc80756b8..03f101caf2 100644
--- a/src/keylessBackup/KeylessBackupIntro.tsx
+++ b/src/keylessBackup/KeylessBackupIntro.tsx
@@ -10,9 +10,8 @@ import CancelButton from 'src/components/CancelButton'
 import Card from 'src/components/Card'
 import TextButton from 'src/components/TextButton'
 import EnvelopeIcon from 'src/keylessBackup/EnvelopeIcon'
-import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
 import SmartphoneIcon from 'src/keylessBackup/SmartphoneIcon'
-import { KeylessBackupFlow } from 'src/keylessBackup/types'
+import { KeylessBackupFlow, KeylessBackupOrigin } from 'src/keylessBackup/types'
 import { emptyHeader } from 'src/navigator/Headers'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
diff --git a/src/keylessBackup/KeylessBackupProgress.test.tsx b/src/keylessBackup/KeylessBackupProgress.test.tsx
index 5a62c90d31..b7e4c33ce3 100644
--- a/src/keylessBackup/KeylessBackupProgress.test.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.test.tsx
@@ -3,9 +3,13 @@ import * as React from 'react'
 import { Provider } from 'react-redux'
 import { KeylessBackupEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
-import KeylessBackupProgress, { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
+import KeylessBackupProgress from 'src/keylessBackup/KeylessBackupProgress'
 import { keylessBackupAcceptZeroBalance, keylessBackupBail } from 'src/keylessBackup/slice'
-import { KeylessBackupFlow, KeylessBackupStatus } from 'src/keylessBackup/types'
+import {
+  KeylessBackupFlow,
+  KeylessBackupOrigin,
+  KeylessBackupStatus,
+} from 'src/keylessBackup/types'
 import { ensurePincode, navigate, navigateHome } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { goToNextOnboardingScreen } from 'src/onboarding/steps'
diff --git a/src/keylessBackup/KeylessBackupProgress.tsx b/src/keylessBackup/KeylessBackupProgress.tsx
index 32a0100da2..540b3c711a 100644
--- a/src/keylessBackup/KeylessBackupProgress.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.tsx
@@ -15,7 +15,11 @@ import { Help } from 'src/icons/Help'
 import RedLoadingSpinnerToInfo from 'src/icons/RedLoadingSpinnerToInfo'
 import { keylessBackupStatusSelector } from 'src/keylessBackup/selectors'
 import { keylessBackupAcceptZeroBalance, keylessBackupBail } from 'src/keylessBackup/slice'
-import { KeylessBackupFlow, KeylessBackupStatus } from 'src/keylessBackup/types'
+import {
+  KeylessBackupFlow,
+  KeylessBackupOrigin,
+  KeylessBackupStatus,
+} from 'src/keylessBackup/types'
 import { useDollarsToLocalAmount, useLocalCurrencyCode } from 'src/localCurrency/hooks'
 import { ensurePincode, navigate, navigateHome } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -32,11 +36,6 @@ import Logger from 'src/utils/Logger'
 
 const TAG = 'keylessBackup/KeylessBackupProgress'
 
-export enum KeylessBackupOrigin {
-  Onboarding = 'Onboarding',
-  Settings = 'Settings',
-}
-
 function KeylessBackupProgress({
   route,
   navigation,
diff --git a/src/keylessBackup/types.ts b/src/keylessBackup/types.ts
index 72eeecd1dd..de108db54e 100644
--- a/src/keylessBackup/types.ts
+++ b/src/keylessBackup/types.ts
@@ -18,3 +18,8 @@ export enum KeylessBackupDeleteStatus {
   Completed = 'Completed',
   Failed = 'Failed',
 }
+
+export enum KeylessBackupOrigin {
+  Onboarding = 'Onboarding',
+  Settings = 'Settings',
+}
diff --git a/src/navigator/types.tsx b/src/navigator/types.tsx
index 892852dc1a..6fb1816c88 100644
--- a/src/navigator/types.tsx
+++ b/src/navigator/types.tsx
@@ -8,8 +8,7 @@ import FiatConnectQuote from 'src/fiatExchanges/quotes/FiatConnectQuote'
 import { CICOFlow, FiatExchangeFlow, SimplexQuote } from 'src/fiatExchanges/utils'
 import { Props as KycLandingProps } from 'src/fiatconnect/KycLanding'
 import { FiatAccount } from 'src/fiatconnect/slice'
-import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
-import { KeylessBackupFlow } from 'src/keylessBackup/types'
+import { KeylessBackupFlow, KeylessBackupOrigin } from 'src/keylessBackup/types'
 import { Screens } from 'src/navigator/Screens'
 import { Nft } from 'src/nfts/types'
 import { Recipient } from 'src/recipients/recipient'
diff --git a/src/onboarding/registration/ImportSelect.test.tsx b/src/onboarding/registration/ImportSelect.test.tsx
index f8653a68dc..2169c9a1ec 100644
--- a/src/onboarding/registration/ImportSelect.test.tsx
+++ b/src/onboarding/registration/ImportSelect.test.tsx
@@ -2,8 +2,7 @@ import { fireEvent, render } from '@testing-library/react-native'
 import * as React from 'react'
 import 'react-native'
 import { Provider } from 'react-redux'
-import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
-import { KeylessBackupFlow } from 'src/keylessBackup/types'
+import { KeylessBackupFlow, KeylessBackupOrigin } from 'src/keylessBackup/types'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import ImportSelect from 'src/onboarding/registration/ImportSelect'
diff --git a/src/onboarding/registration/ImportSelect.tsx b/src/onboarding/registration/ImportSelect.tsx
index d385cf3dd3..ab477dd842 100644
--- a/src/onboarding/registration/ImportSelect.tsx
+++ b/src/onboarding/registration/ImportSelect.tsx
@@ -11,8 +11,7 @@ import Card from 'src/components/Card'
 import Touchable from 'src/components/Touchable'
 import CloudCheck from 'src/icons/CloudCheck'
 import Lock from 'src/icons/Lock'
-import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
-import { KeylessBackupFlow } from 'src/keylessBackup/types'
+import { KeylessBackupFlow, KeylessBackupOrigin } from 'src/keylessBackup/types'
 import { nuxNavigationOptions } from 'src/navigator/Headers'
 import { navigate, navigateClearingStack } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'

From 81fbed46d90124a622a8272367e825334cf50a88 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Fri, 14 Jun 2024 16:24:54 -0700
Subject: [PATCH 128/133] fix(max): respect local decimal separator when
 setting max (#5551)

### Description

Discovered with `EarnEnterAmount.tsx`, but also present in
`EnterAmount.tsx` when pressing max the local decimilar separator was
not set correctly preventing users from being able to delete characters
from the input amount.

### Test plan

- [x] Tested locally on iOS
- [x] Tested locally on Android
- [x] Unit tests updated

### Related issues

N/A

### Backwards compatibility

Yes

### Network scalability

N/A
---
 src/earn/EarnEnterAmount.test.tsx | 57 +++++++++++++++++++++++++++++++
 src/earn/EarnEnterAmount.tsx      |  2 +-
 src/send/EnterAmount.test.tsx     | 20 +++++++++++
 src/send/EnterAmount.tsx          |  2 +-
 4 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/src/earn/EarnEnterAmount.test.tsx b/src/earn/EarnEnterAmount.test.tsx
index 13f0883951..c7687da9c3 100644
--- a/src/earn/EarnEnterAmount.test.tsx
+++ b/src/earn/EarnEnterAmount.test.tsx
@@ -1,6 +1,7 @@
 import { fireEvent, render, waitFor } from '@testing-library/react-native'
 import BigNumber from 'bignumber.js'
 import React from 'react'
+import { getNumberFormatSettings } from 'react-native-localize'
 import { Provider } from 'react-redux'
 import { EarnEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
@@ -17,6 +18,7 @@ import { mockAccount, mockArbEthTokenId, mockTokenBalances } from 'test/values'
 
 jest.mock('src/earn/prepareTransactions')
 jest.mock('src/earn/poolInfo')
+jest.mock('react-native-localize')
 
 const mockPreparedTransaction: PreparedTransactionsPossible = {
   type: 'possible' as const,
@@ -97,6 +99,9 @@ describe('EarnEnterAmount', () => {
   beforeEach(() => {
     jest.clearAllMocks()
     jest.mocked(fetchAavePoolInfo).mockResolvedValue({ apy: 0.1 })
+    jest
+      .mocked(getNumberFormatSettings)
+      .mockReturnValue({ decimalSeparator: '.', groupingSeparator: ',' })
   })
 
   it('should render APY and EarnUpTo', async () => {
@@ -242,4 +247,56 @@ describe('EarnEnterAmount', () => {
     )
     expect(getByTestId('EarnEnterAmount/Continue')).toBeDisabled()
   })
+
+  describe.each([
+    { decimal: '.', group: ',' },
+    { decimal: ',', group: '.' },
+  ])('with decimal separator "$decimal" and group separator "$group"', ({ decimal, group }) => {
+    const replaceSeparators = (value: string) =>
+      value.replace(/\./g, '|').replace(/,/g, group).replace(/\|/g, decimal)
+
+    beforeEach(() => {
+      jest
+        .mocked(getNumberFormatSettings)
+        .mockReturnValue({ decimalSeparator: decimal, groupingSeparator: group })
+      BigNumber.config({
+        FORMAT: {
+          decimalSeparator: decimal,
+          groupSeparator: group,
+          groupSize: 3,
+        },
+      })
+    })
+
+    const mockStore = createMockStore({
+      tokens: {
+        tokenBalances: {
+          [networkConfig.arbUsdcTokenId]: {
+            tokenId: networkConfig.arbUsdcTokenId,
+            symbol: 'USDC',
+            priceUsd: '1',
+            priceFetchedAt: priceFetchedAt,
+            networkId: NetworkId['arbitrum-sepolia'],
+            balance: '100000.42',
+          },
+        },
+      },
+    })
+
+    it('entering MAX token applies correct decimal separator', async () => {
+      const { getByTestId } = render(
+        <Provider store={mockStore}>
+          <MockedNavigator component={EarnEnterAmount} params={params} />
+        </Provider>
+      )
+
+      fireEvent.press(getByTestId('EarnEnterAmount/Max'))
+      expect(getByTestId('EarnEnterAmount/TokenAmountInput').props.value).toBe(
+        replaceSeparators('100000.42')
+      )
+      expect(getByTestId('EarnEnterAmount/LocalAmountInput').props.value).toBe(
+        replaceSeparators('₱133,000.56')
+      )
+    })
+  })
 })
diff --git a/src/earn/EarnEnterAmount.tsx b/src/earn/EarnEnterAmount.tsx
index c8e82ff8a9..13bb8d0b4a 100644
--- a/src/earn/EarnEnterAmount.tsx
+++ b/src/earn/EarnEnterAmount.tsx
@@ -242,7 +242,7 @@ function EarnEnterAmount({ route }: Props) {
     // eventually we may want to do something smarter here, like subtracting gas fees from the max amount if
     // this is a gas-paying token. for now, we are just showing a warning to the user prompting them to lower the amount
     // if there is not enough for gas
-    setTokenAmountInput(token.balance.toString())
+    setTokenAmountInput(token.balance.toFormat({ decimalSeparator }))
     setEnteredIn('token')
     tokenAmountInputRef.current?.blur()
     localAmountInputRef.current?.blur()
diff --git a/src/send/EnterAmount.test.tsx b/src/send/EnterAmount.test.tsx
index b51c4a0ccb..2eb2b9c950 100644
--- a/src/send/EnterAmount.test.tsx
+++ b/src/send/EnterAmount.test.tsx
@@ -320,6 +320,26 @@ describe('EnterAmount', () => {
       expect(tokenAmountInput.props.value).toBe(replaceSeparators('1000'))
       expect(localAmountInput.props.value).toBe(replaceSeparators('₱133'))
     })
+
+    it('entering MAX token applies correct decimal separator', async () => {
+      const store = createMockStore(mockStore)
+      const tokenBalances = mockStoreBalancesToTokenBalances([
+        { ...mockStoreTokenBalances[mockCeloTokenId], balance: '100000.42' },
+      ])
+      const { getByTestId } = render(
+        <Provider store={store}>
+          <EnterAmount {...defaultParams} tokens={tokenBalances} />
+        </Provider>
+      )
+
+      fireEvent.press(getByTestId('SendEnterAmount/Max'))
+      expect(getByTestId('SendEnterAmount/TokenAmountInput').props.value).toBe(
+        replaceSeparators('100000.42')
+      )
+      expect(getByTestId('SendEnterAmount/LocalAmountInput').props.value).toBe(
+        replaceSeparators('₱66,500.28')
+      )
+    })
   })
 
   it.each([
diff --git a/src/send/EnterAmount.tsx b/src/send/EnterAmount.tsx
index 3ec7e83d7a..de1d4e5e93 100644
--- a/src/send/EnterAmount.tsx
+++ b/src/send/EnterAmount.tsx
@@ -183,7 +183,7 @@ function EnterAmount({
     // eventually we may want to do something smarter here, like subtracting gas fees from the max amount if
     // this is a gas-paying token. for now, we are just showing a warning to the user prompting them to lower the amount
     // if there is not enough for gas
-    setTokenAmountInput(token.balance.toString())
+    setTokenAmountInput(token.balance.toFormat({ decimalSeparator }))
     setEnteredIn('token')
     tokenAmountInputRef.current?.blur()
     localAmountInputRef.current?.blur()

From ba0b5c8092605ad528b5908886917ba2ad8c376b Mon Sep 17 00:00:00 2001
From: valora-bot-crowdin
 <80050969+valora-bot-crowdin@users.noreply.github.com>
Date: Sat, 15 Jun 2024 19:38:35 -0700
Subject: [PATCH 129/133] chore(l10n): update translations from Crowdin (#5540)

Co-authored-by: Valora Bot <89419329+valora-bot@users.noreply.github.com>
---
 locales/de/translation.json     |  7 ++++---
 locales/en-US/translation.json  |  7 ++++---
 locales/es-419/translation.json |  7 ++++---
 locales/fr-FR/translation.json  |  7 ++++---
 locales/it-IT/translation.json  |  7 ++++---
 locales/pl-PL/translation.json  |  9 +++++----
 locales/pt-BR/translation.json  |  7 ++++---
 locales/ru-RU/translation.json  | 11 ++++++-----
 locales/th-TH/translation.json  |  7 ++++---
 locales/tr-TR/translation.json  | 11 ++++++-----
 locales/uk-UA/translation.json  | 11 ++++++-----
 locales/vi-VN/translation.json  | 11 ++++++-----
 locales/zh-CN/translation.json  |  9 +++++----
 13 files changed, 62 insertions(+), 49 deletions(-)

diff --git a/locales/de/translation.json b/locales/de/translation.json
index 0513daae71..d1a99c1956 100644
--- a/locales/de/translation.json
+++ b/locales/de/translation.json
@@ -129,7 +129,8 @@
         "title": "Sicherung nicht verfügbar",
         "body": "Du kannst später eine Sicherung deiner Wallet einrichten oder dein Konto jetzt schützen, indem du deine Wiederherstellungsphrase speicherst.",
         "later": "Ich richte später eine Sicherung ein",
-        "manual": "Wiederherstellungsphrase speichern"
+        "manual": "Wiederherstellungsphrase speichern",
+        "skip": "Überspringen (nicht empfohlen)"
       }
     },
     "restore": {
@@ -2338,8 +2339,8 @@
         "title": "Vermögen tauschen",
         "bottomSheet": {
           "title": "Vermögen tauschen",
-          "body": "Hier kannst du alle Details angeben, die du dafür brauchst. Vielleicht ein Mindestbetrag zum Tauschen? \n\nVerdiene {{pointsValue}} Punkte, wenn du Vermögen über {{appName}} tauschst.",
-          "cta": "Zum Tausch gehen"
+          "body": "Verdiene {{pointsValue}} Punkte, wenn du einen Vermögenswert mit {{appName}}tauschst. \n\nTippe unten, um mit dem Tauschen und Sammeln zu beginnen!",
+          "cta": "Einen Tausch starten"
         }
       },
       "moreComing": {
diff --git a/locales/en-US/translation.json b/locales/en-US/translation.json
index 180152a592..65d4a4d600 100644
--- a/locales/en-US/translation.json
+++ b/locales/en-US/translation.json
@@ -129,7 +129,8 @@
         "title": "Backup unavailable",
         "body": "You can set up wallet backup later or protect your account now by saving your recovery phrase.",
         "later": "I'll set up backup later",
-        "manual": "Save recovery phrase"
+        "manual": "Save recovery phrase",
+        "skip": "Skip (not recommended)"
       }
     },
     "restore": {
@@ -2338,8 +2339,8 @@
         "title": "Swap assets",
         "bottomSheet": {
           "title": "Swap assets",
-          "body": "This space will be used to give all the details needed for this. Maybe minimum amount to swap. \n\nEarn {{pointsValue}} points whenever you swap an asset using {{appName}}.",
-          "cta": "Go to swap"
+          "body": "Earn {{pointsValue}} points every time you swap an asset using {{appName}}. \n\nTap below to start swapping and earning!",
+          "cta": "Start a swap"
         }
       },
       "moreComing": {
diff --git a/locales/es-419/translation.json b/locales/es-419/translation.json
index 77759ed63e..6419df5fa8 100644
--- a/locales/es-419/translation.json
+++ b/locales/es-419/translation.json
@@ -129,7 +129,8 @@
         "title": "Copia de seguridad no disponible",
         "body": "Puedes configurar una copia de seguridad de tu billetera más adelante o proteger tu cuenta ahora guardando tu frase de recuperación.",
         "later": "Configuraré una copia de seguridad más tarde",
-        "manual": "Guardar frase de recuperación"
+        "manual": "Guardar frase de recuperación",
+        "skip": "Saltar (no recomendado)"
       }
     },
     "restore": {
@@ -2338,8 +2339,8 @@
         "title": "Intercambia activos",
         "bottomSheet": {
           "title": "Intercambia activos",
-          "body": "Este espacio se utilizará para traerte más detalles. \n\nGana puntos {{pointsValue}} cada vez que intercambies un activo utilizando {{appName}}.",
-          "cta": "Ir a Intercambiar"
+          "body": "Gana {{pointsValue}} puntos cada vez que intercambies un bien utilizando {{appName}}. \n\n¡Toca abajo para empezar a intercambiar y ganar!",
+          "cta": "Iniciar un intercambio"
         }
       },
       "moreComing": {
diff --git a/locales/fr-FR/translation.json b/locales/fr-FR/translation.json
index 2a888e67ac..b6de1cc30b 100644
--- a/locales/fr-FR/translation.json
+++ b/locales/fr-FR/translation.json
@@ -129,7 +129,8 @@
         "title": "Sauvegarde indisponible",
         "body": "Vous pouvez configurer une sauvegarde plus tard ou protéger votre compte maintenant en sauvegardant votre phrase de récupération.",
         "later": "Je sauvegarderai plus tard",
-        "manual": "Sauvegarder phrase de récupération"
+        "manual": "Sauvegarder phrase de récupération",
+        "skip": "Ignorer (non recommandé)"
       }
     },
     "restore": {
@@ -2338,8 +2339,8 @@
         "title": "Échangez des actifs",
         "bottomSheet": {
           "title": "Échangez des actifs",
-          "body": "Cet espace vous présentera tous les détails nécessaires. Il s'agira peut-être d'un montant minimum à échanger. \n\nGagnez {{pointsValue}} points chaque fois que vous échangez un actif avec {{appName}}.",
-          "cta": "Aller à l'échange"
+          "body": "Gagne {{pointsValue}} points chaque fois que tu échanges un bien en utilisant {{appName}}. \n\nTape ci-dessous pour commencer à échanger et à gagner !",
+          "cta": "Commence un échange"
         }
       },
       "moreComing": {
diff --git a/locales/it-IT/translation.json b/locales/it-IT/translation.json
index a2173ff2a1..c160e86049 100644
--- a/locales/it-IT/translation.json
+++ b/locales/it-IT/translation.json
@@ -129,7 +129,8 @@
         "title": "Backup non disponibile",
         "body": "Puoi impostare il backup in un secondo momento o proteggere il tuo account ora salvando la frase di recupero.",
         "later": "Preparerò un backup più tardi",
-        "manual": "Salva frase di recupero"
+        "manual": "Salva frase di recupero",
+        "skip": "Salta (non consigliato)"
       }
     },
     "restore": {
@@ -2338,8 +2339,8 @@
         "title": "Scambia asset",
         "bottomSheet": {
           "title": "Scambia asset",
-          "body": "In questo spazio troverai tutte le informazioni relative a questa attività. Verranno indicate anche le quantità minima da scambiare. \n\nGuadagna {{pointsValue}} punti ogni volta che scambii un asset usando {{appName}}.",
-          "cta": "Vai allo scambio"
+          "body": "Guadagna {{pointsValue}} punti ogni volta che scambi un bene utilizzando {{appName}}. \n\nTocca qui sotto per iniziare a scambiare e guadagnare!",
+          "cta": "Avvia uno scambio"
         }
       },
       "moreComing": {
diff --git a/locales/pl-PL/translation.json b/locales/pl-PL/translation.json
index 7ceded7ba1..048d8bb3d7 100644
--- a/locales/pl-PL/translation.json
+++ b/locales/pl-PL/translation.json
@@ -129,7 +129,8 @@
         "title": "Kopia zapasowa niedostępna",
         "body": "Możesz skonfigurować kopię zapasową portfela później lub zapewnić ochronę swojego konta już teraz, zapisując frazę odzyskiwania.",
         "later": "Utworzę kopię zapasową później",
-        "manual": "Zapisz frazę odzyskiwania"
+        "manual": "Zapisz frazę odzyskiwania",
+        "skip": "Pomiń (niezalecane)"
       }
     },
     "restore": {
@@ -1961,7 +1962,7 @@
       "network": "Sieć {{networkName}}",
       "selectNetwork": "Sieć",
       "stablecoins": "Stablecoiny",
-      "gasTokens": "Żetony gazowe"
+      "gasTokens": "Tokeny gazowe"
     }
   },
   "homeActions": {
@@ -2342,8 +2343,8 @@
         "title": "Dokonaj swapu aktywów",
         "bottomSheet": {
           "title": "Dokonaj swapu aktywów",
-          "body": "To miejsce zostanie wykorzystane do podania wszystkich potrzebnych szczegółów. Może to być minimalna kwota do swapu. \n\nZdobywaj {{pointsValue}} punkty(-ów) za każdym razem, gdy dokonujesz swapu aktywów za pomocą {{appName}}.",
-          "cta": "Przejdź do swapu"
+          "body": "Zdobywaj punkty {{pointsValue}} za każdym razem, gdy wymieniasz aktywa za pomocą {{appName}}. \n\nKliknij poniżej, aby rozpocząć wymianę i zarabianie!",
+          "cta": "Rozpocznij wymianę"
         }
       },
       "moreComing": {
diff --git a/locales/pt-BR/translation.json b/locales/pt-BR/translation.json
index 20a3bd5b17..ad1f39d660 100644
--- a/locales/pt-BR/translation.json
+++ b/locales/pt-BR/translation.json
@@ -129,7 +129,8 @@
         "title": "Backup indisponível",
         "body": "Você pode configurar o backup da carteira mais tarde ou proteger sua conta agora salvando sua frase de recuperação.",
         "later": "Vou configurar o backup mais tarde",
-        "manual": "Salvar frase de recuperação"
+        "manual": "Salvar frase de recuperação",
+        "skip": "Pular (não recomendado)"
       }
     },
     "restore": {
@@ -2338,8 +2339,8 @@
         "title": "Troque ativos",
         "bottomSheet": {
           "title": "Troque ativos",
-          "body": "Este espaço será usado para fornecer todos os detalhes necessários. Talvez o valor mínimo para você trocar. \n\nGanhe {{pointsValue}} pontos sempre que você trocar um ativo usando a {{appName}}.",
-          "cta": "Ir para a troca"
+          "body": "Ganhe {{pointsValue}} pontos toda vez que você trocar um ativo usando {{appName}}. \n\nToque abaixo para você começar a trocar e ganhar!",
+          "cta": "Iniciar uma troca"
         }
       },
       "moreComing": {
diff --git a/locales/ru-RU/translation.json b/locales/ru-RU/translation.json
index 5f671b9b07..6bed8b18a4 100644
--- a/locales/ru-RU/translation.json
+++ b/locales/ru-RU/translation.json
@@ -129,7 +129,8 @@
         "title": "Резервная копия недоступна",
         "body": "Можно создать резервную копию кошелька позже или защитить свой аккаунт сейчас, сохранив фразу восстановления.",
         "later": "Я создам резервную копию позже",
-        "manual": "Сохраните фразу восстановления"
+        "manual": "Сохраните фразу восстановления",
+        "skip": "Пропустить (не рекомендуется)"
       }
     },
     "restore": {
@@ -1960,8 +1961,8 @@
       "recentlySwapped": "Недавно обмененные",
       "network": "Сеть {{networkName}}",
       "selectNetwork": "Сообщество",
-      "stablecoins": "Стабильные монеты",
-      "gasTokens": "Газовые жетоны"
+      "stablecoins": "Стейблкоинам",
+      "gasTokens": "Газоплатные токены"
     }
   },
   "homeActions": {
@@ -2342,8 +2343,8 @@
         "title": "Обменять активы",
         "bottomSheet": {
           "title": "Обменять активы",
-          "body": "Здесь месте можно указать все необходимые для этого сведения. Возможно, минимальную сумму для обмена. \n\nЗарабатывайте по {{pointsValue}} баллов при каждом обмене актива, используя {{appName}}.",
-          "cta": "Перейти к обмену"
+          "body": "Зарабатывай {{pointsValue}} очков каждый раз, когда обмениваешь актив, используя {{appName}}. \n\nНажми ниже, чтобы начать обмениваться и зарабатывать!",
+          "cta": "Начни обмен"
         }
       },
       "moreComing": {
diff --git a/locales/th-TH/translation.json b/locales/th-TH/translation.json
index 68ae9d26c7..acee94033f 100644
--- a/locales/th-TH/translation.json
+++ b/locales/th-TH/translation.json
@@ -129,7 +129,8 @@
         "title": "การสำรองข้อมูลไม่พร้อมใช้งาน",
         "body": "คุณสามารถตั้งค่าการสำรองข้อมูลกระเป๋าเงินได้ในภายหลังหรือปกป้องบัญชีผู้ใช้ของคุณในตอนนี้เลยโดยบันทึกวลีกู้คืนรหัสของคุณ",
         "later": "ฉันจะตั้งค่าการสำรองข้อมูลในภายหลัง",
-        "manual": "บันทึกวลีกู้คืนรหัสของคุณ"
+        "manual": "บันทึกวลีกู้คืนรหัสของคุณ",
+        "skip": "Skip (not recommended)"
       }
     },
     "restore": {
@@ -2336,8 +2337,8 @@
         "title": "สว็อปสินทรัพย์",
         "bottomSheet": {
           "title": "สว็อปสินทรัพย์",
-          "body": "ส่วนนี้จะแสดงรายละเอียดทั้งหมดที่จำเป็นสำหรับการดำเนินการนี้ รวมถึงจำนวนขั้นต่ำในการสว็อป\n\nรับ {{pointsValue}} คะแนนทุกครั้งที่คุณสว็อปสินทรัพย์โดยใช้ {{appName}}",
-          "cta": "ไปที่สว็อป"
+          "body": "Earn {{pointsValue}} points every time you swap an asset using {{appName}}. \n\nTap below to start swapping and earning!",
+          "cta": "Start a swap"
         }
       },
       "moreComing": {
diff --git a/locales/tr-TR/translation.json b/locales/tr-TR/translation.json
index 1616cf5438..884ced3c51 100644
--- a/locales/tr-TR/translation.json
+++ b/locales/tr-TR/translation.json
@@ -129,7 +129,8 @@
         "title": "Yedekleme kullanılamıyor",
         "body": "Cüzdan yedeklemesini daha sonra ayarlayabilir veya kurtarma ifadenizi kaydederek hesabınızı şimdi koruyabilirsiniz.",
         "later": "Yedeklemeyi daha sonra ayarlayacağım",
-        "manual": "Kurtarma ifadesini kaydet"
+        "manual": "Kurtarma ifadesini kaydet",
+        "skip": "Atla (önerilmez)"
       }
     },
     "restore": {
@@ -1956,8 +1957,8 @@
       "recentlySwapped": "Yakın zamanda takas edildi",
       "network": "{{networkName}} Ağı",
       "selectNetwork": "Ağ",
-      "stablecoins": "Stablecoins",
-      "gasTokens": "Gaz Jetonları"
+      "stablecoins": "Stabilcoinler",
+      "gasTokens": "Tokenler"
     }
   },
   "homeActions": {
@@ -2338,8 +2339,8 @@
         "title": "Varlıkları takas edin",
         "bottomSheet": {
           "title": "Varlıkları takas edin",
-          "body": "Bu alan, bununla ilgili gereken tüm ayrıntıları vermek için kullanılacaktır. Takas için minimum tutar olabilir. \n\n{{appName}} uygulamasını kullanarak bir varlığı takas ettiğinizde {{pointsValue}} puan kazanın.",
-          "cta": "Takasa gidin"
+          "body": "{{appName}}adresini kullanarak her varlık takası yaptığınızda {{pointsValue}} puanı kazanın. \n\nTakas etmeye ve kazanmaya başlamak için aşağıya dokunun!",
+          "cta": "Bir takas başlatın"
         }
       },
       "moreComing": {
diff --git a/locales/uk-UA/translation.json b/locales/uk-UA/translation.json
index d65373d592..8c137f2d14 100644
--- a/locales/uk-UA/translation.json
+++ b/locales/uk-UA/translation.json
@@ -129,7 +129,8 @@
         "title": "Резервне копіювання недоступне",
         "body": "Можна налаштувати резервне копіювання гаманця пізніше або захистити свій рахунок зараз, зберігши фразу відновлення.",
         "later": "Я налаштую резервне копіювання пізніше",
-        "manual": "Зберегти фразу відновлення"
+        "manual": "Зберегти фразу відновлення",
+        "skip": "Пропустити (не рекомендується)"
       }
     },
     "restore": {
@@ -1960,8 +1961,8 @@
       "recentlySwapped": "Недавно використані у свопі",
       "network": "Мережа: {{networkName}}",
       "selectNetwork": "Мережа",
-      "stablecoins": "Стейблкоіни",
-      "gasTokens": "Газові жетони"
+      "stablecoins": "Стейблкоїнах",
+      "gasTokens": "Токени для газу"
     }
   },
   "homeActions": {
@@ -2342,8 +2343,8 @@
         "title": "Обміняти активи",
         "bottomSheet": {
           "title": "Обміняти активи",
-          "body": "Цей простір використовуватиметься, щоб надати всі необхідні для цього деталі. Можлива мінімальна сума для обміну. \n\n{{pointsValue}} — бали, що можна заробити щоразу під час обміну активу у {{appName}}.",
-          "cta": "Перейти до обміну"
+          "body": "Заробляйте {{pointsValue}} балів щоразу, коли обмінюєте актив за допомогою {{appName}}. \n\nНатисніть нижче, щоб почати обмінюватися і заробляти!",
+          "cta": "Почніть обмін"
         }
       },
       "moreComing": {
diff --git a/locales/vi-VN/translation.json b/locales/vi-VN/translation.json
index 282c441aa2..4fc203bc26 100644
--- a/locales/vi-VN/translation.json
+++ b/locales/vi-VN/translation.json
@@ -129,7 +129,8 @@
         "title": "Không hỗ trợ sao lưu",
         "body": "Bạn có thể thiết lập sao lưu ví sau hoặc bảo vệ tài khoản của mình ngay bằng cách lưu cụm từ khôi phục.",
         "later": "Tôi sẽ thiết lập sao lưu sau",
-        "manual": "Lưu cụm từ khôi phục"
+        "manual": "Lưu cụm từ khôi phục",
+        "skip": "Skip (not recommended)"
       }
     },
     "restore": {
@@ -1954,8 +1955,8 @@
       "recentlySwapped": "Đã trao đổi gần đây",
       "network": "Mạng {{networkName}}",
       "selectNetwork": "Mạng lưới",
-      "stablecoins": "Stablecoins",
-      "gasTokens": "Gas Tokens"
+      "stablecoins": "Stablecoin",
+      "gasTokens": "Token cho gas"
     }
   },
   "homeActions": {
@@ -2336,8 +2337,8 @@
         "title": "Trao đổi tài sản",
         "bottomSheet": {
           "title": "Trao đổi tài sản",
-          "body": "Vùng này sẽ được sử dụng để cung cấp tất cả thông tin chi tiết cần thiết để thực hiện việc này. Bạn có thể điền số tiền tối thiểu để trao đổi. \n\nKiếm {{pointsValue}} điểm bất cứ khi nào bạn trao đổi tài sản bằng {{appName}}.",
-          "cta": "Bắt đầu trao đổi"
+          "body": "Earn {{pointsValue}} points every time you swap an asset using {{appName}}. \n\nTap below to start swapping and earning!",
+          "cta": "Start a swap"
         }
       },
       "moreComing": {
diff --git a/locales/zh-CN/translation.json b/locales/zh-CN/translation.json
index a9a5c0a400..71412b7628 100644
--- a/locales/zh-CN/translation.json
+++ b/locales/zh-CN/translation.json
@@ -129,7 +129,8 @@
         "title": "备份不可用",
         "body": "您可以稍后设置钱包备份，或者立即保存恢复短语，以保护您的账户。",
         "later": "我稍后会设置备份",
-        "manual": "保存恢复短语"
+        "manual": "保存恢复短语",
+        "skip": "跳过（不建议）"
       }
     },
     "restore": {
@@ -1955,7 +1956,7 @@
       "network": "{{networkName}} 网络",
       "selectNetwork": "网络",
       "stablecoins": "稳定币",
-      "gasTokens": "瓦斯令牌"
+      "gasTokens": "费用代币"
     }
   },
   "homeActions": {
@@ -2336,8 +2337,8 @@
         "title": "交换资产",
         "bottomSheet": {
           "title": "交换资产",
-          "body": "这个空间将用来提供这方面所需的所有细节。也许是交换的最低金额。 \n\n每当您使用 {{appName}} 进行资产交换时，都可以赚取 {{pointsValue}} 积分。",
-          "cta": "前往交换"
+          "body": "每次使用 {{appName}}交换资产都可赚取 {{pointsValue}} 积分。 \n\n点击下方开始交换并赚取积分！",
+          "cta": "开始交换"
         }
       },
       "moreComing": {

From 3133225977eb6d77a0c37dbb6850f1ef1a8baae5 Mon Sep 17 00:00:00 2001
From: Alex Bakoushin <alex@bakoush.in>
Date: Mon, 17 Jun 2024 14:49:19 +0200
Subject: [PATCH 130/133] fix(walletconnect): sort and wrap network tags
 (#5552)

### Description

* Fixing network tags overflow issue
* Networks are sorted in alphabetical order

Designs:
https://www.figma.com/design/VeMXa7ZuRMypYlPPhVHCEZ/Dapps-2.0?node-id=2479-441&t=3OhfnYURRW220bVM-0

Context:
https://valora-app.slack.com/archives/C0684TXDR3K/p1714039681042699

| Before | After |
|--------|--------|
| ![Simulator Screenshot - iPhone 15 - 2024-06-15 at 17 54
36](https://github.com/valora-inc/wallet/assets/2737872/d64eecdc-9071-4965-9b9c-10e116c309b6)
| ![Simulator Screenshot - iPhone 15 - 2024-06-15 at 18 46
41](https://github.com/valora-inc/wallet/assets/2737872/f840a1d1-8d3e-4260-89f8-d8b54c87f29b)
|

### Test plan

* Tested manually
* Updated unit tests

### Related issues

- Fixes ENG-124

### Backwards compatibility

Y

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [x] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)
---
 src/walletConnect/screens/SessionRequest.test.tsx | 12 +++++++-----
 src/walletConnect/screens/SessionRequest.tsx      |  7 ++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/walletConnect/screens/SessionRequest.test.tsx b/src/walletConnect/screens/SessionRequest.test.tsx
index 1d38f442c9..c3a76cde94 100644
--- a/src/walletConnect/screens/SessionRequest.test.tsx
+++ b/src/walletConnect/screens/SessionRequest.test.tsx
@@ -20,7 +20,7 @@ describe(SessionRequest, () => {
       requiredNamespaces: {
         eip155: {
           methods: ['eth_sendTransaction', 'personal_sign'],
-          chains: ['eip155:44787'],
+          chains: ['eip155:11155111', 'eip155:44787'],
           events: ['chainChanged', 'accountsChanged'],
         },
       },
@@ -54,10 +54,10 @@ describe(SessionRequest, () => {
     proposal: pendingSession.params,
     supportedNamespaces: {
       eip155: {
-        chains: ['eip155:44787'],
+        chains: ['eip155:11155111', 'eip155:44787'],
         methods: Object.values(SupportedActions) as string[],
         events: Object.values(SupportedEvents) as string[],
-        accounts: [`eip155:44787:${mockAccount}`],
+        accounts: [`eip155:11155111:${mockAccount}`, `eip155:44787:${mockAccount}`],
       },
     },
   })
@@ -78,7 +78,7 @@ describe(SessionRequest, () => {
             version={2}
             pendingSession={pendingSession}
             namespacesToApprove={namespacesToApprove}
-            supportedChains={supportedChains}
+            supportedChains={['eip155:11155111', 'eip155:44787']}
           />
         </Provider>
       )
@@ -87,7 +87,9 @@ describe(SessionRequest, () => {
       expect(getByText('shareInfo')).toBeTruthy()
       expect(getByText('walletConnectRequest.connectWalletAction')).toBeTruthy()
       expect(queryByText('dismiss')).toBeFalsy()
-      expect(queryByTestId('SessionRequest/NetworkChips')).toHaveTextContent('Celo Alfajores')
+      const networkChips = queryByTestId('SessionRequest/NetworkChips')
+      expect(networkChips?.children[0]).toHaveTextContent('Celo Alfajores')
+      expect(networkChips?.children[1]).toHaveTextContent('Ethereum Sepolia')
       expect(getByText(mockAccount.toLowerCase())).toBeTruthy()
     })
 
diff --git a/src/walletConnect/screens/SessionRequest.tsx b/src/walletConnect/screens/SessionRequest.tsx
index e98425ba0e..5f5b542e70 100644
--- a/src/walletConnect/screens/SessionRequest.tsx
+++ b/src/walletConnect/screens/SessionRequest.tsx
@@ -52,9 +52,9 @@ function SessionRequest({
   const matchedSupportedChains = (namespacesToApprove?.['eip155']?.chains ?? []).filter((chainId) =>
     supportedChains.includes(chainId)
   )
-  const networkNames = matchedSupportedChains.map(
-    (chain) => NETWORK_NAMES[walletConnectChainIdToNetworkId[chain]]
-  )
+  const networkNames = matchedSupportedChains
+    .map((chain) => NETWORK_NAMES[walletConnectChainIdToNetworkId[chain]])
+    .sort()
   if (networkNames.length > 0) {
     requestDetails.push({
       label: t('walletConnectRequest.networksList'),
@@ -199,6 +199,7 @@ const styles = StyleSheet.create({
   },
   networkChipsContainer: {
     flexDirection: 'row',
+    flexWrap: 'wrap',
     gap: Spacing.Tiny4,
   },
   networkChip: {

From 3bab76349b8a8a7a302ba2fb1b737eaaaef2259d Mon Sep 17 00:00:00 2001
From: shottah <wasteofintel@gmail.com>
Date: Mon, 17 Jun 2024 15:30:42 -0400
Subject: [PATCH 131/133] feat: script to replace Valora in locales

---
 scripts/rebrand_locales.sh | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 scripts/rebrand_locales.sh

diff --git a/scripts/rebrand_locales.sh b/scripts/rebrand_locales.sh
new file mode 100644
index 0000000000..55f62c2cd6
--- /dev/null
+++ b/scripts/rebrand_locales.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# ========================================
+# Replace the branded name in translation locale files
+# ========================================
+
+# Flags:
+# -b (Optional): Name of the branding to use: celo or valora (default)
+
+branding=Kolektivo
+
+# Get the branding name from the command line arguments
+while getopts 'b:' flag; do
+  case "${flag}" in
+    b) branding="$OPTARG" ;;
+    *) error "Unexpected option ${flag}" ;;
+  esac
+done
+
+# Get the root directory of the mobile project
+mobile_root="$(dirname "$(dirname "$0")")"
+
+# Change the directory to the root directory of the localization files
+cd "$mobile_root/locales"
+
+# Get all the locale files in the locales directory which may be nested
+locale_files=$(find . -type f -name '*.json')
+
+# Replace the branded name in the locale files
+for locale_file in $locale_files; do
+  sed -i '' "s/Valora/$branding/g" "$locale_file"
+done

From ae1951b0d699fc32b9edb61b78291143acfe7d28 Mon Sep 17 00:00:00 2001
From: shottah <wasteofintel@gmail.com>
Date: Mon, 17 Jun 2024 15:41:02 -0400
Subject: [PATCH 132/133] fix(cicd): update branding reference

---
 scripts/sync_branding.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/sync_branding.sh b/scripts/sync_branding.sh
index 380a62098b..148ab5dee3 100755
--- a/scripts/sync_branding.sh
+++ b/scripts/sync_branding.sh
@@ -21,7 +21,7 @@ echo $mobile_root
 cd "$mobile_root"
 
 # Please update the sha when valora branding updates are needed
-valora_branding_sha=fe1fe854bcfe1261d0ad4ea6351d48b87fc576aa
+valora_branding_sha=7cc2fff8b6df4ddf8d1c266f342657c619b5c238
 
 if [[ "$branding" == "valora" ]]; then
   # prevents git from asking credentials

From 95d94b2721e12e1f6ec8cfe9c382cfa3963eacc4 Mon Sep 17 00:00:00 2001
From: shottah <wasteofintel@gmail.com>
Date: Mon, 17 Jun 2024 15:48:20 -0400
Subject: [PATCH 133/133] fix(lint): explicit boolean expressions

---
 .../vendors/VendorDetailBottomSheet.tsx         |  2 +-
 src/kolektivo/vendors/VendorDetails.tsx         | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/kolektivo/vendors/VendorDetailBottomSheet.tsx b/src/kolektivo/vendors/VendorDetailBottomSheet.tsx
index a16ecbaad9..b8fff34c29 100644
--- a/src/kolektivo/vendors/VendorDetailBottomSheet.tsx
+++ b/src/kolektivo/vendors/VendorDetailBottomSheet.tsx
@@ -69,7 +69,7 @@ function VendorDetailBottomSheet({ vendor, dismiss, select }: Props) {
           </View>
           {/* @todo Add Send button */}
           <View style={styles.actionButtons}>
-            {address && (
+            {!!address && (
               <Button
                 type={BtnTypes.PRIMARY}
                 size={BtnSizes.MEDIUM}
diff --git a/src/kolektivo/vendors/VendorDetails.tsx b/src/kolektivo/vendors/VendorDetails.tsx
index 8980ada74e..44b93e96be 100644
--- a/src/kolektivo/vendors/VendorDetails.tsx
+++ b/src/kolektivo/vendors/VendorDetails.tsx
@@ -59,13 +59,13 @@ const VendorDetails = ({ vendor, close, action }: Props) => {
         <Text style={styles.subtitle}>{subtitle}</Text>
         <Text style={styles.description}>{description}</Text>
         <View style={[styles.cico, acceptsGuilder && providesGuilder ? styles.cicoPartner : null]}>
-          {acceptsGuilder && (
+          {!!acceptsGuilder && (
             <View style={styles.verifiedRow}>
               <VerifiedIcon />
               <Text style={styles.verified}>{t('acceptsGuilder')}</Text>
             </View>
           )}
-          {providesGuilder && (
+          {!!providesGuilder && (
             <View style={styles.verifiedRow}>
               <VerifiedIcon />
               <Text style={styles.verified}>{t('providesGuilder')}</Text>
@@ -74,7 +74,7 @@ const VendorDetails = ({ vendor, close, action }: Props) => {
         </View>
 
         <View style={styles.contactRow}>
-          {phoneNumber && (
+          {!!phoneNumber && (
             <TouchableOpacity
               // @ts-ignore @todo
               onPress={void 0}
@@ -82,7 +82,10 @@ const VendorDetails = ({ vendor, close, action }: Props) => {
               <Phone />
             </TouchableOpacity>
           )}
-          {(((location as any).latitude !== 0 && (location as any).longitude !== 0) || street) && (
+          {!!(
+            ((location as any).latitude !== 0 && (location as any).longitude !== 0) ||
+            street
+          ) && (
             <TouchableOpacity
               // @ts-ignore @todo
               onPress={void 0}
@@ -90,7 +93,7 @@ const VendorDetails = ({ vendor, close, action }: Props) => {
               <Directions />
             </TouchableOpacity>
           )}
-          {siteURI && (
+          {!!siteURI && (
             <TouchableOpacity onPress={() => navigateToURI(siteURI)}>
               <Website />
             </TouchableOpacity>
@@ -106,7 +109,7 @@ const VendorDetails = ({ vendor, close, action }: Props) => {
         </View>
         <View style={styles.actionButtons}></View>
         <View style={styles.furtherDetailsRow}>
-          {street && (
+          {!!street && (
             <View style={styles.streetContainer}>
               <Pin />
               <Text style={styles.street}>{`${street} ${building_number}${
@@ -127,7 +130,7 @@ const VendorDetails = ({ vendor, close, action }: Props) => {
           ))}
         </View>
         <View style={styles.actionButtons}>
-          {account && (
+          {!!account && (
             <Button
               type={BtnTypes.PRIMARY}
               size={BtnSizes.MEDIUM}