Update version to 1.0.88-3 on staging

.github/workflows/cherryPick.yml

@@ -15,14 +15,14 @@ jobs:
   validateActor:
     runs-on: ubuntu-latest
     outputs:
-      IS_DEPLOYER: ${{ steps.isUserDeployer.outputs.isTeamMember }}
+      IS_DEPLOYER: ${{ steps.isUserDeployer.outputs.isTeamMember || github.actor == 'OSBotify' }}
     steps:
       - id: isUserDeployer
         uses: tspascoal/get-user-teams-membership@baf2e6adf4c3b897bd65a7e3184305c165aec872
         with:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
           username: ${{ github.actor }}
-          team: expensify-cash-deployers
+          team: mobile-deployers
 
   createNewVersion:
     needs: validateActor

.github/workflows/deployBlocker.yml

@@ -1,9 +1,6 @@
 name: Update Deploy Blockers
 
 on:
-  pull_request:
-    types:
-      - labeled
   issues:
     types:
       - labeled
@@ -26,13 +23,6 @@ jobs:
           echo "DEPLOY_BLOCKER_NUMBER=${{ github.event.issue.number }}" >> $GITHUB_ENV
           echo "DEPLOY_BLOCKER_TITLE=$(sed -e "s/'/'\\\\''/g; s/\`/\\\\\`/g; 1s/^/'/; \$s/\$/'/" <<< "'${{ github.event.issue.title }}'")" >> $GITHUB_ENV
 
-      - name: Get URL, title, & number of new deploy blocker (pull request)
-        if: ${{ github.event_name == 'pull_request' }}
-        run: |
-          echo "DEPLOY_BLOCKER_URL=${{ github.event.pull_request.html_url }}" >> $GITHUB_ENV
-          echo "DEPLOY_BLOCKER_NUMBER=${{ github.event.pull_request.number }}" >> $GITHUB_ENV
-          echo "DEPLOY_BLOCKER_TITLE=$(sed -e "s/'/'\\\\''/g; s/\`/\\\\\`/g; 1s/^/'/; \$s/\$/'/" <<< "'${{ github.event.pull_request.title }}'")" >> $GITHUB_ENV
-
       - name: Update StagingDeployCash with new deploy blocker
         uses: Expensify/App/.github/actions/createOrUpdateStagingDeploy@main
         with:

.github/workflows/finishReleaseCycle.yml

@@ -6,23 +6,42 @@ on:
 
 # The updateProduction and createNewStagingDeployCash jobs are executed when a StagingDeployCash is closed.
 jobs:
-  checkDeployBlockers:
+  validate:
     runs-on: ubuntu-latest
     if: contains(github.event.issue.labels.*.name, 'StagingDeployCash')
 
     outputs:
-      hasDeployBlockers: ${{ steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS }}
+      isValid: ${{ steps.validateActor.outputs.isTeamMember && steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS == 'false' }}
 
     steps:
+      - name: Validate actor is deployer
+        id: validateActor
+        uses: tspascoal/get-user-teams-membership@baf2e6adf4c3b897bd65a7e3184305c165aec872
+        with:
+          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+          username: ${{ github.actor }}
+          team: mobile-deployers
+
+      - name: Reopen and comment on issue
+        if: ${{ !steps.validateActor.outputs.isTeamMember }}
+        uses: Expensify/App/.github/actions/reopenIssueWithComment@main
+        with:
+          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+          ISSUE_NUMBER: ${{ github.event.issue.number }}
+          COMMENT: |
+            Sorry, only members of @Expensify/Mobile-Deployers can close deploy checklists.
+            Reopening!
+
       - name: Check for any deploy blockers
+        if: ${{ steps.validateActor.outputs.isTeamMember }}
         id: checkDeployBlockers
         uses: Expensify/App/.github/actions/checkDeployBlockers@main
         with:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
           ISSUE_NUMBER: ${{ github.event.issue.number }}
 
       - name: Reopen and comment on issue
-        if: ${{ steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS == 'true' }}
+        if: ${{ steps.validateActor.outputs.isTeamMember && steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS == 'true' }}
         uses: Expensify/App/.github/actions/reopenIssueWithComment@main
         with:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
@@ -34,10 +53,8 @@ jobs:
   # Update the production branch to trigger the production deploy.
   updateProduction:
     runs-on: ubuntu-latest
-
-    # Note: Anyone with Triage access to the New Expensify repo can trigger a production deploy
-    needs: checkDeployBlockers
-    if: ${{ needs.checkDeployBlockers.outputs.hasDeployBlockers == 'false' }}
+    needs: validate
+    if: ${{ needs.validate.outputs.isValid }}
     steps:
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
         with:
@@ -54,8 +71,8 @@ jobs:
   # Deploy deferred PRs to staging and create a new StagingDeployCash for the next release cycle.
   createNewStagingDeployCash:
     runs-on: macos-11
-    needs: checkDeployBlockers
-    if: ${{ needs.checkDeployBlockers.outputs.hasDeployBlockers == 'false' }}
+    needs: validate
+    if: ${{ needs.validate.outputs.isValid }}
     steps:
       # Version: 2.3.4
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f

.github/workflows/platformDeploy.yml

@@ -13,9 +13,22 @@ env:
   DEVELOPER_DIR: /Applications/Xcode_12.5.app/Contents/Developer
 
 jobs:
+  validateActor:
+    runs-on: ubuntu-latest
+    outputs:
+      IS_DEPLOYER: ${{ steps.isUserDeployer.outputs.isTeamMember || github.actor == 'OSBotify' }}
+    steps:
+      - id: isUserDeployer
+        uses: tspascoal/get-user-teams-membership@baf2e6adf4c3b897bd65a7e3184305c165aec872
+        with:
+          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+          username: ${{ github.actor }}
+          team: mobile-deployers
+
   android:
     name: Build and deploy Android
-    if: github.actor == 'OSBotify'
+    needs: validateActor
+    if: ${{ needs.validateActor.outputs.IS_DEPLOYER }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -78,7 +91,8 @@ jobs:
 
   desktop:
     name: Build and deploy Desktop
-    if: github.actor == 'OSBotify'
+    needs: validateActor
+    if: ${{ needs.validateActor.outputs.IS_DEPLOYER }}
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
@@ -133,7 +147,8 @@ jobs:
 
   iOS:
     name: Build and deploy iOS
-    if: github.actor == 'OSBotify'
+    needs: validateActor
+    if: ${{ needs.validateActor.outputs.IS_DEPLOYER }}
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
@@ -216,7 +231,8 @@ jobs:
 
   web:
     name: Build and deploy Web
-    if: github.actor == 'OSBotify'
+    needs: validateActor
+    if: ${{ needs.validateActor.outputs.IS_DEPLOYER }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -368,7 +384,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
-      
+
       - name: 'Announces a production deploy in the #expensify-open-source Slack room'
         uses: 8398a7/action-slack@v3
         if: ${{ env.SHOULD_DEPLOY_PRODUCTION == 'true' }}

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001008802
-        versionName "1.0.88-2"
+        versionCode 1001008803
+        versionName "1.0.88-3"
     }
     splits {
         abi {
@@ -238,8 +238,8 @@ dependencies {
     implementation "com.google.firebase:firebase-perf"
 
     // GIF support
-    implementation 'com.facebook.fresco:fresco:2.3.0'
-    implementation 'com.facebook.fresco:animated-gif:2.3.0'
+    implementation 'com.facebook.fresco:fresco:2.5.0'
+    implementation 'com.facebook.fresco:animated-gif:2.5.0'
 
     // Android support library
     implementation 'com.android.support:support-core-utils:28.0.0'

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.88.2</string>
+	<string>1.0.88.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.88.2</string>
+	<string>1.0.88.3</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.0.88-2",
+  "version": "1.0.88-3",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -60,7 +60,7 @@
     "electron-log": "^4.3.5",
     "electron-serve": "^1.0.0",
     "electron-updater": "^4.3.4",
-    "expensify-common": "git://github.com/Expensify/expensify-common.git#a88a45c68947da7ea769a6ee6a6d3b04d6f62dd7",
+    "expensify-common": "git://github.com/Expensify/expensify-common.git#e5a22b54cde72ff3b9b6b085ea4374144e8937b2",
     "expo-haptics": "^10.0.0",
     "file-loader": "^6.0.0",
     "html-entities": "^1.3.1",

src/Expensify.js

@@ -101,14 +101,7 @@ class Expensify extends PureComponent {
         }
 
         if (this.getAuthToken() && this.props.initialReportDataLoaded && this.props.isSidebarLoaded) {
-            BootSplash.getVisibilityStatus()
-                .then((value) => {
-                    if (value !== 'visible') {
-                        return;
-                    }
-
-                    this.hideSplash();
-                });
+            this.hideSplash();
         }
     }
 

src/components/ExpensiTextInput/index.android.js

@@ -7,6 +7,10 @@ const ExpensiTextInput = forwardRef((props, ref) => (
     <BaseExpensiTextInput
         // eslint-disable-next-line react/jsx-props-no-spreading
         {...props}
+
+        // Setting autoCompleteType to new-password throws an error on Android, so fall back to password in that case
+        // eslint-disable-next-line react/jsx-props-no-multi-spaces
+        autoCompleteType={props.autoCompleteType === 'new-password' ? 'password' : props.autoCompleteType}
         innerRef={ref}
         inputStyle={[
             styles.expensiTextInput,

src/components/ExpensiTextInput/index.ios.js

@@ -7,6 +7,10 @@ const ExpensiTextInput = forwardRef((props, ref) => (
     <BaseExpensiTextInput
         // eslint-disable-next-line react/jsx-props-no-spreading
         {...props}
+
+        // Setting autoCompleteType to new-password throws an error on iOS, so fall back to password in that case
+        // eslint-disable-next-line react/jsx-props-no-multi-spaces
+        autoCompleteType={props.autoCompleteType === 'new-password' ? 'password' : props.autoCompleteType}
         innerRef={ref}
         inputStyle={[styles.expensiTextInput]}
     />

src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js

@@ -21,6 +21,7 @@ import ThumbnailImage from '../ThumbnailImage';
 import variables from '../../styles/variables';
 import themeColors from '../../styles/themes/default';
 import Text from '../Text';
+import withLocalize from '../withLocalize';
 
 const propTypes = {
     /** Whether text elements should be selectable */
@@ -136,7 +137,7 @@ function EditedRenderer(props) {
         >
             {/* Native devices do not support margin between nested text */}
             <Text style={styles.w1}>{' '}</Text>
-            (edited)
+            {props.translate('reportActionCompose.edited')}
         </Text>
     );
 }
@@ -211,7 +212,7 @@ const renderers = {
     a: AnchorRenderer,
     code: CodeRenderer,
     img: ImgRenderer,
-    edited: EditedRenderer,
+    edited: withLocalize(EditedRenderer),
 };
 
 const renderersProps = {
@@ -233,6 +234,7 @@ const defaultViewProps = {style: {alignItems: 'flex-start'}};
 const BaseHTMLEngineProvider = ({children, textSelectable}) => {
     // We need to memoize this prop to make it referentially stable.
     const defaultTextProps = useMemo(() => ({selectable: textSelectable}), [textSelectable]);
+
     return (
         <TRenderEngineProvider
             customHTMLElementModels={customHTMLElementModels}