Merge pull request #25782 from Expensify/arosiclair-cleanup-tab-selec…

…tor-translations Cleanup tab selector translations
Expensify · Aug 28, 2023 · 64ff471 · 64ff471
2 parents 8fdb052 + b94d5b4
commit 64ff471
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js
@@ -176,7 +176,7 @@ function MoneyRequestPreview(props) {
 
     const getPreviewHeaderText = () => {
         if (isDistanceRequest) {
-            return props.translate('tabSelector.distance');
+            return props.translate('common.distance');
         }
 
         if (isScanning) {

diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
@@ -144,7 +144,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
             </OfflineWithFeedback>
             <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.merchant') || lodashGet(transaction, 'pendingAction')}>
                 <MenuItemWithTopDescription
-                    description={isDistanceRequest ? translate('tabSelector.distance') : translate('common.merchant')}
+                    description={isDistanceRequest ? translate('common.distance') : translate('common.merchant')}
                     title={transactionMerchant}
                     disabled={isSettled || !canEdit}
                     shouldShowRightIcon={canEdit}

diff --git a/src/components/TabSelector/TabSelector.js b/src/components/TabSelector/TabSelector.js
@@ -38,6 +38,17 @@ const getIcon = (route) => {
     }
 };
 
+const getTitle = (route, translate) => {
+    switch (route) {
+        case CONST.TAB.SCAN:
+            return translate('tabSelector.scan');
+        case CONST.TAB.DISTANCE:
+            return translate('common.distance');
+        default:
+            return translate('tabSelector.manual');
+    }
+};
+
 function TabSelector({state, navigation, onTabPress}) {
     const {translate} = useLocalize();
     return (
@@ -64,7 +75,7 @@ function TabSelector({state, navigation, onTabPress}) {
                     <TabSelectorItem
                         isSelected={isFocused}
                         key={route.name}
-                        title={translate(`tabSelector.${route.name}`)}
+                        title={getTitle(route.name, translate)}
                         icon={getIcon(route.name)}
                         onPress={onPress}
                     />

diff --git a/src/languages/en.js b/src/languages/en.js
@@ -158,6 +158,7 @@ export default {
         category: 'Category',
         receipt: 'Receipt',
         replace: 'Replace',
+        distance: 'Distance',
     },
     anonymousReportFooter: {
         logoTagline: 'Join the discussion.',
@@ -375,7 +376,6 @@ export default {
     tabSelector: {
         manual: 'Manual',
         scan: 'Scan',
-        distance: 'Distance',
     },
     receipt: {
         upload: 'Upload receipt',

diff --git a/src/languages/es.js b/src/languages/es.js
@@ -157,6 +157,7 @@ export default {
         category: 'Categoría',
         receipt: 'Recibo',
         replace: 'Sustituir',
+        distance: 'Distancia',
     },
     anonymousReportFooter: {
         logoTagline: 'Únete a la discusión.',
@@ -374,7 +375,6 @@ export default {
     tabSelector: {
         manual: 'Manual',
         scan: 'Escanear',
-        distance: 'Distancia',
     },
     receipt: {
         upload: 'Subir recibo',