-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix filter based on reportField.disabledOptions #38958
Conversation
Reviewer Checklist
Screenshots/VideosAndroid: NativeAndroid: mWeb ChromeiOS: NativeiOS: mWeb SafariMacOS: Desktop |
@@ -89,7 +89,7 @@ function EditReportFieldDropdownPage({fieldName, onSubmit, fieldKey, fieldValue, | |||
}); | |||
} | |||
|
|||
const filteredRecentlyUsedOptions = recentlyUsedOptions.filter((option) => option !== selectedValue); | |||
const filteredRecentlyUsedOptions = recentlyUsedOptions.filter((option) => option !== selectedValue && fieldOptions.includes(option)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We shouldn't show options that are not available in "Recent"
Update: @GandalfGwaihir found that we still had a bug where we could offer a disabled option in the "Recents" list. Added a fix for that too. |
@amyevans this should be ready for review again, thanks |
Cool, I'll test locally as well |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! 🥂
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
Fix filter based on reportField.disabledOptions (cherry picked from commit b6d2c59)
QA passed: Testing accounts: [email protected], [email protected] |
🚀 Cherry-picked to staging by https://github.com/yuwenmemon in version: 1.4.56-5 🚀
@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes. |
🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.4.56-8 🚀
|
The filter was wrong and it was checking if the elements in
reportField.values
were not insidereportField.disabledOptions
, and instead we should just used the index to see if the same position insidereportField.disabledOptions
wastrue
or not.Sample
reportField.disabledOptions
:[false, false, true]
Details
Fixed Issues
$ #38898
PROPOSAL: #38898 (comment)
Tests
Offline tests
N/A
QA Steps
PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)myBool && <MyComponent />
.src/languages/*
files and using the translation methodSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)Design
label and/or tagged@Expensify/design
so the design team can review the changes.ScrollView
component to make it scrollable when more elements are added to the page.main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop