Merge branch 'main' into ts-migration/MenuItem

.eslintrc.js

@@ -174,6 +174,7 @@ module.exports = {
                 'rulesdir/prefer-underscore-method': 'off',
                 'rulesdir/prefer-import-module-contents': 'off',
                 'react/require-default-props': 'off',
+                'react/prop-types': 'off',
                 'no-restricted-syntax': [
                     'error',
                     {

.github/scripts/findUnusedKeys.sh

@@ -6,10 +6,11 @@ LIB_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd ../../ && pwd)"
 
 readonly SRC_DIR="${LIB_PATH}/src"
 readonly STYLES_DIR="${LIB_PATH}/src/styles"
-readonly STYLES_FILE="${LIB_PATH}/src/styles/styles.ts"
-readonly UTILITIES_STYLES_FILE="${LIB_PATH}/src/styles/utilities"
+readonly STYLES_FILE="${LIB_PATH}/src/styles/index.ts"
+readonly UTILS_STYLES_FILE="${LIB_PATH}/src/styles/utils"
+readonly UTILS_STYLES_GENERATORS_FILE="${LIB_PATH}/src/styles/utils/generators"
 readonly STYLES_KEYS_FILE="${LIB_PATH}/scripts/style_keys_list_temp.txt"
-readonly UTILITY_STYLES_KEYS_FILE="${LIB_PATH}/scripts/utility_keys_list_temp.txt"
+readonly UTIL_STYLES_KEYS_FILE="${LIB_PATH}/scripts/util_keys_list_temp.txt"
 readonly REMOVAL_KEYS_FILE="${LIB_PATH}/scripts/removal_keys_list_temp.txt"
 readonly AMOUNT_LINES_TO_SHOW=3
 
@@ -29,7 +30,7 @@ ctrl_c() {
   delete_temp_files
   exit 1
 }
-  
+
 count_lines() {
   local file=$1
   if [[ -e "$file" ]]; then
@@ -43,11 +44,11 @@ count_lines() {
 show_unused_style_keywords() {
   while IFS=: read -r key file line_number; do
     title "File: $file:$line_number"
-    
+
     # Get lines before and after the error line
     local lines_before=$((line_number - AMOUNT_LINES_TO_SHOW))
     local lines_after=$((line_number + AMOUNT_LINES_TO_SHOW))
-    
+
     # Read the lines into an array
     local lines=()
     while IFS= read -r line; do
@@ -84,22 +85,22 @@ lookfor_unused_keywords() {
 
     # Search for keywords starting with "styles"
     while IFS= read -r keyword; do
-        
+
         # Remove any [ ] characters from the keyword
         local clean_keyword="${keyword//[\[\]]/}"
         # skip styles. keyword that might be used in comments
         if [[ "$clean_keyword" == "styles." ]]; then
           continue
         fi
-        
+
         if ! remove_keyword "$clean_keyword" ; then
           # In case of a leaf of the styles object is being used, it means the parent objects is being used
           # we need to mark it as used.
           if [[ "$clean_keyword" =~ ^styles\.[a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+$ ]]; then
             # Keyword has more than two words, remove words after the second word
             local keyword_prefix="${clean_keyword%.*}"
             remove_keyword "$keyword_prefix"
-          fi        
+          fi
         fi
     done < <(grep -E -o '\bstyles\.[a-zA-Z0-9_.]*' "$file" | grep -v '\/\/' | grep -vE '\/\*.*\*\/')
   done < <(find "${SRC_DIR}" -type f \( "${FILE_EXTENSIONS[@]}" \))
@@ -134,10 +135,10 @@ find_styles_object_and_store_keys() {
     if [[ ! "$line" =~ ^[[:space:]]*(const|let|var)[[:space:]]+([a-zA-Z0-9_-]+)[[:space:]]*=[[:space:]]*\{|^[[:space:]]*([a-zA-Z0-9_-]+\.)?[a-zA-Z0-9_-]+:[[:space:]]*\{|^[[:space:]]*\} ]]; then
       continue
     fi
-    
+
     if [[ "$line" =~ ^[[:space:]]*(const|let|var)[[:space:]]+([a-zA-Z0-9_-]+)[[:space:]]*=[[:space:]]*\{ ]]; then
       key="${BASH_REMATCH[2]%%:*{*)}"
-      echo "styles.${key}|...${key}|${base_name}.${key}:${file}:${line_number}" >> "$STYLES_KEYS_FILE"    
+      echo "styles.${key}|...${key}|${base_name}.${key}:${file}:${line_number}" >> "$STYLES_KEYS_FILE"
     fi
   done < "$file"
 }
@@ -225,7 +226,7 @@ find_theme_style_and_store_keys() {
 
       continue
     fi
-    
+
     if [[ "$line" =~ ^[[:space:]]*([a-zA-Z0-9_-]+\.)?[a-zA-Z0-9_-]+:[[:space:]]*\{|^[[:space:]]*([a-zA-Z0-9_-])+:[[:space:]]*\(.*\)[[:space:]]*'=>'[[:space:]]*\(\{ ]]; then
       # Removing all the extra lines after the ":"
       local key="${line%%:*}"
@@ -295,63 +296,64 @@ lookfor_unused_spread_keywords() {
   done < "$STYLES_FILE"
 }
 
-find_utility_styles_store_prefix() {
+find_util_styles_store_prefix() {
   # Loop through all files in the src folder
   while read -r file; do
     # Search for keywords starting with "styles"
     while IFS= read -r keyword; do
         local variable="${keyword##*/}"
         local variable_trimmed="${variable// /}"  # Trim spaces
-          
-        echo "$variable_trimmed" >> "$UTILITY_STYLES_KEYS_FILE"
-    done < <(grep -E -o './utilities/[a-zA-Z0-9_-]+' "$file" | grep -v '\/\/' | grep -vE '\/\*.*\*\/')
+
+        echo "$variable_trimmed" >> "$UTIL_STYLES_KEYS_FILE"
+    done < <(grep -E -o './utils/[a-zA-Z0-9_-]+' "$file" | grep -v '\/\/' | grep -vE '\/\*.*\*\/')
   done < <(find "${STYLES_DIR}" -type f \( "${FILE_EXTENSIONS[@]}" \))
 
   # Sort and remove duplicates from the temporary file
-  sort -u -o "${UTILITY_STYLES_KEYS_FILE}" "${UTILITY_STYLES_KEYS_FILE}"
+  sort -u -o "${UTIL_STYLES_KEYS_FILE}" "${UTIL_STYLES_KEYS_FILE}"
 }
 
-find_utility_usage_as_styles() {
+find_util_usage_as_styles() {
   while read -r file; do
     local root_key
     local parent_dir
 
-    # Get the folder name, given this utility files are index.js
+    # Get the folder name, given this util files are index.js
     parent_dir=$(dirname "$file")
     root_key=$(basename "${parent_dir}")
 
-    if [[ "${root_key}" == "utilities" ]]; then
+    if [[ "${root_key}" == "utils" ]]; then
       continue
     fi
 
     find_theme_style_and_store_keys "${file}" 0 "${root_key}"
-  done < <(find "${UTILITIES_STYLES_FILE}" -type f \( "${FILE_EXTENSIONS[@]}" \))
+  done < <(find "${UTILS_STYLES_FILE}" -type f \( -path "${UTILS_STYLES_GENERATORS_FILE}" -prune -o -name "${FILE_EXTENSIONS[@]}" \) -print)
+
 }
 
-lookfor_unused_utilities() {
-  # Read each utility keyword from the file
+lookfor_unused_utils() {
+  # Read each util keyword from the file
   while read -r keyword; do
-    # Creating a copy so later the replacement can reference it  
+    # Creating a copy so later the replacement can reference it
     local original_keyword="${keyword}"
 
     # Iterate through all files in "src/styles"
     while read -r file; do
       # Find all words that match "$keyword.[a-zA-Z0-9_-]+"
       while IFS= read -r match; do
-        # Replace the utility prefix with "styles"
+        # Replace the util prefix with "styles"
         local variable="${match/#$original_keyword/styles}"
         # Call the remove_keyword function with the variable
         remove_keyword "${variable}"
         remove_keyword "${match}"
       done < <(grep -E -o "$original_keyword\.[a-zA-Z0-9_-]+" "$file" | grep -v '\/\/' | grep -vE '\/\*.*\*\/')
     done < <(find "${STYLES_DIR}" -type f \( "${FILE_EXTENSIONS[@]}" \))
-  done < "$UTILITY_STYLES_KEYS_FILE"
+  done < "$UTIL_STYLES_KEYS_FILE"
 }
 
 echo "🔍 Looking for styles."
-# Find and store the name of the utility files as keys
-find_utility_styles_store_prefix
-find_utility_usage_as_styles
+# Find and store the name of the util files as keys
+find_util_styles_store_prefix
+find_util_usage_as_styles
 
 # Find and store keys from styles.ts
 find_styles_object_and_store_keys "$STYLES_FILE"
@@ -360,8 +362,8 @@ collect_theme_keys_from_styles "$STYLES_FILE"
 
 echo "🗄️ Now going through the codebase and looking for unused keys."
 
-# Look for usages of utilities into src/styles
-lookfor_unused_utilities
+# Look for usages of utils into src/styles
+lookfor_unused_utils
 lookfor_unused_spread_keywords
 lookfor_unused_keywords
 

.storybook/theme.js

@@ -1,5 +1,5 @@
 import {create} from '@storybook/theming';
-import colors from '../src/styles/colors';
+import colors from '../src/styles/theme/colors';
 
 export default create({
     brandTitle: 'New Expensify UI Docs',

android/app/build.gradle

@@ -91,8 +91,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001041200
-        versionName "1.4.12-0"
+        versionCode 1001041300
+        versionName "1.4.13-0"
     }
 
     flavorDimensions "default"

desktop/package.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "electron-context-menu": "^2.3.0",
     "electron-log": "^4.4.7",
-    "electron-serve": "^1.0.0",
+    "electron-serve": "^1.2.0",
     "electron-updater": "^6.1.6",
     "node-machine-id": "^1.1.12"
   },

docs/_includes/platform.html

@@ -10,9 +10,4 @@ <h1 class="title">{{ platform.hub-title }}</h1>
             {% include hub-card.html hub=hub platform=selectedPlatform %}
         {% endfor %}
     </div>
-
-    <div class="cards-group">
-        <!-- Concierge button anchored globally (rendered on narrow screens) -->
-        {% include floating-concierge-button.html id="floating-concierge-button-global" %}
-    </div>
 </div>

docs/_layouts/default.html

@@ -57,9 +57,6 @@
                 <div class="article-toc"></div>
             {% endif %}
         </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">

docs/_sass/_main.scss

@@ -712,41 +712,11 @@ button {
     }
 }
 
-#floating-concierge-button-global {
-    position: fixed;
-    display: block;
-    @include breakpoint($breakpoint-tablet) {
-        display: none;
-    }
-}
-
-#floating-concierge-button-lhn {
-    position: absolute;
-    display: none;
-    @include breakpoint($breakpoint-tablet) {
-        display: block;
-    }
-}
-
 .get-help {
     flex-wrap: wrap;
     margin-top: 40px;
 }
 
-.floating-concierge-button {
-    bottom: 2rem;
-    right: 2rem;
-
-    img {
-        width: 4rem;
-        height: 4rem;
-
-        &:hover {
-            filter: saturate(2);
-        }
-    }
-}
-
 .disable-scrollbar {
     @media screen and (max-width: $breakpoint-tablet) {
         overflow: hidden;