Merge branch 'main' into @szymczak/create-buttons

Author: sumo-slonik

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009013305
-        versionName "9.1.33-5"
+        versionCode 1009013307
+        versionName "9.1.33-7"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/app/build.gradle

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.33.5</string>
+	<string>9.1.33.7</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.33</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.33.5</string>
+	<string>9.1.33.7</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.33</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.33.5</string>
+	<string>9.1.33.7</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.1.33-5",
+  "version": "9.1.33-7",
   "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.",

package-lock.json

@@ -6439,7 +6439,6 @@ const CONST = {
         DATA_TYPES: {
             EXPENSE: 'expense',
             INVOICE: 'invoice',
-            TASK: 'task',
             TRIP: 'trip',
             CHAT: 'chat',
         },
@@ -6508,11 +6507,6 @@ const CONST = {
                 LINKS: 'links',
                 PINNED: 'pinned',
             },
-            TASK: {
-                ALL: 'all',
-                OUTSTANDING: 'outstanding',
-                COMPLETED: 'completed',
-            },
         },
         TABLE_COLUMNS: {
             RECEIPT: 'receipt',
@@ -6527,10 +6521,6 @@ const CONST = {
             TYPE: 'type',
             ACTION: 'action',
             TAX_AMOUNT: 'taxAmount',
-            TITLE: 'title',
-            ASSIGNEE: 'assignee',
-            CREATED_BY: 'createdBy',
-            IN: 'in',
         },
         SYNTAX_OPERATORS: {
             AND: 'and',
@@ -6571,9 +6561,6 @@ const CONST = {
             PAID: 'paid',
             EXPORTED: 'exported',
             POSTED: 'posted',
-            TITLE: 'title',
-            ASSIGNEE: 'assignee',
-            CREATED_BY: 'createdBy',
             REIMBURSABLE: 'reimbursable',
             BILLABLE: 'billable',
             POLICY_ID: 'policyID',
@@ -6612,9 +6599,6 @@ const CONST = {
             PAID: 'paid',
             EXPORTED: 'exported',
             POSTED: 'posted',
-            TITLE: 'title',
-            ASSIGNEE: 'assignee',
-            CREATED_BY: 'created-by',
             REIMBURSABLE: 'reimbursable',
             BILLABLE: 'billable',
         },

package.json

@@ -4,7 +4,6 @@ import type {NativeEventSubscription} from 'react-native';
 import {AppState, Linking, Platform} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import Onyx, {useOnyx} from 'react-native-onyx';
-import alert from './components/Alert';
 import ConfirmModal from './components/ConfirmModal';
 import DeeplinkWrapper from './components/DeeplinkWrapper';
 import EmojiPicker from './components/EmojiPicker/EmojiPicker';
@@ -28,7 +27,7 @@ import * as ActiveClientManager from './libs/ActiveClientManager';
 import {isSafari} from './libs/Browser';
 import * as Environment from './libs/Environment/Environment';
 import FS from './libs/Fullstory';
-import * as Growl from './libs/Growl';
+import Growl, {growlRef} from './libs/Growl';
 import Log from './libs/Log';
 import migrateOnyx from './libs/migrateOnyx';
 import Navigation from './libs/Navigation/Navigation';
@@ -57,7 +56,7 @@ Onyx.registerLogger(({level, message, parameters}) => {
         // when they don't return data.
         const shouldShowAlert = typeof parameters === 'object' && !Array.isArray(parameters) && 'showAlert' in parameters && 'key' in parameters;
         if (Environment.isDevelopment() && shouldShowAlert) {
-            alert(`${message} Key: ${parameters.key as string}`);
+            Growl.error(`${message} Key: ${parameters.key as string}`, 10000);
         }
     } else if (level === 'hmmm') {
         Log.hmmm(message, parameters);
@@ -277,7 +276,7 @@ function Expensify() {
         >
             {shouldInit && (
                 <>
-                    <GrowlNotification ref={Growl.growlRef} />
+                    <GrowlNotification ref={growlRef} />
                     <PopoverReportActionContextMenu ref={ReportActionContextMenu.contextMenuRef} />
                     <EmojiPicker ref={EmojiPickerAction.emojiPickerRef} />
                     {/* We include the modal for showing a new update at the top level so the option is always present. */}

src/CONST.ts

@@ -68,9 +68,6 @@ const ROUTES = {
     SEARCH_ADVANCED_FILTERS_PAID: 'search/filters/paid',
     SEARCH_ADVANCED_FILTERS_EXPORTED: 'search/filters/exported',
     SEARCH_ADVANCED_FILTERS_POSTED: 'search/filters/posted',
-    SEARCH_ADVANCED_FILTERS_TITLE: 'search/filters/title',
-    SEARCH_ADVANCED_FILTERS_ASSIGNEE: 'search/filters/assignee',
-    SEARCH_ADVANCED_FILTERS_CREATED_BY: 'search/filters/createdBy',
     SEARCH_ADVANCED_FILTERS_REIMBURSABLE: 'search/filters/reimbursable',
     SEARCH_ADVANCED_FILTERS_BILLABLE: 'search/filters/billable',
     SEARCH_ADVANCED_FILTERS_WORKSPACE: 'search/filters/workspace',