Merge pull request #252 from TogetherCrew/fix/last-update-announcement

update disable buttons statement
TogetherCrew · Feb 9, 2024 · 25417a9 · 25417a9
2 parents 1d127f6 + 6aea68d
commit 25417a9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/src/components/announcements/create/publicMessageContainer/TcPublicMessageContainer.tsx b/src/components/announcements/create/publicMessageContainer/TcPublicMessageContainer.tsx
@@ -145,7 +145,7 @@ function TcPublicMessageContainer({
             </div>
           </TcSelect>
         </FormControl>
-        <div className="flex flex-col space-x-1">
+        <div className="flex flex-col">
           <TcText text="Write message here:" variant="subtitle1" />
           <TcText
             text="Our bot will distribute the announcement through selected channels with the required access to share the designated message."

diff --git a/src/pages/announcements/create-new-announcements.tsx b/src/pages/announcements/create-new-announcements.tsx
@@ -242,7 +242,12 @@ function CreateNewAnnouncements() {
                   <TcButton
                     text="Save as Draft"
                     variant="outlined"
-                    disabled={!scheduledAt}
+                    disabled={
+                      !scheduledAt ||
+                      !isDateValid ||
+                      publicAnnouncements?.template == '' ||
+                      publicAnnouncements?.options.channelIds?.length === 0
+                    }
                     sx={{
                       maxWidth: {
                         xs: '100%',
@@ -257,7 +262,12 @@ function CreateNewAnnouncements() {
                     selectedRoles={roles}
                     selectedUsernames={users}
                     schaduledDate={scheduledAt || ''}
-                    isDisabled={!scheduledAt || !isDateValid}
+                    isDisabled={
+                      !scheduledAt ||
+                      !isDateValid ||
+                      publicAnnouncements?.template == '' ||
+                      publicAnnouncements?.options.channelIds?.length === 0
+                    }
                     handleCreateAnnouncements={(e) =>
                       handleCreateAnnouncements(e)
                     }

diff --git a/src/pages/announcements/edit-announcements/index.tsx b/src/pages/announcements/edit-announcements/index.tsx
@@ -291,7 +291,12 @@ function Index() {
                   selectedRoles={roles}
                   selectedUsernames={users}
                   schaduledDate={scheduledAt || ''}
-                  isDisabled={!scheduledAt || !isDateValid}
+                  isDisabled={
+                    !scheduledAt ||
+                    !isDateValid ||
+                    publicAnnouncements?.template == '' ||
+                    publicAnnouncements?.options.channelIds?.length === 0
+                  }
                   handleCreateAnnouncements={(e) => handleEditAnnouncements(e)}
                 />
               </div>