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

Jump to bottom

X2-8266 | Cannot Decline Reservation through the Notifications Tab #295

Closed
wants to merge 4 commits into from
Closed

X2-8266 | Cannot Decline Reservation through the Notifications Tab #295

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca600f4
X2-8266 | Cannot Decline Reservation through the Notifications Tab
VitalyDevico Dec 18, 2023
5839b5b
Merge branch 'master' into X2-8266
VitalyDevico Dec 18, 2023
04cfef0
resolved PR comments
VitalyDevico Dec 19, 2023
5f45d8c
Merge branch 'master' into X2-8266
VitalyDevico Dec 21, 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
13 changes: 10 additions & 3 deletions src/components/Sidebar/Sidebar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,20 @@ export const Sidebar = ({
onLogoClick,
isStickyHeader = true,
isStickyFooter = true,
shouldCloseOnRouteChange = true,
}) => {
const [isLeftDrawerOpen, setIsLeftDrawerOpen] = useState(false);
const [isRightDrawerOpen, setIsRightDrawerOpen] = useState(false);

// eslint-disable-next-line no-undef
const location = typeof window === "undefined" ? undefined : window.location;

useEffect(() => {
setIsLeftDrawerOpen(false); // Close the drawer if notifications changes
setIsRightDrawerOpen(false);
}, [notifications]);
if (shouldCloseOnRouteChange && location?.search?.includes("redirect=true")) {
setIsLeftDrawerOpen(false);
setIsRightDrawerOpen(false);
}
}, [location.search, shouldCloseOnRouteChange]);
Copy link
Contributor

Choose a reason for hiding this comment

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

I think its better to close the drawer from x2-seller app. since this ui-kit component might be used across different apps. can you try to trigger the close event, when we click on decline / accept purchase

Also, to prevent closing this drawer on notifications changes, we can pass additional props shouldCloseOnChanges - pass this as false from x2-seller app.

@rushi can you also review this once

Copy link
Contributor Author

@VitalyDevico VitalyDevico Dec 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

done, could you please take another look
also, since we are preventing closing on notification changes, we need to manually close it after opening the purchase, to handle the case which was fixed by adding close-on-change logic previously (when we open a purchase from the purchases page), this logic added as part of the x2-seller PR https://github.com/xola/x2-seller/pull/3773


const toggleLeftDrawer = () => {
if (!isLeftDrawerOpen) {
Expand Down Expand Up @@ -168,6 +174,7 @@ Sidebar.propTypes = {
isFixed: PropTypes.bool,
isStickyHeader: PropTypes.bool,
isStickyFooter: PropTypes.bool,
shouldCloseOnRouteChange: PropTypes.bool,
onLogoClick: PropTypes.func.isRequired,
notifications: PropTypes.shape({
announcements: PropTypes.shape({
Expand Down
Loading