diff --git a/.env.staging b/.env.staging index c0daddc3420e..c789087ebded 100644 --- a/.env.staging +++ b/.env.staging @@ -7,4 +7,3 @@ PUSHER_APP_KEY=268df511a204fbb60884 USE_WEB_PROXY=false ENVIRONMENT=staging SEND_CRASH_REPORTS=true -INLINE_RUNTIME_CHUNK=false diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d7e35bb5894d..5d1d2c8f5417 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -108,64 +108,6 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c - [ ] If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected. - [ ] I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR. -
-

PR Reviewer Checklist

- -The reviewer will copy/paste it into a new comment and complete it after the author checklist is completed - - -- [ ] I have verified the author checklist is complete (all boxes are checked off). -- [ ] I verified the correct issue is linked in the `### Fixed Issues` section above -- [ ] I verified testing steps are clear and they cover the changes made in this PR - - [ ] I verified the steps for local testing are in the `Tests` section - - [ ] I verified the steps for expected offline behavior are in the `Offline steps` section - - [ ] I verified the steps for Staging and/or Production testing are in the `QA steps` section - - [ ] I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct) - - [ ] I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline) - - [ ] I tested this PR with a [High Traffic account](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#high-traffic-accounts) against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability). -- [ ] I checked that screenshots or videos are included for tests on [all platforms](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms) -- [ ] I included screenshots or videos for tests on [all platforms](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms) -- [ ] I verified tests pass on **all platforms** & I tested again on: - - [ ] iOS / native - - [ ] Android / native - - [ ] iOS / Safari - - [ ] Android / Chrome - - [ ] MacOS / Chrome - - [ ] MacOS / Desktop -- [ ] If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack -- [ ] I verified proper code patterns were followed (see [Reviewing the code](https://github.com/Expensify/App/blob/main/contributingGuides/PR_REVIEW_GUIDELINES.md#reviewing-the-code)) - - [ ] I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. `toggleReport` and not `onIconClick`). - - [ ] I verified that comments were added to code that is not self explanatory - - [ ] I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing. - - [ ] I verified any copy / text shown in the product was added in all `src/languages/*` files - - [ ] I verified any copy / text that was added to the app is correct English and approved by marketing by adding the `Waiting for Copy` label for a copy review on the original GH to get the correct copy. - - [ ] I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README. - - [ ] I verified the JSDocs style guidelines (in [`STYLE.md`](https://github.com/Expensify/App/blob/main/contributingGuides/STYLE.md#jsdocs)) were followed -- [ ] If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers -- [ ] I verified that this PR follows the guidelines as stated in the [Review Guidelines](https://github.com/Expensify/App/blob/main/contributingGuides/PR_REVIEW_GUIDELINES.md) -- [ ] I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like `Avatar`, I verified the components using `Avatar` have been tested & I retested again) -- [ ] I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests) -- [ ] I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such -- [ ] I verified that if a function's arguments changed that all usages have also been updated correctly -- [ ] If a new component is created I verified that: - - [ ] A similar component doesn't exist in the codebase - - [ ] All props are defined accurately and each prop has a `/** comment above it */` - - [ ] The file is named correctly - - [ ] The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone - - [ ] The only data being stored in the state is data necessary for rendering and nothing else - - [ ] For Class Components, any internal methods passed to components event handlers are bound to `this` properly so there are no scoping issues (i.e. for `onClick={this.submit}` the method `this.submit` should be bound to `this` in the constructor) - - [ ] Any internal methods bound to `this` are necessary to be bound (i.e. avoid `this.submit = this.submit.bind(this);` if `this.submit` is never passed to a component event handler like `onClick`) - - [ ] All JSX used for rendering exists in the render method - - [ ] The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions -- [ ] If a new CSS style is added I verified that: - - [ ] A similar style doesn't already exist - - [ ] The style can't be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function (i.e. `StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG`) -- [ ] If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like `Avatar` is modified, I verified that `Avatar` is working as expected in all cases) -- [ ] If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected. -- [ ] I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR. - -
- ### Screenshots/Videos
Web diff --git a/android/app/build.gradle b/android/app/build.gradle index ec647273da41..5fa45fc05921 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -156,8 +156,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001023401 - versionName "1.2.34-1" + versionCode 1001023500 + versionName "1.2.35-0" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index c65c1f97489b..497566a31b45 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.2.34 + 1.2.35 CFBundleSignature ???? CFBundleURLTypes @@ -30,7 +30,7 @@ CFBundleVersion - 1.2.34.1 + 1.2.35.0 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 2b0d143e6840..dc569b36ba47 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.2.34 + 1.2.35 CFBundleSignature ???? CFBundleVersion - 1.2.34.1 + 1.2.35.0 diff --git a/package-lock.json b/package-lock.json index cf056f243b1b..6c1be35e922c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.2.34-1", + "version": "1.2.35-0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.2.34-1", + "version": "1.2.35-0", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index c9362fbaa66f..849ee69d722d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.2.34-1", + "version": "1.2.35-0", "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.", diff --git a/src/SCREENS.js b/src/SCREENS.js index c3a9414d5c05..24ea27fe9689 100644 --- a/src/SCREENS.js +++ b/src/SCREENS.js @@ -6,5 +6,6 @@ export default { HOME: 'Home', LOADING: 'Loading', REPORT: 'Report', + NOT_FOUND: 'not-found', TRANSITION_FROM_OLD_DOT: 'TransitionFromOldDot', }; diff --git a/src/components/BlockingViews/FullPageNotFoundView.js b/src/components/BlockingViews/FullPageNotFoundView.js index 960428027e14..84014c43d148 100644 --- a/src/components/BlockingViews/FullPageNotFoundView.js +++ b/src/components/BlockingViews/FullPageNotFoundView.js @@ -14,7 +14,7 @@ const propTypes = { ...withLocalizePropTypes, /** Child elements */ - children: PropTypes.node.isRequired, + children: PropTypes.node, /** If true, child components are replaced with a blocking "not found" view */ shouldShow: PropTypes.bool, @@ -36,6 +36,7 @@ const propTypes = { }; const defaultProps = { + children: null, shouldShow: false, titleKey: 'notFound.notHere', subtitleKey: 'notFound.pageNotFound', diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js index 7fce40647c3f..3210e860798d 100755 --- a/src/components/OptionsSelector/BaseOptionsSelector.js +++ b/src/components/OptionsSelector/BaseOptionsSelector.js @@ -206,12 +206,13 @@ class BaseOptionsSelector extends Component { */ selectRow(option, ref) { if (this.props.shouldFocusOnSelectRow) { - // Input is permanently focused on native platforms, so we always highlight the text inside of it - setSelection(this.textInput, 0, this.props.value.length); if (this.relatedTarget && ref === this.relatedTarget) { this.textInput.focus(); + this.relatedTarget = null; + } + if (this.textInput.isFocused()) { + setSelection(this.textInput, 0, this.props.value.length); } - this.relatedTarget = null; } this.props.onSelectRow(option); diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js index c228151ce74f..09aec059ff1d 100644 --- a/src/libs/Navigation/AppNavigator/AuthScreens.js +++ b/src/libs/Navigation/AppNavigator/AuthScreens.js @@ -22,6 +22,7 @@ import * as User from '../../actions/User'; import * as Modal from '../../actions/Modal'; import modalCardStyleInterpolator from './modalCardStyleInterpolator'; import createCustomModalStackNavigator from './createCustomModalStackNavigator'; +import NotFoundPage from '../../../pages/ErrorPage/NotFoundPage'; // Modal Stack Navigators import * as ModalStackNavigators from './ModalStackNavigators'; @@ -314,6 +315,12 @@ class AuthScreens extends React.Component { component={ModalStackNavigators.WalletStatementStackNavigator} listeners={modalScreenListeners} /> + ); } diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js index 09dbe7fe0e5c..58a4207efe27 100644 --- a/src/libs/Navigation/linkingConfig.js +++ b/src/libs/Navigation/linkingConfig.js @@ -231,6 +231,7 @@ export default { WalletStatement_Root: ROUTES.WALLET_STATEMENT_WITH_DATE, }, }, + [SCREENS.NOT_FOUND]: '*', }, }, }; diff --git a/src/pages/ConciergePage.js b/src/pages/ConciergePage.js index 1793f651dde2..4a9812caaee3 100644 --- a/src/pages/ConciergePage.js +++ b/src/pages/ConciergePage.js @@ -25,7 +25,9 @@ const propTypes = { */ const ConciergePage = (props) => { if (_.has(props.session, 'authToken')) { - Report.navigateToConciergeChat(); + Navigation.isDrawerReady().then(() => { + Report.navigateToConciergeChat(); + }); } else { Navigation.navigate(); } diff --git a/src/pages/ErrorPage/NotFoundPage.js b/src/pages/ErrorPage/NotFoundPage.js new file mode 100644 index 000000000000..10b65f0d4ad7 --- /dev/null +++ b/src/pages/ErrorPage/NotFoundPage.js @@ -0,0 +1,14 @@ +import React from 'react'; +import ScreenWrapper from '../../components/ScreenWrapper'; +import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView'; + +// eslint-disable-next-line rulesdir/no-negated-variables +const NotFoundPage = () => ( + + + +); + +NotFoundPage.displayName = 'NotFoundPage'; + +export default NotFoundPage; diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js index fd2260a898b1..eff9d28c74d4 100644 --- a/src/pages/home/ReportScreen.js +++ b/src/pages/home/ReportScreen.js @@ -195,10 +195,12 @@ class ReportScreen extends React.Component { // We create policy rooms for all policies, however we don't show them unless // - It's a free plan workspace // - The report includes guides participants (@team.expensify.com) for 1:1 Assigned + // - It's an archived room if (!Permissions.canUseDefaultRooms(this.props.betas) && ReportUtils.isDefaultRoom(this.props.report) && ReportUtils.getPolicyType(this.props.report, this.props.policies) !== CONST.POLICY.TYPE.FREE && !ReportUtils.hasExpensifyGuidesEmails(lodashGet(this.props.report, ['participants'], [])) + && !ReportUtils.isArchivedRoom(this.props.report) ) { return null; } @@ -225,19 +227,17 @@ class ReportScreen extends React.Component { const animatePlaceholder = !freeze; return ( - - - - - )} + - + + + + )} > - - + + ); } }