Show primary workspace chat first when creating expense #47437

nkdengineer · 2024-08-14T15:50:09Z

Details

Show primary workspace chat first when creating expense

Fixed Issues

$ #46683
PROPOSAL: #46683 (comment)

Tests

Login with an account that has some workspaces and contacts
Setting the default WS as group policy in Old dot
On NewDot, go to FAB > Submit expense
Enter a valid amount and go to the participant page
Verify that the WS chat of the primary workspace displays first

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Login with an account that has some workspaces and contacts
Setting the default WS as group policy in Old dot
On NewDot, go to FAB > Submit expense
Enter a valid amount and go to the participant page
Verify that the WS chat of the primary workspace displays first

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-08-14.at.22.39.45.mov

Android: mWeb Chrome

Screen.Recording.2024-08-14.at.22.36.35.mov

iOS: Native

Screen.Recording.2024-08-14.at.22.39.27.mov

iOS: mWeb Safari

Screen.Recording.2024-08-14.at.22.37.45.mov

MacOS: Chrome / Safari

Screen.Recording.2024-08-14.at.22.34.21.mov

MacOS: Desktop

Screen.Recording.2024-08-14.at.22.42.10.mov

melvin-bot · 2024-08-14T15:54:36Z

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

allgandalf · 2024-08-14T16:00:46Z

@nkdengineer , if no workspace is active we should show the recents as they were before, is this result matched with this PR?

nkdengineer · 2024-08-14T16:02:15Z

@allgandalf Yes, if there is no WS policy is the personal policy then we will not re-order the report.

allgandalf · 2024-08-14T16:19:45Z

@nkdengineer , when i have an active workspace, I don't see that at the top of recents

allgandalf · 2024-08-14T16:20:57Z

Here is the cases and the expected result:

Expected Result:
In step 5 above, under Recents, the first option should show your Workspace name and that option should be static

nkdengineer · 2024-08-14T16:22:50Z

@allgandalf I assume the primary WS here is the default WS that we set in old dot. Is that right?

nkdengineer · 2024-08-14T16:23:28Z

@mountiny Can you please confirm?

allgandalf · 2024-08-14T16:23:43Z

Here are the expected results:

If we have an active paid workspace, then show that at the top of the recents
If we don't have an active workspace, then do nothing, the results which we get on staging/production are ideal.

c.c. @trjExpensify correct me if i miss something

allgandalf · 2024-08-14T16:24:59Z

@allgandalf I assume the primary WS here is the default WS that we set in old dot. Is that right?

Umm, from slack, i confirmed something different here that is why the comment was this on the issue:

When we go from global create, We want the workspace with activePolicyId i.e. the current active workspace to be shown at the top of list, if we do not have any workspace selected then simply :donothing: and show the list as it currently is. and also we need to check if its group policy, we should not do this for personal

lets wait for the internal engineers to clarify

nkdengineer · 2024-08-14T16:26:54Z

I think the activePolicyId is ONYXKEYS.NVP_ACTIVE_POLICY_ID. It's not the active policy in the URL.

trjExpensify · 2024-08-14T17:10:57Z

@allgandalf I assume the primary WS here is the default WS that we set in old dot. Is that right?

That's correct. Though it's totally possible on OldDot to select your personal policy as the default, but we don't have that concept in NewDot (nor give them a workspace chat tbh). So we only want to set the default WS at the top of the option selector if the default workspace set is a group workspace (i.e collect or control).

allgandalf · 2024-08-14T17:12:20Z

okay i get that now, I will complete the review then

allgandalf · 2024-08-14T17:57:07Z

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

Screen.Recording.2024-08-14.at.11.42.18.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-08-14.at.11.45.19.PM.mov

iOS: Native

Screen.Recording.2024-08-14.at.11.40.42.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-08-14.at.11.30.04.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-08-14.at.11.28.27.PM.mov

MacOS: Desktop

Screen.Recording.2024-08-14.at.11.31.00.PM.mov

allgandalf

Looks good to me, works as expected

mountiny

@nkdengineer can you please rename it to activePolicyID so that matches the nvp key?

mountiny · 2024-08-14T18:36:18Z

src/libs/OptionsListUtils.ts

@@ -359,6 +359,12 @@ Onyx.connect({
    callback: (value) => (allReportsDraft = value),
 });

+let primaryPolicyID: OnyxEntry<string>;


Can we call it activePolicyID as thats how the nvp key is called?

@mountiny I updated.

NAB, but i feel primaryPolicyID is right over here, activePolicyID is the policyID we are on currently

@nkdengineer @allgandalf I realize this is not ideal, but we already call the variables from the NVP_ACTIVE_POLICY_ID as activePolicyID elsewhere so I think we should just keep using that instead of using this term

nkdengineer · 2024-08-14T18:44:17Z

src/libs/OptionsListUtils.ts

