From 6a0fabe4f1eeb5f8531a53e0be8fc6ece597dafb Mon Sep 17 00:00:00 2001
From: Rafe Colton <rafe@expensify.com>
Date: Mon, 25 Mar 2024 17:15:14 -0700
Subject: [PATCH 1/2] Check quickAction.action is set before trying to display
 in popover

On a fresh group chat, `props.quickAction` is `[]`, so it enters this
block and then fails to get a translation for
`props.quickAction.action`, which is not set
---
 .../sidebar/SidebarScreen/FloatingActionButtonAndPopover.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
index 117083293b5d..1b6b8f41c1cd 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
@@ -335,7 +335,7 @@ function FloatingActionButtonAndPopover(props) {
                               },
                           ]
                         : []),
-                    ...(props.quickAction
+                    ...(props.quickAction && props.quickAction.action
                         ? [
                               {
                                   icon: getQuickActionIcon(props.quickAction.action),

From 76264c1dda10c770153ea7410bd8c0038149c94e Mon Sep 17 00:00:00 2001
From: Rafe Colton <rafe@expensify.com>
Date: Mon, 25 Mar 2024 17:33:11 -0700
Subject: [PATCH 2/2] Use translation keys that match quick action names

---
 src/languages/en.ts                                           | 2 +-
 src/languages/es.ts                                           | 2 +-
 .../sidebar/SidebarScreen/FloatingActionButtonAndPopover.js   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 41e02692e760..358a3ce61d4f 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -589,7 +589,7 @@ export default {
         recordDistance: 'Record Distance',
         requestMoney: 'Request Money',
         splitBill: 'Split Bill',
-        splitReceipt: 'Split Receipt',
+        splitScan: 'Split Receipt',
         splitDistance: 'Split Distance',
         sendMoney: 'Send Money',
         assignTask: 'Assign Task',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 5e5e958ae075..16d0748eed1d 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -585,7 +585,7 @@ export default {
         recordDistance: 'Grabar Distancia',
         requestMoney: 'Solicitar Dinero',
         splitBill: 'Dividir Cuenta',
-        splitReceipt: 'Dividir Recibo',
+        splitScan: 'Dividir Recibo',
         splitDistance: 'Dividir Distancia',
         sendMoney: 'Enviar Dinero',
         assignTask: 'Assignar Tarea',
diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
index 1b6b8f41c1cd..24603de5679c 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
@@ -70,9 +70,9 @@ const getQuickActionTitle = (action) => {
         case CONST.QUICK_ACTIONS.SPLIT_MANUAL:
             return 'quickAction.splitBill';
         case CONST.QUICK_ACTIONS.SPLIT_SCAN:
-            return 'quickAction.splitReceipt';
-        case CONST.QUICK_ACTIONS.SPLIT_DISTANCE:
             return 'quickAction.splitScan';
+        case CONST.QUICK_ACTIONS.SPLIT_DISTANCE:
+            return 'quickAction.splitDistance';
         case CONST.QUICK_ACTIONS.SEND_MONEY:
             return 'quickAction.sendMoney';
         case CONST.QUICK_ACTIONS.ASSIGN_TASK: