Merge branch 'main' into search-component-translations

Author: jicruz96

components/Card/CardTitle.tsx

@@ -17,6 +17,7 @@ interface CardTitleProps {
   isUserMatch?: boolean
   type?: string
   userRole?: string
+  isNewsfeed?: string
 }
 
 export const CardTitle = (props: CardTitleProps) => {
@@ -29,7 +30,8 @@ export const CardTitle = (props: CardTitleProps) => {
     isUserMatch,
     subheader,
     type,
-    userRole
+    userRole,
+    isNewsfeed
   } = props
 
   return (
@@ -44,14 +46,18 @@ export const CardTitle = (props: CardTitleProps) => {
           subheader={subheader}
           type={type}
         />
-        <CardTitleFollowing
-          billId={billId}
-          header={header}
-          subheader={subheader}
-          isBillMatch={isBillMatch}
-          isUserMatch={isUserMatch}
-          type={type}
-        />
+        {isNewsfeed ? (
+          <CardTitleFollowing
+            billId={billId}
+            header={header}
+            subheader={subheader}
+            isBillMatch={isBillMatch}
+            isUserMatch={isUserMatch}
+            type={type}
+          />
+        ) : (
+          <></>
+        )}
       </CardBootstrap.Body>
     </CardBootstrap.Body>
   )

components/EditProfilePage/ProfileSettingsModal.tsx

@@ -82,7 +82,7 @@ export default function ProfileSettingsModal({
 
   const handleToggleNotifications = async () => {
     if (notifications === "None") {
-      setNotifications("Monthly")
+      setNotifications("Weekly")
     } else {
       setNotifications("None")
     }

components/Footer/Footer.tsx

@@ -11,6 +11,7 @@ import CustomDropdown, {
   CustomDropdownProps
 } from "components/Footer/CustomFooterDropdown"
 import { FooterContainer } from "./FooterContainer"
+import { NEWSLETTER_SIGNUP_URL } from "components/common"
 
 export type PageFooterProps = {
   children?: any
@@ -282,7 +283,7 @@ const PageFooter = (props: PageFooterProps) => {
           {t("legal.disclaimer")}
           {" - "}
           <a
-            href="https://cdn.forms-content.sg-form.com/d049f1ab-b547-11ee-9605-72ceb6b6e337"
+            href={NEWSLETTER_SIGNUP_URL}
             style={{ color: "white" }}
             target="_blank"
             rel="noopener noreferrer"

components/HeroHeader/HeroHeader.js

@@ -6,6 +6,7 @@ import ScrollTrackingItem from "../ScrollTrackEffect/ScrollTrackerItem"
 import styles from "./HeroHeader.module.css"
 import { useTranslation } from "next-i18next"
 import { capitalize } from "lodash"
+import { NEWSLETTER_SIGNUP_URL, TRAINING_CALENDAR_URL } from "../common"
 
 const HeroHeader = ({ authenticated }) => {
   const { t } = useTranslation("common")
@@ -59,7 +60,7 @@ const HeroHeader = ({ authenticated }) => {
                   <p>
                     {t("newcomer")}{" "}
                     <a
-                      href="https://calendar.google.com/calendar/embed?src=998f62323926f0b0076e7f578d3ca72b1bc94c4efa2f24be57b11f52b1b88595%40group.calendar.google.com&ctz=America%2FNew_York"
+                      href={TRAINING_CALENDAR_URL}
                       style={{ color: "white" }}
                       target="_blank"
                       rel="noopener noreferrer"
@@ -70,7 +71,7 @@ const HeroHeader = ({ authenticated }) => {
                   </p>
                   <p>
                     <a
-                      href="https://cdn.forms-content.sg-form.com/d049f1ab-b547-11ee-9605-72ceb6b6e337"
+                      href={NEWSLETTER_SIGNUP_URL}
                       style={{ color: "white" }}
                       target="_blank"
                       rel="noopener noreferrer"

components/Newsfeed/Newsfeed.tsx

@@ -144,16 +144,14 @@ export default function Newsfeed() {
     const [settingsModal, setSettingsModal] = useState<"show" | null>(null)
     const [notifications, setNotifications] = useState<
       "Weekly" | "Monthly" | "None"
-    >(notificationFrequency ? notificationFrequency : "Monthly")
+    >(notificationFrequency ? notificationFrequency : "Weekly")
     const [isProfilePublic, setIsProfilePublic] = useState<false | true>(
       isPublic ? isPublic : false
     )
 
     const onSettingsModalOpen = () => {
       setSettingsModal("show")
-      setNotifications(
-        notificationFrequency ? notificationFrequency : "Monthly"
-      )
+      setNotifications(notificationFrequency ? notificationFrequency : "Weekly")
       setIsProfilePublic(isPublic ? isPublic : false)
     }
 
@@ -230,6 +228,7 @@ export default function Newsfeed() {
                             testimonyId={element.testimonyId}
                             type={element.type}
                             userRole={element.userRole}
+                            isNewsfeed={"enable newsfeed specific subheading"}
                           />
                         </div>
                       ))}

components/NewsfeedCard/NewsfeedCard.tsx

@@ -25,6 +25,7 @@ export const NewsfeedCard = (props: {
   timestamp: Timestamp
   type: string
   userRole?: string
+  isNewsfeed?: string
 }) => {
   const date = props.timestamp.toDate()
   const formattedTimestamp = `${date.toLocaleDateString()}`
@@ -40,6 +41,7 @@ export const NewsfeedCard = (props: {
       timestamp={formattedTimestamp}
       type={props.type}
       userRole={props.userRole}
+      isNewsfeed={"enable newsfeed specific subheading"}
     />
   )
 

components/auth/TermsOfServiceModal.tsx

@@ -3,6 +3,7 @@ import { Button, Col, Modal, Row, Stack } from "../bootstrap"
 import { External } from "components/links"
 import { NavLink } from "../Navlink"
 import { useTranslation } from "next-i18next"
+import { NEWSLETTER_SIGNUP_URL } from "components/common"
 
 export default function TermsOfServiceModal({
   show,
@@ -80,7 +81,7 @@ export default function TermsOfServiceModal({
               </Row>
               <Row>
                 <NavLink
-                  href="https://cdn.forms-content.sg-form.com/d049f1ab-b547-11ee-9605-72ceb6b6e337"
+                  href={NEWSLETTER_SIGNUP_URL}
                   other={{
                     className: `text-center fs-5 mt-4 text-secondary`,
                     target: "_blank",

components/auth/hooks.ts

@@ -76,7 +76,7 @@ export function useCreateUserWithEmailAndPassword(isOrg: boolean) {
           setProfile(credentials.user.uid, {
             fullName,
             orgCategories: categories,
-            notificationFrequency: "Monthly",
+            notificationFrequency: "Weekly",
             email: credentials.user.email
           }),
           sendEmailVerification(credentials.user)
@@ -85,7 +85,7 @@ export function useCreateUserWithEmailAndPassword(isOrg: boolean) {
         await Promise.all([
           setProfile(credentials.user.uid, {
             fullName,
-            notificationFrequency: "Monthly",
+            notificationFrequency: "Weekly",
             email: credentials.user.email,
             public: true
           }),
@@ -136,7 +136,7 @@ export function useSignInWithPopUp() {
       await Promise.all([
         setProfile(credentials.user.uid, {
           fullName: credentials.user.displayName ?? "New User",
-          notificationFrequency: "Monthly",
+          notificationFrequency: "Weekly",
           email: credentials.user.email,
           public: true
         })

components/common.tsx

@@ -0,0 +1,4 @@
+export const NEWSLETTER_SIGNUP_URL =
+  "https://cdn.forms-content.sg-form.com/66e4c174-72e5-11f0-847b-fe4d8dd139cf"
+export const TRAINING_CALENDAR_URL =
+  "https://calendar.google.com/calendar/embed?src=998f62323926f0b0076e7f578d3ca72b1bc94c4efa2f24be57b11f52b1b88595%40group.calendar.google.com&ctz=America%2FNew_York"

functions/src/notifications/deliverNotifications.ts

@@ -66,7 +66,7 @@ const deliverEmailNotifications = async () => {
     }
 
     // Temporarily using email from the profile to test the non-auth issues
-    const verifiedEmail = profile.email //await getVerifiedUserEmail(profileDoc.id)
+    const verifiedEmail = profile.email || profile.contactInfo?.publicEmail //await getVerifiedUserEmail(profileDoc.id)
     if (!verifiedEmail) {
       console.log(
         `Skipping user ${profileDoc.id} because they have no verified email address`