diff --git a/README.md b/README.md index a5a3dd8ef320..d483dbc98bd5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ +
+ +
+ # [Expensify.cash](https://Expensify.cash) -# Philosophy +## Philosophy This application is built with the following principles. 1. **Data Flow** - Ideally, this is how data flows through the app: 1. Server pushes data to the disk of any client (Server -> Pusher event -> Action listening to pusher event -> Onyx). Currently the code only does this with report comments. Until we make more server changes, this steps is actually done by the client requesting data from the server via XHR and then storing the response in Onyx. @@ -41,6 +45,8 @@ This application is built with the following principles. 1. If the reason you can't write cross platform code is because there is a bug in ReactNative that is preventing it from working, the correct action is to fix RN and submit a PR upstream -- not to hack around RN bugs with platform-specific code paths. 1. If there is a feature that simply doesn't exist on all platforms and thus doesn't exist in RN, rather than doing if (platform=iOS) { }, instead write a "shim" library that is implemented with NOOPs on the other platforms. For example, rather than injecting platform-specific multi-tab code (which can only work on browsers, because it's the only platform with multiple tabs), write a TabManager class that just is NOOP for non-browser platforms. This encapsulates the platform-specific code into a platform library, rather than sprinkling through the business logic. 1. Put all platform specific code in dedicated files and folders, like /platform, and reject any PR that attempts to put platform-specific code anywhere else. This maintains a strict separation between business logic and platform code. + +---- # Local development ## Getting started @@ -228,6 +234,8 @@ export default withOnyx({ })(ReportActionsView); ``` +---- + # Deploying ## Continuous deployment / GitHub workflows Every PR merged into `master` will kick off the **Create a new version** GitHub workflow defined in `.github/workflows/version.yml`. diff --git a/android/app/build.gradle b/android/app/build.gradle index 4959ba38f886..44a5913b2009 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -148,8 +148,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 266 - versionName "1.0.1-265" + versionCode 270 + versionName "1.0.1-269" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 4921cd8a247d..d467dff4dbf1 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 266 + 270 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 2b42fdb77f53..2a1eb5e7a17c 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 266 + 270 diff --git a/package-lock.json b/package-lock.json index 9e659a40829b..5e953b24b57b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.1-265", + "version": "1.0.1-269", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 701bebae5995..e307b1f389bc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.1-265", + "version": "1.0.1-269", "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.", diff --git a/src/components/InlineCodeBlock/index.js b/src/components/InlineCodeBlock/index.js index aa6edab7018e..2d2160b12840 100644 --- a/src/components/InlineCodeBlock/index.js +++ b/src/components/InlineCodeBlock/index.js @@ -1,5 +1,6 @@ import React from 'react'; import inlineCodeBlockPropTypes from './inlineCodeBlockPropTypes'; +import styles from '../../styles/styles'; const InlineCodeBlock = ({ TDefaultRenderer, @@ -8,7 +9,7 @@ const InlineCodeBlock = ({ textStyle, }) => ( diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js index 50680d84fef5..7eaf87d649b9 100644 --- a/src/pages/home/report/ReportActionCompose.js +++ b/src/pages/home/report/ReportActionCompose.js @@ -145,7 +145,7 @@ class ReportActionCompose extends React.Component { title="Upload Attachment" onConfirm={(file) => { addAction(this.props.reportID, '', file); - this.setTextInputShouldClear(true); + this.setTextInputShouldClear(false); }} > {({displayFileInModal}) => ( diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js index 5d7489ded3b5..dcf237a5c4cf 100644 --- a/src/pages/home/sidebar/SidebarLinks.js +++ b/src/pages/home/sidebar/SidebarLinks.js @@ -91,7 +91,7 @@ const SidebarLinks = (props) => { : [styles.sidebarHeader]; return ( - +