dimagi · Jignesh-dimagi · Feb 4, 2026 · Feb 4, 2026 · Feb 5, 2026 · Feb 6, 2026
diff --git a/app/src/org/commcare/activities/DispatchActivity.java b/app/src/org/commcare/activities/DispatchActivity.java
@@ -7,6 +7,7 @@
 import static org.commcare.connect.ConnectConstants.NOTIFICATION_ID;
 import static org.commcare.connect.ConnectConstants.PERSONALID_MANAGED_LOGIN;
 import static org.commcare.connect.ConnectConstants.REDIRECT_ACTION;
+import static org.commcare.utils.FirebaseMessagingUtil.getActionFromIntent;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -172,7 +173,7 @@ private void dispatch() {
             FirebaseAnalyticsUtil.reportNotificationEvent(
                     AnalyticsParamValue.NOTIFICATION_EVENT_TYPE_CLICK,
                     AnalyticsParamValue.REPORT_NOTIFICATION_CLICK_NOTIFICATION_TRAY,
-                    actionType,
+                    getActionFromIntent(pnIntent),
                     pnIntent.getStringExtra(NOTIFICATION_ID)
             );
             startActivity(pnIntent);

diff --git a/app/src/org/commcare/activities/PushNotificationActivity.kt b/app/src/org/commcare/activities/PushNotificationActivity.kt
@@ -9,6 +9,7 @@ import androidx.lifecycle.ViewModelProvider
 import org.commcare.activities.connect.viewmodel.PushNotificationViewModel
 import org.commcare.adapters.PushNotificationAdapter
 import org.commcare.android.database.connect.models.PushNotificationRecord
+import org.commcare.android.database.connect.models.PushNotificationRecord.Companion.getActionFromRecord
 import org.commcare.dalvik.R
 import org.commcare.dalvik.databinding.ActivityPushNotificationBinding
 import org.commcare.google.services.analytics.AnalyticsParamValue
@@ -82,7 +83,7 @@ class PushNotificationActivity : CommCareActivity<PushNotificationActivity>() {
                             FirebaseAnalyticsUtil.reportNotificationEvent(
                                 AnalyticsParamValue.NOTIFICATION_EVENT_TYPE_CLICK,
                                 AnalyticsParamValue.REPORT_NOTIFICATION_CLICK_NOTIFICATION_HISTORY,
-                                notificationRecord.action,
+                                getActionFromRecord(notificationRecord),
                                 notificationRecord.notificationId,
                             )
                             val activityIntent = getIntentForPNClick(application, notificationRecord)

diff --git a/app/src/org/commcare/activities/connect/ConnectActivity.java b/app/src/org/commcare/activities/connect/ConnectActivity.java
@@ -1,10 +1,17 @@
 package org.commcare.activities.connect;
 
+import static org.commcare.connect.ConnectConstants.CCC_DEST_DELIVERY_PROGRESS;
+import static org.commcare.connect.ConnectConstants.CCC_DEST_LEARN_PROGRESS;
+import static org.commcare.connect.ConnectConstants.CCC_DEST_PAYMENTS;
+import static org.commcare.connect.ConnectConstants.CCC_GENERIC_OPPORTUNITY;
 import static org.commcare.connect.ConnectConstants.GO_TO_JOB_STATUS;
 import static org.commcare.connect.ConnectConstants.NOTIFICATION_ID;
+import static org.commcare.connect.ConnectConstants.OPPORTUNITY_UUID;
+import static org.commcare.connect.ConnectConstants.PAYMENT_UUID;
 import static org.commcare.connect.ConnectConstants.REDIRECT_ACTION;
 import static org.commcare.connect.ConnectConstants.SHOW_LAUNCH_BUTTON;
 import static org.commcare.personalId.PersonalIdFeatureFlagChecker.FeatureFlag.NOTIFICATIONS;
+import static org.commcare.utils.FirebaseMessagingUtil.getActionFromIntent;
 import static org.commcare.utils.NotificationUtil.getNotificationIcon;
 
 import android.content.BroadcastReceiver;
@@ -123,15 +130,9 @@ private int getStartDestinationId(Bundle startArgs) {
 
     private void initStateFromExtras() {
         redirectionAction = getIntent().getStringExtra(REDIRECT_ACTION);
-        int opportunityId = getIntent().getIntExtra(ConnectConstants.OPPORTUNITY_ID, -1);
-        if (opportunityId == -1) {
-            String opportunityIdStr = getIntent().getStringExtra(ConnectConstants.OPPORTUNITY_ID);
-            if (!StringUtils.isEmpty(opportunityIdStr)) {
-                opportunityId = Integer.parseInt(opportunityIdStr);
-            }
-        }
-        if(opportunityId != -1) {
-            job = ConnectJobUtils.getCompositeJob(this, opportunityId);
+        String opportunityUuid = getIntent().getStringExtra(OPPORTUNITY_UUID);
+        if (!TextUtils.isEmpty(opportunityUuid)) {
+            job = ConnectJobUtils.getCompositeJob(this, opportunityUuid);
         }
     }
 
@@ -154,10 +155,21 @@ private int handleSecureRedirect(Bundle startArgs) {
             FirebaseAnalyticsUtil.reportNotificationEvent(
                     AnalyticsParamValue.NOTIFICATION_EVENT_TYPE_CLICK,
                     AnalyticsParamValue.REPORT_NOTIFICATION_CLICK_NOTIFICATION_TRAY,
-                    redirectionAction,
+                    getActionFromIntent(getIntent()),
                     notificationId
             );
         }
+
+        if(CCC_GENERIC_OPPORTUNITY.equals(redirectionAction)) {
+            String paymentId = getIntent().getStringExtra(PAYMENT_UUID);
+            if (!TextUtils.isEmpty(paymentId) && job!=null && job.getStatus() == ConnectJobRecord.STATUS_DELIVERING) {
+                redirectionAction = CCC_DEST_PAYMENTS;  //  Generic push notification for payment related
+            }else if(job!=null && job.getStatus() == ConnectJobRecord.STATUS_DELIVERING){
+                redirectionAction = CCC_DEST_DELIVERY_PROGRESS; //  Generic push notification for delivery progress related
+            }else if(job!=null && job.getStatus() == ConnectJobRecord.STATUS_LEARNING){
+                redirectionAction = CCC_DEST_LEARN_PROGRESS;    // Generic push notification for learning progress related
+            }
+        }
         startArgs.putString(REDIRECT_ACTION, redirectionAction);
         startArgs.putBoolean(SHOW_LAUNCH_BUTTON, getIntent().getBooleanExtra(SHOW_LAUNCH_BUTTON, true));
 

diff --git a/app/src/org/commcare/activities/connect/ConnectMessagingActivity.java b/app/src/org/commcare/activities/connect/ConnectMessagingActivity.java
@@ -23,6 +23,7 @@
 import static org.commcare.connect.ConnectConstants.CCC_MESSAGE;
 import static org.commcare.connect.ConnectConstants.NOTIFICATION_ID;
 import static org.commcare.connect.ConnectConstants.REDIRECT_ACTION;
+import static org.commcare.utils.FirebaseMessagingUtil.getActionFromIntent;
 
 public class ConnectMessagingActivity extends NavigationHostCommCareActivity<ConnectMessagingActivity> {
     public static final String CHANNEL_ID = "channel_id";
@@ -84,7 +85,7 @@ private void handleRedirectIfAny() {
             FirebaseAnalyticsUtil.reportNotificationEvent(
                     AnalyticsParamValue.NOTIFICATION_EVENT_TYPE_CLICK,
                     AnalyticsParamValue.REPORT_NOTIFICATION_CLICK_NOTIFICATION_TRAY,
-                    action,
+                    getActionFromIntent(getIntent()),
                     getIntent().getStringExtra(NOTIFICATION_ID)
             );
             PersonalIdManager.getInstance().unlockConnect(this, success -> {

diff --git a/app/src/org/commcare/adapters/JobListConnectHomeAppsAdapter.java b/app/src/org/commcare/adapters/JobListConnectHomeAppsAdapter.java
@@ -171,7 +171,7 @@ public void bind(
 
         // We need the composite job because it has the correct number of deliveries.
         ConnectJobRecord compositeJob = ConnectJobUtils
-                .getCompositeJob(mContext, connectLoginJobListModel.getJob().getJobId());
+                .getCompositeJob(mContext, connectLoginJobListModel.getJob().getJobUUID());
         boolean deliveryComplete = compositeJob != null && compositeJob.deliveryComplete();
 
         int dateRes = deliveryComplete

diff --git a/app/src/org/commcare/android/database/connect/models/ConnectAppRecord.java b/app/src/org/commcare/android/database/connect/models/ConnectAppRecord.java
@@ -164,4 +164,12 @@ public void setName(String name) {
     public int getPassingScore() {
         return passingScore;
     }
+
+    public String getJobUUID() {
+        return jobUUID;
+    }
+
+    public void setJobUUID(String jobUUID) {
+        this.jobUUID = jobUUID;
+    }
 }
diff --git a/app/src/org/commcare/android/database/connect/models/ConnectDeliveryDetails.java b/app/src/org/commcare/android/database/connect/models/ConnectDeliveryDetails.java
@@ -7,12 +7,12 @@ public class ConnectDeliveryDetails {
     private long remainingDays;
     private String totalAmount;
     private double approvedPercentage;
-    private int unitId;
+    private String unitUUID;
 
     // Constructor
-    public ConnectDeliveryDetails(int unitId, String deliveryName, int approvedCount, int pendingCount, String totalAmount,
+    public ConnectDeliveryDetails(String unitUUID, String deliveryName, int approvedCount, int pendingCount, String totalAmount,
             long remainingDays, double approvedPercentage) {
-        this.unitId = unitId;
+        this.unitUUID = unitUUID;
         this.deliveryName = deliveryName;
         this.approvedCount = approvedCount;
         this.pendingCount = pendingCount;
@@ -68,12 +68,4 @@ public double getApprovedPercentage() {
     public void setApprovedPercentage(double approvedPercentage) {
         this.approvedPercentage = approvedPercentage;
     }
-
-    public int getUnitId() {
-        return unitId;
-    }
-
-    public void setUnitId(int unitId) {
-        this.unitId = unitId;
-    }
 }
diff --git a/app/src/org/commcare/android/database/connect/models/ConnectJobAssessmentRecord.java b/app/src/org/commcare/android/database/connect/models/ConnectJobAssessmentRecord.java
@@ -99,4 +99,8 @@ public int getPassingScore() {
     public void setLastUpdate(Date date) {
         lastUpdate = date;
     }
+
+    public void setJobUUID(String jobUUID) {
+        this.jobUUID = jobUUID;
+    }
 }
diff --git a/app/src/org/commcare/android/database/connect/models/ConnectJobDeliveryRecord.java b/app/src/org/commcare/android/database/connect/models/ConnectJobDeliveryRecord.java
@@ -33,6 +33,7 @@ public class ConnectJobDeliveryRecord extends Persisted implements Serializable
     public static final String META_DATE = "visit_date";
     public static final String META_UNIT_NAME = "deliver_unit_name";
     public static final String META_SLUG = "deliver_unit_slug";
+    public static final String META_SLUG_UUID = "deliver_unit_slug_id";
     public static final String META_ENTITY_ID = "entity_id";
     public static final String META_ENTITY_NAME = "entity_name";
     public static final String META_FLAGS = "flags";
@@ -56,7 +57,7 @@ public class ConnectJobDeliveryRecord extends Persisted implements Serializable
     private String unitName;
     @Persisting(6)
     @MetaField(META_SLUG)
-    private String slug;
+    private String slug;    //  This is payment unit id
     @Persisting(7)
     @MetaField(META_ENTITY_ID)
     private String entityId;
@@ -73,6 +74,10 @@ public class ConnectJobDeliveryRecord extends Persisted implements Serializable
     @MetaField(META_JOB_UUID)
     private String jobUUID;
 
+    @Persisting(12)
+    @MetaField(META_SLUG_UUID)  //  This is payment unit uuid
+    private String slugUUID;
+
     private List<ConnectJobDeliveryFlagRecord> flags;
 
     public ConnectJobDeliveryRecord() {
@@ -97,6 +102,7 @@ public static ConnectJobDeliveryRecord fromJson(JSONObject json, ConnectJobRecor
         delivery.entityName = json.getString(META_ENTITY_NAME);
         delivery.reason = json.getString(META_REASON);
         delivery.reason = JsonExtensions.optStringSafe(json, META_REASON,"");
+        delivery.slugUUID = json.getString(META_SLUG_UUID);
 
         return delivery;
     }
@@ -170,7 +176,7 @@ public static ConnectJobDeliveryRecord fromV2(ConnectJobDeliveryRecordV2 oldReco
         return newRecord;
     }
 
-    public static ConnectJobDeliveryRecord fromV21(ConnectJobDeliveryRecordV21 oldRecord) {
+    public static ConnectJobDeliveryRecord fromV22(ConnectJobDeliveryRecordV22 oldRecord) {
         ConnectJobDeliveryRecord newRecord = new ConnectJobDeliveryRecord();
 
         newRecord.jobId = oldRecord.getJobId();
@@ -183,7 +189,8 @@ public static ConnectJobDeliveryRecord fromV21(ConnectJobDeliveryRecordV21 oldRe
         newRecord.entityName = oldRecord.getEntityName();
         newRecord.lastUpdate = oldRecord.getLastUpdate();
         newRecord.reason = oldRecord.getReason();
-        newRecord.jobUUID = String.valueOf(oldRecord.getJobId());
+        newRecord.jobUUID = oldRecord.getJobUUID();
+        newRecord.slugUUID = oldRecord.getSlug();
 
         return newRecord;
     }
@@ -232,4 +239,8 @@ public void setFlags(List<ConnectJobDeliveryFlagRecord> flags) {
     public void setJobUUID(String jobUUID) {
         this.jobUUID = jobUUID;
     }
+
+    public String getSlugUUID() {
+        return slugUUID;
+    }
 }
diff --git a/app/src/org/commcare/android/database/connect/models/ConnectJobDeliveryRecordV22.kt b/app/src/org/commcare/android/database/connect/models/ConnectJobDeliveryRecordV22.kt
@@ -0,0 +1,86 @@
+package org.commcare.android.database.connect.models
+
+import org.commcare.android.database.connect.models.ConnectJobDeliveryRecord.META_DATE
+import org.commcare.android.database.connect.models.ConnectJobDeliveryRecord.META_ENTITY_ID
+import org.commcare.android.database.connect.models.ConnectJobDeliveryRecord.META_ENTITY_NAME
+import org.commcare.android.database.connect.models.ConnectJobDeliveryRecord.META_ID
+import org.commcare.android.database.connect.models.ConnectJobDeliveryRecord.META_JOB_ID
+import org.commcare.android.database.connect.models.ConnectJobDeliveryRecord.META_JOB_UUID
+import org.commcare.android.database.connect.models.ConnectJobDeliveryRecord.META_REASON
+import org.commcare.android.database.connect.models.ConnectJobDeliveryRecord.META_SLUG
+import org.commcare.android.database.connect.models.ConnectJobDeliveryRecord.META_STATUS
+import org.commcare.android.database.connect.models.ConnectJobDeliveryRecord.META_UNIT_NAME
+import org.commcare.android.storage.framework.Persisted
+import org.commcare.models.framework.Persisting
+import org.commcare.modern.database.Table
+import org.commcare.modern.models.MetaField
+import java.io.Serializable
+import java.util.Date
+
+@Table(ConnectJobDeliveryRecordV22.STORAGE_KEY)
+class ConnectJobDeliveryRecordV22 :
+    Persisted(),
+    Serializable {
+    @Persisting(1)
+    @MetaField(META_JOB_ID)
+    var jobId = 0
+
+    @Persisting(2)
+    @MetaField(META_ID)
+    var deliveryId = 0
+
+    @Persisting(3)
+    @MetaField(META_DATE)
+    var date: Date? = null
+
+    @Persisting(4)
+    @MetaField(META_STATUS)
+    var status: String? = null
+
+    @Persisting(5)
+    @MetaField(META_UNIT_NAME)
+    var unitName: String? = ""
+
+    @Persisting(6)
+    @MetaField(META_SLUG)
+    var slug: String? = null
+
+    @Persisting(7)
+    @MetaField(META_ENTITY_ID)
+    var entityId: String? = null
+
+    @Persisting(8)
+    @MetaField(META_ENTITY_NAME)
+    var entityName: String? = null
+
+    @Persisting(9)
+    var lastUpdate: Date? = null
+
+    @Persisting(10)
+    @MetaField(META_REASON)
+    var reason: String? = null
+
+    @Persisting(11)
+    @MetaField(META_JOB_UUID)
+    var jobUUID: String? = null
+
+    companion object {
+        const val STORAGE_KEY = ConnectJobDeliveryRecord.STORAGE_KEY
+
+        fun fromV21(oldRecord: ConnectJobDeliveryRecordV21): ConnectJobDeliveryRecordV22 {
+            val newRecord = ConnectJobDeliveryRecordV22()
+            newRecord.jobId = oldRecord.jobId
+            newRecord.deliveryId = oldRecord.deliveryId
+            newRecord.date = oldRecord.date
+            newRecord.status = oldRecord.status
+            newRecord.unitName = oldRecord.unitName
+            newRecord.slug = oldRecord.slug
+            newRecord.entityId = oldRecord.entityId
+            newRecord.entityName = oldRecord.entityName
+            newRecord.lastUpdate = oldRecord.lastUpdate
+            newRecord.reason = oldRecord.reason
+            newRecord.jobUUID = "${oldRecord.jobId}"
+            return newRecord
+        }
+    }
+}
diff --git a/app/src/org/commcare/android/database/connect/models/ConnectJobLearningRecord.java b/app/src/org/commcare/android/database/connect/models/ConnectJobLearningRecord.java
@@ -90,4 +90,8 @@ public Date getDate() {
     public void setLastUpdate(Date date) {
         lastUpdate = date;
     }
+
+    public void setJobUUID(String jobUUID) {
+        this.jobUUID = jobUUID;
+    }
 }
diff --git a/app/src/org/commcare/android/database/connect/models/ConnectJobPaymentRecord.java b/app/src/org/commcare/android/database/connect/models/ConnectJobPaymentRecord.java
@@ -103,10 +103,6 @@ public static ConnectJobPaymentRecord fromJson(JSONObject json, ConnectJobRecord
         return payment;
     }
 
-    public String getPaymentId() {
-        return paymentId;
-    }
-
     public Date getDate() {
         return date;
     }
@@ -160,4 +156,12 @@ public boolean allowConfirmUndo() {
         long days = TimeUnit.DAYS.convert(millis, TimeUnit.MILLISECONDS);
         return days < UNDO_WINDOW_DAYS;
     }
+
+    public void setJobUUID(String jobUUID) {
+        this.jobUUID = jobUUID;
+    }
+
+    public String getPaymentUUID() {
+        return paymentUUID;
+    }
 }