Merge pull request #279 from bettersg/fix/address_not_showing_in_scheme

Fix address not showing in scheme page

Author: longwind48

frontend/src/app/schemes/[schemeId]/page.tsx

@@ -110,10 +110,11 @@ const mapToFullScheme = (rawData: FullSchemeData): Scheme => {
     }
   } else {
     // no physical branch. Group contact details together
-    if (rawData.phone || rawData.email) {
+    if (rawData.phone || rawData.email || rawData.address) {
       contacts.push({
         phones: rawData.phone && rawData.phone,
         emails: rawData.email && rawData.email,
+        address: rawData.address && rawData.address[0],
       });
     }
   }

frontend/src/components/schemes/scheme-card.tsx

@@ -23,7 +23,8 @@ function SchemeCard({scheme}: SchemeCardProps) {
             width={60}
             radius="sm"
             classNames={{
-              wrapper: 'shrink-0'
+              wrapper: 'shrink-0',
+              img: 'object-contain'
             }}
           />
           <div className="flex flex-col">

frontend/src/components/schemes/scheme-contact-card.tsx

@@ -9,6 +9,10 @@ interface SchemeContactCardProps {
 }
 
 export default function SchemeContactCard({contact}: SchemeContactCardProps) {
+  if (!contact.address && !contact.phones?.length && !contact.emails?.length) {
+    return null;
+  }
+
   return (
     <Card
       className="p-4 flex flex-col gap-2"