merge main

Expensify · Feb 5, 2024 · 7fe79d8 · 7fe79d8
2 parents 53e3ae8 + 0ae07be
commit 7fe79d8
Show file tree

Hide file tree

Showing 93 changed files with 1,548 additions and 1,059 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001043504
-        versionName "1.4.35-4"
+        versionCode 1001043600
+        versionName "1.4.36-0"
     }
 
     flavorDimensions "default"

diff --git a/contributingGuides/APPLE_GOOGLE_SIGNIN.md b/contributingGuides/APPLE_GOOGLE_SIGNIN.md
@@ -259,12 +259,33 @@ if (CONFIG.ENVIRONMENT === CONST.ENVIRONMENT.DEV) {
 }
 ```
 
-#### Port requirements
+#### Host/Port requirements
 
 Google allows the web app to be hosted at localhost, but according to the
 current Google console configuration for the Expensify client ID, it must be
 hosted on port 8082.
 
+Also note that you'll need to update the webpack.dev.js config to change `host` from `dev.new.expensify.com` to `localhost` and server type from `https` to `http`. The reason for this is that Google Sign In allows localhost, but `dev.new.expensify.com` is not a registered Google Sign In domain.
+
+```diff
+diff --git a/config/webpack/webpack.dev.js b/config/webpack/webpack.dev.js
+index e28383eff5..b14f6f34aa 100644
+--- a/config/webpack/webpack.dev.js
++++ b/config/webpack/webpack.dev.js
+@@ -44,9 +44,9 @@ module.exports = (env = {}) =>
+                 ...proxySettings,
+                 historyApiFallback: true,
+                 port,
+-                host: 'dev.new.expensify.com',
++                host: 'localhost',
+                 server: {
+-                    type: 'https',
++                    type: 'http',
+                     options: {
+                         key: path.join(__dirname, 'key.pem'),
+                         cert: path.join(__dirname, 'certificate.pem'),
+```
+
 ### Desktop
 
 #### Set Environment to something other than "Development"

diff --git a/docs/_includes/end-option.html b/docs/_includes/end-option.html
@@ -0,0 +1 @@
+</div>
diff --git a/docs/_includes/end-selector.html b/docs/_includes/end-selector.html
@@ -0,0 +1 @@
+</div>
diff --git a/docs/_includes/option.html b/docs/_includes/option.html
@@ -0,0 +1 @@
+<div class="option-{{ include.value }}" markdown="1">
diff --git a/docs/_includes/selector.html b/docs/_includes/selector.html
@@ -0,0 +1,9 @@
+{% assign values = include.values | split: "," %}
+
+<div class="selector-container">
+
+<select class="selector" onchange="selectOption(this)">
+    {% for value in values %}
+        <option value="option-{{ value | strip | downcase }}">{{ value | strip | capitalize }}</option>
+    {% endfor %}
+</select>
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
@@ -12,6 +12,8 @@
     <script src="https://kit.fontawesome.com/263e5e8608.js" crossorigin="anonymous"></script>
     <script defer src="https://cdnjs.cloudflare.com/ajax/libs/tocbot/4.12.0/tocbot.js"></script>
     <script defer src="/assets/js/main.js"></script>
+    <script defer src="/assets/js/platform-tabs.js"></script>
+    <script defer src="/assets/js/selector.js"></script>
     <script async src="https://cse.google.com/cse.js?cx=41f40d6e5c14246ff"></script>
     <!-- Google Tag Manager -->
     <script>(function (w, d, s, l, i) { w[l] = w[l] || []; w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' }); var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f); })(window, document, 'script', 'dataLayer', 'GTM-TQBQW7CR');</script>
@@ -64,10 +66,13 @@
         <div id="article-content">
             <!-- Article title (only shown in article pages) -->
             {% if page.url contains "/articles/" %}
-            <h1 class="title">
-                {{ page.name | remove: '.md' | split: "-" |  join: " " }}
-            </h1>
-
+            <div class="title-platform-tabs">
+                <h1 class="title">
+                    {{ page.name | remove: '.md' | split: "-" |  join: " " }}
+                </h1>
+                <div id="platform-tabs">
+                </div>
+            </div>
             <div class="article-toc-content article">
                 {{ content }}
             </div>

diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss
@@ -350,10 +350,14 @@ button {
     h1 {
         &.title {
             font-size: 2.25em;
+            flex: 1;
         }
     }
 
     .article {
+        .hidden {
+            display: none;
+        }
         img {
             display: block;
             margin: 20px auto;
@@ -459,6 +463,49 @@ button {
             }
         }
 
+        .selector-container {
+            background-color: $color-highlightBG;
+            display: flex;
+            flex-direction: row-reverse;
+            gap: 20px;
+            border-radius: 12px;
+            padding: 20px;
+            margin-bottom: 20px;
+            justify-content: space-between;
+            * > ol, ul {
+                padding: 0;
+            }
+
+            @include maxBreakpoint($breakpoint-tablet) {
+                flex-direction: column;
+            }
+        }
+
+        select {
+            height: 28px;
+            border-radius: 20px;
+            padding: 0px 26px 0px 12px;
+            color: $color-text;
+            font-size: 11px;
+            font-weight: 700;
+            text-align: center;
+            cursor: pointer;
+
+            @include maxBreakpoint($breakpoint-tablet) {
+                width: 100px;
+            }
+
+        }
+
+        select {
+            background: url("/assets/images/down.svg") no-repeat right $color-button-background;
+            background-size: 12px;
+            background-position-x: 85%;
+            appearance: none !important;
+            -moz-appearance: none !important;
+            -webkit-appearance: none !important;
+        }
+
         .info {
             padding: 12px;
             border-radius: 8px;
@@ -862,3 +909,45 @@ button {
         }
     }
 }
+
+.title-platform-tabs {
+    display: flex;
+    justify-content: space-between;
+    padding-bottom: 12px;
+    h1 {
+        padding: 0;
+    }
+
+    @include maxBreakpoint($breakpoint-tablet) {
+        flex-direction: column;
+        gap: 20px;
+    }
+}
+
+#platform-tabs {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    text-align: center;
+    font-weight: 700;
+    font-size: 13px;
+    gap: 4px;
+}
+
+#platform-tabs > * {
+    cursor: pointer;
+    border-radius: 20px;
+    padding: 10px 20px;
+    box-sizing: border-box;
+    height: 36px;
+    line-height: 16px;
+}
+
+#platform-tabs > .active {
+    color: $color-text;
+    background-color: $color-button-background;
+}
+
+.hidden {
+    display: none;
+}