Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix copy of "Network fee" on approval #12370

Merged
merged 4 commits into from
Nov 21, 2024
+3 −6
Merged

fix: Fix copy of "Network fee" on approval #12370

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e826c90
Fix copy
OGPoyraz Nov 21, 2024
f0711e2
Fix lint
OGPoyraz Nov 21, 2024
d5021c9
Fix
OGPoyraz Nov 21, 2024
1cd2f02
Update snapshot
OGPoyraz Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...onents/TransactionReview/TransactionReviewEIP1559Update/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ exports[`TransactionReviewEIP1559 should render correctly 1`] = `
]
}
>
Estimated gas fee
Network fee
<TouchableOpacity
hitSlop={
{
Expand Down
7 changes: 2 additions & 5 deletions ...Views/confirmations/components/TransactionReview/TransactionReviewEIP1559Update/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
\// eslint-disable-next-line @typescript-eslint/ban-ts-comment

Check failure on line 1 in app/components/Views/confirmations/components/TransactionReview/TransactionReviewEIP1559Update/index.tsx

View workflow job for this annotation

GitHub Actions / scripts (lint:tsc) 

Invalid character.
OGPoyraz marked this conversation as resolved.
Show resolved Hide resolved
// @ts-nocheck - Confirmations team or Transactions team
import React, { useCallback, useEffect, useState } from 'react';
import { Linking, TouchableOpacity, View } from 'react-native';
Expand Down Expand Up @@ -31,7 +31,6 @@
onEdit,
hideTotal,
noMargin,
origin,
originWarning,
onUpdatingValuesStart,
onUpdatingValuesEnd,
Expand Down Expand Up @@ -129,9 +128,7 @@
orange={Boolean(originWarning)}
noMargin
>
{!origin
? strings('transaction_review_eip1559.estimated_gas_fee')
: strings('transaction_review_eip1559.network_fee')}
{strings('transaction_review_eip1559.network_fee')}
<TouchableOpacity
style={styles.gasInfoContainer}
onPress={() =>
Expand Down
Loading