awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: review changes

Browse Source
This commit is contained in:
Piyush Gupta
2025-10-28 23:58:17 +05:30
parent 9287ddde72
commit 415de369d2
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
View File

@@ -146,7 +146,9 @@ export const Navbar = () => {
const isCardDeclined = Boolean(subscription?.cardDeclined); const isCardDeclined = Boolean(subscription?.cardDeclined);
const isCardDeclinedMoreThan30Days = Boolean( const isCardDeclinedMoreThan30Days = Boolean(
isCardDeclined && subscription?.cardDeclinedDays && subscription?.cardDeclinedDays >= 30 isCardDeclined &&
subscription?.cardDeclinedDays !== undefined &&
subscription?.cardDeclinedDays >= 30
); );
const { data: orgs } = useGetOrganizations(); const { data: orgs } = useGetOrganizations();
@@ -161,10 +163,10 @@ export const Navbar = () => {
const location = useLocation(); const location = useLocation();
const isBillingPage = location.pathname === "/organization/billing"; const isBillingPage = location.pathname === "/organization/billing";
const makeModalIntrusive = Boolean(!isBillingPage && isCardDeclinedMoreThan30Days); const isModalIntrusive = Boolean(!isBillingPage && isCardDeclinedMoreThan30Days);
useEffect(() => { useEffect(() => {
if (makeModalIntrusive) { if (isModalIntrusive) {
setShowCardDeclinedModal(true); setShowCardDeclinedModal(true);
sessionStorage.setItem("paymentFailed", "true"); sessionStorage.setItem("paymentFailed", "true");
return; return;
@@ -174,7 +176,8 @@ export const Navbar = () => {
sessionStorage.setItem("paymentFailed", "true"); sessionStorage.setItem("paymentFailed", "true");
setShowCardDeclinedModal(true); setShowCardDeclinedModal(true);
} }
}, [subscription, isBillingPage]); }, [subscription, isBillingPage, isModalIntrusive]);
const matches = useRouterState({ select: (s) => s.matches.at(-1)?.context }); const matches = useRouterState({ select: (s) => s.matches.at(-1)?.context });
const breadcrumbs = matches && "breadcrumbs" in matches ? matches.breadcrumbs : undefined; const breadcrumbs = matches && "breadcrumbs" in matches ? matches.breadcrumbs : undefined;
@@ -700,7 +703,7 @@ export const Navbar = () => {
<Modal <Modal
isOpen={showCardDeclinedModal} isOpen={showCardDeclinedModal}
onOpenChange={() => !makeModalIntrusive && setShowCardDeclinedModal(false)} onOpenChange={() => !isModalIntrusive && setShowCardDeclinedModal(false)}
> >
<ModalContent <ModalContent
title={ title={
@@ -709,7 +712,7 @@ export const Navbar = () => {
Your payment could not be processed. Your payment could not be processed.
</div> </div>
} }
showCloseButton={!makeModalIntrusive} showCloseButton={!isModalIntrusive}
> >
<div> <div>
<div> <div>
@@ -731,7 +734,7 @@ export const Navbar = () => {
Update Payment Method Update Payment Method
</Button> </Button>
</Link> </Link>
{!makeModalIntrusive && ( {!isModalIntrusive && (
<Button <Button
colorSchema="secondary" colorSchema="secondary"
variant="outline" variant="outline"