Merge branch 'feat/schedule-actions-modal' into feat/schedule-actions-mount

Bring in modal layout fix: move banner above error.

Author: Assem-Uber

src/views/schedule-actions/schedule-actions-modal-content/schedule-actions-modal-content.styles.ts

@@ -15,12 +15,6 @@ export const styled = {
     overflowY: 'auto',
     maxHeight: '70vh',
   })),
-  ContextBanner: createStyled(
-    'div',
-    ({ $theme }: { $theme: Theme }): StyleObject => ({
-      marginBottom: $theme.sizing.scale500,
-    })
-  ),
   ModalBodyContent: createStyled(
     'div',
     ({ $theme }: { $theme: Theme }): StyleObject => ({
@@ -48,6 +42,7 @@ export const overrides = {
   banner: {
     Root: {
       style: {
+        marginTop: 0,
         marginLeft: 0,
         marginRight: 0,
       },

src/views/schedule-actions/schedule-actions-modal-content/schedule-actions-modal-content.tsx

@@ -124,6 +124,7 @@ export default function ScheduleActionsModalContent<
       <styled.ModalHeader>{`${action.label} schedule`}</styled.ModalHeader>
       <form onSubmit={handleSubmit(onSubmit)}>
         <styled.ModalBody>
+          {modalBanner}
           {error && (
             <div ref={errorAlertRef} role="alert">
               <Banner
@@ -138,9 +139,6 @@ export default function ScheduleActionsModalContent<
               </Banner>
             </div>
           )}
-          {modalBanner ? (
-            <styled.ContextBanner>{modalBanner}</styled.ContextBanner>
-          ) : null}
           <styled.ModalBodyContent>
             {action.modal.withForm && Form && (
               <Form