Fix conflicts

.github/workflows/createNewVersion.yml

@@ -55,19 +55,20 @@ jobs:
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
+      - uses: softprops/turnstyle@8db075d65b19bf94e6e8687b504db69938dc3c65
+        with:
+          poll-interval-seconds: 10
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
       - name: Create new branch
         run: |
+          git pull
           BRANCH_NAME="version-${{ inputs.SEMVER_LEVEL }}-$(uuidgen)"
           git checkout -b "$BRANCH_NAME"
           git push --set-upstream origin "$BRANCH_NAME"
           echo "VERSION_BRANCH=$BRANCH_NAME" >> "$GITHUB_ENV"
 
-      - uses: softprops/turnstyle@8db075d65b19bf94e6e8687b504db69938dc3c65
-        with:
-          poll-interval-seconds: 10
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
       - name: Generate version
         id: bumpVersion
         uses: Expensify/App/.github/actions/javascript/bumpVersion@main

android/app/build.gradle

@@ -155,8 +155,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001018900
-        versionName "1.1.89-0"
+        versionCode 1001019404
+        versionName "1.1.94-4"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

contributingGuides/OFFLINE_UX.md

@@ -60,12 +60,12 @@ This is the pattern where we queue the request to be sent when the user is onlin
 - the user should be given instant feedback and
 - the user does not need to know when the change is done on the server in the background
 
-**How to implement:** Use [`API.write()`](https://github.com/Expensify/App/blob/3493f3ca3a1dc6cdbf9cb8bd342866fcaf45cf1d/src/libs/API.js#L7-L28) to implement this pattern. For this pattern we should only put `optimisticData` in the options. We don't need successData or failData as we don't care what response comes back at all.
+**How to implement:** Use [`API.write()`](https://github.com/Expensify/App/blob/3493f3ca3a1dc6cdbf9cb8bd342866fcaf45cf1d/src/libs/API.js#L7-L28) to implement this pattern. For this pattern we should only put `optimisticData` in the options. We don't need successData or failureData as we don't care what response comes back at all.
 
 **Example:** Pinning a chat.
 
 ### B - Optimistic WITH Feedback Pattern
-This pattern queues the API request, but also makes sure that the user is aware that the request hasn’t been sent yet **when the user is offline**. 
+This pattern queues the API request, but also makes sure that the user is aware that the request hasn’t been sent yet **when the user is offline**.
 When the user is online, the feature should just look like it succeeds immediately (we don't want the offline UI to flicker on and off when the user is online).
 When the user is offline:
 - Things pending to be created or updated will be shown greyed out (0.5 opacity)

docs/404.html

@@ -3,7 +3,7 @@
 lhn_content: '404'
 ---
 <div class="centered-content with-lhn">
-    <img id="icon" src="/assets/images/circle-hourglass.svg" />
+    <img class="icon" src="/assets/images/circle-hourglass.svg" />
     <strong>Hmm it's not here...</strong>
     <div>That page is nowhere to be found.</div>
 </div>

docs/README.md

@@ -70,7 +70,7 @@ There are 3 main components in the hub page: 1. Stage title, 2. Row of Card butt
 
     <a class="card" href="/articles/request-money/SmartScan">
         <div class="body">
-            <div class="title">SmartScan</div>
+            <h3 class="title">SmartScan</h3>
         </div>
         <div class="right-icon">
             <i class="fa-solid fa-angle-right icon"></i>
@@ -79,7 +79,7 @@ There are 3 main components in the hub page: 1. Stage title, 2. Row of Card butt
 
     <a class="card" href="/articles/request-money/AnotherArticle">
         <div class="body">
-            <div class="title">Another Article</div>
+            <h3 class="title">Another Article</h3>
         </div>
         <div class="right-icon">
             <i class="fa-solid fa-angle-right icon"></i>
@@ -121,7 +121,7 @@ In order to add a new Card button in the respective hub page ([send-money/index.
 ```html
 <a class="card" href="/articles/request-money/SmartScan">
     <div class="body">
-        <div class="title">SmartScan</div>
+        <h3 class="title">SmartScan</h3>
     </div>
     <div class="right-icon">
         <i class="fa-solid fa-angle-right icon"></i>

docs/_includes/CONST.html

@@ -0,0 +1,7 @@
+{% if jekyll.environment == "production" %}
+    {% assign MAIN_SITE_URL = "https://new.expensify.com" %}
+{% else %}
+    {% assign MAIN_SITE_URL = "http://localhost:8080" %}
+{% endif %}
+
+{% capture CONCIERGE_CHAT_URL %}{{MAIN_SITE_URL}}/concierge{% endcapture %}

docs/_includes/floating-concierge-button.html

@@ -0,0 +1,3 @@
+<a id="{{ include.id }}" class="floating-concierge-button" href="{{ CONCIERGE_CHAT_URL }}" target="_blank">
+  <img src="/assets/images/concierge-avatar.svg" alt="Chat with concierge" />
+</a>

docs/_layouts/default.html

@@ -1,6 +1,8 @@
 <!doctype html>
 <html>
 
+{% include CONST.html %}
+
 <head>
     <meta charset="utf-8">
     <title>Expensify Help</title>
@@ -53,10 +55,8 @@
         </div>
 
 
-        <!-- Concierge button anchored at the bottom of the LHN-->
-        <div class="floating-concierge-button">
-            <!-- Floating button content -->
-        </div>
+        <!-- Concierge button anchored at the bottom of the LHN (rendered on wider screens) -->
+        {% include floating-concierge-button.html id="floating-concierge-button-lhn" %}
     </div>
 
     <div id="content-area">
@@ -73,9 +73,15 @@ <h1 class="title">
         </div>
 
         <!-- Concierge button at the bottom of the page -->
-        <div class="footer-concierge-button">
-            <!-- Footer button content -->
-        </div>
+        <a class="card get-help" href="{{ CONCIERGE_CHAT_URL }}" target="_blank">
+            <div class="body">
+                <h3 class="title">Didn't find what you were looking for?</h3>
+                <p class="description">Concierge is here to answer all your questions.</p>
+            </div>
+            <div class="submit-button">
+                <button class="success">Send a message</button>
+            </div>
+        </a>
     </div>
     {% endif %}
 

docs/_sass/_breakpoints.scss

@@ -0,0 +1,9 @@
+$breakpoint-tablet: 800px;
+$breakpoint-desktop: 1120px;
+$breakpoint-wide: 1600px;
+
+@mixin breakpoint($breakpoint) {
+  @media screen and (min-width: $breakpoint) {
+    @content
+  }
+}

docs/_sass/_colors.scss

@@ -4,5 +4,6 @@ $color-dark: #0B1B34;
 $color-gray1: #FAFAFA;
 $color-gray2: #ECECEC;
 $color-gray3: #C6C9CA;
-$color-white: #FFFFFF;
 $color-green: #07d973;
+$color-pink: #F68DFE;
+$color-white: #FFFFFF;