Skip to content

Replace FullscreenLoadingIndicator with ActivityIndicator in WorkspaceOwnerChangeWrapperPage#88741

Merged
Julesssss merged 4 commits into
mainfrom
claude-useActivityIndicatorInWorkspaceOwnerChange
May 15, 2026
Merged

Replace FullscreenLoadingIndicator with ActivityIndicator in WorkspaceOwnerChangeWrapperPage#88741
Julesssss merged 4 commits into
mainfrom
claude-useActivityIndicatorInWorkspaceOwnerChange

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Apr 24, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

As part of the loading indicator standardization (#69850), WorkspaceOwnerChangeWrapperPage uses FullscreenLoadingIndicator alongside a HeaderWithBackButton. Once shouldUseGoBackButton is enabled by default, users would see two back controls. This replaces FullscreenLoadingIndicator with an ActivityIndicator wrapped in a View that reproduces the exact same layout and background styling (StyleSheet.absoluteFill, fullScreenLoading, w100), so the loading state is visually identical but without the Go Back button capability.

Fixed Issues

$ #85393

Tests

  1. Open the app and navigate to a workspace where you are the owner
  2. Go to Settings > Workspaces > [Workspace] > Members
  3. Select a member and tap Transfer ownership
  4. Observe the loading indicator appears centered with the correct background styling while the ownership change request is in progress
  5. Verify there is only one back button (the header back button) and no additional "Go Back" button on the loading screen
  6. Verify no errors appear in the JS console
  • Verify that no errors appear in the JS console

Offline tests

  1. Disconnect from the network
  2. Attempt the transfer ownership flow
  3. Verify the loading state still renders correctly without errors

QA Steps

Precondition:

  • User A is an admin and User B is the owner of the workspace
  • In native app, User A must have a payment card on the Subscription page
  1. Login as User A
  2. Go to the workspace list page
  3. Click the three dots menu
  4. Verify that the Transfer owner option is available
  5. Click the Transfer owner option
  6. Verify that everything works correctly (loading indicator appears centered, only one back button, no errors)
  7. Do the same with the Transfer owner option in the workspace overview page
  8. Verify no errors appear in the JS console
  • Verify that no errors appear in the JS console

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
  • 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 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 used JaimeGPT to get English > Spanish translation. I then posted it 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 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 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.ts 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • 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

MelvinBot and others added 2 commits April 24, 2026 18:00
…eOwnerChangeWrapperPage

The workspace owner change flow screen has a HeaderWithBackButton, so using
FullscreenLoadingIndicator would show duplicate back controls once
shouldUseGoBackButton is enabled by default. Replace it with an ActivityIndicator
wrapped in a View that reproduces the same layout and background styling
(absoluteFillObject, fullScreenLoading, w100).

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
@codecov

codecov Bot commented Apr 24, 2026

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
...kspace/members/WorkspaceOwnerChangeWrapperPage.tsx 0.00% <0.00%> (ø)
... and 11 files with indirect coverage changes

@situchan

Copy link
Copy Markdown
Contributor

@MelvinBot add Tests/QA Steps and check off all items in author checklist as verified by me

@MelvinBot

Copy link
Copy Markdown
Contributor Author

Updated the PR body with Tests/QA Steps and checked off all author checklist items as verified by situchan.

<View style={[styles.containerWithSpaceBetween, error !== CONST.POLICY.OWNERSHIP_ERRORS.NO_BILLING_CARD ? styles.ph5 : styles.ph0, styles.pb0]}>
{isLoading && <FullScreenLoadingIndicator reasonAttributes={reasonAttributes} />}
{isLoading && (
<View style={[StyleSheet.absoluteFill, styles.fullScreenLoading, styles.w100]}>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MelvinBot remove styles.w100 if redundant. And pull main

MelvinBot and others added 2 commits May 14, 2026 14:04
StyleSheet.absoluteFill already provides full width via left: 0 and right: 0,
making styles.w100 unnecessary.

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
…icatorInWorkspaceOwnerChange

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor Author

Removed redundant styles.w100 (StyleSheet.absoluteFill already provides full width via left: 0 + right: 0) and merged main.

@situchan

Copy link
Copy Markdown
Contributor

@MelvinBot mark as ready for review

@MelvinBot MelvinBot marked this pull request as ready for review May 14, 2026 14:07
@MelvinBot MelvinBot requested a review from a team as a code owner May 14, 2026 14:07
@melvin-bot melvin-bot Bot requested review from trjExpensify and removed request for a team May 14, 2026 14:07
@MelvinBot

Copy link
Copy Markdown
Contributor Author

Marked this PR as ready for review as requested by situchan.

@situchan

Copy link
Copy Markdown
Contributor

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • 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 there are no new alerts related to the canBeMissing param for useOnyx
  • 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 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.ts 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.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • 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: HybridApp
Android: mWeb Chrome
iOS: HybridApp ios
iOS: mWeb Safari
MacOS: Chrome / Safari web

@melvin-bot melvin-bot Bot requested a review from Julesssss May 14, 2026 14:13
Comment thread src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx
@trjExpensify trjExpensify removed their request for review May 15, 2026 00:59
@trjExpensify

Copy link
Copy Markdown
Contributor

PR doesn’t need product input as a refactor PR. Unassigning and unsubscribing myself.

@Julesssss Julesssss merged commit 732ac22 into main May 15, 2026
58 checks passed
@Julesssss Julesssss deleted the claude-useActivityIndicatorInWorkspaceOwnerChange branch May 15, 2026 17:24
@melvin-bot melvin-bot Bot added the Emergency label May 15, 2026
@melvin-bot

melvin-bot Bot commented May 15, 2026

Copy link
Copy Markdown

@Julesssss looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@OSBotify

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@github-actions

Copy link
Copy Markdown
Contributor

🚧 @Julesssss has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.3.75-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor Author

No help site changes are required for this PR.

This is a purely internal UI refactor that replaces FullscreenLoadingIndicator with ActivityIndicator in the workspace ownership transfer loading screen to avoid a duplicate back button. It does not change any user-facing workflow, feature names, button labels, or functionality.

@IuliiaHerets

IuliiaHerets commented May 16, 2026

Copy link
Copy Markdown

There is no "Transfer Ownership" button when the owner selects another member. Which preconditions should we follow?

cc @Julesssss @Expensify/pullerbear @situchan

Web-No-Transfer-Ownership-button.1.mp4

@situchan

situchan commented May 17, 2026

Copy link
Copy Markdown
Contributor

@IuliiaHerets Please try this: (referenced from #67989 which added this feature)

Precondition:

  • User A is admin and user B is the owner of the workspace
  • In native app user A must have a payment card on the Subscription page
  1. Login as User A
  2. Go to workspace list page
  3. Click to the three dots
  4. Verify that: we have Transfer owner option
  5. Click to this option
  6. Verify that: everything works well
  7. Do the same with the Transfer owner option in workspace overview page

@MelvinBot update QA Steps. Not workspace owner but admin should see transfer option.

@MelvinBot

Copy link
Copy Markdown
Contributor Author

Updated the QA Steps to clarify that User A should be an admin (not the workspace owner). The steps now include the preconditions and flow from situchan's comment.

@IuliiaHerets

Copy link
Copy Markdown

Does this PR apply to Native apps?
QA team can't see the Transfer Owner option here

cc @situchan @Julesssss

ScreenRecording_05-18-2026.12-51-49_1.MP4

@situchan

Copy link
Copy Markdown
Contributor

In native app user A must have a payment card on the Subscription page

@IuliiaHerets this is precondition but feel free to check off if web test is fine.

@Julesssss

Copy link
Copy Markdown
Contributor

@Julesssss looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

I don't remember which hadn't completed, but it was a minor safe change

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.75-14 🚀

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

Bundle Size Analysis (Sentry):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants