🍒 Cherry pick PR #6259 to staging 🍒

[OSBotify]

🍒 Cherry pick #6259 to staging 🍒

[OSBotify]

This pull request has merge conflicts and can not be automatically merged. 😞
Please manually resolve the conflicts, push your changes, and then request another reviewer to review and merge.
Important: There may be conflicts that GitHub is not able to detect, so please carefully review this pull request before approving.

[nickmurray47]

*conflict was in ReimbursementAccountPage, I think I pulled down and merged changes that were not on staging yet

I pulled and merged main with the original PR, but it seems like ../../components/ExpensifyText is still just ../../components/Text on staging so reverted back to ../../components/Text

[marcaaron]

LGTM

[OSBotify]

🚀 Cherry-picked to staging by @marcaaron in version: 1.1.17-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.

[marcaaron]

@nickmurray47 actually I think the URL config change borked stuff. I have double forward slashes when testing staging.

[marcaaron]

Sending a PR now.

[nickmurray47]

Ah crap

[isagoico]

@nickmurray47 @marcaaron We were testing this CP on our side as well - should I hold testing since this be tested internally?

[nickmurray47]

@isagoico yes, I think this will be tested internally.

[nickmurray47]

This passes our sandbox QA on staging @isagoico

[OSBotify]

🚀 Deployed to production by @roryabraham in version: 1.1.17-7 🚀

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