From ddf2a69295c80c047dc88136d32e2706c32a0509 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Wed, 22 Dec 2021 15:29:47 -0800 Subject: [PATCH 1/2] Merge pull request #6886 from Expensify/version-BUILD-c218d6121b63ad26694d6834737327ac2d0bf042 (cherry picked from commit 6678173b3c38ecb029ef549e07557ffdd0803865) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index e731f7abc29f..91c3a94fd201 100644 --- a/android/app/build.gradle +++ b/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 { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 30c9cd822122..1176d3f9fce9 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.23.0 + 1.1.23.1 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 0855b1aabe5d..3339b725c35c 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.23.0 + 1.1.23.1 diff --git a/package-lock.json b/package-lock.json index fb46fcee407d..575239a8b023 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.23-0", + "version": "1.1.23-1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7ee9236751ee..bde36470cc9c 100644 --- a/package.json +++ b/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.", From ae2b2aaf388e5fc5b263486cefa1e7946fc57591 Mon Sep 17 00:00:00 2001 From: Rory Abraham <47436092+roryabraham@users.noreply.github.com> Date: Wed, 22 Dec 2021 18:27:10 -0500 Subject: [PATCH 2/2] Merge pull request #6881 from akshayasalvi/hide-keyboard-shortcuts-menu (cherry picked from commit c218d6121b63ad26694d6834737327ac2d0bf042) --- src/CONST.js | 2 + src/libs/getPlatform/index.desktop.js | 4 +- src/libs/getPlatform/index.website.js | 4 +- .../getPlatformSpecificMenuItems/index.js | 15 ++++++ .../index.native.js | 1 + .../{AboutPage.js => AboutPage/index.js} | 46 ++++++++++--------- 6 files changed, 49 insertions(+), 23 deletions(-) create mode 100644 src/pages/settings/AboutPage/getPlatformSpecificMenuItems/index.js create mode 100644 src/pages/settings/AboutPage/getPlatformSpecificMenuItems/index.native.js rename src/pages/settings/{AboutPage.js => AboutPage/index.js} (79%) diff --git a/src/CONST.js b/src/CONST.js index 9e06129f252f..46ccb595a5ef 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -123,6 +123,8 @@ const CONST = { PLATFORM: { IOS: 'ios', ANDROID: 'android', + WEB: 'web', + DESKTOP: 'desktop', }, KEYBOARD_SHORTCUT_MODIFIERS: { CTRL: { diff --git a/src/libs/getPlatform/index.desktop.js b/src/libs/getPlatform/index.desktop.js index 30ac3e4128ee..c00ea00fd645 100644 --- a/src/libs/getPlatform/index.desktop.js +++ b/src/libs/getPlatform/index.desktop.js @@ -1,3 +1,5 @@ +import CONST from '../../CONST'; + export default function getPlatform() { - return 'desktop'; + return CONST.PLATFORM.DESKTOP; } diff --git a/src/libs/getPlatform/index.website.js b/src/libs/getPlatform/index.website.js index 7e6c88e6c07f..8b7e99c13c10 100644 --- a/src/libs/getPlatform/index.website.js +++ b/src/libs/getPlatform/index.website.js @@ -1,3 +1,5 @@ +import CONST from '../../CONST'; + export default function getPlatform() { - return 'web'; + return CONST.PLATFORM.WEB; } diff --git a/src/pages/settings/AboutPage/getPlatformSpecificMenuItems/index.js b/src/pages/settings/AboutPage/getPlatformSpecificMenuItems/index.js new file mode 100644 index 000000000000..52f8ffa2250f --- /dev/null +++ b/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, + }, + ]; +}; diff --git a/src/pages/settings/AboutPage/getPlatformSpecificMenuItems/index.native.js b/src/pages/settings/AboutPage/getPlatformSpecificMenuItems/index.native.js new file mode 100644 index 000000000000..4ba9480748fc --- /dev/null +++ b/src/pages/settings/AboutPage/getPlatformSpecificMenuItems/index.native.js @@ -0,0 +1 @@ +export default () => []; diff --git a/src/pages/settings/AboutPage.js b/src/pages/settings/AboutPage/index.js similarity index 79% rename from src/pages/settings/AboutPage.js rename to src/pages/settings/AboutPage/index.js index 8ac081eb5480..d99b98ebe9bd 100644 --- a/src/pages/settings/AboutPage.js +++ b/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);