Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
fix(ui): right-align sheet footers with Cancel before the primary action (#8675)
Andrew Huang41011c395946
diff --git a/DESIGN.md b/DESIGN.mdindex 38eb96dfcf..40adc35eb2 100644--- a/DESIGN.md+++ b/DESIGN.md@@ -302,6 +302,7 @@ host component; don't override unless necessary.- **Forms inside Sheets/Dialog** — create / edit flows open in a Sheet or Dialog, never inline, never as a full-page route. **Pick by form size:** small forms (1–2 fields, e.g. "Add domain", "Rename") go in a centered `Dialog`; large or multi-step forms (multiple fields, scrollable detail, file uploads, wizard steps) go in a right-side `Sheet`. When in doubt, default to Dialog — Sheet is for cases where Dialog feels cramped.- **Authentication form stacks** — use `CardContent className="flex flex-col gap-4"` for the major vertical rhythm between fields, validation groups, and primary actions. Use a nested `flex flex-col gap-2` only for compact sets of equivalent actions such as social or SSO provider buttons. Use `FieldSeparator` between alternate authentication paths. Do not recreate sibling spacing with `mt-*`, `mb-*`, or `py-*`; keep a wrapper only when it owns animation, responsive visibility, conditional grouping, or tightly coupled control/error content.- **Spacing rhythm** — `gap-1.5` (intra-element), `gap-2 / gap-3` (adjacent elements), `p-4 / p-5` (section padding). Card = `p-5 gap-5`; Sheet header/footer = `p-4`.+- **Sheet and Dialog footers** — actions sit right-aligned with the primary action last: `SheetFooter className="justify-end border-t"` (`DialogFooter` is right-aligned by default), then Cancel (`ghost`), then the primary button. Back navigation in a multi-step flow sits on the left with `mr-auto`, and wizard footers with status text on the left use `justify-between`. A single full-width action needs no alignment class.## 6. Depth & Elevationdiff --git a/frontend/src/components/v3/generic/Sheet/Sheet.stories.tsx b/frontend/src/components/v3/generic/Sheet/Sheet.stories.tsxindex 2da7ff624f..4e3d2ed3a7 100644--- a/frontend/src/components/v3/generic/Sheet/Sheet.stories.tsx+++ b/frontend/src/components/v3/generic/Sheet/Sheet.stories.tsx@@ -73,7 +73,7 @@ export const Default: Story = {and footer.</p></div>- <SheetFooter>+ <SheetFooter className="justify-end"><SheetClose asChild><Button variant="ghost">Cancel</Button></SheetClose>@@ -301,7 +301,7 @@ export const WithForm: Story = {<Input id="sheet-title" defaultValue="Software Engineer" /></div></div>- <SheetFooter>+ <SheetFooter className="justify-end"><SheetClose asChild><Button variant="ghost">Cancel</Button></SheetClose>@@ -343,7 +343,7 @@ export const ScrollableContent: Story = {</div>))}</div>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t"><SheetClose asChild><Button variant="ghost">Close</Button></SheetClose>diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateTemplateEnrollmentModal.tsx b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateTemplateEnrollmentModal.tsxindex 652b71fc4a..6d2c25bc50 100644--- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateTemplateEnrollmentModal.tsx+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateTemplateEnrollmentModal.tsx@@ -281,7 +281,7 @@ export const CertificateTemplateEnrollmentModal = ({ popUp, handlePopUpToggle }:}}/></div>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t"><SheetClose asChild><Button variant="ghost">Cancel</Button></SheetClose>diff --git a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/CreateOrgIdentitySheet.tsx b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/CreateOrgIdentitySheet.tsxindex 46b8ee6bc5..f6538fe9b8 100644--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/CreateOrgIdentitySheet.tsx+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/CreateOrgIdentitySheet.tsx@@ -52,7 +52,7 @@ type Props = {const CreateOrgIdentityForm = ({ onClose }: { onClose: () => void }) => {const navigate = useNavigate();- const { currentOrg } = useOrganization();+ const { currentOrg, isSubOrganization } = useOrganization();const orgId = currentOrg?.id || "";const { subscription } = useSubscription();const {@@ -172,13 +172,18 @@ const CreateOrgIdentityForm = ({ onClose }: { onClose: () => void }) => {)}/></div>- <SheetFooter className="border-t">- <Button type="submit" variant="org" isPending={isSubmitting} isDisabled={isSubmitting}>- Create- </Button>+ <SheetFooter className="justify-end border-t"><Button type="button" variant="outline" onClick={onClose}>Cancel</Button>+ <Button+ type="submit"+ variant={isSubOrganization ? "sub-org" : "org"}+ isPending={isSubmitting}+ isDisabled={isSubmitting}+ >+ Create+ </Button></SheetFooter><UpgradeGatepaywallKey="organization.create-org-identity-sheet"diff --git a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModal.tsx b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModal.tsxindex 72eb965e4b..fd2105144c 100644--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModal.tsx+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModal.tsx@@ -77,7 +77,15 @@ export const IdentityAuthMethodModal = ({ popUp, handlePopUpOpen, handlePopUpTogonSubmittingChange={setIsSubmitting}/></div>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t">+ <Button+ type="button"+ variant="ghost"+ isDisabled={isSubmitting}+ onClick={() => handlePopUpToggle("identityAuthMethod", false)}+ >+ Cancel+ </Button><Buttontype="submit"form={IDENTITY_AUTH_FORM_ID}@@ -87,14 +95,6 @@ export const IdentityAuthMethodModal = ({ popUp, handlePopUpOpen, handlePopUpTog>{isSelectedAuthAlreadyConfigured ? "Update" : "Add"}</Button>- <Button- type="button"- variant="ghost"- isDisabled={isSubmitting}- onClick={() => handlePopUpToggle("identityAuthMethod", false)}- >- Cancel- </Button></SheetFooter></SheetContent><UpgradeGatediff --git a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAuthTemplateModal.tsx b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAuthTemplateModal.tsxindex c183bcce02..0868ee4749 100644--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAuthTemplateModal.tsx+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAuthTemplateModal.tsx@@ -901,7 +901,10 @@ export const IdentityAuthTemplateModal = ({ popUp, handlePopUpToggle }: Props) =</>)}</FieldGroup>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t">+ <Button variant="ghost" onClick={handleClose}>+ Cancel+ </Button><Buttontype="submit"variant={isSubOrganization ? "sub-org" : "org"}@@ -909,9 +912,6 @@ export const IdentityAuthTemplateModal = ({ popUp, handlePopUpToggle }: Props) =>{isEdit ? "Update Template" : "Create Template"}</Button>- <Button variant="ghost" onClick={handleClose}>- Cancel- </Button></SheetFooter></form></SheetContent>diff --git a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/OrgIdentityLinkForm.tsx b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/OrgIdentityLinkForm.tsxindex 6ee97788da..d3b1bd5ae7 100644--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/OrgIdentityLinkForm.tsx+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/OrgIdentityLinkForm.tsx@@ -131,13 +131,13 @@ export const OrgIdentityLinkForm = ({ onClose }: Props) => {)}/></div>- <SheetFooter className="border-t">- <Button type="submit" variant="sub-org" isPending={isSubmitting} isDisabled={isSubmitting}>- Assign to Sub-Organization- </Button>+ <SheetFooter className="justify-end border-t"><Button type="button" variant="outline" onClick={() => onClose()}>Cancel</Button>+ <Button type="submit" variant="sub-org" isPending={isSubmitting} isDisabled={isSubmitting}>+ Assign to Sub-Organization+ </Button></SheetFooter></form>);diff --git a/frontend/src/pages/organization/ProductSettingsPage/SecretsManagement/honey-token-config/HoneyTokenModal.tsx b/frontend/src/pages/organization/ProductSettingsPage/SecretsManagement/honey-token-config/HoneyTokenModal.tsxindex f30278156f..c06b02a1b2 100644--- a/frontend/src/pages/organization/ProductSettingsPage/SecretsManagement/honey-token-config/HoneyTokenModal.tsx+++ b/frontend/src/pages/organization/ProductSettingsPage/SecretsManagement/honey-token-config/HoneyTokenModal.tsx@@ -366,7 +366,10 @@ export const HoneyTokenModal = ({ isOpen, onOpenChange }: Props) => {)}</div>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t">+ <Button variant="ghost" onClick={() => onOpenChange(false)} type="button">+ Cancel+ </Button><OrgPermissionCanI={OrgPermissionHoneyTokenActions.Setup}a={OrgPermissionSubjects.HoneyTokens}@@ -382,9 +385,6 @@ export const HoneyTokenModal = ({ isOpen, onOpenChange }: Props) => {</Button>)}</OrgPermissionCan>- <Button variant="ghost" onClick={() => onOpenChange(false)} type="button">- Cancel- </Button></SheetFooter></form></SheetContent>diff --git a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/CreateProjectIdentity/CreateProjectIdentityForm.tsx b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/CreateProjectIdentity/CreateProjectIdentityForm.tsxindex 4630c1882c..b21bedef07 100644--- a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/CreateProjectIdentity/CreateProjectIdentityForm.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/CreateProjectIdentity/CreateProjectIdentityForm.tsx@@ -396,7 +396,10 @@ export const CreateProjectIdentityForm = ({</Field>)}</div>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t">+ <Button type="button" variant="outline" onClick={onClose} isDisabled={isSubmitting}>+ Cancel+ </Button><Buttontype="submit"variant={SUBMIT_VARIANT_BY_PRODUCT[projectType] ?? "project"}@@ -405,9 +408,6 @@ export const CreateProjectIdentityForm = ({>{mode === CreateProjectIdentityMode.Assign ? "Add" : "Create"}</Button>- <Button type="button" variant="outline" onClick={onClose} isDisabled={isSubmitting}>- Cancel- </Button></SheetFooter></form></FormProvider>diff --git a/frontend/src/pages/project/AccessControlPage/components/ServiceTokenTab/components/ServiceTokenSection/AddServiceTokenModal.tsx b/frontend/src/pages/project/AccessControlPage/components/ServiceTokenTab/components/ServiceTokenSection/AddServiceTokenModal.tsxindex 7fec76b1c0..70b859edae 100644--- a/frontend/src/pages/project/AccessControlPage/components/ServiceTokenTab/components/ServiceTokenSection/AddServiceTokenModal.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/ServiceTokenTab/components/ServiceTokenSection/AddServiceTokenModal.tsx@@ -405,7 +405,7 @@ const ServiceTokenForm = () => {)}</div></form>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t">{hasServiceToken ? (<SheetClose asChild><Button type="button" variant="project">@@ -414,6 +414,11 @@ const ServiceTokenForm = () => {</SheetClose>) : (<>+ <SheetClose asChild>+ <Button type="button" variant="outline" isDisabled={isSubmitting}>+ Cancel+ </Button>+ </SheetClose><Buttontype="submit"form="add-service-token-form"@@ -423,11 +428,6 @@ const ServiceTokenForm = () => {>Create</Button>- <SheetClose asChild>- <Button type="button" variant="outline" isDisabled={isSubmitting}>- Cancel- </Button>- </SheetClose></>)}</SheetFooter>diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentityRoleModify.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentityRoleModify.tsxindex 09b83e415a..7261529e3b 100644--- a/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentityRoleModify.tsx+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentityRoleModify.tsx@@ -349,15 +349,7 @@ export const IdentityRoleModify = ({ identityProjectMembership, onClose }: Props)}</ProjectPermissionCan></div>- <SheetFooter className="border-t">- <Button- type="submit"- variant="project"- isDisabled={!roleForm.formState.isDirty || isEditDisabled}- isPending={roleForm.formState.isSubmitting}- >- Save Roles- </Button>+ <SheetFooter className="justify-end border-t"><Buttontype="button"variant="outline"@@ -366,6 +358,14 @@ export const IdentityRoleModify = ({ identityProjectMembership, onClose }: Props>Cancel</Button>+ <Button+ type="submit"+ variant="project"+ isDisabled={!roleForm.formState.isDirty || isEditDisabled}+ isPending={roleForm.formState.isSubmitting}+ >+ Save Roles+ </Button></SheetFooter><UpgradeGatepaywallKey="project.identity-role-modify"diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberMultiRoleModify.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberMultiRoleModify.tsxindex 63893bc838..1d725d0ffd 100644--- a/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberMultiRoleModify.tsx+++ b/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberMultiRoleModify.tsx@@ -168,7 +168,10 @@ export const MemberMultiRoleModify = ({ projectMember, onOpenUpgradeModal, onClo)}</ProjectPermissionCan></div>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t">+ <Button type="button" variant="outline" onClick={onClose}>+ Cancel+ </Button><Buttontype="submit"variant="project"@@ -177,9 +180,6 @@ export const MemberMultiRoleModify = ({ projectMember, onOpenUpgradeModal, onClo>Save Roles</Button>- <Button type="button" variant="outline" onClick={onClose}>- Cancel- </Button></SheetFooter></form>);diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.tsxindex 2e91bbbc7b..034a7224ae 100644--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.tsx+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.tsx@@ -188,7 +188,7 @@ const Content = ({ role, onClose }: ContentProps) => {/></FieldGroup></div>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t"><SheetClose asChild><Button variant="ghost" isDisabled={isSubmitting}>Cancel@@ -247,7 +247,7 @@ export const DuplicateProjectRoleModal = ({ isOpen, onOpenChange, roleSlug }: Pr<p className="p-4 text-sm text-danger">Could not find a role with the slug "{roleSlug}".</p>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t"><SheetClose asChild><Button variant="ghost">Close</Button></SheetClose>diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/EditProjectRoleDialog.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/EditProjectRoleDialog.tsxindex 57e86c01f7..39cc1d41b9 100644--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/EditProjectRoleDialog.tsx+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/EditProjectRoleDialog.tsx@@ -196,7 +196,7 @@ export const EditProjectRoleDialog = ({ isOpen, role, onOpenChange }: Props) =>/></FieldGroup></div>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t"><SheetClose asChild><Button variant="ghost" isDisabled={isSubmitting}>Canceldiff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/RoleModal.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/RoleModal.tsxindex 50dabd96b8..7d1818aff0 100644--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/RoleModal.tsx+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/RoleModal.tsx@@ -187,7 +187,7 @@ export const RoleModal = ({ popUp, handlePopUpToggle }: Props) => {/></FieldGroup></div>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t"><SheetClose asChild><Button variant="ghost" isDisabled={isSubmitting}>Canceldiff --git a/frontend/src/pages/project/components/FolderAccessSection/EditFolderAccessSheet.tsx b/frontend/src/pages/project/components/FolderAccessSection/EditFolderAccessSheet.tsxindex ed105ece74..511818d9b2 100644--- a/frontend/src/pages/project/components/FolderAccessSection/EditFolderAccessSheet.tsx+++ b/frontend/src/pages/project/components/FolderAccessSection/EditFolderAccessSheet.tsx@@ -146,7 +146,7 @@ const EditFolderAccessForm = ({ access, actor, environmentName, onClose }: FormP</div></div>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t"><Button variant="outline" onClick={onClose}>Cancel</Button>diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretDropzone/CsvColumnMapDialog.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretDropzone/CsvColumnMapDialog.tsxindex 8b5c487903..557fa0768c 100644--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretDropzone/CsvColumnMapDialog.tsx+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretDropzone/CsvColumnMapDialog.tsx@@ -388,8 +388,8 @@ export const CsvColumnMapContent = ({</tbody></table></div>- <SheetFooter className="border-t">- <Button variant="outline" onClick={onClose}>+ <SheetFooter className="justify-end border-t">+ <Button variant="outline" onClick={onClose} className="mr-auto">Back</Button><Button variant="project" onClick={handleImport}>diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretDropzone/ImportSecretsModal.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretDropzone/ImportSecretsModal.tsxindex 8f36feca38..43dc090d16 100644--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretDropzone/ImportSecretsModal.tsx+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretDropzone/ImportSecretsModal.tsx@@ -889,7 +889,7 @@ const ImportSecretsContent = ({</TabsContent></div></Tabs>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t"><Button variant="ghost" onClick={onClose}>Cancel</Button>@@ -898,7 +898,6 @@ const ImportSecretsContent = ({variant="project"type="submit"form={PASTE_SECRETS_FORM_ID}- className="ml-auto"isDisabled={!isPasteDirty}>Parse Secrets@@ -1225,7 +1224,7 @@ const ImportSecretsContent = ({</div></div>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t">{!initialParsedSecrets && (<Buttonvariant="outline"diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/RequestAccessForm.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/RequestAccessForm.tsxindex 7b690f1a64..6c0820eb4d 100644--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/RequestAccessForm.tsx+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/RequestAccessForm.tsx@@ -799,7 +799,10 @@ export const RequestAccessForm = ({)}/></div>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t">+ <Button type="button" variant="outline" onClick={onClose}>+ Cancel+ </Button><Buttontype="submit"variant="project"@@ -807,9 +810,6 @@ export const RequestAccessForm = ({>Request Access</Button>- <Button type="button" variant="outline" onClick={onClose}>- Cancel- </Button></SheetFooter></form>);diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsxindex 3132d1037e..08cdbd3b77 100644--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx@@ -1000,7 +1000,17 @@ export const ReviewAccessRequestModal = ({)}</div>)}- <div className="space-x-2">+ <div className="flex flex-wrap justify-end gap-2">+ <Button+ isPending={isLoading === "rejected"}+ isDisabled={!!isLoading || isRejectionDisabled}+ onClick={() => handleReview("rejected")}+ size="sm"+ variant="danger"+ >+ <BanIcon />+ Reject Request+ </Button><ButtonisPending={isLoading === "approved"}isDisabled={@@ -1018,21 +1028,11 @@ export const ReviewAccessRequestModal = ({<CheckIcon />Approve Request</Button>- <Button- isPending={isLoading === "rejected"}- isDisabled={!!isLoading || isRejectionDisabled}- onClick={() => handleReview("rejected")}- size="sm"- variant="danger"- >- <BanIcon />- Reject Request- </Button></div></>)}{hasApproved && canRevokeAccess && (- <div>+ <div className="flex justify-end"><ButtonisDisabled={Boolean(isLoading)}onClick={() => handlePopUpOpen("revokeConfirm")}diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsxindex 0caeb452c9..7abfb6380a 100644--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx@@ -1135,13 +1135,13 @@ const Form = ({</>)}</div>- <SheetFooter className="border-t">- <Button type="submit" variant="project" isPending={isSubmitting} isDisabled={isSubmitting}>- {isEditMode ? "Update Policy" : "Add Policy"}- </Button>+ <SheetFooter className="justify-end border-t"><Button onClick={onRequestClose} variant="outline" type="button" isDisabled={isSubmitting}>Close</Button>+ <Button type="submit" variant="project" isPending={isSubmitting} isDisabled={isSubmitting}>+ {isEditMode ? "Update Policy" : "Add Policy"}+ </Button></SheetFooter></form>);diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/VaultSecretImportModal.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/VaultSecretImportModal.tsxindex 9c28bd383b..53169f179b 100644--- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/VaultSecretImportModal.tsx+++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/VaultSecretImportModal.tsx@@ -419,7 +419,7 @@ const Content = ({)}</div>- <SheetFooter className="border-t">+ <SheetFooter className="justify-end border-t"><SheetClose asChild><Button variant="ghost">Cancel</Button></SheetClose>diff --git a/frontend/src/pages/secret-manager/SettingsPage/components/SecretValidationRulesSection/SecretValidationRulesSection.tsx b/frontend/src/pages/secret-manager/SettingsPage/components/SecretValidationRulesSection/SecretValidationRulesSection.tsxindex f141c74c9e..3d8bac4df2 100644--- a/frontend/src/pages/secret-manager/SettingsPage/components/SecretValidationRulesSection/SecretValidationRulesSection.tsx+++ b/frontend/src/pages/secret-manager/SettingsPage/components/SecretValidationRulesSection/SecretValidationRulesSection.tsx@@ -519,13 +519,13 @@ const RuleFormContent = ({</div>{/* Footer */}- <SheetFooter className="border-t">- <Button variant="project" type="submit">- {isEditing ? "Save Changes" : "Create Rule"}- </Button>+ <SheetFooter className="justify-end border-t"><Button type="button" variant="ghost" onClick={onClose}>Cancel</Button>+ <Button variant="project" type="submit">+ {isEditing ? "Save Changes" : "Create Rule"}+ </Button></SheetFooter></form></FormProvider>diff --git a/frontend/src/views/Alerts/AlertForm.tsx b/frontend/src/views/Alerts/AlertForm.tsxindex dd3d4c3797..096cadd883 100644--- a/frontend/src/views/Alerts/AlertForm.tsx+++ b/frontend/src/views/Alerts/AlertForm.tsx@@ -324,7 +324,10 @@ export const AlertForm = ({/></div>- <SheetFooter className="sticky bottom-0 border-t bg-popover">+ <SheetFooter className="sticky bottom-0 justify-end border-t bg-popover">+ <Button type="button" variant="outline" onClick={onCancel} isDisabled={isSubmitting}>+ Cancel+ </Button><Buttontype="submit"variant={scopeVariant}@@ -333,9 +336,6 @@ export const AlertForm = ({>{isEditing ? "Update Alert" : "Create Alert"}</Button>- <Button type="button" variant="outline" onClick={onCancel} isDisabled={isSubmitting}>- Cancel- </Button></SheetFooter></form></FormProvider>