From 57477efdfa5196c5d26afc08a7ff3b4a123d8129 Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Thu, 28 Mar 2024 11:38:12 +0530 Subject: [PATCH 1/4] Fix crash for unknown action type when getting quick action --- .../SidebarScreen/FloatingActionButtonAndPopover.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js index 24603de5679c..278fff58e9fa 100644 --- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js +++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js @@ -154,6 +154,11 @@ function FloatingActionButtonAndPopover(props) { return []; }, [props.personalDetails, props.session.accountID, quickActionReport]); + const quickActionTitle = useMemo(() => { + const titleKey = getQuickActionTitle(props.quickAction.action); + return titleKey ? translate(titleKey) : ''; + }, [props.quickAction.action, translate]); + const navigateToQuickAction = () => { switch (props.quickAction.action) { case CONST.QUICK_ACTIONS.REQUEST_MANUAL: @@ -339,7 +344,7 @@ function FloatingActionButtonAndPopover(props) { ? [ { icon: getQuickActionIcon(props.quickAction.action), - text: translate(getQuickActionTitle(props.quickAction.action)), + text: quickActionTitle, label: translate('quickAction.shortcut'), isLabelHoverable: false, floatRightAvatars: quickActionAvatars, From 2e5c1a6df97358bfcac58d771fc249418da1d0ce Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Thu, 28 Mar 2024 11:52:23 +0530 Subject: [PATCH 2/4] Add more actions --- src/languages/en.ts | 3 +++ src/languages/es.ts | 3 +++ .../sidebar/SidebarScreen/FloatingActionButtonAndPopover.js | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/src/languages/en.ts b/src/languages/en.ts index 4badcddbc03d..998781ba5e04 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -595,6 +595,9 @@ export default { sendMoney: 'Send Money', assignTask: 'Assign Task', shortcut: 'Shortcut', + trackManual: 'Track Manual', + trackScan: 'Track Scan', + trackDistance: 'Track Distance', }, iou: { amount: 'Amount', diff --git a/src/languages/es.ts b/src/languages/es.ts index 8167633c2d64..85071b499bc6 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -591,6 +591,9 @@ export default { sendMoney: 'Enviar Dinero', assignTask: 'Assignar Tarea', shortcut: 'Acceso Directo', + trackManual: 'Track Manual', + trackScan: 'Track Scan', + trackDistance: 'Track Distance', }, iou: { amount: 'Importe', diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js index 278fff58e9fa..20912cc73bd6 100644 --- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js +++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js @@ -77,6 +77,12 @@ const getQuickActionTitle = (action) => { return 'quickAction.sendMoney'; case CONST.QUICK_ACTIONS.ASSIGN_TASK: return 'quickAction.assignTask'; + case CONST.QUICK_ACTIONS.TRACK_MANUAL: + return 'quickAction.trackManual'; + case CONST.QUICK_ACTIONS.TRACK_SCAN: + return 'quickAction.trackScan'; + case CONST.QUICK_ACTIONS.TRACK_DISTANCE: + return 'quickAction.trackDistance'; default: return ''; } From 1fc252b47344d01deeb3b84b4778f456f5db2f10 Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Fri, 29 Mar 2024 14:40:55 +0530 Subject: [PATCH 3/4] Update translations --- src/languages/es.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/languages/es.ts b/src/languages/es.ts index 85071b499bc6..a45ba74f875b 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -591,9 +591,9 @@ export default { sendMoney: 'Enviar Dinero', assignTask: 'Assignar Tarea', shortcut: 'Acceso Directo', - trackManual: 'Track Manual', - trackScan: 'Track Scan', - trackDistance: 'Track Distance', + trackManual: 'Seguimiento de Gastos', + trackScan: 'Seguimiento de Recibo', + trackDistance: 'Seguimiento de Distancia', }, iou: { amount: 'Importe', From e43acd0779fdb873c80c4181afe65d022d32d7bb Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Fri, 29 Mar 2024 14:57:23 +0530 Subject: [PATCH 4/4] QuickAction is optional prop --- .../sidebar/SidebarScreen/FloatingActionButtonAndPopover.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js index b8732ee3573c..be8a43b1a483 100644 --- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js +++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js @@ -162,9 +162,9 @@ function FloatingActionButtonAndPopover(props) { }, [props.personalDetails, props.session.accountID, quickActionReport]); const quickActionTitle = useMemo(() => { - const titleKey = getQuickActionTitle(props.quickAction.action); + const titleKey = getQuickActionTitle(props.quickAction && props.quickAction.action); return titleKey ? translate(titleKey) : ''; - }, [props.quickAction.action, translate]); + }, [props.quickAction, translate]); const navigateToQuickAction = () => { switch (props.quickAction.action) {