diff --git a/src/components/announcements/TcAnnouncementsTable.tsx b/src/components/announcements/TcAnnouncementsTable.tsx
index df28b871..0fec5768 100644
--- a/src/components/announcements/TcAnnouncementsTable.tsx
+++ b/src/components/announcements/TcAnnouncementsTable.tsx
@@ -21,6 +21,7 @@ import { useSnackbar } from '../../context/SnackbarContext';
 import { MdModeEdit, MdDelete } from 'react-icons/md';
 import Loading from '../global/Loading';
 import { truncateCenter } from '../../helpers/helper';
+import moment from 'moment';
 
 interface Channel {
   channelId: string;
@@ -61,12 +62,14 @@ interface Announcement {
 interface AnnouncementsTableProps {
   announcements: Announcement[];
   isLoading: boolean;
+  selectedZone: string;
   handleRefreshList: () => void;
 }
 
 function TcAnnouncementsTable({
   announcements,
   isLoading,
+  selectedZone,
   handleRefreshList,
 }: AnnouncementsTableProps) {
   const { deleteAnnouncements } = useAppStore();
@@ -78,6 +81,13 @@ function TcAnnouncementsTable({
     string | null
   >(null);
 
+  const formatDateBasedOnTimezone = (
+    date: string | number | Date,
+    timezone: string
+  ) => {
+    return moment(date).tz(timezone).format('DD/MM/YYYY, h:mm:ss a');
+  };
+
   const handleClick = (
     event: React.MouseEvent<HTMLButtonElement>,
     id: string
@@ -228,57 +238,60 @@ function TcAnnouncementsTable({
             />
           </div>
         );
-      case 'users':
-        return (
-          <div className="flex flex-row overflow-hidden whitespace-nowrap">
-            <TcText
-              text={announcement.data
-                .map((item: { options: { users: any } }) => {
-                  const users = item.options.users;
-                  if (users && users.length > 0) {
-                    const displayedUsers = users
-                      .slice(0, 2)
-                      .map((user: { ngu: any }) => `@${user.ngu}`)
-                      .join(', ');
-                    const moreUsersIndicator = users.length > 2 ? '...' : '';
-                    return `${displayedUsers}${moreUsersIndicator}`;
-                  }
-                  return '';
-                })
-                .filter((text: string) => text !== '')
-                .join(', ')}
-              variant="subtitle2"
-            />
-          </div>
-        );
-      case 'roles':
-        return (
-          <div className="flex flex-row overflow-hidden whitespace-nowrap">
-            <TcText
-              text={announcement.data
-                .map((item: { options: { roles: any } }) => {
-                  const roles = item.options.roles;
-                  if (roles && roles.length > 0) {
-                    const displayedRoles = roles
-                      .slice(0, 2)
-                      .map((role: { name: any }) => role.name)
-                      .join(', ');
-                    const moreRolesIndicator = roles.length > 2 ? '...' : '';
-                    return `${displayedRoles}${moreRolesIndicator}`;
-                  }
-                  return '';
-                })
-                .filter((text: string) => text !== '')
-                .join(', ')}
-              variant="subtitle2"
-            />
-          </div>
-        );
+      // case 'users':
+      //   return (
+      //     <div className="flex flex-row overflow-hidden whitespace-nowrap">
+      //       <TcText
+      //         text={announcement.data
+      //           .map((item: { options: { users: any } }) => {
+      //             const users = item.options.users;
+      //             if (users && users.length > 0) {
+      //               const displayedUsers = users
+      //                 .slice(0, 2)
+      //                 .map((user: { ngu: any }) => `@${user.ngu}`)
+      //                 .join(', ');
+      //               const moreUsersIndicator = users.length > 2 ? '...' : '';
+      //               return `${displayedUsers}${moreUsersIndicator}`;
+      //             }
+      //             return '';
+      //           })
+      //           .filter((text: string) => text !== '')
+      //           .join(', ')}
+      //         variant="subtitle2"
+      //       />
+      //     </div>
+      //   );
+      // case 'roles':
+      //   return (
+      //     <div className="flex flex-row overflow-hidden whitespace-nowrap">
+      //       <TcText
+      //         text={announcement.data
+      //           .map((item: { options: { roles: any } }) => {
+      //             const roles = item.options.roles;
+      //             if (roles && roles.length > 0) {
+      //               const displayedRoles = roles
+      //                 .slice(0, 2)
+      //                 .map((role: { name: any }) => role.name)
+      //                 .join(', ');
+      //               const moreRolesIndicator = roles.length > 2 ? '...' : '';
+      //               return `${displayedRoles}${moreRolesIndicator}`;
+      //             }
+      //             return '';
+      //           })
+      //           .filter((text: string) => text !== '')
+      //           .join(', ')}
+      //         variant="subtitle2"
+      //       />
+      //     </div>
+      //   );
       case 'scheduledAt':
         return (
           <div className="flex flex-row overflow-hidden whitespace-nowrap">
             <TcText
-              text={new Date(announcement.scheduledAt).toLocaleString()}
+              text={formatDateBasedOnTimezone(
+                announcement.scheduledAt,
+                selectedZone
+              )}
               variant="subtitle2"
             />
           </div>
@@ -346,39 +359,35 @@ function TcAnnouncementsTable({
             key={announcement.id}
             className={`my-5 ${index % 2 === 0 ? 'bg-gray-100' : ''}`}
           >
-            {[
-              'title',
-              'channels',
-              'users',
-              'roles',
-              'scheduledAt',
-              'actions',
-            ].map((cellType, cellIndex, array) => (
-              <TableCell
-                key={cellType}
-                sx={{
-                  padding: '14px 16px',
-                  borderBottom: index % 2 !== 0 ? '1px solid #f3f4f6' : 'none',
-                  borderTop: index % 2 !== 0 ? '1px solid #f3f4f6' : 'none',
-                  borderLeft:
-                    cellIndex === 0 && index % 2 !== 0
-                      ? '1px solid #f3f4f6'
-                      : 'none',
-                  borderRight:
-                    cellIndex === array.length - 1 && index % 2 !== 0
-                      ? '1px solid #f3f4f6'
-                      : 'none',
-                  borderTopLeftRadius: cellIndex === 0 ? '5px' : '0',
-                  borderBottomLeftRadius: cellIndex === 0 ? '5px' : '0',
-                  borderTopRightRadius:
-                    cellIndex === array.length - 1 ? '5px' : '0',
-                  borderBottomRightRadius:
-                    cellIndex === array.length - 1 ? '5px' : '0',
-                }}
-              >
-                {renderTableCell(announcement, cellType)}
-              </TableCell>
-            ))}
+            {['title', 'channels', 'scheduledAt', 'actions'].map(
+              (cellType, cellIndex, array) => (
+                <TableCell
+                  key={cellType}
+                  sx={{
+                    padding: '14px 16px',
+                    borderBottom:
+                      index % 2 !== 0 ? '1px solid #f3f4f6' : 'none',
+                    borderTop: index % 2 !== 0 ? '1px solid #f3f4f6' : 'none',
+                    borderLeft:
+                      cellIndex === 0 && index % 2 !== 0
+                        ? '1px solid #f3f4f6'
+                        : 'none',
+                    borderRight:
+                      cellIndex === array.length - 1 && index % 2 !== 0
+                        ? '1px solid #f3f4f6'
+                        : 'none',
+                    borderTopLeftRadius: cellIndex === 0 ? '5px' : '0',
+                    borderBottomLeftRadius: cellIndex === 0 ? '5px' : '0',
+                    borderTopRightRadius:
+                      cellIndex === array.length - 1 ? '5px' : '0',
+                    borderBottomRightRadius:
+                      cellIndex === array.length - 1 ? '5px' : '0',
+                  }}
+                >
+                  {renderTableCell(announcement, cellType)}
+                </TableCell>
+              )
+            )}
           </TableRow>
         ))}
       </TableBody>
@@ -394,7 +403,7 @@ function TcAnnouncementsTable({
               sx={{ borderBottom: 'none' }}
               className="uppercase text-gray-400"
               style={{
-                width: '20%',
+                width: '60%',
                 borderBottom: 'none',
                 whiteSpace: 'nowrap',
                 padding: '0 1rem',
@@ -416,7 +425,7 @@ function TcAnnouncementsTable({
             >
               <TcText text="Channels" variant="body2" />
             </TableCell>
-            <TableCell
+            {/* <TableCell
               sx={{ borderBottom: 'none' }}
               className="uppercase text-gray-400"
               style={{
@@ -428,8 +437,8 @@ function TcAnnouncementsTable({
               align="left"
             >
               <TcText text="Handle" variant="body2" />
-            </TableCell>
-            <TableCell
+            </TableCell> */}
+            {/* <TableCell
               sx={{ borderBottom: 'none' }}
               className="uppercase text-gray-400"
               style={{
@@ -441,7 +450,7 @@ function TcAnnouncementsTable({
               align="left"
             >
               <TcText text="Role" variant="body2" />
-            </TableCell>
+            </TableCell> */}
             <TableCell
               sx={{ borderBottom: 'none' }}
               className="uppercase text-gray-400"
diff --git a/src/components/announcements/TcConfirmSchaduledAnnouncementsDialog.spec.tsx b/src/components/announcements/TcConfirmSchaduledAnnouncementsDialog.spec.tsx
index 20228b6f..e3e0ce30 100644
--- a/src/components/announcements/TcConfirmSchaduledAnnouncementsDialog.spec.tsx
+++ b/src/components/announcements/TcConfirmSchaduledAnnouncementsDialog.spec.tsx
@@ -5,7 +5,7 @@ import TcConfirmSchaduledAnnouncementsDialog from './TcConfirmSchaduledAnnouncem
 const mockHandleCreateAnnouncements = jest.fn();
 
 const defaultProps = {
-  buttonLabel: 'Schedule Announcement',
+  buttonLabel: 'Select Date for Announcement',
   selectedChannels: [{ id: '1', label: 'General' }],
   schaduledDate: '2024-01-20T12:00:00',
   isDisabled: false,
@@ -17,7 +17,7 @@ test('renders the dialog with button and calls handleCreateAnnouncements when co
     <TcConfirmSchaduledAnnouncementsDialog {...defaultProps} />
   );
 
-  const button = getByText('Schedule Announcement');
+  const button = getByText('Select Date for Announcement');
   expect(button).toBeInTheDocument();
 
   fireEvent.click(button);
diff --git a/src/components/announcements/create/publicMessageContainer/TcPublicMessageContainer.spec.tsx b/src/components/announcements/create/publicMessageContainer/TcPublicMessageContainer.spec.tsx
index 17b3daf7..88d1b3d1 100644
--- a/src/components/announcements/create/publicMessageContainer/TcPublicMessageContainer.spec.tsx
+++ b/src/components/announcements/create/publicMessageContainer/TcPublicMessageContainer.spec.tsx
@@ -38,23 +38,13 @@ describe('TcPublicMessageContainer', () => {
     expect(screen.getByText(/Public Message/i)).toBeInTheDocument();
   });
 
-  it('renders the "Send message to:" text', () => {
-    expect(screen.getByText(/Send message to:/i)).toBeInTheDocument();
-  });
-
-  it('renders the message about bot delivery', () => {
+  it('renders the message about bot distribute', () => {
     const message =
-      /Our bot will deliver the announcement across chosen channels with the necessary access to share the specified message\./i;
+      /Our bot will distribute the announcement through selected channels with the required access to share the designated message./i;
     expect(screen.getByText(message)).toBeInTheDocument();
   });
 
   it('renders the "Write message here:" text', () => {
     expect(screen.getByText(/Write message here:/i)).toBeInTheDocument();
   });
-
-  it('renders the auto-generated safety message prompt', () => {
-    const message =
-      /If you don’t write a custom message then this auto-generated safety message wlll be sent out/i;
-    expect(screen.getByText(message)).toBeInTheDocument();
-  });
 });
diff --git a/src/components/announcements/create/publicMessageContainer/TcPublicMessageContainer.tsx b/src/components/announcements/create/publicMessageContainer/TcPublicMessageContainer.tsx
index 673afe84..9c54ec29 100644
--- a/src/components/announcements/create/publicMessageContainer/TcPublicMessageContainer.tsx
+++ b/src/components/announcements/create/publicMessageContainer/TcPublicMessageContainer.tsx
@@ -67,9 +67,7 @@ function TcPublicMessageContainer({
     setSelectedChannels(flattenChannels(channels));
   }, [channels, selectedSubChannels]);
 
-  const [message, setMessage] = useState<string>(
-    `This message was sent to you because you’re part of ${community?.name}. To verify the legitimacy of this message, see the official announcement here ⁠👥together-crew⁠ and verify the bot ID If you don’t want to receive any more private message from ${community?.name}, please adjust your settings here: https://app.togethercrew.com/community-settings/`
-  );
+  const [message, setMessage] = useState<string>('');
 
   const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     setMessage(event.target.value);
@@ -94,6 +92,7 @@ function TcPublicMessageContainer({
             label: channel.name,
           })
         );
+
         setSelectedChannels(formattedChannels);
         setMessage(publicAnnouncementsData.template);
       }
@@ -103,7 +102,7 @@ function TcPublicMessageContainer({
   return (
     <div className="space-y-3">
       <div className="flex flex-col md:flex-row md:justify-between md:items-center space-y-1 md:space-y-0">
-        <div className="flex flex-col md:flex-row md:items-center md:space-x-3">
+        <div className="flex flex-row items-center space-x-3">
           <TcIconContainer>
             <MdAnnouncement size={20} />
           </TcIconContainer>
@@ -116,14 +115,14 @@ function TcPublicMessageContainer({
         />
       </div>
       <div className="space-y-1.5">
-        <div>
+        {/* <div>
           <TcText text="Send message to:" variant="subtitle1" />
           <TcText
             text="Our bot will deliver the announcement across chosen channels with the necessary access to share the specified message."
             variant="caption"
             className="text-gray-400"
           />
-        </div>
+        </div> */}
         <FormControl variant="filled" fullWidth size="medium">
           <InputLabel id="select-standard-label">Select Channels</InputLabel>
           <TcSelect
@@ -146,10 +145,10 @@ function TcPublicMessageContainer({
             </div>
           </TcSelect>
         </FormControl>
-        <div className="flex items-center space-x-1">
+        <div className="flex flex-col space-x-1">
           <TcText text="Write message here:" variant="subtitle1" />
           <TcText
-            text="If you don’t write a custom message then this auto-generated safety message wlll be sent out"
+            text="Our bot will distribute the announcement through selected channels with the required access to share the designated message."
             variant="caption"
             className="text-gray-400"
           />
diff --git a/src/components/announcements/create/scheduleAnnouncement/TcScheduleAnnouncement.spec.tsx b/src/components/announcements/create/scheduleAnnouncement/TcScheduleAnnouncement.spec.tsx
index 870106c8..b07aef74 100644
--- a/src/components/announcements/create/scheduleAnnouncement/TcScheduleAnnouncement.spec.tsx
+++ b/src/components/announcements/create/scheduleAnnouncement/TcScheduleAnnouncement.spec.tsx
@@ -4,8 +4,52 @@ import '@testing-library/jest-dom';
 import TcScheduleAnnouncement from './TcScheduleAnnouncement';
 
 describe('TcScheduleAnnouncement Tests', () => {
+  // Mock functions for the new props
+  const mockHandleScheduledDate = jest.fn();
+  const mockSetIsDateValid = jest.fn();
+
   test('renders the component without crashing', () => {
-    render(<TcScheduleAnnouncement />);
-    expect(screen.getByText('Schedule Announcement')).toBeInTheDocument();
+    render(
+      <TcScheduleAnnouncement
+        handleSchaduledDate={mockHandleScheduledDate}
+        isDateValid={true}
+        setIsDateValid={mockSetIsDateValid}
+      />
+    );
+
+    // Since the initial text is "Select Date for Announcement", we should assert this text.
+    expect(
+      screen.getByText('Select Date for Announcement')
+    ).toBeInTheDocument();
+  });
+
+  test('initially displays the calendar icon', () => {
+    render(
+      <TcScheduleAnnouncement
+        handleSchaduledDate={mockHandleScheduledDate}
+        isDateValid={true}
+        setIsDateValid={mockSetIsDateValid}
+      />
+    );
+
+    // Assuming your TcButton component renders an <MdCalendarMonth /> icon, this test checks for its presence.
+    const calendarIcon = screen.getByTestId('MdCalendarMonth');
+    expect(calendarIcon).toBeInTheDocument();
+  });
+
+  test('displays the button to open date-time popover', () => {
+    render(
+      <TcScheduleAnnouncement
+        handleSchaduledDate={mockHandleScheduledDate}
+        isDateValid={true}
+        setIsDateValid={mockSetIsDateValid}
+      />
+    );
+
+    // Check if the button that is supposed to open the date-time popover is rendered.
+    const button = screen.getByRole('button', {
+      name: /select date for announcement/i,
+    });
+    expect(button).toBeInTheDocument();
   });
 });
diff --git a/src/components/announcements/create/scheduleAnnouncement/TcScheduleAnnouncement.tsx b/src/components/announcements/create/scheduleAnnouncement/TcScheduleAnnouncement.tsx
index e68e28cb..394f88f4 100644
--- a/src/components/announcements/create/scheduleAnnouncement/TcScheduleAnnouncement.tsx
+++ b/src/components/announcements/create/scheduleAnnouncement/TcScheduleAnnouncement.tsx
@@ -5,22 +5,28 @@ import TcText from '../../../shared/TcText';
 import TcButton from '../../../shared/TcButton';
 import moment from 'moment';
 import TcDateTimePopover from './TcDateTimePopover';
+import { validateDateTime } from '../../../../helpers/helper';
 
 export interface ITcScheduleAnnouncementProps {
   isEdit?: boolean;
   preSelectedTime?: string;
   handleSchaduledDate: ({ selectedTime }: { selectedTime: string }) => void;
+  isDateValid: boolean;
+  setIsDateValid: (isValid: boolean) => void;
 }
 
 function TcScheduleAnnouncement({
   isEdit = false,
   preSelectedTime,
   handleSchaduledDate,
+  isDateValid,
+  setIsDateValid,
 }: ITcScheduleAnnouncementProps) {
   const [anchorEl, setAnchorEl] = useState<HTMLButtonElement | null>(null);
   const [activeTab, setActiveTab] = useState(0);
   const [selectedDate, setSelectedDate] = useState<Date | null>(null);
   const [selectedTime, setSelectedTime] = useState<Date | null>(null);
+
   const [dateTimeDisplay, setDateTimeDisplay] = useState<string>(
     'Select Date for Announcement'
   );
@@ -40,6 +46,8 @@ function TcScheduleAnnouncement({
     if (date) {
       setSelectedDate(date);
       setActiveTab(1);
+      const isValid = validateDateTime(date, selectedTime);
+      setIsDateValid(isValid);
     }
   };
 
@@ -54,6 +62,8 @@ function TcScheduleAnnouncement({
         });
         setDateTimeDisplay(fullDateTime.format('D MMMM YYYY @ hh:mm A'));
       }
+      const isValid = validateDateTime(selectedDate, time);
+      setIsDateValid(isValid);
     }
   };
 
@@ -74,26 +84,23 @@ function TcScheduleAnnouncement({
 
   useEffect(() => {
     if (isEdit && preSelectedTime) {
-      const date = moment(preSelectedTime);
-
-      setSelectedDate(date.toDate());
-      setSelectedTime(date.toDate());
-      setDateTimeDisplay(date.format('D MMMM YYYY @ hh:mm A'));
+      const dateTime = moment(preSelectedTime);
+      const date = dateTime.toDate();
+      setSelectedDate(date);
+      setSelectedTime(date);
+      setDateTimeDisplay(dateTime.format('D MMMM YYYY @ hh:mm A'));
+      setIsDateValid(validateDateTime(date, date));
     }
   }, [isEdit, preSelectedTime]);
 
   return (
     <div className="space-y-3">
-      <div className="flex flex-col md:flex-row md:justify-between md:items-center space-y-3 md:space-y-0">
+      <div className="flex flex-col md:flex-row md:justify-start md:space-x-3 md:items-center space-y-3 md:space-y-0">
         <div className="flex items-center space-x-3">
           <TcIconContainer>
-            <MdCalendarMonth size={20} />
+            <MdCalendarMonth size={20} data-testid="MdCalendarMonth" />
           </TcIconContainer>
-          <TcText
-            text="Schedule Announcement"
-            variant="body1"
-            fontWeight="bold"
-          />
+          <TcText text="Select Date" variant="body1" fontWeight="bold" />
         </div>
         <TcButton
           text={dateTimeDisplay}
@@ -104,6 +111,13 @@ function TcScheduleAnnouncement({
           aria-describedby={id}
           onClick={handleOpen}
         />
+        {!isDateValid && (
+          <TcText
+            text="Selected Date should be greater that now."
+            variant="caption"
+            className="text-red-500"
+          />
+        )}
         <TcDateTimePopover
           open={open}
           anchorEl={anchorEl}
diff --git a/src/helpers/helper.ts b/src/helpers/helper.ts
index ee764a08..b7819636 100644
--- a/src/helpers/helper.ts
+++ b/src/helpers/helper.ts
@@ -1,3 +1,4 @@
+import moment from 'moment';
 import { SelectedSubChannels } from '../context/ChannelContext';
 import { IDecodedToken } from '../utils/interfaces';
 import { IUser } from '../utils/types';
@@ -120,3 +121,16 @@ export function hexToRGBA(hex: string, opacity: number): string {
 
   return `rgba(${r}, ${g}, ${b}, ${opacity})`;
 }
+
+export function validateDateTime(date: Date | null, time: Date | null) {
+  if (date && time) {
+    const selectedDateTime = moment(date).set({
+      hour: time.getHours(),
+      minute: time.getMinutes(),
+      second: 0,
+    });
+
+    return selectedDateTime.isAfter(moment());
+  }
+  return false;
+}
diff --git a/src/pages/announcements/create-new-announcements.tsx b/src/pages/announcements/create-new-announcements.tsx
index b0e73836..a4c047a3 100644
--- a/src/pages/announcements/create-new-announcements.tsx
+++ b/src/pages/announcements/create-new-announcements.tsx
@@ -16,6 +16,12 @@ import { IRoles, IUser } from '../../utils/interfaces';
 import { useSnackbar } from '../../context/SnackbarContext';
 import { useRouter } from 'next/router';
 import SimpleBackdrop from '../../components/global/LoadingBackdrop';
+import { FormControlLabel } from '@mui/material';
+import { MdOutlineAnnouncement } from 'react-icons/md';
+import TcIconContainer from '../../components/announcements/create/TcIconContainer';
+import TcIconWithTooltip from '../../components/shared/TcIconWithTooltip';
+import TcSwitch from '../../components/shared/TcSwitch';
+import TcText from '../../components/shared/TcText';
 
 export type CreateAnnouncementsPayloadDataOptions =
   | { channelIds: string[]; userIds?: string[]; roleIds?: string[] }
@@ -50,6 +56,7 @@ function CreateNewAnnouncements() {
   const [roles, setRoles] = useState<IRoles[]>([]);
   const [users, setUsers] = useState<IUser[]>([]);
   const [loading, setLoading] = useState<boolean>(false);
+  const [isDateValid, setIsDateValid] = useState<boolean>(true);
 
   const platformId = community?.platforms.find(
     (platform) => platform.disconnectedAt === null
@@ -134,6 +141,13 @@ function CreateNewAnnouncements() {
             <div className="flex flex-col justify-between p-4 md:px-10 min-h-[92dvh]">
               <div className="space-y-4">
                 <TcSelectPlatform isEdit={false} />
+                <TcScheduleAnnouncement
+                  handleSchaduledDate={({ selectedTime }) => {
+                    setScheduledAt(selectedTime);
+                  }}
+                  isDateValid={isDateValid}
+                  setIsDateValid={setIsDateValid}
+                />
                 <TcPublicMessageContainer
                   handlePublicAnnouncements={({
                     message,
@@ -152,7 +166,18 @@ function CreateNewAnnouncements() {
                     });
                   }}
                 />
-                <TcPrivateMessageContainer
+                <div className="flex flex-row items-center space-x-3">
+                  <TcIconContainer>
+                    <MdOutlineAnnouncement size={20} />
+                  </TcIconContainer>
+                  <TcText
+                    text="Smart Announcements"
+                    variant="body1"
+                    fontWeight="700"
+                  />
+                  <TcText text="Coming Soon..." variant="subtitle1" />
+                </div>
+                {/* <TcPrivateMessageContainer
                   handlePrivateAnnouncements={({
                     message,
                     selectedUsers,
@@ -199,12 +224,7 @@ function CreateNewAnnouncements() {
                       setPrivateAnnouncements([combinedPrivateAnnouncement]);
                     }
                   }}
-                />
-                <TcScheduleAnnouncement
-                  handleSchaduledDate={({ selectedTime }) => {
-                    setScheduledAt(selectedTime);
-                  }}
-                />
+                /> */}
               </div>
               <div className="flex flex-col md:flex-row justify-between items-center space-y-3 pt-6 md:pt-8">
                 <TcButton
@@ -237,7 +257,7 @@ function CreateNewAnnouncements() {
                     selectedRoles={roles}
                     selectedUsernames={users}
                     schaduledDate={scheduledAt || ''}
-                    isDisabled={!scheduledAt}
+                    isDisabled={!scheduledAt || !isDateValid}
                     handleCreateAnnouncements={(e) =>
                       handleCreateAnnouncements(e)
                     }
diff --git a/src/pages/announcements/edit-announcements/index.tsx b/src/pages/announcements/edit-announcements/index.tsx
index 7b0bc067..07075306 100644
--- a/src/pages/announcements/edit-announcements/index.tsx
+++ b/src/pages/announcements/edit-announcements/index.tsx
@@ -16,6 +16,9 @@ import { useSnackbar } from '../../../context/SnackbarContext';
 import { useToken } from '../../../context/TokenContext';
 import { CreateAnnouncementsPayloadData } from '../create-new-announcements';
 import SimpleBackdrop from '../../../components/global/LoadingBackdrop';
+import { MdOutlineAnnouncement } from 'react-icons/md';
+import TcIconContainer from '../../../components/announcements/create/TcIconContainer';
+import TcText from '../../../components/shared/TcText';
 
 export interface DiscordChannel {
   channelId: string;
@@ -69,6 +72,7 @@ function Index() {
   const [roles, setRoles] = useState<IRoles[]>([]);
   const [users, setUsers] = useState<IUser[]>([]);
   const [loading, setLoading] = useState<boolean>(false);
+  const [isDateValid, setIsDateValid] = useState<boolean>(true);
 
   const platformId = community?.platforms.find(
     (platform) => platform.disconnectedAt === null
@@ -160,6 +164,8 @@ function Index() {
       if (data) {
         showMessage('Announcement updated successfully', 'success');
         router.push('/announcements');
+      } else {
+        fetchPlatformChannels();
       }
     } catch (error) {
       showMessage('Failed to create announcement', 'error');
@@ -187,6 +193,15 @@ function Index() {
             <div className="flex flex-col justify-between p-4 md:p-10 min-h-[92dvh]">
               <div className="space-y-4">
                 <TcSelectPlatform isEdit={true} />
+                <TcScheduleAnnouncement
+                  isEdit={true}
+                  preSelectedTime={scheduledAt}
+                  handleSchaduledDate={({ selectedTime }) => {
+                    setScheduledAt(selectedTime);
+                  }}
+                  isDateValid={isDateValid}
+                  setIsDateValid={setIsDateValid}
+                />
                 <TcPublicMessaageContainer
                   isEdit={true}
                   publicAnnouncementsData={publicSelectedAnnouncements}
@@ -207,7 +222,18 @@ function Index() {
                     });
                   }}
                 />
-                <TcPrivateMessageContainer
+                <div className="flex flex-row items-center space-x-3">
+                  <TcIconContainer>
+                    <MdOutlineAnnouncement size={20} />
+                  </TcIconContainer>
+                  <TcText
+                    text="Smart Announcements"
+                    variant="body1"
+                    fontWeight="700"
+                  />
+                  <TcText text="Coming Soon..." variant="subtitle1" />
+                </div>
+                {/* <TcPrivateMessageContainer
                   isEdit={true}
                   privateAnnouncementsData={privateSelectedAnnouncements}
                   handlePrivateAnnouncements={({
@@ -256,14 +282,7 @@ function Index() {
                       setPrivateAnnouncements([combinedPrivateAnnouncement]);
                     }
                   }}
-                />
-                <TcScheduleAnnouncement
-                  isEdit={true}
-                  preSelectedTime={scheduledAt}
-                  handleSchaduledDate={({ selectedTime }) => {
-                    setScheduledAt(selectedTime);
-                  }}
-                />
+                /> */}
               </div>
               <div className="flex flex-col md:flex-row justify-end items-center space-y-3 pt-6 md:pt-12">
                 <TcConfirmSchaduledAnnouncementsDialog
@@ -272,7 +291,7 @@ function Index() {
                   selectedRoles={roles}
                   selectedUsernames={users}
                   schaduledDate={scheduledAt || ''}
-                  isDisabled={!scheduledAt}
+                  isDisabled={!scheduledAt || !isDateValid}
                   handleCreateAnnouncements={(e) => handleEditAnnouncements(e)}
                 />
               </div>
diff --git a/src/pages/announcements/index.tsx b/src/pages/announcements/index.tsx
index a055b024..2e8c06c6 100644
--- a/src/pages/announcements/index.tsx
+++ b/src/pages/announcements/index.tsx
@@ -208,6 +208,7 @@ function Index() {
                       }
                       handleRefreshList={fetchData}
                       isLoading={loading}
+                      selectedZone={selectedZone}
                     />
                   </div>
                 ) : (