Fixed icon fill colors #33607

shubham1206agra · 2023-12-26T17:41:29Z

Details

Fixed Issues

$ #33664

Tests

Go to Workspace > Bank Account
Select Connect online via plaid
Select any bank, and complete the plaid process
Observe the icon next to bank name

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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 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(theme.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 the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label so the design team can review the changes.
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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

github-actions · 2023-12-26T21:47:09Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/33607/index.html	❌ FAILED ❌
	The QR code can't be generated, because the iOS build failed
Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/33607/NewExpensify.dmg	https://33607.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

shubham1206agra · 2023-12-27T14:11:02Z

Waiting for https://expensify.slack.com/archives/C049HHMV9SM/p1703677023896169 to get an issue

shubham1206agra · 2024-01-01T13:41:31Z

@Pujan92 Would you like to start the review in the meantime?

Pujan92 · 2024-01-01T13:56:11Z

@Pujan92 Would you like to start the review in the meantime?

Yes.

src/components/AddPlaidBankAccount.js

Pujan92 · 2024-01-02T13:36:05Z

We also need to remove the fill prop within ImageCropView component.
https://github.com/Expensify/App/pull/30905/files#diff-7ead4ae598b36d2acf038cfe3d0a166b21e9a9ebe6da3d5e72fe7e5d6877d8caR93

shubham1206agra · 2024-01-02T13:41:17Z

We also need to remove the fill prop within ImageCropView component. https://github.com/Expensify/App/pull/30905/files#diff-7ead4ae598b36d2acf038cfe3d0a166b21e9a9ebe6da3d5e72fe7e5d6877d8caR93

This is not entirely possible as it uses 2 colors. We can use react-native-svg to generate the svg dynamically for theme.

Pujan92 · 2024-01-02T13:53:52Z

We also need to remove the fill prop within ImageCropView component. https://github.com/Expensify/App/pull/30905/files#diff-7ead4ae598b36d2acf038cfe3d0a166b21e9a9ebe6da3d5e72fe7e5d6877d8caR93

This is not entirely possible as it uses 2 colors. We can use react-native-svg to generate the svg dynamically for theme.

Sorry but I am not getting it, do you mean it is added intentionally to differentiate mask image for diff theme?
If yes then let me share the screenshot of the comparison.

Earlier(without fill prop)	Current(with fill prop)

shubham1206agra · 2024-01-02T14:07:35Z

Nope, I am talking about creating a custom svg that switches colors on switching theme. And using that instead. See Lounge svg for reference

shubham1206agra · 2024-01-03T04:10:38Z

@mountiny What's your opinion on #33607 (comment)?

dannymcclain · 2024-01-04T15:43:17Z

In reference to these screenshots, I think I have a slight preference for the left side (without fill prop), but honestly both look acceptable. @Expensify/design care to weigh in here?

shawnborton · 2024-01-04T15:46:19Z

What exactly is the question? I'm a bit lost.

Are we discussing how to handle the default bank account icon in light mode vs dark mode? If so, from a technical perspective, I don't feel too strongly in terms of how we implement it, but I do agree that each theme should use its respective colors for these default icons.

Pujan92 · 2024-01-04T15:58:37Z

The question is with the latest changes we landed on the right side screenshots, but seems it applied by mistake in that PR. So we were thinking of reverting that which makes it look like the left side(the way it was for long), but as we are not sure we wanted to clarify which side you prefer.

mountiny · 2024-01-04T16:11:26Z

@shawnborton the question is about this comment and screenshots in it specifically #33607 (comment)

shawnborton · 2024-01-04T16:41:42Z

Ah got it. I would think that the slightly translucent color of that mask should match the app BG in each respective theme. So I think I like these two:

Dark	Light

And then perhaps we should adjust border color to use the theme border color too?

dannymcclain · 2024-01-04T17:17:39Z

@shawnborton that sounds good to me!

Pujan92 · 2024-01-05T05:40:01Z

@shubham1206agra I believe that(mask image based on theme) should be handled in a separate issue as for this we are just correcting the prop set in the wrong places. Do you think the same?

mountiny · 2024-01-05T14:11:20Z

@shubham1206agra @Pujan92 Can we just do it here? I think its not big enough that it could not be added to this PR?

Thanks design team for chiming in

Pujan92 · 2024-01-07T05:07:15Z

@shubham1206agra @Pujan92 Can we just do it here? I think its not big enough that it could not be added to this PR?

Yes, @shubham1206agra I think for maskimage below changes should work.

Pass theme.iconReversed for the fill prop instead of theme.icon.
https://github.com/Expensify/App/pull/30905/files#diff-7ead4ae598b36d2acf038cfe3d0a166b21e9a9ebe6da3d5e72fe7e5d6877d8caR93
Remove fixed fill from the class st1 in image-crop-circle-mask.svg

melvin-bot · 2024-01-07T06:11:38Z

@dannymcclain @allroundexperts One of you needs to 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]

