diff --git a/src/screens/OrganizationDashboard/OrganizationDashboard.module.css b/src/screens/OrganizationDashboard/OrganizationDashboard.module.css
index b65b822c49..f2445c67e9 100644
--- a/src/screens/OrganizationDashboard/OrganizationDashboard.module.css
+++ b/src/screens/OrganizationDashboard/OrganizationDashboard.module.css
@@ -22,6 +22,11 @@
justify-content: center;
align-items: center;
}
+
.BottomRow {
- margin-top: 45px;
+ margin-top: 30px;
+}
+
+.memeberShipCard {
+ height: 150px;
}
diff --git a/src/screens/OrganizationDashboard/OrganizationDashboard.test.tsx b/src/screens/OrganizationDashboard/OrganizationDashboard.test.tsx
index cb221f94ce..568d5e6bc9 100644
--- a/src/screens/OrganizationDashboard/OrganizationDashboard.test.tsx
+++ b/src/screens/OrganizationDashboard/OrganizationDashboard.test.tsx
@@ -78,7 +78,6 @@ describe('Organisation Dashboard Page', () => {
// Checking if posts are rendered
expect(screen.getByText('Post 15')).toBeInTheDocument();
- // Checking if membership requests are rendered
expect(screen.getByText('Jane Doe')).toBeInTheDocument();
const peopleBtn = screen.getByText('Members');
@@ -147,4 +146,26 @@ describe('Organisation Dashboard Page', () => {
await wait();
expect(window.location).toBeAt('/orglist');
});
+
+ test('rendering of upcoming events', async () => {
+ render(
+
+
+
+
+
+
+
+
+
+ );
+
+ await wait();
+
+ const upcomingEventsTitle = screen.getByText('Upcoming Events');
+ expect(upcomingEventsTitle).toBeInTheDocument();
+
+ const upcomingEvents = screen.queryAllByTestId('upcomingEventItem');
+ expect(upcomingEvents.length).toBeGreaterThanOrEqual(0);
+ });
});
diff --git a/src/screens/OrganizationDashboard/OrganizationDashboard.tsx b/src/screens/OrganizationDashboard/OrganizationDashboard.tsx
index dc3e0489a1..59e5c0e339 100644
--- a/src/screens/OrganizationDashboard/OrganizationDashboard.tsx
+++ b/src/screens/OrganizationDashboard/OrganizationDashboard.tsx
@@ -228,7 +228,7 @@ function organizationDashboard(): JSX.Element {
{t('viewAll')}
-
+
{loadingOrgData ? (
[...Array(4)].map((_, index) => {
return ;