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.

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

do not show amounts for approvals #9032

Merged
merged 1 commit into from
Jul 21, 2020
Merged

do not show amounts for approvals #9032

merged 1 commit into from
Jul 21, 2020

Conversation

brad-decker
Copy link
Contributor

@brad-decker brad-decker commented Jul 17, 2020

For conversation see: https://consensys.slack.com/archives/GTQAGKY5V/p1595014477062700

  1. Removes amounts from the activity tab for approved spending limits.
  2. Also updates the translation to use a variable so that the token can be included in the message.

@brad-decker brad-decker requested a review from a team as a code owner July 17, 2020 22:05
@brad-decker brad-decker marked this pull request as draft July 17, 2020 22:05
"alertSettingsUnconnectedAccount": {
"message": "Browsing a website with an unconnected account selected"
},
"alertSettingsUnconnectedAccountDescription": {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

¿Que pasó?

@brad-decker brad-decker marked this pull request as ready for review July 20, 2020 17:49
@metamaskbot
Copy link
Collaborator

Builds ready [5455ebb]
Page Load Metrics (606 ± 34 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint288438157
domContentLoaded3557566047234
load3577586067234
domInteractive3557566047234

test/e2e/metamask-ui.spec.js Outdated Show resolved Hide resolved
@metamaskbot
Copy link
Collaborator

Builds ready [df85746]
Page Load Metrics (648 ± 27 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint288344188
domContentLoaded5697706475627
load5707726485727
domInteractive5687696465627

@brad-decker brad-decker requested a review from whymarrh July 20, 2020 19:34
whymarrh
whymarrh previously approved these changes Jul 21, 2020
Copy link
Contributor

@whymarrh whymarrh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@@ -106,7 +106,7 @@ export function useTransactionDisplayData (transactionGroup) {
subtitleContainsOrigin = true
} else if (transactionCategory === TOKEN_METHOD_APPROVE) {
category = TRANSACTION_CATEGORY_APPROVAL
title = t('approve')
title = t('approve', [token?.symbol || t('token')])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, actually, we shouldn't do this. approve is used elsewhere as a key where no substitution will ever be passed in (e.g. confirm-transaction-base.component, where transactionCategory is passed to t(..)).

We should leave the old "Approve" message there and preserve the translations, but add a new message for this particular case.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @Gudahtt. Pushed up a resolution for this

Copy link
Member

@Gudahtt Gudahtt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@metamaskbot
Copy link
Collaborator

Builds ready [f0837eb]
Page Load Metrics (619 ± 61 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint2896482211
domContentLoaded33978861812761
load34078961912761
domInteractive33978861712761

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants