Merge pull request #3 from Expensify/master

Merge

.github/workflows/android.yml

@@ -10,6 +10,9 @@ jobs:
     build:
         runs-on: ubuntu-latest
         steps:
+            - name: Echo actor
+              run: echo ${{ github.actor }}
+
             - uses: actions/checkout@v2
 
             - uses: actions/setup-ruby@v1

.github/workflows/desktop.yml

@@ -10,6 +10,9 @@ jobs:
     build:
         runs-on: macos-latest
         steps:
+            - name: Echo actor
+              run: echo ${{ github.actor }}
+
             - uses: actions/checkout@v2
 
             - name: Setup Node

.github/workflows/ios.yml

@@ -13,6 +13,9 @@ jobs:
     build:
         runs-on: macos-latest
         steps:
+            - name: Echo actor
+              run: echo ${{ github.actor }}
+
             - uses: actions/checkout@v2
 
             - name: Setup Node

.github/workflows/version.yml

@@ -27,7 +27,7 @@ jobs:
               run: |
                 git fetch
                 git checkout master
-                git config user.name botify
+                git config user.name OSBotify
 
             - name: Checkout new branch
               run: git checkout -b version-bump-${{ github.sha }}

.github/workflows/web.yml

@@ -11,6 +11,9 @@ jobs:
         runs-on: ubuntu-16.04
 
         steps:
+            - name: Echo actor
+              run: echo ${{ github.actor }}
+
             - uses: actions/checkout@v2
 
             # Installs node

android/app/build.gradle

@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 432
-        versionName "1.0.1-433"
+        versionCode 438
+        versionName "1.0.1-439"
     }
     splits {
         abi {

config/webpack/webpack.prod.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const webpack = require('webpack');
 const {merge} = require('webpack-merge');
+const {BundleAnalyzerPlugin} = require('webpack-bundle-analyzer');
 const dotenv = require('dotenv');
 const common = require('./webpack.common.js');
 
@@ -10,6 +11,8 @@ module.exports = merge(common, {
     mode: 'production',
     devtool: 'source-map',
     plugins: [
+        // This allows us to interactively inspect JS bundle contents
+        ...(process.env.ANALYZE_BUNDLE === 'true' ? [new BundleAnalyzerPlugin()] : []),
         new webpack.DefinePlugin({
             __REACT_WEB_CONFIG__: JSON.stringify(env),
 

ios/ExpensifyCash/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>432</string>
+	<string>438</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false />
 	<key>LSRequiresIPhoneOS</key>

ios/ExpensifyCashTests/Info.plist

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.1-433",
+  "version": "1.0.1-439",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.cash",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -23,7 +23,8 @@
     "print-version": "echo $npm_package_version",
     "detox-build": "detox build --configuration ios.sim.debug",
     "detox-test": "detox test --configuration ios.sim.debug",
-    "gh-actions-build": "./.github/scripts/buildActions.sh"
+    "gh-actions-build": "./.github/scripts/buildActions.sh",
+    "analyze-packages": "ANALYZE_BUNDLE=true webpack --config config/webpack/webpack.prod.js"
   },
   "dependencies": {
     "@babel/plugin-proposal-class-properties": "^7.12.1",
@@ -120,6 +121,7 @@
     "react-native-version": "^4.0.0",
     "react-test-renderer": "16.13.1",
     "webpack": "^4.44.1",
+    "webpack-bundle-analyzer": "^4.4.0",
     "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.11.0",
     "webpack-merge": "^5.1.1"

src/ONYXKEYS.js

@@ -40,7 +40,6 @@ export default {
     // Information about the current session (authToken, accountID, email, loading, error)
     SESSION: 'session',
     IS_SIDEBAR_SHOWN: 'isSidebarShown',
-    IS_CHAT_SWITCHER_ACTIVE: 'isChatSwitcherActive',
     IS_SIDEBAR_ANIMATING: 'isSidebarAnimating',
     BETAS: 'betas',
 

src/ROUTES.js

@@ -9,6 +9,7 @@ export default {
     REPORT: '/r/:reportID',
     getReportRoute: reportID => `/r/${reportID}`,
     ROOT: '/',
+    SEARCH: '/search',
     SET_PASSWORD: '/setpassword/:validateCode',
     SIGNIN: '/signin',
     SIGNIN_WITH_EXITTO: '/signIn/exitTo/:exitTo*',

src/components/Hoverable/HoverablePropTypes.js

@@ -2,7 +2,10 @@ import PropTypes from 'prop-types';
 
 const propTypes = {
     // Children to wrap with Hoverable.
-    children: PropTypes.node.isRequired,
+    children: PropTypes.oneOfType([
+        PropTypes.node,
+        PropTypes.func,
+    ]).isRequired,
 
     // Function that executes when the mouse moves over the children.
     onHoverIn: PropTypes.func,

src/components/Modal/BaseModal.js

@@ -60,6 +60,7 @@ const BaseModal = (props) => {
             animationIn={animationIn}
             animationOut={animationOut}
             useNativeDriver={props.useNativeDriver}
+            statusBarTranslucent
         >
             <CustomStatusBar />
             <SafeAreaInsetsContext.Consumer>

src/components/OptionsList.js

@@ -7,6 +7,10 @@ import OptionRow from '../pages/home/sidebar/OptionRow';
 import optionPropTypes from './optionPropTypes';
 
 const propTypes = {
+    // Style for hovered state
+    // eslint-disable-next-line react/forbid-prop-types
+    optionHoveredStyle: PropTypes.object,
+
     // Extra styles for the section list container
     contentContainerStyles: PropTypes.arrayOf(PropTypes.object),
 
@@ -63,6 +67,7 @@ const propTypes = {
 };
 
 const defaultProps = {
+    optionHoveredStyle: undefined,
     contentContainerStyles: [],
     sections: [],
     focusedIndex: 0,
@@ -145,6 +150,7 @@ class OptionsList extends Component {
         return (
             <OptionRow
                 option={item}
+                hoverStyle={this.props.optionHoveredStyle}
                 optionIsFocused={!this.props.disableFocusOptions
                         && this.props.focusedIndex === (index + section.indexOffset)}
                 onSelectRow={this.props.onSelectRow}

src/components/OptionsSelector.js

@@ -184,6 +184,7 @@ class OptionsSelector extends Component {
                 </View>
                 <OptionsList
                     ref={el => this.list = el}
+                    optionHoveredStyle={styles.hoveredComponentBG}
                     onSelectRow={this.props.onSelectRow}
                     sections={this.props.sections}
                     focusedIndex={this.state.focusedIndex}