Merge branch 'main' into qrs_v3

rowanseymour · rowanseymour · commit 7599d3d5ade7 · 2026-02-03T20:35:46.000Z
diff --git a/flows/events/testdata/TestEventMarshaling_contact_last_seen_changed.snap b/flows/events/testdata/TestEventMarshaling_contact_last_seen_changed.snap
@@ -0,0 +1,6 @@
+{
+    "uuid": "01969b47-0583-76f8-ae7f-f8b243c49ff5",
+    "type": "contact_last_seen_changed",
+    "created_on": "2025-05-04T12:30:46.123456789Z",
+    "last_seen_on": "2022-02-03T13:45:30Z"
+}
diff --git a/flows/events/testdata/TestEventMarshaling_msg_created_rich.snap b/flows/events/testdata/TestEventMarshaling_msg_created_rich.snap
@@ -14,9 +14,11 @@
         ],
         "quick_replies": [
             {
+                "type": "text",
                 "text": "yes"
             },
             {
+                "type": "text",
                 "text": "no"
             }
         ],
diff --git a/test/testdata/runner/all_actions.test.json b/test/testdata/runner/all_actions.test.json
@@ -332,10 +332,12 @@
                         "locale": "eng-US",
                         "quick_replies": [
                             {
-                                "text": "Yes"
+                                "text": "Yes",
+                                "type": "text"
                             },
                             {
-                                "text": "No"
+                                "text": "No",
+                                "type": "text"
                             }
                         ],
                         "text": "This is a reply with attachments and quick replies",
diff --git a/test/testdata/runner/two_questions.test.json b/test/testdata/runner/two_questions.test.json
@@ -50,10 +50,12 @@
                         "locale": "eng-US",
                         "quick_replies": [
                             {
-                                "text": "Red"
+                                "text": "Red",
+                                "type": "text"
                             },
                             {
-                                "text": "Blue"
+                                "text": "Blue",
+                                "type": "text"
                             }
                         ],
                         "text": "Hi Ben Haggerty! What is your favorite color? (red/blue) Your number is (206) 555-1212",
diff --git a/test/testdata/runner/two_questions.test_resume_with_expiration.json b/test/testdata/runner/two_questions.test_resume_with_expiration.json
@@ -42,10 +42,12 @@
                         "locale": "eng-US",
                         "quick_replies": [
                             {
-                                "text": "Red"
+                                "text": "Red",
+                                "type": "text"
                             },
                             {
-                                "text": "Blue"
+                                "text": "Blue",
+                                "type": "text"
                             }
                         ],
                         "text": "Hi Ben Haggerty! What is your favorite color? (red/blue) Your number is (202) 456-1111",

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,11 @@`
`14`	`14`	`],`
`15`	`15`	`"quick_replies": [`
`16`	`16`	`{`
	`17`	`+ "type": "text",`
`17`	`18`	`"text": "yes"`
`18`	`19`	`},`
`19`	`20`	`{`
	`21`	`+ "type": "text",`
`20`	`22`	`"text": "no"`
`21`	`23`	`}`
`22`	`24`	`],`
Original file line number	Diff line number	Diff line change
`@@ -332,10 +332,12 @@`
`332`	`332`	`"locale": "eng-US",`
`333`	`333`	`"quick_replies": [`
`334`	`334`	`{`
`335`		`- "text": "Yes"`
	`335`	`+ "text": "Yes",`
	`336`	`+ "type": "text"`
`336`	`337`	`},`
`337`	`338`	`{`
`338`		`- "text": "No"`
	`339`	`+ "text": "No",`
	`340`	`+ "type": "text"`
`339`	`341`	`}`
`340`	`342`	`],`
`341`	`343`	`"text": "This is a reply with attachments and quick replies",`
Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,12 @@`
`50`	`50`	`"locale": "eng-US",`
`51`	`51`	`"quick_replies": [`
`52`	`52`	`{`
`53`		`- "text": "Red"`
	`53`	`+ "text": "Red",`
	`54`	`+ "type": "text"`
`54`	`55`	`},`
`55`	`56`	`{`
`56`		`- "text": "Blue"`
	`57`	`+ "text": "Blue",`
	`58`	`+ "type": "text"`
`57`	`59`	`}`
`58`	`60`	`],`
`59`	`61`	`"text": "Hi Ben Haggerty! What is your favorite color? (red/blue) Your number is (206) 555-1212",`
Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,12 @@`
`42`	`42`	`"locale": "eng-US",`
`43`	`43`	`"quick_replies": [`
`44`	`44`	`{`
`45`		`- "text": "Red"`
	`45`	`+ "text": "Red",`
	`46`	`+ "type": "text"`
`46`	`47`	`},`
`47`	`48`	`{`
`48`		`- "text": "Blue"`
	`49`	`+ "text": "Blue",`
	`50`	`+ "type": "text"`
`49`	`51`	`}`
`50`	`52`	`],`
`51`	`53`	`"text": "Hi Ben Haggerty! What is your favorite color? (red/blue) Your number is (202) 456-1111",`