Merge branch 'master' into amechler-bubble-error

# Conflicts: # src/lib/API.js
Expensify · Oct 8, 2020 · 5d57a86 · 5d57a86
2 parents f6d86a3 + 0abb48a
commit 5d57a86
Show file tree

Hide file tree

Showing 47 changed files with 919 additions and 857 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -20,6 +20,10 @@ jobs:
         - name: Install gems
           run: bundle install
 
+        - uses: webfactory/ssh-agent@v0.4.0
+          with:
+              ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
         - name: Install node packages
           run: npm install
 
@@ -70,7 +74,7 @@ jobs:
                     channel: '#qa',
                     attachments: [{
                       color: "#39AA56",
-                      text: `${process.env.AS_WORKFLOW} version *${{ env.VERSION }}* was deployed, please start *regression testing*: https://git.io/JUb0r`,
+                      text: `*Expensify Chat :expensifychat:* ${process.env.AS_WORKFLOW} version *${{ env.VERSION }}* was deployed, please start *regression testing*: https://git.io/JUb0r`,
                     }]
                   }
           env:

diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml
@@ -17,6 +17,10 @@ jobs:
               with:
                 node-version: '14.x'
 
+            - uses: webfactory/ssh-agent@v0.4.0
+              with:
+                  ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
             - name: Install node packages
               run: npm install
 
@@ -69,7 +73,7 @@ jobs:
                         channel: '#qa',
                         attachments: [{
                           color: "#39AA56",
-                          text: `${process.env.AS_WORKFLOW} version *${{ env.VERSION }}* was deployed, please start *regression testing*: https://git.io/JUb0r`,
+                          text: `*Expensify Chat :expensifychat:* ${process.env.AS_WORKFLOW} version *${{ env.VERSION }}* was deployed, please start *regression testing*: https://git.io/JUb0r`,
                         }]
                       }
               env:

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -20,6 +20,10 @@ jobs:
             - name: Install gems
               run: bundle install
 
+            - uses: webfactory/ssh-agent@v0.4.0
+              with:
+                  ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
             - name: Install node packages
               run: npm install
 
@@ -75,7 +79,7 @@ jobs:
                         channel: '#qa',
                         attachments: [{
                           color: "#39AA56",
-                          text: `${process.env.AS_WORKFLOW} version *${{ env.VERSION }}* was deployed, please start *regression testing*: https://git.io/JUb0r`,
+                          text: `*Expensify Chat :expensifychat:* ${process.env.AS_WORKFLOW} version *${{ env.VERSION }}* was deployed, please start *regression testing*: https://git.io/JUb0r`,
                         }]
                       }
               env:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -27,6 +27,10 @@ jobs:
               with:
                   node-version: '14.x'
 
+            - uses: webfactory/ssh-agent@v0.4.0
+              with:
+                  ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
             - run: npm install
 
             - run: npm run lint

diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
@@ -19,6 +19,10 @@ jobs:
               with:
                   node-version: '14.x'
 
+            - uses: webfactory/ssh-agent@v0.4.0
+              with:
+                  ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
             - name: Install dependenices
               run: npm install
 

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -38,6 +38,10 @@ jobs:
             aws-region: us-east-1
 
         # Install node modules
+        - uses: webfactory/ssh-agent@v0.4.0
+          with:
+              ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
         - name: Install dependenices
           run: npm install
 
@@ -86,7 +90,7 @@ jobs:
                     channel: '#qa',
                     attachments: [{
                       color: "#39AA56",
-                      text: `${process.env.AS_WORKFLOW} version *${{ env.VERSION }}* was deployed, please start *regression testing*: https://git.io/JUb0r`,
+                      text: `*Expensify Chat :expensifychat:* ${process.env.AS_WORKFLOW} version *${{ env.VERSION }}* was deployed, please start *regression testing*: https://git.io/JUb0r`,
                     }]
                   }
           env:

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -138,8 +138,8 @@ android {
         applicationId "com.expensify.chat"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 97
-        versionName "1.0.1-96"
+        versionCode 111
+        versionName "1.0.1-110"
     }
     splits {
         abi {

diff --git a/android/app/src/main/assets/fonts/GTAmericaExpMono-Rg.otf b/android/app/src/main/assets/fonts/GTAmericaExpMono-Rg.otf
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -25,7 +25,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.37.0
+FLIPPER_VERSION=0.54.0
 
 # Key Store Information
 MYAPP_UPLOAD_STORE_FILE=my-upload-key.keystore

diff --git a/assets/fonts/GTAmericaExpMono-Rg.otf b/assets/fonts/GTAmericaExpMono-Rg.otf