[Free trial] Restrict actions throughout the App of "past due" billing owner #44393

fabioh8010 · 2024-06-25T14:01:14Z

Details

This PR implements the restrict actions logic for the user, admin and owner against a "past due" billing workspace. (Design doc)

Fixed Issues

$ #43674
PROPOSAL:

Tests

Workspace User

Prerequisites

The user must be a member of the workspace you created with another account.
The workspace must have the Approvals workflow enabled.

Add the following code to Expensify.tsx in order to set the Onyx keys during initialisation, where <ownerAccountID> is the account ID of the workspace's owner, and <timestamp> is your current date in Unix timestamp minus some days to simulate that the owner is past due billing (Use https://www.unixtimestamp.com/ to calculate it).

useEffect(() => {
    Onyx.multiSet({
        [`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END}<ownerAccountID>` as const]: {
            name: '',
            permissions: '',
            value: <timestamp>,
        },
        [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: null,
        [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: null,
    });
}, []);

Test steps

Submitting an expense on a Workspace

Click the FAB button > Submit expense.
Choose manual, any amount, and select the workspace.
Assert the Restricted Action screen was open, and the "Chat with your admin" button will redirect you to the Workspace chat.
Go to the Workspace chat, click the composer "+" button > Submit expense.
Assert the Restricted Action screen was open, and the "Chat with your admin" button will redirect you to the Workspace chat.

Tracking an expense on a Workspace

Go to the Workspace chat, click the composer "+" button > Track expense.
Assert the Restricted Action screen was open, and the "Chat with your admin" button will redirect you to the Workspace chat.

Splitting an expense on a Workspace

Click the FAB button > Split expense.
Choose manual, any amount, and select the workspace.
Assert the Restricted Action screen was open, and the "Chat with your admin" button will redirect you to the Workspace chat.
Go to the Workspace chat, click the composer "+" button > Split expense.
Assert the Restricted Action screen was open, and the "Chat with your admin" button will redirect you to the Workspace chat.

Use the following code to reset Onyx data.

useEffect(() => {
    Onyx.multiSet({
        [`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END}<ownerAccountID>` as const]: null,
        [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: null,
        [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: null,
    });
}, []);

Workspace Admin

Prerequisites

Same as Workspace User prerequisites, except that now the user must be a admin of the workspace you created with another account.

Test steps

Submitting an expense on a Workspace

Click the FAB button > Submit expense.
Choose manual, any amount, and select the workspace.
Assert the Restricted Action screen was open, and the "Chat in #admins" button will redirect you to the #admins chat.
Go to the Workspace chat, click the composer "+" button > Submit expense.
Assert the Restricted Action screen was open, and the "Chat in #admins" button will redirect you to the #admins chat.

Tracking an expense on a Workspace

Go to the Workspace chat, click the composer "+" button > Track expense.
Assert the Restricted Action screen was open, and the "Chat in #admins" button will redirect you to the #admins chat.

Splitting an expense on a Workspace

Click the FAB button > Split expense.
Choose manual, any amount, and select the workspace.
Assert the Restricted Action screen was open, and the "Chat in #admins" button will redirect you to the #admins chat.
Go to the Workspace chat, click the composer "+" button > Split expense.
Assert the Restricted Action screen was open, and the "Chat in #admins" button will redirect you to the #admins chat.

Use the following code to reset Onyx data.

useEffect(() => {
    Onyx.multiSet({
        [`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END}<ownerAccountID>` as const]: null,
        [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: null,
        [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: null,
    });
}, []);

Workspace Owner

Prerequisites

The user must be the owner of the workspace.
The workspace must have the Approvals workflow enabled.
The workspace must be configured to submit expenses manually (Go to https://www.expensify.com/ with the account -> Settings -> Workspaces -> Your Workspace -> Reports -> How often expenses submit, change it to Manually).
Using the same user, go to the Workspace chat, submit an expense but don't click "Submit".
Using the same user, go to the Workspace chat again, submit an expense, click "Submit" and approve it.
Using the same user, go to the Workspace chat again and submit an expense without approving.
Add the following code to Expensify.tsx in order to set the Onyx keys during initialisation, where <timestamp> is your current date in Unix timestamp minus some days to simulate that the owner is past due billing (Use https://www.unixtimestamp.com/ to calculate it).
```
useEffect(() => {
    Onyx.multiSet({
        [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: <timestamp>,
        [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: 1000,
    });
}, []);
```

Test steps

Submitting an expense on a Workspace

Refresh the App to ensure the Onyx data is applied.
Click the FAB button > Submit expense.
Choose manual, any amount, and select your workspace.
Assert the Restricted Action screen was open, and the "Add payment card button" button will redirect you to the Subscription screen.
Refresh the App to ensure the Onyx data is applied.
Go to your Workspace chat, click the composer "+" button > Submit expense.
Assert the Restricted Action screen was open, and the "Add payment card button" button will redirect you to the Subscription screen.
Go to the Workspace chat again, look for the expense that has the "Submit" button and click it.
Assert the Restricted Action screen was open, and the "Add payment card button" button will redirect you to the Subscription screen.

Tracking an expense on a Workspace

Refresh the App to ensure the Onyx data is applied.
Go to your Workspace chat, click the composer "+" button > Track expense.
Assert the Restricted Action screen was open, and the "Add payment card button" button will redirect you to the Subscription screen.

Approving an expense on a Workspace

Refresh the App to ensure the Onyx data is applied.
Go to your Workspace chat, look for the expense you created before that is pending approval, approve it.
Assert the Restricted Action screen was open, and the "Add payment card button" button will redirect you to the Subscription screen.

Paying an expense on a Workspace

Refresh the App to ensure the Onyx data is applied.
Go to your Workspace chat, look for the expense you created before that is pending payment, pay it.
Assert the Restricted Action screen was open, and the "Add payment card button" button will redirect you to the Subscription screen.

Splitting an expense on a Workspace

Refresh the App to ensure the Onyx data is applied.
Click the FAB button > Split expense.
Choose manual, any amount, and select your workspace.
Assert the Restricted Action screen was open, and the "Add payment card button" button will redirect you to the Subscription screen.
Refresh the App to ensure the Onyx data is applied.
Go to your Workspace chat, click the composer "+" button > Split expense.
Assert the Restricted Action screen was open, and the "Add payment card button" button will redirect you to the Subscription screen.

Use the following code to reset Onyx data.

useEffect(() => {
    Onyx.multiSet({
        [`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END}<ownerAccountID>` as const]: null,
        [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: null,
        [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: null,
    });
}, []);

Verify that no errors appear in the JS console

Offline tests

Same as above.

QA Steps

Same as above.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

Screen.Recording.2024-06-26.at.19.08.24-compressed.mov

iOS: Native

Screen.Recording.2024-06-26.at.19.37.24-compressed.mov

iOS: mWeb Safari

Screen.Recording.2024-06-26.at.19.44.39-compressed.mov

MacOS: Chrome / Safari

Screen.Recording.2024-06-26.at.19.48.14-compressed.mov

Screen.Recording.2024-06-26.at.19.51.31-compressed.mov

MacOS: Desktop

Screen.Recording.2024-06-26.at.20.51.13-compressed.mov

…ut not the workspace owner

…estrict-actions

melvin-bot · 2024-06-26T20:11:56Z

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

rojiphil · 2024-06-27T05:47:17Z

@fabioh8010 There are merge conflicts here to be resolved. I will continue to review though.

…estrict-actions

fabioh8010 · 2024-06-27T09:21:35Z

@rojiphil Conflicts resolved

rojiphil

@fabioh8010 Thanks for the PR. Code looks good and tests well too.
But I also have left few comments. Please have a look.

rojiphil · 2024-06-27T18:09:12Z

src/pages/RestrictedAction/Workspace/WorkspaceUserRestrictedAction.tsx

@@ -39,7 +38,7 @@ function WorkspaceUserRestrictedAction({policyID}: WorkspaceUserRestrictedAction
        >
            <HeaderWithBackButton
                title={translate('workspace.restrictedAction.restricted')}
-                onBackButtonPress={Navigation.goBack}
+                onBackButtonPress={Navigation.resetToHome}


On returning from the Restricted Actions view for users, why do we need to reset the navigation history? Seems too harsh on the user for no fault of his.

Personally, I would not recommend to reset the navigation history even for Admins and Owner. Also, we reset the navigation history when we guide the user/admin/owner to the appropriate report.

Also, for the scenario of manual/split request, I think the user would expect to go back to the participant selection page instead of abruptly ending the request. no?

Is this all intentional/agreed upon somewhere? Maybe I am missing something here.

If I keep the previous behavior this is what happens on mobile for example:

Screen.Recording.2024-06-28.at.14.22.20-compressed.mov

FAB -> Submit expense -> Restricted Action -> Workspace chat

If I go back on the workspace chat I will return to the restricted action, which i don't think it makes much sense. I'm not familiar with the navigation system so that's why I'm resetting like this, do you have any thoughts about the flow with goBack vs resetToHome?

I think the comment here may solve this problem.

src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx

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

rojiphil · 2024-06-27T18:56:39Z

@chiragsalian I notice that we do not restrict submit action for users whereas we restrict approve and pay. And I also do not find any reference to this in the design document.
Is this intentionally omitted or did we miss this?

44393-submit-issue.mp4

rojiphil · 2024-06-27T19:12:38Z

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

MacOS: Chrome / Safari

44393-web-safari-all-002.mp4

MacOS: Desktop

44393-desktop-admin-001.mp4

Android: Native

44393-android-native-admin-001.mp4

44393-android-native-owner-001.mp4

44393-android-native-user-001.mp4

Android: mWeb Chrome

44390-mweb-chrome-001.mp4

iOS: Native

44393-ios-native-admin-002.mp4

44393-ios-native-owner-001.mp4

iOS: mWeb Safari

44393-mweb-safari-user-001.mp4

chiragsalian · 2024-06-27T21:15:11Z

@chiragsalian I notice that we do not restrict submit action for users whereas we restrict approve and pay. And I also do not find any reference to this in the design document.

From the design doc, these are the actions that we'll have to restrict,

Submitting a request on a workspace.
Tracking an expense on a workspace.
Approving a request on a workspace.
Paying a request on a workspace.
Splitting an expense on a workspace.

But i see fabio included these in his test steps. I see he tests for submitting a request. Did you test the same steps and they did not work for you or did you mean something else? I'm wondering if there was some edge case you might have noticed. In your video was that the workspace owner or admin?

rojiphil · 2024-06-28T05:10:07Z

But i see fabio included these in his test steps. I see he tests for submitting a request. Did you test the same steps and they did not work for you or did you mean something else? I'm wondering if there was some edge case you might have noticed. In your video was that the workspace owner or admin?

@chiragsalian Hmm... Looks like we use the same term to describe two actions which is causing confusion. We use the same term while, a) Initiating a Submit Expense via FAB/Workspace menu and, b) Submitting an expense via Report Action button for further processing. Anyway, I am referring to the functionality of submitting an expense via report action as shown below. This is applicable for all users i.e. employee,admin,owner. Since we do not have any reference to this in the design document, I just wanted to reconfirm if this was intentionally left out.

rojiphil · 2024-06-28T05:14:45Z

@fabioh8010 I was unable to test the workspace chat scenarios for workspace owner as the workspace chat itself do not show up. But I do get the workspace chat for admin though. What am I missing here?

fabioh8010 · 2024-06-28T14:00:43Z

@chiragsalian Hmm... Looks like we use the same term to describe two actions which is causing confusion. We use the same term while, a) Initiating a Submit Expense via FAB/Workspace menu and, b) Submitting an expense via Report Action button for further processing. Anyway, I am referring to the functionality of submitting an expense via report action as shown below. This is applicable for all users i.e. employee,admin,owner. Since we do not have any reference to this in the design document, I just wanted to reconfirm if this was intentionally left out.

I will wait on this discussion as I don't really know if this case should be covered by the restriction.

@fabioh8010 I was unable to test the workspace chat scenarios for workspace owner as the workspace chat itself do not show up. But I do get the workspace chat for admin though. What am I missing here?

@rojiphil I'm not sure if I understood, could you elaborate more? Did you try my test steps?

chiragsalian · 2024-06-28T19:27:06Z

@chiragsalian Hmm... Looks like we use the same term to describe two actions which is causing confusion. We use the same term while, a) Initiating a Submit Expense via FAB/Workspace menu and, b) Submitting an expense via Report Action button for further processing. Anyway, I am referring to the functionality of submitting an expense via report action as shown below. This is applicable for all users i.e. employee,admin,owner. Since we do not have any reference to this in the design document, I just wanted to reconfirm if this was intentionally left out.

I will wait on this discussion as I don't really know if this case should be covered by the restriction.

Yeah i think we should add a restriction for submitting an expense via a report action as well. Basically submitting an expense anywhere should be restricted. @MitchExpensify can you double check and confirm as well.

rojiphil · 2024-06-28T19:54:46Z

src/pages/RestrictedAction/Workspace/WorkspaceUserRestrictedAction.tsx

@@ -28,7 +27,7 @@ function WorkspaceUserRestrictedAction({policyID}: WorkspaceUserRestrictedAction

    const openPolicyExpenseReport = useCallback(() => {
        const reportID = ReportUtils.findPolicyExpenseChatByPolicyID(policyID)?.reportID ?? '-1';
-        Report.openReport(reportID);
+        // Navigation.resetToHome();


Got it. I think the following may solve our problem. Can you also please test this out?

Suggested change

// Navigation.resetToHome();

Navigation.closeRHPFlow();

44393-back-issue.mp4

src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx

trjExpensify · 2024-07-01T11:05:39Z

Yeah i think we should add a restriction for submitting an expense via a report action as well. Basically submitting an expense anywhere should be restricted. @MitchExpensify can you double check and confirm as well.

Yes, they should be restricted from submitting an expense report everywhere, so via a report action as well. 👍

fabioh8010 · 2024-07-01T11:12:34Z

@rojiphil Addressed the comments about the navigation and tested, looks better I think, please have a look!

@rojiphil @chiragsalian @MitchExpensify @trjExpensify Also addressed the submit action and now we are restricting it too.

rojiphil

@fabioh8010 Thanks for the changes. Code looks good and tests well too. We are almost there for PR approval. And the checklist is also almost done.

Pending work is to resolve the merge conflicts. Once resolved, will verify the outcome again.
Please add the test steps for submitting expense via report action.

rojiphil · 2024-07-01T19:14:36Z

@fabioh8010 I was unable to test the workspace chat scenarios for workspace owner as the workspace chat itself do not show up. But I do get the workspace chat for admin though. What am I missing here?

@rojiphil I'm not sure if I understood, could you elaborate more? Did you try my test steps?

Specific to your test videos, I am referring to the workspace equivalent to My Past Due Workspace for workspace owner. What am I missing to get such a workspace?

And specific to the test steps, I am unable to test scenarios on a workspace i.e. Submitting/Tracking/Splitting an expense on a workspace for Workspace Owner

fabioh8010 · 2024-07-02T08:35:54Z

@rojiphil I resolved the conflicts and updated test steps, please have another look.

Regarding the Workspace Owner tests, please follow the instructions I put and try using this code instead.

useEffect(() => {
    Onyx.multiSet({
        [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: 1719818912,
        [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: 1000,
    });
}, []);

Also, please note that we've renamed NVP_PRIVATE_AMOUNT_OWNED to NVP_PRIVATE_AMOUNT_OWED, it was wrong before.

rojiphil

Thanks @fabioh8010 . Tests well and completed checklist.
I still could not get the workspace chat for workspace owner though. But I think that’s fine since I have tested the workspace chat for workspace admin.
@chiragsalian. All yours.

chiragsalian

Code LGTM.

OSBotify · 2024-07-02T17:47:32Z

✋ 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-07-03T20:01:51Z

🚀 Deployed to staging by https://github.com/chiragsalian in version: 9.0.4-0 🚀

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

OSBotify · 2024-07-04T22:14:18Z

🚀 Cherry-picked to staging by https://github.com/tgolen in version: 9.0.4-5 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

kavimuru · 2024-07-05T02:10:37Z

@fabioh8010 Where do we run the scripts and how to run this step

Add the following code to Expensify.tsx in order to set the Onyx keys during initialisation, where is your current date in Unix timestamp minus some days to simulate that the owner is past due billing (Use https://www.unixtimestamp.com/ to calculate it).

fabioh8010 · 2024-07-05T09:45:17Z

@kavimuru You must add the useEffect() code right after the last useEffect() you can find in src/Expensify.tsx. For example:

function Expensify({
    isCheckingPublicRoom = true,
    session,
    updateAvailable,
    isSidebarLoaded = false,
    screenShareRequest,
    updateRequired = false,
    focusModeNotification = false,
    lastVisitedPath,
}: ExpensifyProps) {
    ...
    // This is being done since we want to play sound even when iOS device is on silent mode, to align with other platforms.
    useEffect(() => {
        Audio.setAudioModeAsync({playsInSilentModeIOS: true});
    }, []);

    // Add the useEffect() here. <----------------------------------------

    // Display a blank page until the onyx migration completes
    if (!isOnyxMigrated) {
        return null;
    }

    if (updateRequired) {
        throw new Error(CONST.ERROR.UPDATE_REQUIRED);
    }

    return (
    ...
}

kavimuru · 2024-07-05T10:44:00Z

@trjExpensify @MitchExpensify @fabioh8010 Do we run these scripts in the console? Could you help us?

rojiphil · 2024-07-05T10:53:32Z

Do we run these scripts in the console? Could you help us?

No. These changes are in the code.

@fabioh8010 We have to provide Onyx updates for the QA to test this via Inspect Console.

chiragsalian · 2024-07-05T17:31:58Z

Oops yeah i missed this in test steps.
@kavimuru, for the Prerequisites step you should run,

First get ownerAccountID. You can get this by logging into the policy owner, and then in chrome debugging tools go to application -> Storage -> Indexed DB -> Onyx db -> keyvaluepairs to see onyx data. Search for userMetaData -> accountID.
Then in console run,

Onyx.merge("sharedNVP_private_billingGracePeriodEnd_<ownerAccountID>", {"name": "private_billingGracePeriodEnd", "permissions": "read", "value": <yesterdays epoch timestamp>});
Onyx.merge("nvp_private_billingGracePeriodEnd", null);
Onyx.merge("nvp_private_amountOwed", null);

To reset Onyx data,

Onyx.merge("sharedNVP_private_billingGracePeriodEnd_<ownerAccountID>", null);
Onyx.merge("nvp_private_billingGracePeriodEnd", null);
Onyx.merge("nvp_private_amountOwed", null);

Workspace Owner, prerequisites,

Onyx.merge("nvp_private_billingGracePeriodEnd", <yesterdays epoch timestamp>);
Onyx.merge("nvp_private_amountOwed", 1000);

kavimuru · 2024-07-05T20:15:19Z

@chiragsalian QA team is finding difficulty validating this PR. It would be great if this PR could be validated internally. Thanks!

chiragsalian · 2024-07-05T21:16:54Z

Sure, @fabioh8010 or @rojiphil would you guys be able to test this on staging? If not let me know and I'll test it out.

rojiphil · 2024-07-06T06:36:19Z

Sure, @fabioh8010 or @rojiphil would you guys be able to test this on staging? If not let me know and I'll test it out.

Works well on staging.

44393-web-safari-staging-01.mp4

44393-mweb-chrome-staging-01.mp4

OSBotify · 2024-07-10T11:01:17Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.0.5-13 🚀

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

OSBotify · 2024-07-15T20:20:50Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.6-8 🚀

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

fabioh8010 added 9 commits June 25, 2024 15:00

Restrict actions throughout the App

a9907d0

Merge branch 'main' into feature/free-trials/restrict-actions

efc3742

Fix billing banner pre-trial subtitle link text

e7f3c92

Fix AttachmentPicker logic to dont include Invoice option to restrict

101925e

Fix shouldRestrictUserBillableActions() logic when user is past due b…

05d214f

…ut not the workspace owner

Improve Restricted Action screen navigation

3c13487

Restrict actions on FAB quick actions

e4b609e

Merge remote-tracking branch 'origin/main' into feature/free-trials/r…

f040c49

…estrict-actions

Fix lint and prettier

ca58a72

fabioh8010 changed the title ~~[WIP] [Free trial] Restrict actions throughout the App of "past due" billing owner~~ [Free trial] Restrict actions throughout the App of "past due" billing owner Jun 26, 2024

fabioh8010 marked this pull request as ready for review June 26, 2024 20:11

fabioh8010 requested a review from a team as a code owner June 26, 2024 20:11

melvin-bot bot requested review from rojiphil and removed request for a team June 26, 2024 20:11

chiragsalian self-requested a review June 26, 2024 20:56

Merge remote-tracking branch 'origin/main' into feature/free-trials/r…

7353e51

…estrict-actions

rojiphil reviewed Jun 27, 2024

View reviewed changes

Merge branch 'main' into feature/free-trials/restrict-actions

a7b34f3

Address comments

acab549

rojiphil reviewed Jun 28, 2024

View reviewed changes

fabioh8010 added 2 commits July 1, 2024 11:17

Merge branch 'main' into feature/free-trials/restrict-actions

8f708d8

Fix workspace restricted action navigations

45cffc0

Restrict submit action

43fbc5a

This comment was marked as outdated.

Sign in to view

rojiphil reviewed Jul 1, 2024

View reviewed changes

Merge branch 'main' into feature/free-trials/restrict-actions

380ab09

rojiphil approved these changes Jul 2, 2024

View reviewed changes

chiragsalian approved these changes Jul 2, 2024

View reviewed changes

chiragsalian merged commit 22bcc98 into Expensify:main Jul 2, 2024
15 checks passed

github-actions bot mentioned this pull request Jul 3, 2024

Deploy Checklist: New Expensify 2024-07-03 #44782

Closed

This comment was marked as off-topic.

Sign in to view

rojiphil mentioned this pull request Jul 9, 2024

[Free trial] Implement and show Trial Ended banner, Expensify DM GBR and custom Expensify DM chat item in the App after Free Trial ends #44483

Merged

48 tasks

melvin-bot bot mentioned this pull request Jul 10, 2024

[HOLD for payment 2024-07-17] [$750] [Free trial] Restrict actions throughout the App of "past due" billing owner #43674

Closed

[Free trial] Restrict actions throughout the App of "past due" billing owner #44393

[Free trial] Restrict actions throughout the App of "past due" billing owner #44393

Conversation

fabioh8010 commented Jun 25, 2024 • edited Loading

Details

Fixed Issues

Tests

Workspace User

Workspace Admin

Workspace Owner

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 26, 2024

rojiphil commented Jun 27, 2024

fabioh8010 commented Jun 27, 2024

rojiphil left a comment

Choose a reason for hiding this comment

rojiphil Jun 27, 2024 • edited Loading

Choose a reason for hiding this comment

fabioh8010 Jun 28, 2024

Choose a reason for hiding this comment

rojiphil Jun 29, 2024

Choose a reason for hiding this comment

rojiphil commented Jun 27, 2024 • edited Loading

rojiphil commented Jun 27, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

chiragsalian commented Jun 27, 2024

rojiphil commented Jun 28, 2024

rojiphil commented Jun 28, 2024

fabioh8010 commented Jun 28, 2024

chiragsalian commented Jun 28, 2024

rojiphil Jun 28, 2024

Choose a reason for hiding this comment

trjExpensify commented Jul 1, 2024

fabioh8010 commented Jul 1, 2024

This comment was marked as outdated.

rojiphil left a comment

Choose a reason for hiding this comment

rojiphil commented Jul 1, 2024 • edited Loading

fabioh8010 commented Jul 2, 2024

rojiphil left a comment

Choose a reason for hiding this comment

chiragsalian left a comment

Choose a reason for hiding this comment

OSBotify commented Jul 2, 2024

OSBotify commented Jul 3, 2024

OSBotify commented Jul 4, 2024

kavimuru commented Jul 5, 2024

fabioh8010 commented Jul 5, 2024

kavimuru commented Jul 5, 2024

This comment was marked as off-topic.

rojiphil commented Jul 5, 2024

chiragsalian commented Jul 5, 2024

kavimuru commented Jul 5, 2024

chiragsalian commented Jul 5, 2024

rojiphil commented Jul 6, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 15, 2024

fabioh8010 commented Jun 25, 2024 •

edited

Loading

rojiphil Jun 27, 2024 •

edited

Loading

rojiphil commented Jun 27, 2024 •

edited

Loading

rojiphil commented Jun 27, 2024 •

edited

Loading

rojiphil commented Jul 1, 2024 •

edited

Loading