From 0ae5a93e475924f4a25d0cf3466295e936beb8b4 Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Tue, 3 Sep 2024 14:54:41 +0100
Subject: [PATCH] Change copy from estimated to network fee

---
 app/_locales/en/messages.json                               | 3 +++
 test/e2e/tests/confirmations/transactions/shared.ts         | 4 ++--
 .../transactions/contract-interaction.test.tsx              | 2 +-
 .../info/approve/__snapshots__/approve.test.tsx.snap        | 2 +-
 .../__snapshots__/base-transaction-info.test.tsx.snap       | 6 +++---
 .../__snapshots__/edit-gas-fees-row.test.tsx.snap           | 2 +-
 .../info/shared/edit-gas-fees-row/edit-gas-fees-row.tsx     | 2 +-
 .../__snapshots__/gas-fees-details.test.tsx.snap            | 2 +-
 .../__snapshots__/gas-fees-section.test.tsx.snap            | 2 +-
 9 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index bd6b4c23c6bf..c5f16a427c8c 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -3022,6 +3022,9 @@
   "networkDetails": {
     "message": "Network details"
   },
+  "networkFee": {
+    "message": "Network fee"
+  },
   "networkIsBusy": {
     "message": "Network is busy. Gas prices are high and estimates are less accurate."
   },
diff --git a/test/e2e/tests/confirmations/transactions/shared.ts b/test/e2e/tests/confirmations/transactions/shared.ts
index 178168ffc220..62ceb318aa48 100644
--- a/test/e2e/tests/confirmations/transactions/shared.ts
+++ b/test/e2e/tests/confirmations/transactions/shared.ts
@@ -226,13 +226,13 @@ export async function toggleAdvancedDetails(driver: Driver) {
 }
 
 export async function assertAdvancedGasDetails(driver: Driver) {
-  await driver.waitForSelector({ css: 'p', text: 'Estimated fee' });
+  await driver.waitForSelector({ css: 'p', text: 'Network fee' });
   await driver.waitForSelector({ css: 'p', text: 'Speed' });
   await driver.waitForSelector({ css: 'p', text: 'Max fee' });
 }
 
 export async function assertAdvancedGasDetailsWithL2Breakdown(driver: Driver) {
-  await driver.waitForSelector({ css: 'p', text: 'Estimated fee' });
+  await driver.waitForSelector({ css: 'p', text: 'Network fee' });
   await driver.waitForSelector({ css: 'p', text: 'L1 fee' });
   await driver.waitForSelector({ css: 'p', text: 'L2 fee' });
   await driver.waitForSelector({ css: 'p', text: 'Speed' });
diff --git a/test/integration/confirmations/transactions/contract-interaction.test.tsx b/test/integration/confirmations/transactions/contract-interaction.test.tsx
index 3e25a0140f12..7d07dc31e7db 100644
--- a/test/integration/confirmations/transactions/contract-interaction.test.tsx
+++ b/test/integration/confirmations/transactions/contract-interaction.test.tsx
@@ -271,7 +271,7 @@ describe('Contract Interaction Confirmation', () => {
 
     const editGasFeesRow =
       within(gasFeesSection).getByTestId('edit-gas-fees-row');
-    expect(editGasFeesRow).toHaveTextContent('Estimated fee');
+    expect(editGasFeesRow).toHaveTextContent('Network fee');
 
     const firstGasField = within(editGasFeesRow).getByTestId('first-gas-field');
     expect(firstGasField).toHaveTextContent('0.0084 ETH');
diff --git a/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap
index b9a49ded127c..a2d0fae7d02f 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap
@@ -190,7 +190,7 @@ exports[`<ApproveInfo /> renders component for approve request 1`] = `
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
         >
-          Estimated fee
+          Network fee
         </p>
         <div>
           <div
diff --git a/ui/pages/confirmations/components/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap
index 63d9ef01d490..557af97233e9 100644
--- a/ui/pages/confirmations/components/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap
@@ -233,7 +233,7 @@ exports[`<BaseTransactionInfo /> renders component for contract interaction requ
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
         >
-          Estimated fee
+          Network fee
         </p>
         <div>
           <div
@@ -593,7 +593,7 @@ exports[`<BaseTransactionInfo /> renders component for contract interaction requ
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
         >
-          Estimated fee
+          Network fee
         </p>
         <div>
           <div
@@ -950,7 +950,7 @@ exports[`<BaseTransactionInfo /> renders component for contract interaction requ
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
         >
-          Estimated fee
+          Network fee
         </p>
         <div>
           <div
diff --git a/ui/pages/confirmations/components/confirm/info/shared/edit-gas-fees-row/__snapshots__/edit-gas-fees-row.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/edit-gas-fees-row/__snapshots__/edit-gas-fees-row.test.tsx.snap
index e017e36052f3..f0702978aa6c 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/edit-gas-fees-row/__snapshots__/edit-gas-fees-row.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/shared/edit-gas-fees-row/__snapshots__/edit-gas-fees-row.test.tsx.snap
@@ -14,7 +14,7 @@ exports[`<EditGasFeesRow /> renders component 1`] = `
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
       >
-        Estimated fee
+        Network fee
       </p>
       <div>
         <div
diff --git a/ui/pages/confirmations/components/confirm/info/shared/edit-gas-fees-row/edit-gas-fees-row.tsx b/ui/pages/confirmations/components/confirm/info/shared/edit-gas-fees-row/edit-gas-fees-row.tsx
index 699c8ce3fd51..067f0c942071 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/edit-gas-fees-row/edit-gas-fees-row.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/edit-gas-fees-row/edit-gas-fees-row.tsx
@@ -44,7 +44,7 @@ export const EditGasFeesRow = ({
       alertKey={RowAlertKey.EstimatedFee}
       ownerId={transactionMeta.id}
       data-testid="edit-gas-fees-row"
-      label={t('estimatedFee')}
+      label={t('networkFee')}
       tooltip={t('estimatedFeeTooltip')}
     >
       <Box
diff --git a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-details/__snapshots__/gas-fees-details.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-details/__snapshots__/gas-fees-details.test.tsx.snap
index 9282358dd774..008103100deb 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-details/__snapshots__/gas-fees-details.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-details/__snapshots__/gas-fees-details.test.tsx.snap
@@ -14,7 +14,7 @@ exports[`<GasFeesDetails /> renders component for gas fees section 1`] = `
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
       >
-        Estimated fee
+        Network fee
       </p>
       <div>
         <div
diff --git a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-section/__snapshots__/gas-fees-section.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-section/__snapshots__/gas-fees-section.test.tsx.snap
index 2d8f4f89edd1..02348c7d159b 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-section/__snapshots__/gas-fees-section.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-section/__snapshots__/gas-fees-section.test.tsx.snap
@@ -20,7 +20,7 @@ exports[`<GasFeesSection /> renders component for gas fees section 1`] = `
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
         >
-          Estimated fee
+          Network fee
         </p>
         <div>
           <div