Merge pull request #6888 from Expensify/OSBotify-cherry-pick-staging-…

…6881

android/app/build.gradle

@@ -149,8 +149,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001012300
-        versionName "1.1.23-0"
+        versionCode 1001012301
+        versionName "1.1.23-1"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.23.0</string>
+	<string>1.1.23.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.23.0</string>
+	<string>1.1.23.1</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.23-0",
+  "version": "1.1.23-1",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/CONST.js

@@ -123,6 +123,8 @@ const CONST = {
     PLATFORM: {
         IOS: 'ios',
         ANDROID: 'android',
+        WEB: 'web',
+        DESKTOP: 'desktop',
     },
     KEYBOARD_SHORTCUT_MODIFIERS: {
         CTRL: {

src/libs/getPlatform/index.desktop.js

@@ -1,3 +1,5 @@
+import CONST from '../../CONST';
+
 export default function getPlatform() {
-    return 'desktop';
+    return CONST.PLATFORM.DESKTOP;
 }

src/libs/getPlatform/index.website.js

@@ -1,3 +1,5 @@
+import CONST from '../../CONST';
+
 export default function getPlatform() {
-    return 'web';
+    return CONST.PLATFORM.WEB;
 }

src/pages/settings/AboutPage/getPlatformSpecificMenuItems/index.js

@@ -0,0 +1,15 @@
+import * as KeyboardShortcuts from '../../../../libs/actions/KeyboardShortcuts';
+import * as Expensicons from '../../../../components/Icon/Expensicons';
+
+export default (isSmallScreenWidth) => {
+    if (isSmallScreenWidth) {
+        return [];
+    }
+    return [
+        {
+            translationKey: 'initialSettingsPage.aboutPage.viewKeyboardShortcuts',
+            icon: Expensicons.Keyboard,
+            action: KeyboardShortcuts.showKeyboardShortcutModal,
+        },
+    ];
+};

src/pages/settings/AboutPage/getPlatformSpecificMenuItems/index.native.js

@@ -0,0 +1 @@
+export default () => [];

src/pages/settings/AboutPage.js → src/pages/settings/AboutPage/index.js

@@ -1,27 +1,32 @@
 import _ from 'underscore';
 import React from 'react';
 import {View, ScrollView} from 'react-native';
-import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
-import Navigation from '../../libs/Navigation/Navigation';
-import * as KeyboardShortcuts from '../../libs/actions/KeyboardShortcuts';
-import ROUTES from '../../ROUTES';
-import styles from '../../styles/styles';
-import ExpensifyText from '../../components/ExpensifyText';
-import CONST from '../../CONST';
-import * as Expensicons from '../../components/Icon/Expensicons';
-import ScreenWrapper from '../../components/ScreenWrapper';
-import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
-import MenuItem from '../../components/MenuItem';
-import Logo from '../../../assets/images/new-expensify.svg';
-import {version} from '../../../package.json';
-import * as Report from '../../libs/actions/Report';
-import * as Link from '../../libs/actions/Link';
+import HeaderWithCloseButton from '../../../components/HeaderWithCloseButton';
+import Navigation from '../../../libs/Navigation/Navigation';
+import ROUTES from '../../../ROUTES';
+import styles from '../../../styles/styles';
+import ExpensifyText from '../../../components/ExpensifyText';
+import CONST from '../../../CONST';
+import * as Expensicons from '../../../components/Icon/Expensicons';
+import ScreenWrapper from '../../../components/ScreenWrapper';
+import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
+import withWindowDimensions, {windowDimensionsPropTypes} from '../../../components/withWindowDimensions';
+import MenuItem from '../../../components/MenuItem';
+import Logo from '../../../../assets/images/new-expensify.svg';
+import {version} from '../../../../package.json';
+import * as Report from '../../../libs/actions/Report';
+import * as Link from '../../../libs/actions/Link';
+import getPlatformSpecificMenuItems from './getPlatformSpecificMenuItems';
+import compose from '../../../libs/compose';
 
 const propTypes = {
     ...withLocalizePropTypes,
+    ...windowDimensionsPropTypes,
 };
 
 const AboutPage = (props) => {
+    const platformSpecificMenuItems = getPlatformSpecificMenuItems(props.isSmallScreenWidth);
+
     const menuItems = [
         {
             translationKey: 'initialSettingsPage.aboutPage.appDownloadLinks',
@@ -30,11 +35,7 @@ const AboutPage = (props) => {
                 Navigation.navigate(ROUTES.SETTINGS_APP_DOWNLOAD_LINKS);
             },
         },
-        {
-            translationKey: 'initialSettingsPage.aboutPage.viewKeyboardShortcuts',
-            icon: Expensicons.Keyboard,
-            action: KeyboardShortcuts.showKeyboardShortcutModal,
-        },
+        ...platformSpecificMenuItems,
         {
             translationKey: 'initialSettingsPage.aboutPage.viewTheCode',
             icon: Expensicons.Eye,
@@ -146,4 +147,7 @@ const AboutPage = (props) => {
 AboutPage.propTypes = propTypes;
 AboutPage.displayName = 'AboutPage';
 
-export default withLocalize(AboutPage);
+export default compose(
+    withLocalize,
+    withWindowDimensions,
+)(AboutPage);