shubham1206agra · 2024-01-07T06:12:10Z

@allroundexperts Here @Pujan92 will do the review. Sorry for the tag.

mountiny · 2024-01-07T19:13:31Z

@Pujan92 let us know your eta, thanks!

Pujan92

Looks good to me. Seems need to re-run the flow to consider a new reviewer checklist.
cc: @mountiny

Pujan92 · 2024-01-08T04:35:57Z

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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(theme.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 the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label so the design team can review the changes.
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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

shawnborton · 2024-01-08T10:07:37Z

What exactly are we doing for the bank account icon? Is it the same image being used for both dark and light mode, or something else?

I wonder if we should follow what we recently did for the fallback avatars where they are different based on the theme. @dubielzyk-expensify does that sound familiar, and if so, can you share what you had for those here?

shubham1206agra · 2024-01-08T10:09:55Z

What exactly are we doing for the bank account icon? Is it the same image being used for both dark and light mode, or something else?

I wonder if we should follow what we recently did for the fallback avatars where they are different based on the theme. @dubielzyk-expensify does that sound familiar, and if so, can you share what you had for those here?

They are same before expo too, right?

Pujan92 · 2024-01-08T11:14:13Z

What exactly are we doing for the bank account icon? Is it the same image being used for both dark and light mode, or something else?

Yes, it is the same only. We haven't done anything here for the bank icon color, we just fix the color unnecessarily applied to entire icon for the native.

dannymcclain · 2024-01-08T14:25:02Z

What we have going on here is probably fine (same icon for both themes)—I mean it gets the job done for sure, but I am curious what it would look like with theme-specific colors and if that would be an easy-to-implement thing.

shubham1206agra · 2024-01-08T15:20:39Z

What we have going on here is probably fine (same icon for both themes)—I mean it gets the job done for sure, but I am curious what it would look like with theme-specific colors and if that would be an easy-to-implement thing.

This will require to create svg using react-native-svg, and not as a svg file.

mountiny

Thanks for testing @Pujan92 and for the PR @shubham1206agra!

OSBotify · 2024-01-09T00:17:48Z

✋ 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 · 2024-01-09T05:37:09Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.23-0 🚀

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

OSBotify · 2024-01-10T06:04:24Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.23-4 🚀

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

situchan · 2024-01-15T17:43:50Z

src/components/AvatarCropModal/ImageCropView.js

@@ -90,7 +90,7 @@ function ImageCropView(props) {
                <View style={[containerStyle, styles.l0, styles.b0, styles.pAbsolute]}>
                    <Icon
                        src={props.maskImage}
-                        fill={theme.icon}
+                        fill={theme.iconReversed}


any reason for keeping this value remained here only? I see all other fill values are removed

For applying maskImage based on theme we have kept that, comment ref

fixed plaid account icon

fada9bf

mountiny assigned shubham1206agra Dec 26, 2023

mountiny added the Ready To Build label Dec 26, 2023

shubham1206agra and others added 2 commits December 30, 2023 19:59

Merge branch 'Expensify:main' into fix-plaid-icon

1538f92

fixed illustrations

24b7c4a

Pujan92 reviewed Jan 2, 2024

View reviewed changes

src/components/AddPlaidBankAccount.js Outdated Show resolved Hide resolved

shubham1206agra and others added 4 commits January 4, 2024 19:05

Merge branch 'Expensify:main' into fix-plaid-icon

863fda9

fixed icon with colors

206a90d

removed extra prop

cde4c3d

fix lint

9c70ec9

shubham1206agra mentioned this pull request Jan 4, 2024

[HOLD for payment 2024-01-17] [$500] Grey box is shown instead of bank icon #33664

Closed

6 tasks

Merge branch 'main' into fix-plaid-icon

9979e91

changed fill color for image crop mask

bd6a858

shubham1206agra changed the title ~~Fixed plaid account icon~~ Fixed icon fill colors Jan 7, 2024

shubham1206agra marked this pull request as ready for review January 7, 2024 06:11

shubham1206agra requested a review from a team as a code owner January 7, 2024 06:11

melvin-bot bot requested review from allroundexperts and dannymcclain and removed request for a team January 7, 2024 06:11

mountiny removed the request for review from allroundexperts January 7, 2024 19:13

Pujan92 approved these changes Jan 8, 2024

View reviewed changes

mountiny approved these changes Jan 9, 2024

View reviewed changes

mountiny merged commit b338f53 into Expensify:main Jan 9, 2024
17 of 18 checks passed

github-actions bot mentioned this pull request Jan 9, 2024

Deploy Checklist: New Expensify 2024-01-09 #34121

Closed

87 tasks

situchan reviewed Jan 15, 2024

View reviewed changes

shubham1206agra deleted the fix-plaid-icon branch February 6, 2024 03:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed icon fill colors #33607

Fixed icon fill colors #33607

shubham1206agra commented Dec 26, 2023 •

edited

Loading

github-actions bot commented Dec 26, 2023

shubham1206agra commented Dec 27, 2023

shubham1206agra commented Jan 1, 2024

Pujan92 commented Jan 1, 2024

Pujan92 commented Jan 2, 2024

shubham1206agra commented Jan 2, 2024

Pujan92 commented Jan 2, 2024 •

edited

Loading

shubham1206agra commented Jan 2, 2024

shubham1206agra commented Jan 3, 2024

dannymcclain commented Jan 4, 2024

shawnborton commented Jan 4, 2024

Pujan92 commented Jan 4, 2024

mountiny commented Jan 4, 2024

shawnborton commented Jan 4, 2024

dannymcclain commented Jan 4, 2024

Pujan92 commented Jan 5, 2024

mountiny commented Jan 5, 2024

Pujan92 commented Jan 7, 2024

melvin-bot bot commented Jan 7, 2024

shubham1206agra commented Jan 7, 2024

mountiny commented Jan 7, 2024

Pujan92 left a comment •

edited

Loading

Pujan92 commented Jan 8, 2024 •

edited

Loading

shawnborton commented Jan 8, 2024

shubham1206agra commented Jan 8, 2024

Pujan92 commented Jan 8, 2024 •

edited

Loading

dannymcclain commented Jan 8, 2024

shubham1206agra commented Jan 8, 2024

mountiny left a comment

OSBotify commented Jan 9, 2024

OSBotify commented Jan 9, 2024

OSBotify commented Jan 10, 2024

situchan Jan 15, 2024

Pujan92 Jan 15, 2024

Fixed icon fill colors #33607

Fixed icon fill colors #33607

Conversation

shubham1206agra commented Dec 26, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

github-actions bot commented Dec 26, 2023

shubham1206agra commented Dec 27, 2023

shubham1206agra commented Jan 1, 2024

Pujan92 commented Jan 1, 2024

Pujan92 commented Jan 2, 2024

shubham1206agra commented Jan 2, 2024

Pujan92 commented Jan 2, 2024 • edited Loading

shubham1206agra commented Jan 2, 2024

shubham1206agra commented Jan 3, 2024

dannymcclain commented Jan 4, 2024

shawnborton commented Jan 4, 2024

Pujan92 commented Jan 4, 2024

mountiny commented Jan 4, 2024

shawnborton commented Jan 4, 2024

dannymcclain commented Jan 4, 2024

Pujan92 commented Jan 5, 2024

mountiny commented Jan 5, 2024

Pujan92 commented Jan 7, 2024

melvin-bot bot commented Jan 7, 2024

shubham1206agra commented Jan 7, 2024

mountiny commented Jan 7, 2024

Pujan92 left a comment • edited Loading

Choose a reason for hiding this comment

Pujan92 commented Jan 8, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

shawnborton commented Jan 8, 2024

shubham1206agra commented Jan 8, 2024

Pujan92 commented Jan 8, 2024 • edited Loading

dannymcclain commented Jan 8, 2024

shubham1206agra commented Jan 8, 2024

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Jan 9, 2024

OSBotify commented Jan 9, 2024

OSBotify commented Jan 10, 2024

situchan Jan 15, 2024

Choose a reason for hiding this comment

Pujan92 Jan 15, 2024

Choose a reason for hiding this comment

shubham1206agra commented Dec 26, 2023 •

edited

Loading

Pujan92 commented Jan 2, 2024 •

edited

Loading

Pujan92 left a comment •

edited

Loading

Pujan92 commented Jan 8, 2024 •

edited

Loading

Pujan92 commented Jan 8, 2024 •

edited

Loading