Shortcut - Workspace avatar next to request shortcut does not update when it is changed #39368

ZhenjaHorbach · 2024-04-01T16:27:30Z

Details

Shortcut - Workspace avatar next to request shortcut does not update when it is changed

Fixed Issues

$ #39045
PROPOSAL: #39045 (comment)

Tests

Open app
Create a new workspace and do not change workspace name and avatar.
Request money from workspace chat.
Click FAB and note the workspace avatar next to Request money shortcut.
Go to Profile > Workspaces > select workspace in Step 2.
Change workspace name and avatar.
Go to Chat tab
Open FAB
Verify that the avatar was updated

Verify that no errors appear in the JS console

Offline tests

Open app
Create a new workspace and do not change workspace name and avatar.
Request money from workspace chat.
Click FAB and note the workspace avatar next to Request money shortcut.
Go to Profile > Workspaces > select workspace in Step 2.
Change workspace name and avatar.
Go to Chat tab
Open FAB
Verify that the avatar was updated

QA Steps

Open app
Create a new workspace and do not change workspace name and avatar.
Request money from workspace chat.
Click FAB and note the workspace avatar next to Request money shortcut.
Go to Profile > Workspaces > select workspace in Step 2.
Change workspace name and avatar.
Go to Chat tab
Open FAB
Verify that the avatar was updated

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

android.mov

iOS: Native

Screen.Recording.2024-04-01.at.18.17.21.mov

iOS: mWeb Safari

Screen.Recording.2024-04-01.at.18.18.21.mov

MacOS: Chrome / Safari

Screen.Recording.2024-04-01.at.14.22.03.mov

MacOS: Desktop

Screen.Recording.2024-04-01.at.18.09.43.mov

…e when it is changed

melvin-bot · 2024-04-01T16:27:35Z

@jjcoffee 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]

ZhenjaHorbach · 2024-04-01T16:49:01Z

@jjcoffee
Hello )
PR is ready )

jjcoffee · 2024-04-04T11:46:29Z

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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design 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

Android: Native

android-app-2024-04-04_14.47.25.mp4

Android: mWeb Chrome

android-chrome-2024-04-04_14.52.45.mp4

iOS: Native

ios-native-2024-04-04_16.03.25.mp4

iOS: mWeb Safari

ios-safari-2024-04-04_16.12.51.mp4

MacOS: Chrome / Safari

desktop-chrome-2024-04-04_14.19.50.mp4

MacOS: Desktop

desktop-app-2024-04-04_14.22.03.mp4

jjcoffee · 2024-04-04T14:10:20Z

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js

@@ -153,13 +155,16 @@ function FloatingActionButtonAndPopover(props) {

    const quickActionReport = useMemo(() => (props.quickAction ? ReportUtils.getReport(props.quickAction.chatReportID) : 0), [props.quickAction]);

+    const policy = props.allPolicies ? props.allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${quickActionReport.policyID}`] : undefined;


Suggested change

const policy = props.allPolicies ? props.allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${quickActionReport.policyID}`] : undefined;

