From 14af0abbbbaf4f55dba70aab3bc3e9190ecca89f Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Thu, 3 Jun 2021 06:09:21 +0530 Subject: [PATCH 01/31] added file type check --- src/libs/actions/Report.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 79d6c99c86e8..53bfa45135c9 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -21,6 +21,7 @@ import Log from '../Log'; import {isReportMessageAttachment, sortReportsByLastVisited} from '../reportUtils'; import Timers from '../Timers'; import {dangerouslyGetReportActionsMaxSequenceNumber, isReportMissingActions} from './ReportActions'; +import Growl from '../Growl'; let currentUserEmail; let currentUserAccountID; @@ -1040,7 +1041,17 @@ function addAction(reportID, text, file) { // the same way report actions can. persist: !isAttachment, }) - .then(({reportAction}) => updateReportWithNewAction(reportID, reportAction)); + .then((response) => { + if (response.jsonCode === 408) { + Growl.show('Upload Failed. File is not supported.', CONST.GROWL.ERROR); + Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, { + [optimisticReportActionID]: null, + }); + console.error(response.message); + return; + } + updateReportWithNewAction(reportID, response.reportAction); + }); } /** From 266fc19b6917e5a468c1eec21458f9e4dd560564 Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Fri, 4 Jun 2021 08:25:01 +0530 Subject: [PATCH 02/31] localized error --- src/CONST.js | 2 ++ src/components/withLocalize.js | 3 ++- src/languages/en.js | 1 + src/libs/actions/Report.js | 13 ++++++++++++- src/libs/translate.js | 4 +++- 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/CONST.js b/src/CONST.js index 7c0721bad621..257bd0703cdc 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -189,6 +189,8 @@ const CONST = { WARNING: 'warning', DURATION: 2000, }, + + DEFAULT_LOCALE: 'en', }; export default CONST; diff --git a/src/components/withLocalize.js b/src/components/withLocalize.js index 4a45ac62004e..28b9409796d3 100755 --- a/src/components/withLocalize.js +++ b/src/components/withLocalize.js @@ -8,6 +8,7 @@ import {translate} from '../libs/translate'; import DateUtils from '../libs/DateUtils'; import {toLocalPhone, fromLocalPhone} from '../libs/LocalePhoneNumber'; import numberFormat from '../libs/numberFormat'; +import CONST from '../CONST'; const withLocalizePropTypes = { /** Returns translated string for given locale and phrase */ @@ -66,7 +67,7 @@ function withLocalizeHOC(WrappedComponent) { ]), }; WithLocalize.defaultProps = { - preferredLocale: 'en', + preferredLocale: CONST.DEFAULT_LOCALE, forwardedRef: undefined, }; return React.forwardRef((props, ref) => ( diff --git a/src/languages/en.js b/src/languages/en.js index fa4489706212..eb00922f56d7 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -77,6 +77,7 @@ export default { addAttachment: 'Add Attachment', writeSomething: 'Write something...', youAppearToBeOffline: 'You appear to be offline.', + fileUploadFailed: 'Upload Failed. File is not supported.', }, reportActionContextMenu: { copyToClipboard: 'Copy to Clipboard', diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 53bfa45135c9..eded48301edc 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -22,6 +22,7 @@ import {isReportMessageAttachment, sortReportsByLastVisited} from '../reportUtil import Timers from '../Timers'; import {dangerouslyGetReportActionsMaxSequenceNumber, isReportMissingActions} from './ReportActions'; import Growl from '../Growl'; +import {translate} from '../translate'; let currentUserEmail; let currentUserAccountID; @@ -58,6 +59,16 @@ Onyx.connect({ }, }); +let translateLocal = (phrase, variables) => translate(CONST.DEFAULT_LOCALE, phrase, variables); +Onyx.connect({ + key: ONYXKEYS.PREFERRED_LOCALE, + callback: (preferredLocale) => { + if (preferredLocale) { + translateLocal = (phrase, variables) => translate(preferredLocale, phrase, variables); + } + }, +}); + const typingWatchTimers = {}; /** @@ -1043,7 +1054,7 @@ function addAction(reportID, text, file) { }) .then((response) => { if (response.jsonCode === 408) { - Growl.show('Upload Failed. File is not supported.', CONST.GROWL.ERROR); + Growl.show(translateLocal('reportActionCompose.fileUploadFailed'), CONST.GROWL.ERROR); Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, { [optimisticReportActionID]: null, }); diff --git a/src/libs/translate.js b/src/libs/translate.js index 7560fdc15626..2d548f8acd84 100644 --- a/src/libs/translate.js +++ b/src/libs/translate.js @@ -3,6 +3,7 @@ import Str from 'expensify-common/lib/str'; import Log from './Log'; import Config from '../CONFIG'; import translations from '../languages/translations'; +import CONST from '../CONST'; /** * Return translated string for given locale and phrase @@ -12,7 +13,8 @@ import translations from '../languages/translations'; * @param {Object} [variables] * @returns {String} */ -function translate(locale = 'en', phrase, variables = {}) { +// eslint-disable-next-line no-undef +function translate(locale = CONST.DEFAULT_LOCALE, phrase, variables = {}) { const localeLanguage = locale.substring(0, 2); const fullLocale = lodashGet(translations, locale, {}); const language = lodashGet(translations, localeLanguage, {}); From e37cb157ca71f49c151f071fc464b814d1ee6b7b Mon Sep 17 00:00:00 2001 From: Jules Rosser Date: Wed, 9 Jun 2021 15:24:58 +0100 Subject: [PATCH 03/31] update Permissions logic to fix IOU regression --- src/libs/Permissions.js | 6 ++++-- src/pages/iou/IOUDetailsModal.js | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/libs/Permissions.js b/src/libs/Permissions.js index 33cfb6084308..f0a981b350b3 100644 --- a/src/libs/Permissions.js +++ b/src/libs/Permissions.js @@ -28,16 +28,18 @@ function canUseIOU(betas) { } /** + * @param {Array} betas * @returns {Boolean} */ -function canUsePayWithExpensify() { +function canUsePayWithExpensify(betas) { return _.contains(betas, CONST.BETAS.PAY_WITH_EXPENSIFY) || canUseAllBetas(); } /** + * @param {Array} betas * @returns {Boolean} */ -function canUseFreePlan() { +function canUseFreePlan(betas) { return _.contains(betas, CONST.BETAS.FREE_PLAN) || canUseAllBetas(); } diff --git a/src/pages/iou/IOUDetailsModal.js b/src/pages/iou/IOUDetailsModal.js index 5b00f2aa5556..878220af9793 100644 --- a/src/pages/iou/IOUDetailsModal.js +++ b/src/pages/iou/IOUDetailsModal.js @@ -67,6 +67,9 @@ const propTypes = { email: PropTypes.string, }).isRequired, + /** Beta features list */ + betas: PropTypes.arrayOf(PropTypes.string).isRequired, + ...withLocalizePropTypes, }; @@ -181,7 +184,7 @@ class IOUDetailsModal extends Component { */ addExpensifyPaymentOptionIfAvailable() { if (lodashGet(this.props, 'iouReport.currency') !== CONST.CURRENCY.USD - || !Permissions.canUsePayWithExpensify()) { + || !Permissions.canUsePayWithExpensify(this.props.betas)) { return; } @@ -286,5 +289,8 @@ export default compose( session: { key: ONYXKEYS.SESSION, }, + betas: { + key: ONYXKEYS.BETAS, + }, }), )(IOUDetailsModal); From 3683b1148a0d94f6592a81edae33c5b9e54f1493 Mon Sep 17 00:00:00 2001 From: Jules Rosser Date: Wed, 9 Jun 2021 18:14:53 +0100 Subject: [PATCH 04/31] bump Onyx commit to fix IOU regression --- 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 94373a4e006e..b87bbb9fb051 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33848,8 +33848,8 @@ } }, "react-native-onyx": { - "version": "git+https://github.com/Expensify/react-native-onyx.git#4ff94b6c068582a75f50c6e159d3ff69fa123138", - "from": "git+https://github.com/Expensify/react-native-onyx.git#4ff94b6c068582a75f50c6e159d3ff69fa123138", + "version": "git+https://github.com/Expensify/react-native-onyx.git#52c254fbc4b96224d2ac087e57ef6efc4210ccc1", + "from": "git+https://github.com/Expensify/react-native-onyx.git#52c254fbc4b96224d2ac087e57ef6efc4210ccc1", "requires": { "@react-native-community/async-storage": "^1.12.1", "expensify-common": "git+https://github.com/Expensify/expensify-common.git#2e5cff552cf132da90a3fb9756e6b4fb6ae7b40c", diff --git a/package.json b/package.json index 7c503eccb40f..62b25118f25c 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "react-native-image-picker": "^2.3.3", "react-native-keyboard-spacer": "^0.4.1", "react-native-modal": "^11.10.0", - "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#4ff94b6c068582a75f50c6e159d3ff69fa123138", + "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#52c254fbc4b96224d2ac087e57ef6efc4210ccc1", "react-native-pdf": "^6.2.2", "react-native-permissions": "^3.0.1", "react-native-picker-select": "8.0.4", From d5a77f516920b427212b7edf5fac17c7accc4680 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Wed, 9 Jun 2021 07:52:08 -1000 Subject: [PATCH 05/31] Use hrefAttrs for links --- .../AnchorForCommentsOnly/BaseAnchorForCommentsOnly/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly/index.js b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly/index.js index 37faebd2ee02..9082f8ad396b 100644 --- a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly/index.js +++ b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly/index.js @@ -17,8 +17,7 @@ const BaseAnchorForCommentsOnly = ({ style={StyleSheet.flatten(style)} accessibilityRole="link" href={href} - rel={rel} - target={target} + hrefAttrs={{rel, target}} // eslint-disable-next-line react/jsx-props-no-spreading {...props} > From 63ccda78475d804c6290fb2dd892bcb933f2db66 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Wed, 9 Jun 2021 19:52:58 +0000 Subject: [PATCH 06/31] Update version to 1.0.66-1 --- 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 b810f2c425ea..42ee7d3fcb8d 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 1001006600 - versionName "1.0.66-0" + versionCode 1001006601 + versionName "1.0.66-1" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index b1def0197240..20947ab79753 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.66.0 + 1.0.66.1 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 1c502a7a7e22..f5b2ccec44ca 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.66.0 + 1.0.66.1 diff --git a/package-lock.json b/package-lock.json index b87bbb9fb051..b38b920c609a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-0", + "version": "1.0.66-1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 62b25118f25c..a4841582e351 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-0", + "version": "1.0.66-1", "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 4f0ee3cd31b88c49ecc223b88475fda1f6187643 Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Wed, 9 Jun 2021 13:48:54 -0700 Subject: [PATCH 07/31] Single brackets not double brackets --- .github/workflows/cherryPick.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml index db76a651b818..b1facd69e10e 100644 --- a/.github/workflows/cherryPick.yml +++ b/.github/workflows/cherryPick.yml @@ -84,7 +84,7 @@ jobs: - name: Save correct NEW_VERSION to env run: | - if [[ -z ${{ github.event.inputs.NEW_VERSION }} ]]; then + if [ -z ${{ github.event.inputs.NEW_VERSION }} ]; then echo "NEW_VERSION=${{ needs.createNewVersion.outputs.NEW_VERSION }}" >> $GITHUB_ENV echo "New version is ${{ env.NEW_VERSION }}" else From eb66e02e60e9d12db4df964d7e8dc9c5a9e07ab5 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Wed, 9 Jun 2021 20:59:17 +0000 Subject: [PATCH 08/31] Update version to 1.0.66-2 --- 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 42ee7d3fcb8d..16befd8217db 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 1001006601 - versionName "1.0.66-1" + versionCode 1001006602 + versionName "1.0.66-2" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 20947ab79753..6d596a804220 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.66.1 + 1.0.66.2 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index f5b2ccec44ca..37838b44aa4e 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.66.1 + 1.0.66.2 diff --git a/package-lock.json b/package-lock.json index b38b920c609a..4066cd09d21f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-1", + "version": "1.0.66-2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a4841582e351..b0643f461daa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-1", + "version": "1.0.66-2", "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 8e5ee09d32ee8f2a250b4a4c3b2873272271d524 Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Wed, 9 Jun 2021 14:15:22 -0700 Subject: [PATCH 09/31] Push changes before trying to create CP branch --- .github/workflows/cherryPick.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml index b1facd69e10e..245801923139 100644 --- a/.github/workflows/cherryPick.yml +++ b/.github/workflows/cherryPick.yml @@ -120,6 +120,9 @@ jobs: echo "::set-output name=SHOULD_AUTOMERGE::false" fi + - name: Push changes to CP branch + run: git push + - name: Create Pull Request id: createPullRequest # Version: 2.4.3 From 5d197981eef36563464f6e489eb7479cc187d313 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Wed, 9 Jun 2021 21:26:12 +0000 Subject: [PATCH 10/31] Update version to 1.0.66-3 --- 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 16befd8217db..c0c6e7e3e4e6 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 1001006602 - versionName "1.0.66-2" + versionCode 1001006603 + versionName "1.0.66-3" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 6d596a804220..ca03582a1f92 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.66.2 + 1.0.66.3 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 37838b44aa4e..b327c2030571 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.66.2 + 1.0.66.3 diff --git a/package-lock.json b/package-lock.json index 4066cd09d21f..140b1066665d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-2", + "version": "1.0.66-3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b0643f461daa..da1f687372a7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-2", + "version": "1.0.66-3", "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 fdc4c01b26bf38a7d3765d8999196fb46601754b Mon Sep 17 00:00:00 2001 From: OSBotify Date: Wed, 9 Jun 2021 22:08:46 +0000 Subject: [PATCH 11/31] Update version to 1.0.66-4 --- 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 c0c6e7e3e4e6..b1476e387479 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 1001006603 - versionName "1.0.66-3" + versionCode 1001006604 + versionName "1.0.66-4" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index ca03582a1f92..fa0dbed6d62b 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.66.3 + 1.0.66.4 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index b327c2030571..2668ec6f448d 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.66.3 + 1.0.66.4 diff --git a/package-lock.json b/package-lock.json index 140b1066665d..50f74dc083d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-3", + "version": "1.0.66-4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index da1f687372a7..ac03a46e51ea 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-3", + "version": "1.0.66-4", "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 c3cd696bd54eab2dfd712654052e9023e6ece90c Mon Sep 17 00:00:00 2001 From: OSBotify Date: Wed, 9 Jun 2021 22:58:13 +0000 Subject: [PATCH 12/31] Update version to 1.0.66-5 --- 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 b1476e387479..db40e1537e52 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 1001006604 - versionName "1.0.66-4" + versionCode 1001006605 + versionName "1.0.66-5" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index fa0dbed6d62b..5420ad9ae1eb 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.66.4 + 1.0.66.5 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 2668ec6f448d..eee15df15375 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.66.4 + 1.0.66.5 diff --git a/package-lock.json b/package-lock.json index 50f74dc083d8..6216280967b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-4", + "version": "1.0.66-5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ac03a46e51ea..c63abaee41cb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-4", + "version": "1.0.66-5", "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 91353e645746cdfe56c137f437f74f5519c0691e Mon Sep 17 00:00:00 2001 From: tugbadogan Date: Thu, 10 Jun 2021 00:10:57 +0100 Subject: [PATCH 13/31] Fix line breaks in homepage texts --- src/languages/en.js | 2 +- src/languages/es.js | 2 +- .../signin/TermsAndLicenses/TermsWithLicenses.js | 16 ++++++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index cfe1a9790ade..2adce967588c 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -220,7 +220,7 @@ export default { phrase2: 'terms of service', phrase3: 'and', phrase4: 'privacy policy', - phrase5: '. Money transmission is provided by Expensify Payments LLC (NMLS ID:2017010) pursuant to its', + phrase5: 'Money transmission is provided by Expensify Payments LLC (NMLS ID:2017010) pursuant to its', phrase6: 'licenses', }, passwordForm: { diff --git a/src/languages/es.js b/src/languages/es.js index a199c313d8da..6bc5675e40bb 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -216,7 +216,7 @@ export default { phrase2: 'términos de servicio', phrase3: 'y', phrase4: 'política de privacidad', - phrase5: '. El envío de dinero es brindado por Expensify Payments LLC (NMLS ID:2017010) de conformidad con sus', + phrase5: 'El envío de dinero es brindado por Expensify Payments LLC (NMLS ID:2017010) de conformidad con sus', phrase6: 'licencias', }, passwordForm: { diff --git a/src/pages/signin/TermsAndLicenses/TermsWithLicenses.js b/src/pages/signin/TermsAndLicenses/TermsWithLicenses.js index 96b287c25da8..03f447154b8d 100755 --- a/src/pages/signin/TermsAndLicenses/TermsWithLicenses.js +++ b/src/pages/signin/TermsAndLicenses/TermsWithLicenses.js @@ -22,13 +22,17 @@ const TermsWithLicenses = ({translate}) => ( {translate('termsOfUse.phrase4')} - - {translate('termsOfUse.phrase5')} - - - {translate('termsOfUse.phrase6')} - . + + + {translate('termsOfUse.phrase5')} + {' '} + + + {translate('termsOfUse.phrase6')} + + . + ); From e9371f685a23d1ca351da4587a4ee16fa05aeb26 Mon Sep 17 00:00:00 2001 From: Joe Gambino Date: Wed, 9 Jun 2021 17:13:25 -0700 Subject: [PATCH 14/31] Update UrbanAirship version --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6216280967b0..bf00be5b4ab0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38431,9 +38431,9 @@ } }, "urbanairship-react-native": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/urbanairship-react-native/-/urbanairship-react-native-10.0.0.tgz", - "integrity": "sha512-0vJ6K+KnGeB5vJujFzfWXc7x+nFkdELj4TSOBkfW0VfxrQpojIXmOdXt0GHWOUOVTzFj2iA25qkfcSAaImQeGw==" + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/urbanairship-react-native/-/urbanairship-react-native-11.0.1.tgz", + "integrity": "sha512-QNXz655hBveFSv5kMFivhUkpHopt0ojIFCWEP+H0vssKjrO8z0xDmlM6Gd4aeUT63nwTaAUbH7zU8qTLFFrs+w==" }, "uri-js": { "version": "4.4.0", diff --git a/package.json b/package.json index c63abaee41cb..48aa4b64a67d 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "rn-fetch-blob": "^0.12.0", "save": "^2.4.0", "underscore": "^1.10.2", - "urbanairship-react-native": "^10.0.0" + "urbanairship-react-native": "^11.0.1" }, "devDependencies": { "@actions/core": "^1.2.6", From 445f1709882a26257575bc851781d434b4759d73 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 10 Jun 2021 00:18:26 +0000 Subject: [PATCH 15/31] Update version to 1.0.66-6 --- 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 db40e1537e52..bacd213f4aef 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 1001006605 - versionName "1.0.66-5" + versionCode 1001006606 + versionName "1.0.66-6" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 5420ad9ae1eb..3988645d1644 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.66.5 + 1.0.66.6 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index eee15df15375..886c1787085e 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.66.5 + 1.0.66.6 diff --git a/package-lock.json b/package-lock.json index 6216280967b0..3f6811762c55 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-5", + "version": "1.0.66-6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c63abaee41cb..f4e9c710c719 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-5", + "version": "1.0.66-6", "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 996381945d5173b14bcb78a5bf66736e0e962808 Mon Sep 17 00:00:00 2001 From: Joe Gambino Date: Wed, 9 Jun 2021 19:47:02 -0700 Subject: [PATCH 16/31] update pods --- ios/Podfile.lock | 62 ++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 80f75b7712b9..657d76e23e12 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,15 +1,15 @@ PODS: - - Airship (14.2.0): - - Airship/Automation (= 14.2.0) - - Airship/Core (= 14.2.0) - - Airship/ExtendedActions (= 14.2.0) - - Airship/MessageCenter (= 14.2.0) - - Airship/Automation (14.2.0): + - Airship (14.3.0): + - Airship/Automation (= 14.3.0) + - Airship/Core (= 14.3.0) + - Airship/ExtendedActions (= 14.3.0) + - Airship/MessageCenter (= 14.3.0) + - Airship/Automation (14.3.0): - Airship/Core - - Airship/Core (14.2.0) - - Airship/ExtendedActions (14.2.0): + - Airship/Core (14.3.0) + - Airship/ExtendedActions (14.3.0): - Airship/Core - - Airship/MessageCenter (14.2.0): + - Airship/MessageCenter (14.3.0): - Airship/Core - boost-for-react-native (1.63.0) - CocoaAsyncSocket (7.6.5) @@ -494,8 +494,8 @@ PODS: - React-Core - RNSVG (12.1.0): - React - - urbanairship-react-native (10.0.0): - - Airship (= 14.2.0) + - urbanairship-react-native (11.0.1): + - Airship (= 14.3.0) - React-Core - Yoga (1.14.0) - YogaKit (1.18.1): @@ -728,12 +728,12 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - Airship: 02ad73780f9eed21870e36b0aaab327acda6a102 + Airship: 7609d263d3a207f112d6db066af5852b80af6819 boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - DoubleConversion: cde416483dac037923206447da6e1454df403714 + DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de FBLazyVector: 7b423f9e248eae65987838148c36eec1dbfe0b53 - FBReactNativeSpec: 884d4cc2b011759361797a4035c47e10099393b5 + FBReactNativeSpec: 825b0f0851f5cc5c6268a920286281f62fc96c37 Firebase: c23a36d9e4cdf7877dfcba8dd0c58add66358999 FirebaseAnalytics: 3bb096873ee0d7fa4b6c70f5e9166b6da413cc7f FirebaseCore: d3a978a3cfa3240bf7e4ba7d137fdf5b22b628ec @@ -747,7 +747,7 @@ SPEC CHECKSUMS: Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154 FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00 - glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 + glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62 GoogleAppMeasurement: a6a3a066369828db64eda428cb2856dc1cdc7c4e GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833 GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3 @@ -756,9 +756,9 @@ SPEC CHECKSUMS: Onfido: 116a268e4cb8b767c15285e8071c2e8304673cdf onfido-react-native-sdk: b8f1b7cbe1adab6479d735275772390161630dcd OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b - Permission-LocationAccuracy: e8adff9ede1b23b43b7054a4500113d515fc87a8 - Permission-LocationAlways: 7f7f373d086af7a81b2f4f20d65d29266ca2043b - Permission-LocationWhenInUse: 3ae82a9feb5da4e94e386dba17c7dd3531af9feb + Permission-LocationAccuracy: 76669f87b4c276f5ae803cc0ddd1862a4c0e9dd8 + Permission-LocationAlways: a274bc04bb386068782468dbdaca3859f51634ca + Permission-LocationWhenInUse: 3a2b0dbc167d79e8e920a4377ff9520cdc108407 Plaid: c02276ccc630a726a9ed790bf923d29839ff4017 PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97 RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c @@ -773,15 +773,15 @@ SPEC CHECKSUMS: React-jsiexecutor: 124e8f99992490d0d13e0649d950d3e1aae06fe9 React-jsinspector: 500a59626037be5b3b3d89c5151bc3baa9abf1a9 react-native-config: d8b45133fd13d4f23bd2064b72f6e2c08b2763ed - react-native-document-picker: b3e78a8f7fef98b5cb069f20fc35797d55e68e28 + react-native-document-picker: 0bba80cc56caab1f67dbaa81ff557e3a9b7f2b9f react-native-geolocation-service: 7c9436da6dfdecd9526c62eac62ea2bc3f0cc8ea - react-native-image-picker: 32d1ad2c0024ca36161ae0d5c2117e2d6c441f11 - react-native-netinfo: 52cf0ee8342548a485e28f4b09e56b477567244d + react-native-image-picker: c6d75c4ab2cf46f9289f341242b219cb3c1180d3 + react-native-netinfo: 30fb89fa913c342be82a887b56e96be6d71201dd react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f - react-native-plaid-link-sdk: 1a6593e2d3d790e8113c29178d883eb883f8c032 - react-native-progress-bar-android: ce95a69f11ac580799021633071368d08aaf9ad8 - react-native-progress-view: 5816e8a6be812c2b122c6225a2a3db82d9008640 - react-native-safe-area-context: 01158a92c300895d79dee447e980672dc3fb85a6 + react-native-plaid-link-sdk: 59b7376efca9f00e9693321c5cf7c6ab2c567635 + react-native-progress-bar-android: be43138ab7da30d51fc038bafa98e9ed594d0c40 + react-native-progress-view: 21b1e29e70c7559c16c9e0a04c4adc19fce6ede2 + react-native-safe-area-context: 79fea126c6830c85f65947c223a5e3058a666937 React-perflogger: aad6d4b4a267936b3667260d1f649b6f6069a675 React-RCTActionSheet: fc376be462c9c8d6ad82c0905442fd77f82a9d2a React-RCTAnimation: ba0a1c3a2738be224a08092fa7f1b444ab77d309 @@ -795,20 +795,20 @@ SPEC CHECKSUMS: React-runtimeexecutor: ff951a0c241bfaefc4940a3f1f1a229e7cb32fa6 ReactCommon: bedc99ed4dae329c4fcf128d0c31b9115e5365ca rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba - RNBootSplash: 3123ba68fe44d8be09a014e89cc8f0f55b68a521 - RNCAsyncStorage: cb9a623793918c6699586281f0b51cbc38f046f9 - RNCClipboard: 5e299c6df8e0c98f3d7416b86ae563d3a9f768a3 - RNCMaskedView: 138134c4d8a9421b4f2bf39055a79aa05c2d47b1 + RNBootSplash: 24175aa28fe203b10c48dc34e78d946fd33c77af + RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398 + RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495 + RNCMaskedView: fc29d354a40316a990e8fb46391f08aea829c3aa RNCPicker: 6780c753e9e674065db90d9c965920516402579d RNFBAnalytics: 2dc4dd9e2445faffca041b10447a23a71dcdabf8 RNFBApp: 7eacc7da7ab19f96c05e434017d44a9f09410da8 RNFBCrashlytics: 4870c14cf8833053b6b5648911abefe1923854d2 RNGestureHandler: 9b7e605a741412e20e13c512738a31bd1611759b - RNPermissions: eb94f9fdc0a8ecd02fcce0676d56ffb1395d41e1 + RNPermissions: 4c8a37b4dde50f1f152bf8cd08c4a43d2355829e RNReanimated: b8c8004b43446e3c2709fe64b2b41072f87428ad RNScreens: e8e8dd0588b5da0ab57dcca76ab9b2d8987757e0 RNSVG: ce9d996113475209013317e48b05c21ee988d42e - urbanairship-react-native: dfb6dc22b2f41ccaadd636b73d51b448cd1b2bbc + urbanairship-react-native: d415a12e67ba93bf3ce914df9a310b66a88a5cc3 Yoga: a7de31c64fe738607e7a3803e3f591a4b1df7393 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a From 6078f1119cade3e4dd27db3d22ae03bbc28440ed Mon Sep 17 00:00:00 2001 From: Joe Gambino Date: Wed, 9 Jun 2021 20:20:18 -0700 Subject: [PATCH 17/31] re-build pods --- ios/Podfile.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 657d76e23e12..689a21969a4b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -756,9 +756,9 @@ SPEC CHECKSUMS: Onfido: 116a268e4cb8b767c15285e8071c2e8304673cdf onfido-react-native-sdk: b8f1b7cbe1adab6479d735275772390161630dcd OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b - Permission-LocationAccuracy: 76669f87b4c276f5ae803cc0ddd1862a4c0e9dd8 - Permission-LocationAlways: a274bc04bb386068782468dbdaca3859f51634ca - Permission-LocationWhenInUse: 3a2b0dbc167d79e8e920a4377ff9520cdc108407 + Permission-LocationAccuracy: e8adff9ede1b23b43b7054a4500113d515fc87a8 + Permission-LocationAlways: 7f7f373d086af7a81b2f4f20d65d29266ca2043b + Permission-LocationWhenInUse: 3ae82a9feb5da4e94e386dba17c7dd3531af9feb Plaid: c02276ccc630a726a9ed790bf923d29839ff4017 PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97 RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c @@ -773,15 +773,15 @@ SPEC CHECKSUMS: React-jsiexecutor: 124e8f99992490d0d13e0649d950d3e1aae06fe9 React-jsinspector: 500a59626037be5b3b3d89c5151bc3baa9abf1a9 react-native-config: d8b45133fd13d4f23bd2064b72f6e2c08b2763ed - react-native-document-picker: 0bba80cc56caab1f67dbaa81ff557e3a9b7f2b9f + react-native-document-picker: b3e78a8f7fef98b5cb069f20fc35797d55e68e28 react-native-geolocation-service: 7c9436da6dfdecd9526c62eac62ea2bc3f0cc8ea - react-native-image-picker: c6d75c4ab2cf46f9289f341242b219cb3c1180d3 - react-native-netinfo: 30fb89fa913c342be82a887b56e96be6d71201dd + react-native-image-picker: 32d1ad2c0024ca36161ae0d5c2117e2d6c441f11 + react-native-netinfo: 52cf0ee8342548a485e28f4b09e56b477567244d react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f - react-native-plaid-link-sdk: 59b7376efca9f00e9693321c5cf7c6ab2c567635 - react-native-progress-bar-android: be43138ab7da30d51fc038bafa98e9ed594d0c40 - react-native-progress-view: 21b1e29e70c7559c16c9e0a04c4adc19fce6ede2 - react-native-safe-area-context: 79fea126c6830c85f65947c223a5e3058a666937 + react-native-plaid-link-sdk: 1a6593e2d3d790e8113c29178d883eb883f8c032 + react-native-progress-bar-android: ce95a69f11ac580799021633071368d08aaf9ad8 + react-native-progress-view: 5816e8a6be812c2b122c6225a2a3db82d9008640 + react-native-safe-area-context: 01158a92c300895d79dee447e980672dc3fb85a6 React-perflogger: aad6d4b4a267936b3667260d1f649b6f6069a675 React-RCTActionSheet: fc376be462c9c8d6ad82c0905442fd77f82a9d2a React-RCTAnimation: ba0a1c3a2738be224a08092fa7f1b444ab77d309 @@ -795,16 +795,16 @@ SPEC CHECKSUMS: React-runtimeexecutor: ff951a0c241bfaefc4940a3f1f1a229e7cb32fa6 ReactCommon: bedc99ed4dae329c4fcf128d0c31b9115e5365ca rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba - RNBootSplash: 24175aa28fe203b10c48dc34e78d946fd33c77af - RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398 - RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495 - RNCMaskedView: fc29d354a40316a990e8fb46391f08aea829c3aa + RNBootSplash: 3123ba68fe44d8be09a014e89cc8f0f55b68a521 + RNCAsyncStorage: cb9a623793918c6699586281f0b51cbc38f046f9 + RNCClipboard: 5e299c6df8e0c98f3d7416b86ae563d3a9f768a3 + RNCMaskedView: 138134c4d8a9421b4f2bf39055a79aa05c2d47b1 RNCPicker: 6780c753e9e674065db90d9c965920516402579d RNFBAnalytics: 2dc4dd9e2445faffca041b10447a23a71dcdabf8 RNFBApp: 7eacc7da7ab19f96c05e434017d44a9f09410da8 RNFBCrashlytics: 4870c14cf8833053b6b5648911abefe1923854d2 RNGestureHandler: 9b7e605a741412e20e13c512738a31bd1611759b - RNPermissions: 4c8a37b4dde50f1f152bf8cd08c4a43d2355829e + RNPermissions: eb94f9fdc0a8ecd02fcce0676d56ffb1395d41e1 RNReanimated: b8c8004b43446e3c2709fe64b2b41072f87428ad RNScreens: e8e8dd0588b5da0ab57dcca76ab9b2d8987757e0 RNSVG: ce9d996113475209013317e48b05c21ee988d42e From c335b92c9b6a3b0768361c7e1acda4579890fcdb Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 10 Jun 2021 04:01:59 +0000 Subject: [PATCH 18/31] Update version to 1.0.66-7 --- 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 bacd213f4aef..3366175a623c 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 1001006606 - versionName "1.0.66-6" + versionCode 1001006607 + versionName "1.0.66-7" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 3988645d1644..685a75ba6a35 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.66.6 + 1.0.66.7 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 886c1787085e..e6094f24a840 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.66.6 + 1.0.66.7 diff --git a/package-lock.json b/package-lock.json index 3f6811762c55..58df082b00cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-6", + "version": "1.0.66-7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f4e9c710c719..98e909d7463e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-6", + "version": "1.0.66-7", "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 09b7e0a2e2a1eccfa844d5f40723d1499cc404a0 Mon Sep 17 00:00:00 2001 From: Ali Abbas Malik Date: Thu, 10 Jun 2021 05:09:33 -0400 Subject: [PATCH 19/31] [IS-3218] Fixed cursor issue --- src/pages/home/report/ReportActionItemMessageEdit.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js index 798fc3ad5d0c..5e9bb1ec625d 100644 --- a/src/pages/home/report/ReportActionItemMessageEdit.js +++ b/src/pages/home/report/ReportActionItemMessageEdit.js @@ -62,6 +62,7 @@ class ReportActionItemMessageEdit extends React.Component { * @param {String} newDraft */ updateDraft(newDraft) { + this.textInput.setNativeProps({text: newDraft}); const trimmedNewDraft = newDraft.trim(); this.setState({draft: trimmedNewDraft}); this.debouncedSaveDraft(trimmedNewDraft); @@ -113,6 +114,7 @@ class ReportActionItemMessageEdit extends React.Component { this.textInput = el} onChangeText={this.updateDraft} // Debounced saveDraftComment onKeyPress={this.triggerSaveOrCancel} defaultValue={this.props.draftMessage} From afb44ff4667bb5686c81c074097af60c26913a5c Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Thu, 10 Jun 2021 05:56:48 -0400 Subject: [PATCH 20/31] Quit early when persistedRequests is empty --- src/libs/Network.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/Network.js b/src/libs/Network.js index e6f13c476564..8f708144cc86 100644 --- a/src/libs/Network.js +++ b/src/libs/Network.js @@ -32,7 +32,7 @@ let didLoadPersistedRequests; Onyx.connect({ key: ONYXKEYS.NETWORK_REQUEST_QUEUE, callback: (persistedRequests) => { - if (didLoadPersistedRequests || !persistedRequests) { + if (didLoadPersistedRequests || !persistedRequests || persistedRequests.length === 0) { return; } From 345c8c5796c88a330e3d346129d8209bd1ba74bd Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 10 Jun 2021 16:28:52 +0000 Subject: [PATCH 21/31] Update version to 1.0.66-8 --- 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 3366175a623c..f893e6dfbcec 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 1001006607 - versionName "1.0.66-7" + versionCode 1001006608 + versionName "1.0.66-8" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 685a75ba6a35..0f99e28bd233 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.66.7 + 1.0.66.8 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index e6094f24a840..3d4c42d6ca6f 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.66.7 + 1.0.66.8 diff --git a/package-lock.json b/package-lock.json index 9ead83b35935..bd01c070fcc9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-7", + "version": "1.0.66-8", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 845f6cdadbb9..b50e8e92fe22 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-7", + "version": "1.0.66-8", "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 8abd528e4f62d8f3844151d695868bd9d624dc3c Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Thu, 10 Jun 2021 22:15:41 +0530 Subject: [PATCH 22/31] fix: argument order --- src/pages/NewChatPage.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/NewChatPage.js b/src/pages/NewChatPage.js index 6b94785958f2..96b2153541f3 100755 --- a/src/pages/NewChatPage.js +++ b/src/pages/NewChatPage.js @@ -65,6 +65,7 @@ class NewChatPage extends Component { props.reports, props.personalDetails, '', + false, props.betas, ); @@ -153,6 +154,7 @@ class NewChatPage extends Component { this.props.reports, this.props.personalDetails, searchValue, + false, this.props.betas, ); this.setState({ From f812fb688f7a226f76476ca00385a0a34e58b68c Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 10 Jun 2021 17:31:22 +0000 Subject: [PATCH 23/31] Update version to 1.0.66-9 --- 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 f893e6dfbcec..1425467a5071 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 1001006608 - versionName "1.0.66-8" + versionCode 1001006609 + versionName "1.0.66-9" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 0f99e28bd233..d6c5b8182b28 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.66.8 + 1.0.66.9 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 3d4c42d6ca6f..57786f9c57b9 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.66.8 + 1.0.66.9 diff --git a/package-lock.json b/package-lock.json index bd01c070fcc9..582318896649 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-8", + "version": "1.0.66-9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b50e8e92fe22..213c9c954fae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-8", + "version": "1.0.66-9", "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 4f5286153977b88f1d0005bf5247f0645d02f3e2 Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Thu, 10 Jun 2021 23:36:35 +0530 Subject: [PATCH 24/31] fix: betas for participant pages --- .../steps/IOUParticipantsPage/IOUParticipantsRequest.js | 8 ++++++++ .../steps/IOUParticipantsPage/IOUParticipantsSplit.js | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsRequest.js b/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsRequest.js index 19bdb905ccdf..2b671c1f0325 100755 --- a/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsRequest.js +++ b/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsRequest.js @@ -21,6 +21,9 @@ const personalDetailsPropTypes = PropTypes.shape({ }); const propTypes = { + /** Beta features list */ + betas: PropTypes.arrayOf(PropTypes.string).isRequired, + /** Callback to inform parent modal of success */ onStepComplete: PropTypes.func.isRequired, @@ -54,6 +57,7 @@ class IOUParticipantsRequest extends Component { props.personalDetails, '', true, + props.betas, ); this.state = { @@ -125,6 +129,7 @@ class IOUParticipantsRequest extends Component { this.props.personalDetails, searchValue, true, + this.props.betas, ); this.setState({ searchValue, @@ -153,5 +158,8 @@ export default compose( reports: { key: ONYXKEYS.COLLECTION.REPORT, }, + betas: { + key: ONYXKEYS.BETAS, + }, }), )(IOUParticipantsRequest); diff --git a/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js b/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js index df8b40695799..2aa79d7b9e6e 100755 --- a/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js +++ b/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js @@ -25,6 +25,9 @@ const personalDetailsPropTypes = PropTypes.shape({ }); const propTypes = { + /** Beta features list */ + betas: PropTypes.arrayOf(PropTypes.string).isRequired, + /** Callback to inform parent modal of success */ onStepComplete: PropTypes.func.isRequired, @@ -78,6 +81,7 @@ class IOUParticipantsSplit extends Component { '', props.participants, true, + props.betas, ); this.state = { @@ -178,6 +182,7 @@ class IOUParticipantsSplit extends Component { isOptionInList ? prevState.searchValue : '', newSelectedOptions, true, + this.props.betas, ); return { recentReports, @@ -213,6 +218,7 @@ class IOUParticipantsSplit extends Component { searchValue, [], true, + this.props.betas, ); this.setState({ searchValue, @@ -253,5 +259,8 @@ export default compose( reports: { key: ONYXKEYS.COLLECTION.REPORT, }, + betas: { + key: ONYXKEYS.BETAS, + }, }), )(IOUParticipantsSplit); From 56f152a4866ae882a860c5b5ce596f1df2641fe0 Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Thu, 10 Jun 2021 14:11:55 -0400 Subject: [PATCH 25/31] Keep original logic and move didLoad persisted call --- src/libs/Network.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/Network.js b/src/libs/Network.js index 8f708144cc86..5116cc2d002d 100644 --- a/src/libs/Network.js +++ b/src/libs/Network.js @@ -32,15 +32,15 @@ let didLoadPersistedRequests; Onyx.connect({ key: ONYXKEYS.NETWORK_REQUEST_QUEUE, callback: (persistedRequests) => { - if (didLoadPersistedRequests || !persistedRequests || persistedRequests.length === 0) { + if (didLoadPersistedRequests || !persistedRequests) { return; } // Merge the persisted requests with the requests in memory then clear out the queue as we only need to load // this once when the app initializes networkRequestQueue = [...networkRequestQueue, ...persistedRequests]; - Onyx.set(ONYXKEYS.NETWORK_REQUEST_QUEUE, []); didLoadPersistedRequests = true; + Onyx.set(ONYXKEYS.NETWORK_REQUEST_QUEUE, []); }, }); From 42ad61772c70ce64097ce01ad578541243b5ce01 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 10 Jun 2021 18:55:12 +0000 Subject: [PATCH 26/31] Update version to 1.0.66-10 --- 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 1425467a5071..997f148d5dd4 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 1001006609 - versionName "1.0.66-9" + versionCode 1001006610 + versionName "1.0.66-10" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index d6c5b8182b28..adf83f499f6a 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.66.9 + 1.0.66.10 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 57786f9c57b9..a769d8fedd45 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.66.9 + 1.0.66.10 diff --git a/package-lock.json b/package-lock.json index 582318896649..b8f4c4ff52dd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-9", + "version": "1.0.66-10", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 213c9c954fae..a39134ac01b8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-9", + "version": "1.0.66-10", "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 649b3ca9cf57c65fce68efc25f8e59158ea59b32 Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Thu, 10 Jun 2021 12:22:28 -0700 Subject: [PATCH 27/31] Update staging,prod from a separate branch to auto-resolve conflicts --- .github/workflows/updateProtectedBranch.yml | 25 ++++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/.github/workflows/updateProtectedBranch.yml b/.github/workflows/updateProtectedBranch.yml index 70aa094221f4..db6ca2cb2c78 100644 --- a/.github/workflows/updateProtectedBranch.yml +++ b/.github/workflows/updateProtectedBranch.yml @@ -30,16 +30,16 @@ jobs: echo "Cannot update main branch without specifying a source branch" exit 1 - # If updating staging, the head branch will always be main - # If updating production, the head branch will always be staging + # If updating staging, the source branch will always be main + # If updating production, the source branch will always be staging - name: Set source branch run: | if [[ ${{ github.event.inputs.TARGET_BRANCH }} == 'staging' ]]; then - echo "HEAD_BRANCH=main" >> $GITHUB_ENV + echo "SOURCE_BRANCH=main" >> $GITHUB_ENV elif [[ ${{ github.event.inputs.TARGET_BRANCH }} == 'production' ]]; then - echo "HEAD_BRANCH=staging" >> $GITHUB_ENV + echo "SOURCE_BRANCH=staging" >> $GITHUB_ENV else - echo "HEAD_BRANCH=${{ github.event.inputs.SOURCE_BRANCH }}" >> $GITHUB_ENV + echo "SOURCE_BRANCH=${{ github.event.inputs.SOURCE_BRANCH }}" >> $GITHUB_ENV fi # Version: 2.3.4 @@ -48,18 +48,27 @@ jobs: fetch-depth: 0 token: ${{ secrets.OS_BOTIFY_TOKEN }} - - name: Checkout head branch - run: git checkout ${{ env.HEAD_BRANCH }} + - name: Checkout source branch + run: git checkout ${{ env.SOURCE_BRANCH }} - name: Set New Version run: echo "NEW_VERSION=$(npm run print-version --silent)" >> $GITHUB_ENV + - name: Create temporary branch to resolve conflicts + if: ${{ contains(fromJSON('["staging", "production"]'), github.event.inputs.TARGET_BRANCH) }} + run: | + git checkout ${{ github.event.inputs.TARGET_BRANCH }} + git checkout -b update-${{ github.event.inputs.TARGET_BRANCH }}-from-${{ env.SOURCE_BRANCH }} + git merge -Xtheirs ${{ env.SOURCE_BRANCH }} + git push --set-upstream origin update-${{ github.event.inputs.TARGET_BRANCH }}-from-${{ env.SOURCE_BRANCH }} + echo "SOURCE_BRANCH=update-${{ github.event.inputs.TARGET_BRANCH }}-from-${{ env.SOURCE_BRANCH }}" >> $GITHUB_ENV + - name: Create Pull Request id: createPullRequest # Version: 2.4.3 uses: repo-sync/pull-request@65194d8015be7624d231796ddee1cd52a5023cb3 with: - source_branch: ${{ env.HEAD_BRANCH }} + source_branch: ${{ env.SOURCE_BRANCH }} destination_branch: ${{ github.event.inputs.TARGET_BRANCH }} github_token: ${{ secrets.OS_BOTIFY_TOKEN }} pr_title: Update version to ${{ env.NEW_VERSION }} on ${{ github.event.inputs.TARGET_BRANCH }} From 0c5dedb86e887b08bf425d438fd9d1fdb0a59c57 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 10 Jun 2021 19:48:36 +0000 Subject: [PATCH 28/31] Update version to 1.0.66-11 --- 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 997f148d5dd4..ca241088890f 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 1001006610 - versionName "1.0.66-10" + versionCode 1001006611 + versionName "1.0.66-11" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index adf83f499f6a..e0eae13b9b8b 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.66.10 + 1.0.66.11 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index a769d8fedd45..f8786770dd4c 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.66.10 + 1.0.66.11 diff --git a/package-lock.json b/package-lock.json index b8f4c4ff52dd..7a3894875c90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-10", + "version": "1.0.66-11", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a39134ac01b8..1a2d38c1b294 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-10", + "version": "1.0.66-11", "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 f0194e904ea93a769f099f7efdae7f877f4e4c8f Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 10 Jun 2021 21:26:04 +0000 Subject: [PATCH 29/31] Update version to 1.0.66-12 --- 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 ca241088890f..b12998b1a117 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 1001006611 - versionName "1.0.66-11" + versionCode 1001006612 + versionName "1.0.66-12" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index e0eae13b9b8b..20146c2b7f2d 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.66.11 + 1.0.66.12 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index f8786770dd4c..fbd043c5aca4 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.66.11 + 1.0.66.12 diff --git a/package-lock.json b/package-lock.json index 7a3894875c90..4850b200c9fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-11", + "version": "1.0.66-12", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1a2d38c1b294..a61d1a68bef5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-11", + "version": "1.0.66-12", "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 236f5378aae8fde75620e1613d8318666a12f78e Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Thu, 10 Jun 2021 14:30:54 -0700 Subject: [PATCH 30/31] Add committer name --- .github/workflows/updateProtectedBranch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/updateProtectedBranch.yml b/.github/workflows/updateProtectedBranch.yml index db6ca2cb2c78..c926f8e44ae9 100644 --- a/.github/workflows/updateProtectedBranch.yml +++ b/.github/workflows/updateProtectedBranch.yml @@ -57,6 +57,7 @@ jobs: - name: Create temporary branch to resolve conflicts if: ${{ contains(fromJSON('["staging", "production"]'), github.event.inputs.TARGET_BRANCH) }} run: | + git config user.name ${{ github.actor }} git checkout ${{ github.event.inputs.TARGET_BRANCH }} git checkout -b update-${{ github.event.inputs.TARGET_BRANCH }}-from-${{ env.SOURCE_BRANCH }} git merge -Xtheirs ${{ env.SOURCE_BRANCH }} From 513f5bd79e5f8c9fc2f7d381e7c0e31858a13e18 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 10 Jun 2021 21:35:14 +0000 Subject: [PATCH 31/31] Update version to 1.0.66-13 --- 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 b12998b1a117..e78b73cdf91c 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 1001006612 - versionName "1.0.66-12" + versionCode 1001006613 + versionName "1.0.66-13" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 20146c2b7f2d..750bf36a13f1 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.66.12 + 1.0.66.13 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index fbd043c5aca4..1221ef74bad2 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.66.12 + 1.0.66.13 diff --git a/package-lock.json b/package-lock.json index 4850b200c9fd..ad3f4ce36cac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-12", + "version": "1.0.66-13", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a61d1a68bef5..0260ad51769f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.66-12", + "version": "1.0.66-13", "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.",