From 93385d9c2d4ff8eba9dc18e6821b1aec226a3308 Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Tue, 16 Mar 2021 13:58:32 +0800 Subject: [PATCH 1/8] Make the 2FA keyboard numeric on mobile. --- src/pages/signin/PasswordForm.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/signin/PasswordForm.js b/src/pages/signin/PasswordForm.js index a393ecd0b925..68aca6d584ae 100644 --- a/src/pages/signin/PasswordForm.js +++ b/src/pages/signin/PasswordForm.js @@ -88,6 +88,7 @@ class PasswordForm extends React.Component { placeholderTextColor={themeColors.textSupporting} onChangeText={text => this.setState({twoFactorAuthCode: text})} onSubmitEditing={this.validateAndSubmitForm} + keyboardType="numeric" /> )} From 3cceab605b253f63f93140e4be74dd7ce459aa56 Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Thu, 18 Mar 2021 09:01:04 -0700 Subject: [PATCH 2/8] Auto-retry cocoapods installation --- .github/workflows/e2e.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 523b17acac0f..7fa9fd5a1559 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -33,8 +33,14 @@ jobs: - name: Install detox run: npm install -g detox-cli + - run: cd ios + - name: Install cocoapods - run: cd ios && pod install --repo-update + uses: nick-invision/retry@7c68161adf97a48beb850a595b8784ec57a98cbb + with: + timeout_minutes: 15 + max_attempts: 3 + command: pod install --repo-update - name: Install brew depdencies run: | From eed35679dbe6efb977f2c1c827f0f9af0e4399d0 Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Thu, 18 Mar 2021 10:22:51 -0600 Subject: [PATCH 3/8] Send the proper comment to the API when adding comments --- src/libs/actions/Report.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 11988ae99b21..38e5b25bfcd5 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -651,7 +651,7 @@ function addAction(reportID, text, file) { API.Report_AddComment({ reportID, - reportComment: htmlForNewComment, + reportComment: commentText, file, clientID: optimisticReportActionID, From a4234e9c80d5322c0eea9d35b247a07b602b56a4 Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Thu, 18 Mar 2021 09:34:19 -0700 Subject: [PATCH 4/8] Move cd ios into retry step --- .github/workflows/e2e.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 7fa9fd5a1559..9685e74a56f7 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -33,14 +33,12 @@ jobs: - name: Install detox run: npm install -g detox-cli - - run: cd ios - - name: Install cocoapods uses: nick-invision/retry@7c68161adf97a48beb850a595b8784ec57a98cbb with: timeout_minutes: 15 max_attempts: 3 - command: pod install --repo-update + command: cd ios && pod install --repo-update - name: Install brew depdencies run: | From b5eccd91caf34701c62ccde2d0fa493a17586356 Mon Sep 17 00:00:00 2001 From: runner Date: Fri, 19 Mar 2021 00:18:55 +0000 Subject: [PATCH 5/8] Update version to 1.0.2-87 --- 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 c14b9cf421d4..f2782bfc4b9b 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 1001000286 - versionName "1.0.2-86" + versionCode 1001000287 + versionName "1.0.2-87" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 0683fd6014f6..d97309b1d45d 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.0.2.86 + 1.0.2.87 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 49c3a0f1c256..eea10ceff81d 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.2.86 + 1.0.2.87 diff --git a/package-lock.json b/package-lock.json index 9f43a8dad56b..1f88bc32674a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.2-86", + "version": "1.0.2-87", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a955746e6ab7..d461500ab366 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.2-86", + "version": "1.0.2-87", "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 8814af5ca6a3f52800e069329a0164ee617c1214 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 19 Mar 2021 00:29:01 +0000 Subject: [PATCH 6/8] Update version to 1.0.2-88 --- 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 f2782bfc4b9b..748ca5160d21 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 1001000287 - versionName "1.0.2-87" + versionCode 1001000288 + versionName "1.0.2-88" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index d97309b1d45d..c1f4573e68a4 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.0.2.87 + 1.0.2.88 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index eea10ceff81d..e6349ee732d7 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.2.87 + 1.0.2.88 diff --git a/package-lock.json b/package-lock.json index 1f88bc32674a..ae7c94f66410 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.2-87", + "version": "1.0.2-88", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index d461500ab366..09d87b476959 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.2-87", + "version": "1.0.2-88", "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 51788f1a3fe894070cfd4b5d170b972ebac2240b Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 19 Mar 2021 04:38:04 +0000 Subject: [PATCH 7/8] Update version to 1.0.2-89 --- 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 748ca5160d21..75a6225f46a5 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 1001000288 - versionName "1.0.2-88" + versionCode 1001000289 + versionName "1.0.2-89" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index c1f4573e68a4..e757aa262a7d 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.0.2.88 + 1.0.2.89 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index e6349ee732d7..cd1695f2a446 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.2.88 + 1.0.2.89 diff --git a/package-lock.json b/package-lock.json index ae7c94f66410..1d91b1a82134 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.2-88", + "version": "1.0.2-89", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 09d87b476959..c82ea2306d2e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.2-88", + "version": "1.0.2-89", "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 d69f4dac6f1438a87e60a5a17da3b22f8c983a08 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 19 Mar 2021 15:56:27 +0000 Subject: [PATCH 8/8] Update version to 1.0.2-90 --- 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 75a6225f46a5..0f5a6c472cad 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 1001000289 - versionName "1.0.2-89" + versionCode 1001000290 + versionName "1.0.2-90" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index e757aa262a7d..4b842d02fc56 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.0.2.89 + 1.0.2.90 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index cd1695f2a446..d7ddd743bdd4 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.2.89 + 1.0.2.90 diff --git a/package-lock.json b/package-lock.json index 1d91b1a82134..0764fe40c0a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.2-89", + "version": "1.0.2-90", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c82ea2306d2e..0b32d9fbfddd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.2-89", + "version": "1.0.2-90", "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.",