const quickActionPolicy = props.allPolicies ? props.allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${quickActionReport.policyID}`] : undefined;

To keep things consistent 😉

Sound good )
Fixed )

jjcoffee · 2024-04-04T14:11:08Z

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js

    const quickActionAvatars = useMemo(() => {
        if (quickActionReport) {
            const avatars = ReportUtils.getIcons(quickActionReport, props.personalDetails);
            return avatars.length <= 1 || ReportUtils.isPolicyExpenseChat(quickActionReport) ? avatars : _.filter(avatars, (avatar) => avatar.id !== props.session.accountID);
        }
        return [];
-    }, [props.personalDetails, props.session.accountID, quickActionReport]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps


I would add a brief explanatory comment here, so future visitors know why we've included policy as a dependency.

jjcoffee

Just some minor tweaks needed, otherwise looks great and tests well! 🙏

jjcoffee · 2024-04-04T14:38:44Z

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js

    const quickActionAvatars = useMemo(() => {
        if (quickActionReport) {
            const avatars = ReportUtils.getIcons(quickActionReport, props.personalDetails);
            return avatars.length <= 1 || ReportUtils.isPolicyExpenseChat(quickActionReport) ? avatars : _.filter(avatars, (avatar) => avatar.id !== props.session.accountID);
        }
        return [];
-    }, [props.personalDetails, props.session.accountID, quickActionReport]);
+        // We added police depending on the fact that if the workspace changes, we would see these changes on Shortcut too


Suggested change

// We added police depending on the fact that if the workspace changes, we would see these changes on Shortcut too

// Policy is needed as a dependency in order to update the shortcut details when the workspace changes

jjcoffee

LGTM!

OSBotify · 2024-04-04T16:10:01Z

✋ 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-04-08T11:09:14Z

🚀 Deployed to staging by https://github.com/amyevans in version: 1.4.61-0 🚀

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

OSBotify · 2024-04-08T13:05:52Z

🚀 Deployed to staging by https://github.com/amyevans in version: 1.4.61-0 🚀

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

OSBotify · 2024-04-10T17:23:29Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.61-8 🚀

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

Fix bug with Workspace avatar next to request shortcut does not updat…

a7c74d0

…e when it is changed

ZhenjaHorbach requested a review from a team as a code owner April 1, 2024 16:27

melvin-bot bot requested review from jjcoffee and removed request for a team April 1, 2024 16:27

jjcoffee reviewed Apr 4, 2024

View reviewed changes

jjcoffee suggested changes Apr 4, 2024

View reviewed changes

ZhenjaHorbach added 2 commits April 4, 2024 16:16

Fix comments

b5bfe75

Fix comments x3

224ea3a

jjcoffee reviewed Apr 4, 2024

View reviewed changes

Fix comments x2

9adb9ef

jjcoffee approved these changes Apr 4, 2024

View reviewed changes

melvin-bot bot requested a review from amyevans April 4, 2024 14:44

amyevans approved these changes Apr 4, 2024

View reviewed changes

amyevans merged commit 969ee24 into Expensify:main Apr 4, 2024
16 checks passed

github-actions bot mentioned this pull request Apr 8, 2024

Deploy Checklist: New Expensify 2024-04-08 #39807

Closed

This was referenced Apr 12, 2024

Deploy Checklist: New Expensify 2024-04-08 #39807 Derevyaa/Expensify-App#1

Closed

Deploy Checklist: New Expensify 2024-04-09 #39808 Derevyaa/Expensify-App#2

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Shortcut - Workspace avatar next to request shortcut does not update when it is changed #39368

Shortcut - Workspace avatar next to request shortcut does not update when it is changed #39368

ZhenjaHorbach commented Apr 1, 2024 •

edited

Loading

melvin-bot bot commented Apr 1, 2024

ZhenjaHorbach commented Apr 1, 2024

jjcoffee commented Apr 4, 2024 •

edited

Loading

jjcoffee Apr 4, 2024

ZhenjaHorbach Apr 4, 2024

jjcoffee Apr 4, 2024

ZhenjaHorbach Apr 4, 2024

jjcoffee left a comment

jjcoffee Apr 4, 2024

jjcoffee left a comment

OSBotify commented Apr 4, 2024

OSBotify commented Apr 8, 2024

OSBotify commented Apr 8, 2024

OSBotify commented Apr 10, 2024

		@@ -153,13 +155,16 @@ function FloatingActionButtonAndPopover(props) {

		const quickActionReport = useMemo(() => (props.quickAction ? ReportUtils.getReport(props.quickAction.chatReportID) : 0), [props.quickAction]);

		const policy = props.allPolicies ? props.allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${quickActionReport.policyID}`] : undefined;

	const policy = props.allPolicies ? props.allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${quickActionReport.policyID}`] : undefined;
	const quickActionPolicy = props.allPolicies ? props.allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${quickActionReport.policyID}`] : undefined;

	// We added police depending on the fact that if the workspace changes, we would see these changes on Shortcut too
	// Policy is needed as a dependency in order to update the shortcut details when the workspace changes

Shortcut - Workspace avatar next to request shortcut does not update when it is changed #39368

Shortcut - Workspace avatar next to request shortcut does not update when it is changed #39368

Conversation

ZhenjaHorbach commented Apr 1, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 1, 2024

ZhenjaHorbach commented Apr 1, 2024

jjcoffee commented Apr 4, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

jjcoffee Apr 4, 2024

Choose a reason for hiding this comment

ZhenjaHorbach Apr 4, 2024

Choose a reason for hiding this comment

jjcoffee Apr 4, 2024

Choose a reason for hiding this comment

ZhenjaHorbach Apr 4, 2024

Choose a reason for hiding this comment

jjcoffee left a comment

Choose a reason for hiding this comment

jjcoffee Apr 4, 2024

Choose a reason for hiding this comment

jjcoffee left a comment

Choose a reason for hiding this comment

OSBotify commented Apr 4, 2024

OSBotify commented Apr 8, 2024

OSBotify commented Apr 8, 2024

OSBotify commented Apr 10, 2024

ZhenjaHorbach commented Apr 1, 2024 •

edited

Loading

jjcoffee commented Apr 4, 2024 •

edited

Loading