Skip to content

Scroll New rule to a refused rule so the keyboard doesn't cover it - #105457

Merged
mollfpr merged 1 commit into
mainfrom
yuwen-105449-scrollToRefusal
Nov 4, 2026
Merged

mollfpr merged 1 commit into
mainfrom
yuwen-105449-scrollToRefusal

Conversation

@yuwenmemon

@yuwenmemon yuwenmemon commented Oct 30, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

When Concierge refuses a description on New rule, the reason, the suggested description and the Create anyway and Use suggestion buttons show below the describe box. On iOS and Android the keyboard stays open after Next, so all of it sits under the keyboard until the admin scrolls.

The form now scrolls to its end when a refusal arrives. The scroll waits for the keyboard animation and stops at the end of the content, so the box stays in view above the refusal when it fits. The keyboard stays open, so the admin can still edit the description.

The rule editors' Describe modal uses the same form without a scroll view, so nothing changes there.

Fixed Issues

$ #105449
PROPOSAL: N/A

Tests

  1. With the describeRule beta on, open a Control workspace > Rules > Add rule on iOS or Android.
  2. Tap the describe box, enter "Text the approver's phone whenever a report is submitted", and tap Next with the keyboard still open.
  3. Verify the page scrolls so that the reason, the quoted suggestion, Create anyway and Use suggestion all show above the keyboard.
  4. Tap the describe box again and verify the page scrolls back to it.
  5. Close New rule, open Add rule > Restrict card spend, tap Describe, and describe the same rule. Verify the modal shows the refusal and doesn't jump.
Force a refusal against the dev VM

The VM's answer depends on its model and RuleBot vocabulary. Paste this in the console before step 2 to turn the next answer into a refusal:

const refusal = {state: 'impossible', reason: 'noCapability', explanation: "Agents can't send text messages.", suggestedPrompt: 'When a report is submitted, send the approver a direct message notifying them.'};
let isPending = true;
const swap = (value) => (isPending && value?.generationID && value.state ? ((isPending = false), {generationID: value.generationID, ...refusal}) : value);
const {set, merge, update} = Onyx;
Onyx.set = (key, value) => set(key, key === 'generatedRule' ? swap(value) : value);
Onyx.merge = (key, value) => merge(key, key === 'generatedRule' ? swap(value) : value);
Onyx.update = (updates) => update(updates.map((item) => (item.key === 'generatedRule' ? {...item, value: swap(item.value)} : item)));
  • Verify that no errors appear in the JS console

Offline tests

N/A. Describing a rule needs a connection, so no refusal arrives offline.

QA Steps

Same as tests, on staging, where Concierge refuses the description in step 2.

  • 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 verified any copy / text that was added to the app 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)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • 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)
  • 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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

@yuwenmemon
yuwenmemon requested a review from a team as a code owner October 30, 2026 06:20
@yuwenmemon
yuwenmemon requested a review from a team as a code owner October 30, 2026 06:20
@melvin-bot
melvin-bot Bot requested a review from hoangzinh October 30, 2026 06:20
@melvin-bot

melvin-bot Bot commented Oct 30, 2026

Copy link
Copy Markdown

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

@melvin-bot
melvin-bot Bot requested review from trjExpensify and removed request for a team October 30, 2026 06:20
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 30, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-30T06:34:10.208255Z 31b2725 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@hoangzinh

hoangzinh commented Oct 30, 2026 •

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
  • 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 any copy / text that was added to the app 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)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • 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)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • 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
    • 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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
Screen.Recording.2026-10-30.at.22.07.55.mov
Android: mWeb Chrome
Screen.Recording.2026-10-30.at.21.57.19.mov
iOS: HybridApp
Screen.Recording.2026-11-04.at.14.58.25.mov
iOS: mWeb Safari
Screen.Recording.2026-10-30.at.22.02.28.mov
MacOS: Chrome / Safari
Screen.Recording.2026-10-30.at.21.55.52.mov

@hoangzinh

Copy link
Copy Markdown
Contributor

@yuwenmemon it seems you haven't completed "PR Author Checklist"

@trjExpensify trjExpensify left a comment

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.

Would be great to have some videos included! :)

@hoangzinh

Copy link
Copy Markdown
Contributor

@trjExpensify, you can check my recordings in the meantime. I still need some time for iOS build, but it should work the same as Android.

@trjExpensify

Copy link
Copy Markdown
Contributor

Thanks. There looks like there's a bit of a jump on Android. It stops here before fully opening
image

@yuwenmemon

Copy link
Copy Markdown
Contributor Author

@hoangzinh I can create an ad hoc build if that's easier

@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@hoangzinh

Copy link
Copy Markdown
Contributor

Thanks. There looks like there's a bit of a jump on Android. It stops here before fully opening

It's reproducible in the current main branch as well. @yuwenmemon, will you fix this bug in this PR or in another follow-up PR?

@yuwenmemon

Copy link
Copy Markdown
Contributor Author

Yeah we can do so as a follow-up

@yuwenmemon

Copy link
Copy Markdown
Contributor Author

Issue created (with PR) @hoangzinh, could you help me test the Android ad hoc build there?

@hoangzinh

Copy link
Copy Markdown
Contributor

Issue created (with PR) @hoangzinh, could you help me test the Android ad hoc build there?

sure, @yuwenmemon

@hoangzinh hoangzinh left a comment

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.

🚢

@melvin-bot
melvin-bot Bot requested a review from mollfpr November 4, 2026 08:00
@melvin-bot

melvin-bot Bot commented Nov 4, 2026

Copy link
Copy Markdown

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

@hoangzinh

Copy link
Copy Markdown
Contributor

Issue created (with PR) @hoangzinh, could you help me test the Android ad hoc build there?

@trjExpensify, given that the new issue you found above will be fixed in another issue. Can you help with another review round for the original issue that we're trying to fix in this PR? TY

@trjExpensify trjExpensify left a comment

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.

Yep 👍

@mollfpr
mollfpr merged commit 4a24aae into main Nov 4, 2026
52 of 56 checks passed
@mollfpr
mollfpr deleted the yuwen-105449-scrollToRefusal branch November 4, 2026 14:56
@github-actions

github-actions Bot commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Nov 4, 2026

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

github-actions Bot commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

@OSBotify OSBotify mentioned this pull request Nov 4, 2026
88 tasks done
@OSBotify

OSBotify commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mollfpr in version: 9.5.32-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No FullStory changes needed. This PR only fixes scrolling so the keyboard no longer covers existing rule-refusal messages and buttons.

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed. This PR only fixes scrolling to keep existing refusal messages and buttons visible above the keyboard; it does not change a workflow or make existing instructions incorrect.

@jponikarchuk

Copy link
Copy Markdown

This PR failing because of the issue #106059
This issue is reproducible in: Android and iOS app

@hoangzinh

Copy link
Copy Markdown
Contributor

This PR failing because of the issue #106059 This issue is reproducible in: Android and iOS app

I think it's another issue 👀.

@OSBotify

OSBotify commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/lakchote in version: 9.5.32-7 🚀

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

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants