diff --git a/packages/announcements/src/App.js b/packages/announcements/src/App.js
index 9cc4e59c..5fe3ee7c 100644
--- a/packages/announcements/src/App.js
+++ b/packages/announcements/src/App.js
@@ -29,7 +29,7 @@ function App() {
theme={theme}
routes={routes}
AuthComponent={LoginComponent}
- isShowPinnedAnnouncements={true}
+ appName="announcements"
/>
);
}
diff --git a/packages/announcements/src/pages/Announcements.js b/packages/announcements/src/pages/Announcements.js
index cfb25618..53da1956 100644
--- a/packages/announcements/src/pages/Announcements.js
+++ b/packages/announcements/src/pages/Announcements.js
@@ -142,7 +142,7 @@ const Announcements = ({ footerLinks, appName, pinnedAnnouncementsData }) => {
subHeading: moment().format("hh:mm A"),
_subHeading: { fontWeight: 500, textTransform: "uppercase" },
}}
- _appBar={{ languages: manifest.languages, showPinnedAnnouncements: true }}
+ _appBar={{ languages: manifest.languages }}
subHeader={t("VIEW_LATEST_ANNOUNCEMENTS")}
_subHeader={{
bg: colors?.cardBg,
diff --git a/packages/attendance/src/App.js b/packages/attendance/src/App.js
index 52025fea..8ae06035 100644
--- a/packages/attendance/src/App.js
+++ b/packages/attendance/src/App.js
@@ -44,6 +44,7 @@ function App() {
basename={process.env.PUBLIC_URL}
routes={routes}
AuthComponent={LoginComponent}
+ appName="attendance"
/>
);
}
diff --git a/packages/common-lib/src/components/AppShell.tsx b/packages/common-lib/src/components/AppShell.tsx
index e06072ec..b9f1bfcc 100644
--- a/packages/common-lib/src/components/AppShell.tsx
+++ b/packages/common-lib/src/components/AppShell.tsx
@@ -11,7 +11,6 @@ function AppShell({
basename,
isShowFooterLink,
appName,
- isShowPinnedAnnouncements,
...otherProps
}: any) {
const [token, setToken] = useState(localStorage.getItem('token'))
@@ -57,10 +56,14 @@ function AppShell({
]
}
+ //TODO: integrate with API call to fetch whitelisted modules
+ const pinnedAnnouncementsWhitelist = ['announcements']
//TODO: integrate with API call to fetch pinned announcements
- //pinned announcements data is common to all components depending on their
- const pinnedAnnouncementsData = !isShowPinnedAnnouncements
- ? []
+
+ const pinnedAnnouncementsData = !pinnedAnnouncementsWhitelist.some(
+ (val: string) => val === appName
+ )
+ ? undefined
: [
{
data: 'Shiksha V2.0 Is Live! 🚀🎉',
diff --git a/packages/common-lib/src/components/layout/Layout.js b/packages/common-lib/src/components/layout/Layout.js
index 6b85a07b..d1cbd85d 100644
--- a/packages/common-lib/src/components/layout/Layout.js
+++ b/packages/common-lib/src/components/layout/Layout.js
@@ -36,7 +36,9 @@ export default function Layout({
}}
space={5}
>
-
+ {_pinnedAnnouncementsData ? (
+
+ ) : null}
{!isDisabledAppBar ? (
) : (