+                    return 0;
+                }
+
+                if (option.isPolicyExpenseChat && preferPolicyExpenseChat) {


@mountiny I have a question here: Do we also prefer re-order the other policy expense chat that isn't the active policy ID when we re-order the active policy expense chat.

Actually, I implemented this logic. If we don't want to do that, I can remove this logic.

@mountiny What do you think about my comment above?

src/libs/OptionsListUtils.ts

github-actions · 2024-08-14T18:57:13Z

🧪🧪 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/47437/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/47437/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/47437/NewExpensify.dmg	https://47437.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

trjExpensify · 2024-08-14T19:41:13Z

It's not really working for me reliably on the adhoc build.

2024-08-14_20-38-09.mp4

nkdengineer · 2024-08-14T20:02:34Z

@trjExpensify I can't reproduce this bug. It's late and I'm going to sleep now. Will check again tomorrow.

trjExpensify · 2024-08-14T20:20:46Z

Sounds good!

mountiny · 2024-08-14T21:01:20Z

Posted what I posted in Slack:

you are in focus mode, this is because we only load the pinned or the primary policyID workspace chats in focus mode.
So as you change the active policy to the other workspace, its not showing up because in NewDot you do not have that workspace chat.

Is this core flow for the feature? Are people changing their preferred policy often? this will work once they will load the workspace chat to their NewDot by search or by smartscan that will autoreport onto that workspace chat

nkdengineer · 2024-08-15T03:35:19Z

@mountiny So this isn't a bug from our PR, right?

mountiny · 2024-08-15T06:48:03Z

@nkdengineer its not

allgandalf · 2024-08-15T09:04:10Z

I guess all the problems are solved here, we aren't holding on anything right?

mountiny

Looks good, just need to resolve this thread in Slack https://expensify.slack.com/archives/C01GTK53T8Q/p1723704378019929

trjExpensify · 2024-08-15T12:54:32Z

I think we're good here now?

mountiny

Thanks!

OSBotify · 2024-08-15T13:53:27Z

✋ 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-08-15T18:20:51Z

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

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

OSBotify · 2024-08-19T16:01:55Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.0.21-4 🚀

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

OSBotify · 2024-08-19T16:26:19Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.0.21-4 🚀

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

shawnborton · 2024-08-28T14:22:27Z

I just tried this on my account in production and it's not working. Any ideas?

mountiny · 2024-08-28T15:40:45Z

@shawnborton It is working for me

What is your primary policy?
Does it have a workspace chat? Might be some policy that is not yet migrated

shawnborton · 2024-08-28T15:42:45Z

Ah apologies, I didn't realize this only showed the primary workspace... which my primary workspace is not in newDot

Show primary workspace chat first when creating exepnse

02ef09a

nkdengineer marked this pull request as ready for review August 14, 2024 15:54

nkdengineer requested a review from a team as a code owner August 14, 2024 15:54

melvin-bot bot requested review from allgandalf and removed request for a team August 14, 2024 15:54

nkdengineer mentioned this pull request Aug 14, 2024

[PAID] [CVP] [$250] Always show primary workspace at the top when submitting an expense #46683

Closed

6 tasks

allgandalf approved these changes Aug 14, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny August 14, 2024 18:20

trjExpensify added the Ready To Build label Aug 14, 2024

mountiny assigned nkdengineer Aug 14, 2024

mountiny requested changes Aug 14, 2024

View reviewed changes

rename primaryPolicyID

7f3878b

nkdengineer commented Aug 14, 2024

View reviewed changes

mountiny reviewed Aug 14, 2024

View reviewed changes

src/libs/OptionsListUtils.ts Show resolved Hide resolved

revert change name

caffcd1

merge main

3cf5578

rename variable

38d3d8e

mountiny previously approved these changes Aug 15, 2024

View reviewed changes

only display the active policy expense chat at the top

8836661

nkdengineer dismissed mountiny’s stale review via 8836661 August 15, 2024 10:46

mountiny approved these changes Aug 15, 2024

View reviewed changes

mountiny merged commit 6a9a976 into Expensify:main Aug 15, 2024
16 checks passed

github-actions bot mentioned this pull request Aug 15, 2024

Deploy Checklist: New Expensify 2024-08-15 #47512

Closed

74 tasks

Show primary workspace chat first when creating expense #47437

Show primary workspace chat first when creating expense #47437

Conversation

nkdengineer commented Aug 14, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Aug 14, 2024

allgandalf commented Aug 14, 2024

nkdengineer commented Aug 14, 2024

allgandalf commented Aug 14, 2024

allgandalf commented Aug 14, 2024

nkdengineer commented Aug 14, 2024

nkdengineer commented Aug 14, 2024

allgandalf commented Aug 14, 2024

allgandalf commented Aug 14, 2024

nkdengineer commented Aug 14, 2024

trjExpensify commented Aug 14, 2024

allgandalf commented Aug 14, 2024

allgandalf commented Aug 14, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

allgandalf left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

mountiny Aug 14, 2024

Choose a reason for hiding this comment

This comment was marked as outdated.

nkdengineer Aug 14, 2024

Choose a reason for hiding this comment

allgandalf Aug 14, 2024

Choose a reason for hiding this comment

mountiny Aug 15, 2024

Choose a reason for hiding this comment

nkdengineer Aug 14, 2024

Choose a reason for hiding this comment

nkdengineer Aug 14, 2024

Choose a reason for hiding this comment

nkdengineer Aug 15, 2024

Choose a reason for hiding this comment

github-actions bot commented Aug 14, 2024

trjExpensify commented Aug 14, 2024

nkdengineer commented Aug 14, 2024

trjExpensify commented Aug 14, 2024

mountiny commented Aug 14, 2024

nkdengineer commented Aug 15, 2024

mountiny commented Aug 15, 2024

allgandalf commented Aug 15, 2024

mountiny left a comment

Choose a reason for hiding this comment

trjExpensify commented Aug 15, 2024

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Aug 15, 2024

OSBotify commented Aug 15, 2024

OSBotify commented Aug 19, 2024

OSBotify commented Aug 19, 2024

shawnborton commented Aug 28, 2024

mountiny commented Aug 28, 2024

shawnborton commented Aug 28, 2024

allgandalf commented Aug 14, 2024 •

edited

Loading