Merge branch 'dev' into staging

src/front/Components/LayoutTemplates/DefaultDoubleSidePage/index.tsx

@@ -46,7 +46,7 @@ export default function DefaultDoubleSidePage(props: IProps) {
 					<Image alt={"right side image"} src={image} className={classes["background-image"]} priority />
 				</div>
 			)}
-			<Footer hasLeftPadding isSticky />
+			<Footer hasLeftPadding />
 		</div>
 	);
 }

src/front/Components/LayoutTemplates/DefaultUserDashboard/index.tsx

@@ -15,7 +15,7 @@ export default function DefaultUserDashboard(props: IProps) {
 	const { userUid } = router.query;
 	useEffect(() => {
 		const query: IGetUsersparams = {
-			include: { contact: true },
+			include: { contact: true, office_membership: true },
 		};
 
 		Users.getInstance()
@@ -37,7 +37,7 @@ export default function DefaultUserDashboard(props: IProps) {
 							id: user.uid!,
 							primaryText: user.contact?.first_name + " " + user.contact?.last_name,
 							isActive: user.uid === userUid,
-							secondaryText: user.contact?.email,
+							secondaryText: user.office_membership?.crpcen + " - " + user.office_membership?.name,
 					  }))
 					: []
 			}