Merge pull request #492 from bettersg/develop

3.3.6

checkers-app/src/components/dashboard/CelebrationDialog.tsx

@@ -19,6 +19,7 @@ interface PropType {
 
 export function CelebrationDialog({ display, certificateUrl }: PropType) {
   const [open, setOpen] = React.useState(display);
+  const hasCompletedRef = React.useRef(false);
   const { checkerDetails } = useUser();
   const navigate = useNavigate();
   const handleOpen = () => setOpen(!open);
@@ -32,13 +33,14 @@ export function CelebrationDialog({ display, certificateUrl }: PropType) {
 
   React.useEffect(() => {
     const completeCheckerProgram = async () => {
-      if (checkerDetails.checkerId) {
+      if (checkerDetails.checkerId && open && !hasCompletedRef.current) {
         await completeProgram(checkerDetails.checkerId);
+        hasCompletedRef.current = true;
       }
     };
 
     completeCheckerProgram();
-  }, []);
+  }, [open, checkerDetails.checkerId]);
 
   return (
     <Dialog open={open} handler={handleOpen}>

functions/src/definitions/api/handlers/patchChecker.ts

@@ -84,6 +84,9 @@ const patchCheckerHandler = async (req: Request, res: Response) => {
         } else if (body.programData === "complete") {
           //delete programdata from body
           delete body.programData
+          if (checkerSnap.get("programData.programEnd") == null) {
+            return res.status(400).send("Program not yet able to be completed")
+          }
           body["programData.isOnProgram"] = false
         } else if (body.programData === "withdraw") {
           const thresholds = await getThresholds()

functions/src/definitions/common/responseUtils.ts

@@ -18,7 +18,7 @@ import { getThresholds, sleep } from "./utils"
 import { getSignedUrl } from "./mediaUtils"
 import { sendTextMessage } from "./sendMessage"
 import { getVoteCounts } from "./counters"
-import { CustomReply, UserBlast } from "../../types"
+import { CustomReply, LanguageSelection, UserBlast } from "../../types"
 import { incrementCheckerCounts } from "./counters"
 import { get } from "http"
 
@@ -73,11 +73,11 @@ type ResponseObject = {
 async function getResponsesObj(botType: "factChecker"): Promise<ResponseObject>
 async function getResponsesObj(
   botType: "user",
-  language: "en" | "cn"
+  language: LanguageSelection
 ): Promise<ResponseObject>
 async function getResponsesObj(
   botType: "user" | "factChecker" = "user",
-  language: "en" | "cn" = "en"
+  language: LanguageSelection = "en"
 ) {
   let path
   if (botType === "factChecker") {
@@ -178,11 +178,12 @@ async function sendMenuMessage(
   disputedInstancePath: string | null = null,
   isTruncated: boolean = false,
   isGenerated: boolean = false,
-  isIncorrect: boolean = false
+  isIncorrect: boolean = false,
+  language: LanguageSelection | null = null
 ) {
   const isSubscribedUpdates = userSnap.get("isSubscribedUpdates") ?? false
-  const language = userSnap.get("language") ?? "en"
-  const responses = await getResponsesObj("user", language)
+  const resolvedLanguage = language ?? userSnap.get("language") ?? "en"
+  const responses = await getResponsesObj("user", resolvedLanguage)
   if (!(prefixName in responses)) {
     functions.logger.error(`prefixName ${prefixName} not found in responses`)
     return
@@ -375,7 +376,7 @@ async function getVotingStatsMessage(
   truthScore: number | null,
   numberPointScale: number,
   messageRef: DocumentReference,
-  language: "en" | "cn" = "en"
+  language: LanguageSelection = "en"
 ) {
   if (!messageRef) {
     throw new Error("messageRef missing")
@@ -576,12 +577,22 @@ async function sendRationalisation(
 
 async function updateLanguageAndSendMenu(
   userSnap: DocumentSnapshot,
-  language: string
+  language: LanguageSelection
 ) {
   await userSnap.ref.update({
     language: language,
   })
-  await sendMenuMessage(userSnap, "MENU_PREFIX", "whatsapp", null, null, true) //truncated menu on onboarding
+  await sendMenuMessage(
+    userSnap,
+    "MENU_PREFIX",
+    "whatsapp",
+    null,
+    null,
+    true,
+    false,
+    false,
+    language
+  ) //truncated menu on onboarding
 }
 
 async function sendInterimUpdate(

functions/src/definitions/eventHandlers/onCheckerUpdate.ts

@@ -115,8 +115,6 @@ const onCheckerUpdateV2 = onDocumentUpdated(
           // Existing code to get the checker app host URL
           const url = `${checkerAppHost}/`
 
-          console.log(linkedInUrl)
-
           // Fetch the base message template
           const checkerResponses = await getResponsesObj("factChecker")
           const baseMessage = checkerResponses.PROGRAM_COMPLETED

functions/src/definitions/eventHandlers/userNavigationHandlers.ts

@@ -26,7 +26,7 @@ import {
   respondToBlastFeedback,
 } from "../common/responseUtils"
 import { defineString } from "firebase-functions/params"
-import { WhatsappMessageObject } from "../../types"
+import { LanguageSelection, WhatsappMessageObject } from "../../types"
 import { AppEnv } from "../../appEnv"
 
 const runtimeEnvironment = defineString(AppEnv.ENVIRONMENT)
@@ -191,7 +191,7 @@ async function onButtonReply(
       await respondToBlastFeedback(userSnap, blastPath, selection)
       break
     case "languageSelection":
-      ;[selection] = rest
+      ;[selection] = rest as [LanguageSelection]
       await updateLanguageAndSendMenu(userSnap, selection)
       break
   }

functions/src/types.ts

@@ -19,6 +19,8 @@ export type WhatsappButton = {
   }
 }
 
+export type LanguageSelection = "en" | "cn"
+
 export type WhatsappMessageObject = {
   from: string
   type: string
@@ -226,7 +228,7 @@ export type UserData = {
   referralCount: number
   isReferralMessageSent: boolean
   isReminderMessageSent: boolean //whether the response
-  language: "en" | "cn"
+  language: LanguageSelection
   isSubscribedUpdates: boolean
   isIgnored: boolean
 }