Skip to content
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.

Sign up for GitHub

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 LHN - Click and long pressing a user report with lots of messages opens popover inside report #27904

Closed
wants to merge 7 commits into from
Closed

Fix LHN - Click and long pressing a user report with lots of messages opens popover inside report #27904

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
95f187e
fix: left hand navigation row opens modal in wrong screen
redpanda-bit Sep 13, 2023
719964d
test: add useFocusEffect to navigation mock
redpanda-bit Sep 20, 2023
cc87d7e
refactor: use hook instead of HOC for useWindowDimensions
redpanda-bit Sep 21, 2023
3ce5f60
fix: use isSmallScreenWidth inside longpress callback instead of useF…
redpanda-bit Sep 22, 2023
3dac180
fix: eslint rule no conditional hooks OptioRowLHN
redpanda-bit Sep 28, 2023
d2783d2
Merge branch 'main' into fix/hold-to-show-popover-wrong-screen
redpanda-bit Sep 28, 2023
654aaa0
Merge branch 'Expensify:main' into fix/hold-to-show-popover-wrong-screen
redpanda-bit Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions src/components/LHNOptionsList/OptionRowLHN.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,15 @@ function OptionRowLHN(props) {
const optionItem = props.optionItem;
const [isContextMenuActive, setIsContextMenuActive] = useState(false);

useFocusEffect(
useCallback(() => {
isFocusedRef.current = true;
return () => {
isFocusedRef.current = false;
};
}, []),
);

if (!optionItem) {
return null;
}
Expand Down Expand Up @@ -106,19 +115,8 @@ function OptionRowLHN(props) {
const hasBrickError = optionItem.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
const defaultSubscriptSize = optionItem.isExpenseRequest ? CONST.AVATAR_SIZE.SMALL_NORMAL : CONST.AVATAR_SIZE.DEFAULT;
const shouldShowGreenDotIndicator =
!hasBrickError &&
(optionItem.isUnreadWithMention ||
ReportUtils.isWaitingForIOUActionFromCurrentUser(optionItem) ||
(optionItem.isTaskReport && optionItem.isTaskAssignee && !optionItem.isCompletedTaskReport && !optionItem.isArchivedRoom));
!hasBrickError && (optionItem.isUnreadWithMention || optionItem.isWaitingForTaskCompleteFromAssignee || ReportUtils.isWaitingForIOUActionFromCurrentUser(optionItem));
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I did not introduced these changes! Is this normal on a merge workflow? This doesn't happen in rebase workflows.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, I imagine something got messes up with the re-push. I'd recommend just moving your changes to a new branch fresh from main

Copy link
Contributor Author

Choose a reason for hiding this comment

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

😞 a lot of learnings, I tell you. Here is the new branch: https://github.com/redpanda-bit/Expensify-App/tree/fix/popover-showing.

Copy link
Contributor

Choose a reason for hiding this comment

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

At this point, I think you can just create a PR for that branch and we'll close this one

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Here is the new PR: #28614.


useFocusEffect(
useCallback(() => {
isFocusedRef.current = true;
return () => {
isFocusedRef.current = false;
};
}, []),
);
/**
* Show the ReportActionContextMenu modal popover.
*
Expand Down Expand Up @@ -195,6 +193,7 @@ function OptionRowLHN(props) {
]}
accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
accessibilityLabel={translate('accessibilityHints.navigatesToChat')}
needsOffscreenAlphaCompositing={props.optionItem.icons.length >= 2}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same here.

>
<View style={sidebarInnerRowStyle}>
<View style={[styles.flexRow, styles.alignItemsCenter]}>
Expand Down