-
Notifications
You must be signed in to change notification settings - Fork 3k
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
Workspace Editor Page Design Updates #12419
Conversation
src/styles/styles.js
Outdated
@@ -2761,6 +2761,20 @@ const styles = { | |||
fontSize: variables.fontSizeSmall, | |||
...spacing.ph2, | |||
}, | |||
|
|||
workspaceSection: { | |||
backgroundColor: colors.gray1, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if we can make a more global value here that comes from the theme file... something like themeColors.cardBackground
or something? Then in the theme file, use gray1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, ideally we don't want to import colors anywhere except into the theme file. I'll be working on this when I update the colors in the upcoming week, but feel free to add as a variable todefault.js
for now!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good!
src/styles/styles.js
Outdated
@@ -2761,6 +2761,20 @@ const styles = { | |||
fontSize: variables.fontSizeSmall, | |||
...spacing.ph2, | |||
}, | |||
|
|||
workspaceSection: { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is fine for now, but I could see making this even more generic... like cardSection
or something? In case we use it elsewhere
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah I like that too. This was already more genericized than my first attempt (workspaceEditorSection
) but will make it even broader.
src/styles/styles.js
Outdated
workspaceSection: { | ||
backgroundColor: colors.gray1, | ||
borderRadius: variables.componentBorderRadiusCard, | ||
marginVertical: 10, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we can just do bottom margin for all of these cards? This way the first card in a view will sit more towards the top.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh that works
menuItems={[ | ||
{ | ||
title: this.props.translate('workspace.reimburse.viewAllReceipts'), | ||
onPress: () => Link.openOldDotLink(`expenses?policyIDList=${this.props.policy.id}&billableReimbursable=reimbursable&submitterEmail=%2B%2B`), | ||
icon: Expensicons.Receipt, | ||
shouldShowRightIcon: true, | ||
iconRight: Expensicons.NewWindow, | ||
iconFill: themeColors.buttonSuccessBG, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if we're holding for new color theme, you'll want to use themeColors.success
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can wait on this until the colors are merged, I just wanted to make a note
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cool! Will keep this in here for now for testing purposes but can swap it once that's ready to go.
Updated! I think I caught everything in the Figma you shared. There are a couple more places in settings where we use the same
I think all of those will show up on an account that has a bank account connected - except for There are also a couple places we use
Also, I didn't update the button shapes (since that will be global, right?) or the icons (since I don't have the icons yet) but happy to do either/both if we have the goods. And, let me know if you want me to rename any of the illustrations; these should mostly be fine but some are a little wonky (if we're eventually going to remove the existing ones we can be a little more broad in how we name these). Lastly, there are some merge conflicts, I'll work on those separately. |
Yup, no worries on the button shape or icons just yet. For those sections you referenced, can you share screenshots of them here? |
@shawnborton here you go! There are a couple I couldn't quite figure out how to get at yet, so I screenshotted the code (that notes what icons are used). I realize that's not super helpful but figured you could start on the others and then I will keep figuring out how to see the remaining four. Also please remind me that in this PR i changed the background color of the sections to blue so I could see them better, so I need to update that before we go much further. |
Here's another batch of illustrations to use: MoreSimpleIllustrations.zip I tried going through your screenshots in the same Figma file... here are some proposed ideas: We might want to change the headline for this one, the equals sign made the break a bit awkward: |
Awesome, thanks @shawnborton ! I've updated all of the screens and so I'm going to go through and screenshot their final forms (and really try to get those last few). Now that we have updated ALL of them, I'm going to switch out the styling changes from each individual instance into the main |
Sounds great, thanks for the update! I'm planning to do a weekly update for the overall branding tasks in the open source room tomorrow, so let me know where we're at by tomorrow morning when you get a moment. |
Haven't had time for anything yet but things are slowing down outside of this PR so I plan to have it completed and ready for final review later today! |
Sounds great, thanks for the update! |
Ok have been thrown in a bunch of different directions today even though I was hoping not to be. Started going through this and will be able to finish tomorrow. |
Just committing some more updates here. Just the last four remaining (the harder ones to figure out where they actually exist... Can track progress here: https://docs.google.com/spreadsheets/d/1NEe1pc-1Wy2f0gpSCPPAb0SsHSAeXub56BuX_6-oaBU/edit#gid=0 |
Updated and ready for review! I believe this should remain on hold until the new colors/icons are ready because I'll likely have to make some final changes at that point. But, it's all synced up with the new style in all the sections. Screenshots, labelled by the number noted in the Google Sheet are here - all 138 of them. There are also a couple marked "OLD" which is for places I was able to get what they looked like before. Lastly, I didn't make that copy change (the |
Thoughts @shawnborton @grgia ? |
I am down to merge and do follow ups for the small things we might have missed. Thanks so much for the review Aldo, I know this was a big one! |
@grgia do you want to review before I merge? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, tested dark mode
@Santhosh-Sellavel all you! |
Thanks for the bump on it already! |
Reviewer Checklist
Screenshots/VideosNote missed a few screens that I can't access like with an Expensify card. WebScreen.Recording.2022-11-23.at.6.21.52.AM.movMobile Web - ChromeScreen_Recording_20221123_063938_Chrome.mp4Mobile Web - SafariRPReplay_Final1669165540.MP4DesktopScreen.Recording.2022-11-23.at.6.29.38.AM.moviOS & AndroidScreen.Recording.2022-11-23.at.6.41.33.AM.mov |
Is this expected on offline, shouldn't buttons be disabled? |
Hmm good catch, how does it currently work on the main branch? |
Same behaviour on main too! |
Okay cool, then no worries if it's the same thing on main. |
Should we log a bug for it @shawnborton ? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good!
@Santhosh-Sellavel can't hurt, you can bring that up in #expensify-bugs |
If the bug is logged, am I good to merge this? |
@shawnborton from this slack conversation , I understand that we should proceed with the merge, right? |
Lol, now I see that Luke posted "Buttons merged", so I guess that was about a different PR |
Yup, let’s do it!
…On Wed, Nov 23, 2022 at 10:47 AM Aldo Canepa Garay ***@***.***> wrote:
@shawnborton <https://github.com/shawnborton> from this slack
<https://expensify.slack.com/archives/C01GTK53T8Q/p1669147855166289>
conversation , I understand that we should proceed with the merge, right?
—
Reply to this email directly, view it on GitHub
<#12419 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AARWH5R3RLD2IVAOVC3UDLLWJZRCHANCNFSM6AAAAAARVUSZKQ>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
Done! |
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
🚀 Deployed to staging by @aldo-expensify in version: 1.2.31-0 🚀
|
The production deploy comment failed for this PR, but this was deployed to production on v1.2.32-2 on Nov 28. |
As requested in #13318 (comment) - commenting here. This was not really a bug per se so we don't need a new process. Generally I guess we should make sure that if multiple PRs are affecting something (say, a redesign), we make sure that all of them are considered in each. In this case, we were matching the style of the old buttons, and not the new ones. |
Details
Fixed Issues
$ #12257
Tests
QA Steps
Note: I'm sorry in advance. The testing steps are the same on all platforms. There should be no changes to functionality with any of these code changes. I'm a little unsure if these will actually get to all the screens - I had to hack a bit locally to make it work - so please reach out to me if you need assistance and we can work through it together.
Request a setup call
and confirm that the design matches 2 in the screenshots file, and all buttons/links work as expected.Issue cards
and confirm that the design matches 10 in the screenshots file, and all buttons/links work as expected.Reimburse expenses
and confirm that the design matches 16, 17, and 19 in the screenshots file, and all buttons/links work as expected.Pay bills
and confirm that the design matches 7 and 8 in the screenshots file, and all buttons/links work as expected.Send invoices
and confirm that the design matches 13 and 14 in the screenshots file, and all buttons/links work as expected.Book travel
and confirm that the design matches 20 in the screenshots file, and all buttons/links work as expected.Connect bank account
and confirm that the design matches 3 in the screenshots file, and all buttons/links work as expected.Connect bank account
again. Confirm that the design matches 4 in the screenshots file, and all buttons/links work as expected.Issue cards
and confirm that the design matches 11 in the screenshots file, and all buttons/links work as expected.Reimburse expenses
and confirm that the design matches 16, 17, and 18 in the screenshots file, and all buttons/links work as expected.Pay bills
and confirm that the design matches 7 and 9 in the screenshots file, and all buttons/links work as expected.Send invoices
and confirm that the design matches 13 and 15 in the screenshots file, and all buttons/links work as expected.Book travel
and confirm that the design matches 21 in the screenshots file, and all buttons/links work as expected.Issue cards
and confirm that the design matches 12 in the screenshots file, and all buttons/links work as expected.Connect a bank account
and go through the flow adding a bank account via Plaid.Offline Steps
PR Author Checklist
I linked the correct issue in the
### Fixed Issues
section aboveI wrote clear testing steps that cover the changes made in this PR
Tests
sectionOffline steps
sectionQA steps
sectionI included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
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)
toggleReport
and notonIconClick
)src/languages/*
filesWaiting for Copy
label for a copy review on the original GH to get the correct copy.STYLE.md
) were followedIf 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 usingAvatar
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:
/** comment above it */
this
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)If a new CSS style is added I verified that:
StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG
)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 thatAvatar
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.
I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.
PR Reviewer Checklist
The reviewer will copy/paste it into a new comment and complete it after the author checklist is completed
### Fixed Issues
section aboveTests
sectionQA steps
sectiontoggleReport
and notonIconClick
).src/languages/*
filesWaiting for Copy
label for a copy review on the original GH to get the correct copy.STYLE.md
) were followedAvatar
, I verified the components usingAvatar
have been tested & I retested again)/** comment above it */
this
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)Screenshots
All screenshots are available here: https://www.dropbox.com/s/1nv9cicwl758ea7/Screenshots.zip?dl=0
Web
Mobile Web - Chrome
Mobile Web - Safari
Desktop
iOS
Android