fix style copy button #21698

namhihi237 · 2023-06-27T16:18:05Z

Details

Fixed Issues

$ #21566
PROPOSAL: GH_LINK_ISSUE(COMMENT)

Tests

Go to the "Settings" section.
Click on the "Security" option.
Click the "Two-factor authentication" feature.
Verify that when the "copy code" button is clicked, the size button does not change
Click next
Verify that when the "copy" button is clicked, the size button does not change

Verify that no errors appear in the JS console

Offline tests

The same with test step

QA Steps

The same with test step

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
I verified that if a function's arguments changed that all usages have also been updated correctly
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG))
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

web.mov

Mobile Web - Chrome

web-android.mov

Mobile Web - Safari

safari-mobile.MP4

Desktop

desktop.mov

iOS

native-ios.mov

Android

native-android.mov

melvin-bot · 2023-06-27T16:18:11Z

@s77rt Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

s77rt · 2023-06-27T19:12:21Z

src/styles/styles.js

+        minWidth: 140,
+    },
+
+    verifyCodesButton: {


Can you rename the style here to something more close to what the buttons are for? e.g. twoFactorAuthCopyCodeButton

Sure, I will update

updated @s77rt .

s77rt · 2023-06-28T14:43:27Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

web.mp4

Mobile Web - Chrome

mweb-chrome.mp4

Mobile Web - Safari

mweb-safari.mp4

Desktop

desktop.mp4

iOS

ios.mp4

Android

android.mp4

s77rt

LGTM! 🚀

🎀 👀 🎀 C+ reviewed

aldo-expensify · 2023-06-28T16:04:49Z

Sorry, I'm not very convinced of the new alignment and I just noticed it was shown in the proposal.

Before	After

The larger space on the sides is what feels not so good to me:

@shawnborton can you confirm if this is fine or if it needs adjustments? 🙏

namhihi237 · 2023-06-28T17:09:13Z

I think we can adjustments like this, it looks better. what do you think @aldo-expensify cc @shawnborton

s77rt · 2023-06-28T17:48:43Z

@aldo-expensify Great catch. I missed that. Here is a proposed fix (with some extra adjustments):

Update the twoFactorAuthCode width from 100 to 140 to match the buttons.
Update the horizontal padding accordignly in twoFactorAuthCodesBox.
In twoFactorAuthCodesContainer use minHeight instead of height to prevent this kind of bug fix: 2FA bug fixes #19260 (comment)
In twoFactorAuthCodesButtonsContainer add flexWrap: 'wrap' and remove StyleUtils.getWrappingStyle. StyleUtils.getWrappingStyle seems as a hacky solution, also it makes the button not respecting the horizontal padding

s77rt · 2023-06-28T17:49:51Z

@namhihi237 Thoughts on the above?

namhihi237 · 2023-06-28T18:02:06Z

@s77rt Yeah, Agree with you for the update.

shawnborton · 2023-06-28T18:47:39Z

What if we shortened the copy to just say "Copy" instead of "Copy codes"? I think it's self explanatory, so we can make the copy shorter and thus the button length shorter too. Thoughts?

namhihi237 · 2023-06-28T19:15:52Z

Agree, I think we can update "Copy" instead, It is also easy to understand for users. It will be like this:
If agree, I will update the PR base on recommend, cc @s77rt @aldo-expensify

Update "Copy codes" to "Copy"
twoFactorAuthCodesButton minWidth: 112
twoFactorAuthCode width: 112
twoFactorAuthCodesBox => let paddingHorizontal = styles.ph9;
remove getWrappingStyle

Screen.Recording.2023-06-29.at.02.03.59.mov

aldo-expensify · 2023-06-28T19:47:54Z

I just noticed that the button being in Spanish made the issue more noticeable. I think it looks better now: #21698 (comment)

Thanks!

s77rt · 2023-06-28T20:42:48Z

Cool looks good, let's make sure we test in responsive mode going from 250px wide to wide enough

namhihi237 · 2023-06-29T00:03:25Z

@s77rt What the expect for 250px b/c with the min size button 112px

s77rt · 2023-06-29T00:10:08Z

@namhihi237 The buttons do not respect the padding

In twoFactorAuthCodesButtonsContainer add flexWrap: 'wrap'

src/pages/settings/Security/TwoFactorAuth/CodesPage.js

s77rt · 2023-06-29T00:30:05Z

@namhihi237 Can you please include screenshots for different sizes from 250px to (a wide enough)px using 50px or so increments

namhihi237 · 2023-06-29T01:15:30Z

Screenshots:

s77rt · 2023-06-29T09:35:23Z

@namhihi237 Thanks!

@shawnborton Would you please check the above screenshots if the design is okay to go with

shawnborton · 2023-06-29T15:53:37Z

Works for me!

s77rt · 2023-06-29T16:48:31Z

@namhihi237 On native the height is too much. Can you please fix this but keep using minHeight and not height in twoFactorAuthCodesContainer.

aldo-expensify · 2023-06-29T22:00:29Z

src/styles/styles.js

@@ -2198,12 +2198,12 @@ const styles = {
        flexDirection: 'row',
        flexWrap: 'wrap',
        gap: 12,
-        height: 148,
+        minHeight: 148,


Question, why do we need a minHeight or height? Is it possible to let the container have the height defined by the content?

Yeah, think again agree @aldo-expensify , We can don't need set height or minHeight.

Work well from web, native (android and ios)

Screen.Recording.2023-06-30.at.05.22.29.mov

Hmm yeah, I thought this is made to make it look nice when no code is loaded, i.e. loading the spinner but the spinner uses it own View with a fixed height already.

No we should only show the spinner if we are actually loading something. But in what cases no code is loaded (and the spinner is not loading either)

So we only need to remove minHeight and height. @aldo-expensify What do you think about this, if we come to the conclusion I will update the PR right away for this.

But in what cases no code is loaded (and the spinner is not loading either)

No cases? 🤷

So we only need to remove minHeight and height. @aldo-expensify What do you think about this, if we come to the conclusion I will update the PR right away for this.

I guess that sounds fine. Sounds good to you @s77rt ?

Yes sounds good to me 👍

Yeah thanks, The PR has been updated. cc @s77rt @aldo-expensify

aldo-expensify

Thanks! Looks good to me

OSBotify · 2023-06-30T21:17:42Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2023-07-03T14:49:23Z

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 1.3.36-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-07-05T17:12:36Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.36-5 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

fix style copy button

8e3b94f

namhihi237 requested a review from a team as a code owner June 27, 2023 16:18

melvin-bot bot requested review from s77rt and removed request for a team June 27, 2023 16:18

namhihi237 mentioned this pull request Jun 27, 2023

[HOLD for payment 2023-07-12] [$1000] 2FA - When the "copy code" button is clicked, the download button moves. #21566

Closed

6 tasks

s77rt suggested changes Jun 27, 2023

View reviewed changes

update name style 2fa copy button

a1898ea

s77rt approved these changes Jun 28, 2023

View reviewed changes

melvin-bot bot requested a review from aldo-expensify June 28, 2023 14:53

fix: style and change text to copy

8eae5b0

s77rt suggested changes Jun 29, 2023

View reviewed changes

src/pages/settings/Security/TwoFactorAuth/CodesPage.js Show resolved Hide resolved

remove translation not use

fb4e23a

namhihi237 requested a review from s77rt June 29, 2023 03:04

aldo-expensify reviewed Jun 29, 2023

View reviewed changes

fix minor

c0924e6

namhihi237 force-pushed the fix-21566-copy-code-button-move branch from 2940422 to c0924e6 Compare June 30, 2023 18:34

s77rt approved these changes Jun 30, 2023

View reviewed changes

melvin-bot bot requested a review from aldo-expensify June 30, 2023 18:44

aldo-expensify approved these changes Jun 30, 2023

View reviewed changes

aldo-expensify merged commit 50c16ac into Expensify:main Jun 30, 2023

OSBotify mentioned this pull request Jul 3, 2023

Deploy Checklist: New Expensify 2023-07-03 #22116

Closed

40 tasks

fix style copy button #21698

fix style copy button #21698

Conversation

namhihi237 commented Jun 27, 2023

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 27, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

s77rt commented Jun 28, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

s77rt left a comment

Choose a reason for hiding this comment

aldo-expensify commented Jun 28, 2023

namhihi237 commented Jun 28, 2023

s77rt commented Jun 28, 2023

s77rt commented Jun 28, 2023

namhihi237 commented Jun 28, 2023

shawnborton commented Jun 28, 2023

namhihi237 commented Jun 28, 2023

aldo-expensify commented Jun 28, 2023

s77rt commented Jun 28, 2023

namhihi237 commented Jun 29, 2023

s77rt commented Jun 29, 2023

s77rt commented Jun 29, 2023

namhihi237 commented Jun 29, 2023

s77rt commented Jun 29, 2023

shawnborton commented Jun 29, 2023

s77rt commented Jun 29, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aldo-expensify left a comment

Choose a reason for hiding this comment

OSBotify commented Jun 30, 2023

OSBotify commented Jul 3, 2023

OSBotify commented Jul 5, 2023

s77rt commented Jun 28, 2023 •

edited

Loading