From 6dcac9b2e63ae9323dd1475ffd21737b167e1b08 Mon Sep 17 00:00:00 2001 From: Alexander Date: Fri, 11 Dec 2020 11:05:38 -0800 Subject: [PATCH 01/13] bump hash --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index bf22edffef19..b2d6c773d2d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10072,8 +10072,8 @@ } }, "expensify-common": { - "version": "git+ssh://git@github.com/Expensify/expensify-common.git#d42b24c739aefbb0424291c0b2e9e817ed322ac6", - "from": "git+ssh://git@github.com/Expensify/expensify-common.git#d42b24c739aefbb0424291c0b2e9e817ed322ac6", + "version": "git+ssh://git@github.com/Expensify/expensify-common.git#6822f35081fd949fc42dce133fce9064d8fdcee8", + "from": "git+ssh://git@github.com/Expensify/expensify-common.git#6822f35081fd949fc42dce133fce9064d8fdcee8", "requires": { "classnames": "2.2.5", "clipboard": "2.0.4", diff --git a/package.json b/package.json index 8f2e6c50c9f3..7c610c268186 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "electron-log": "^4.2.4", "electron-serve": "^1.0.0", "electron-updater": "^4.3.4", - "expensify-common": "git+https://git@github.com:Expensify/expensify-common.git#d42b24c739aefbb0424291c0b2e9e817ed322ac6", + "expensify-common": "git+https://git@github.com:Expensify/expensify-common.git#6822f35081fd949fc42dce133fce9064d8fdcee8", "file-loader": "^6.0.0", "html-entities": "^1.3.1", "lodash.get": "^4.4.2", From 3d5b17f5f156458fa972886acc64b5c5f726b139 Mon Sep 17 00:00:00 2001 From: Alexander Date: Fri, 11 Dec 2020 13:08:59 -0800 Subject: [PATCH 02/13] Fix styling --- src/components/InlineCodeBlock/index.js | 3 ++- src/styles/StyleSheet.js | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/InlineCodeBlock/index.js b/src/components/InlineCodeBlock/index.js index aa6edab7018e..ece83dd5f408 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/StyleSheet'; const InlineCodeBlock = ({ TDefaultRenderer, @@ -8,7 +9,7 @@ const InlineCodeBlock = ({ textStyle, }) => ( diff --git a/src/styles/StyleSheet.js b/src/styles/StyleSheet.js index bca628cea8ad..61ab7801b733 100644 --- a/src/styles/StyleSheet.js +++ b/src/styles/StyleSheet.js @@ -154,6 +154,10 @@ const styles = { display: 'none', }, + dInlineBlock: { + display: 'inline-block', + }, + bgHighlight: { backgroundColor: 'yellow', }, @@ -967,6 +971,8 @@ const styles = { const baseCodeTagStyles = { borderWidth: 1, borderRadius: 5, + marginTop: 4, + marginBottom: 4, borderColor: colors.border, backgroundColor: colors.textBackground, }; @@ -1016,10 +1022,6 @@ const webViewStyles = { paddingRight: 8, paddingLeft: 8, fontFamily: fontFamily.MONOSPACE, - - // override user agent styles - marginTop: 0, - marginBottom: 0 }, code: { From 0168945e973737e636a9aee4cba013dc0616a0db Mon Sep 17 00:00:00 2001 From: Avais392 Date: Sat, 12 Dec 2020 09:05:36 +0500 Subject: [PATCH 03/13] Issue#895 fix --- package-lock.json | 6 ++---- src/pages/home/report/ReportActionCompose.js | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0f464cf87f7b..90aaa26800ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5539,8 +5539,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz", "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==", - "dev": true, - "optional": true + "dev": true }, "boxen": { "version": "4.2.0", @@ -6141,8 +6140,7 @@ "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "optional": true + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" }, "to-regex-range": { "version": "5.0.1", diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js index fdee01745edb..7fb023489e33 100644 --- a/src/pages/home/report/ReportActionCompose.js +++ b/src/pages/home/report/ReportActionCompose.js @@ -144,7 +144,6 @@ class ReportActionCompose extends React.Component { title="Upload Attachment" onConfirm={(file) => { addAction(this.props.reportID, '', file); - this.setTextInputShouldClear(true); }} > {({displayFileInModal}) => ( From c80bc29262f284c85a2da7dfeb04df78ae283c1f Mon Sep 17 00:00:00 2001 From: Avais392 Date: Sat, 12 Dec 2020 09:35:06 +0500 Subject: [PATCH 04/13] Issue#895 fixed --- src/pages/home/report/ReportActionCompose.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js index 7fb023489e33..02cb47d766d9 100644 --- a/src/pages/home/report/ReportActionCompose.js +++ b/src/pages/home/report/ReportActionCompose.js @@ -144,6 +144,7 @@ class ReportActionCompose extends React.Component { title="Upload Attachment" onConfirm={(file) => { addAction(this.props.reportID, '', file); + this.setTextInputShouldClear(false); }} > {({displayFileInModal}) => ( From 15c8e0fe6954820ecefda16f1815813407f62a88 Mon Sep 17 00:00:00 2001 From: Shawn Borton Date: Wed, 16 Dec 2020 15:15:37 -0800 Subject: [PATCH 05/13] Add logo to the Expensify.cash README.md This adds the Expensify logo to the top of the Expensify.cash repo's README.md --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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`. From ba06b42bfbd499eb1377660859b50f1f270d264d Mon Sep 17 00:00:00 2001 From: Shawn Borton Date: Wed, 16 Dec 2020 16:05:07 -0800 Subject: [PATCH 06/13] $ https://github.com/Expensify/Expensify.cash/issues/989 --- src/pages/home/sidebar/SidebarLinks.js | 2 +- src/styles/styles.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 ( - + Date: Thu, 17 Dec 2020 01:18:41 +0000 Subject: [PATCH 07/13] Update version to 1.0.1-266 --- android/app/build.gradle | 4 ++-- ios/ExpensifyCash/Info.plist | 2 +- ios/ExpensifyCashTests/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 4959ba38f886..8ba8a725c568 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 267 + versionName "1.0.1-266" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 4921cd8a247d..800d80ef9631 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 266 + 267 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 2b42fdb77f53..45076bc790c7 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 266 + 267 diff --git a/package-lock.json b/package-lock.json index 9e659a40829b..5b30c36adca3 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-266", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 701bebae5995..a9c74d5c8562 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.1-265", + "version": "1.0.1-266", "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.", From 9475cb5d9df736b0fc94b20bcb84f04e5d5e4ca4 Mon Sep 17 00:00:00 2001 From: Avais392 Date: Thu, 17 Dec 2020 06:26:31 +0500 Subject: [PATCH 08/13] https://github.com/Expensify/Expensify.cash/pull/969#discussion_r543815807 fixed --- package-lock.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 90aaa26800ee..fad49ccdb9a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5539,7 +5539,8 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz", "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==", - "dev": true + "dev": true, + "optional":true }, "boxen": { "version": "4.2.0", @@ -6140,7 +6141,8 @@ "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "optional":true }, "to-regex-range": { "version": "5.0.1", From e4133f7ef6de4ac7c112851a42cf6a2b5dbe590e Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 16 Dec 2020 17:31:13 -0800 Subject: [PATCH 09/13] fix style --- src/components/InlineCodeBlock/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/InlineCodeBlock/index.js b/src/components/InlineCodeBlock/index.js index ece83dd5f408..2d2160b12840 100644 --- a/src/components/InlineCodeBlock/index.js +++ b/src/components/InlineCodeBlock/index.js @@ -1,6 +1,6 @@ import React from 'react'; import inlineCodeBlockPropTypes from './inlineCodeBlockPropTypes'; -import styles from '../../styles/StyleSheet'; +import styles from '../../styles/styles'; const InlineCodeBlock = ({ TDefaultRenderer, From e7e26b73ea973ebe2c983877563882a709e0342d Mon Sep 17 00:00:00 2001 From: Avais392 Date: Thu, 17 Dec 2020 07:17:44 +0500 Subject: [PATCH 10/13] . --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index fad49ccdb9a6..0f464cf87f7b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5540,7 +5540,7 @@ "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz", "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==", "dev": true, - "optional":true + "optional": true }, "boxen": { "version": "4.2.0", @@ -6142,7 +6142,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "optional":true + "optional": true }, "to-regex-range": { "version": "5.0.1", From 7cd5cbe327747a587a620198ece97f944eb3f402 Mon Sep 17 00:00:00 2001 From: botify Date: Thu, 17 Dec 2020 02:58:53 +0000 Subject: [PATCH 11/13] Update version to 1.0.1-267 --- android/app/build.gradle | 4 ++-- ios/ExpensifyCash/Info.plist | 2 +- ios/ExpensifyCashTests/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 8ba8a725c568..b3aa3c7c93e4 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 267 - versionName "1.0.1-266" + versionCode 268 + versionName "1.0.1-267" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 800d80ef9631..0e39b5dd7ff0 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 267 + 268 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 45076bc790c7..53afde3f51c5 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 267 + 268 diff --git a/package-lock.json b/package-lock.json index 5b30c36adca3..2b91f8bad34f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.1-266", + "version": "1.0.1-267", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a9c74d5c8562..6eb2dce5bcfb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.1-266", + "version": "1.0.1-267", "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.", From 25d57c1decfb9dadfc26982fd8dcedaa6a585c65 Mon Sep 17 00:00:00 2001 From: botify Date: Thu, 17 Dec 2020 10:13:59 +0000 Subject: [PATCH 12/13] Update version to 1.0.1-268 --- android/app/build.gradle | 4 ++-- ios/ExpensifyCash/Info.plist | 2 +- ios/ExpensifyCashTests/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 b3aa3c7c93e4..be0a86edaf12 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 268 - versionName "1.0.1-267" + versionCode 269 + versionName "1.0.1-268" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 0e39b5dd7ff0..6b329b9d9555 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 268 + 269 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 53afde3f51c5..a4b665090e15 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 268 + 269 diff --git a/package-lock.json b/package-lock.json index 2b91f8bad34f..5b0b87775726 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.1-267", + "version": "1.0.1-268", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6eb2dce5bcfb..485e0c5b31e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.1-267", + "version": "1.0.1-268", "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.", From 30568a08b9e490e62014fc0333a6ef78f063d009 Mon Sep 17 00:00:00 2001 From: botify Date: Thu, 17 Dec 2020 17:55:34 +0000 Subject: [PATCH 13/13] Update version to 1.0.1-269 --- android/app/build.gradle | 4 ++-- ios/ExpensifyCash/Info.plist | 2 +- ios/ExpensifyCashTests/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 be0a86edaf12..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 269 - versionName "1.0.1-268" + versionCode 270 + versionName "1.0.1-269" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 6b329b9d9555..d467dff4dbf1 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 269 + 270 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index a4b665090e15..2a1eb5e7a17c 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 269 + 270 diff --git a/package-lock.json b/package-lock.json index 5b0b87775726..5e953b24b57b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.1-268", + "version": "1.0.1-269", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 485e0c5b31e9..e307b1f389bc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.1-268", + "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.",