diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 523b17acac0f..9685e74a56f7 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -34,7 +34,11 @@ jobs: run: npm install -g detox-cli - name: Install cocoapods - run: cd ios && pod install --repo-update + uses: nick-invision/retry@7c68161adf97a48beb850a595b8784ec57a98cbb + with: + timeout_minutes: 15 + max_attempts: 3 + command: cd ios && pod install --repo-update - name: Install brew depdencies run: | diff --git a/android/app/build.gradle b/android/app/build.gradle index c14b9cf421d4..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 1001000286 - versionName "1.0.2-86" + versionCode 1001000290 + versionName "1.0.2-90" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 0683fd6014f6..4b842d02fc56 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.0.2.86 + 1.0.2.90 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 49c3a0f1c256..d7ddd743bdd4 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.2.86 + 1.0.2.90 diff --git a/package-lock.json b/package-lock.json index 9f43a8dad56b..0764fe40c0a6 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-90", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a955746e6ab7..0b32d9fbfddd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.2-86", + "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.", 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, 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" /> )}