Merge branch 'main' into rn-upgrade/0.81.5-no-unit-tests

Author: adnxy

.github/workflows/update-e2e-fixtures.yml

@@ -255,7 +255,7 @@ jobs:
         run: |
           IS_TEST='true' NODE_OPTIONS='--experimental-vm-modules' \
             yarn detox test -c ios.sim.main.ci --headless \
-            tests/regression/fixtures/fixture-validation.spec.ts
+            tests/smoke/fixtures/fixture-validation.spec.ts
         env:
           PREBUILT_IOS_APP_PATH: artifacts/main-qa-MetaMask.app
 

app/components/UI/Rewards/components/Campaigns/CampaignTile.utils.test.ts

@@ -23,6 +23,8 @@ jest.mock('@metamask/design-system-react-native', () => ({
 }));
 
 jest.mock('../../../../../../locales/i18n', () => ({
+  __esModule: true,
+  default: { locale: 'en-US' },
   strings: jest.fn((key: string, params?: Record<string, string>) =>
     params ? `${key}:${JSON.stringify(params)}` : key,
   ),

app/components/UI/Rewards/components/Campaigns/CampaignTile.utils.ts

@@ -4,7 +4,8 @@ import {
   type CampaignDto,
   type CampaignStatus,
 } from '../../../../../core/Engine/controllers/rewards-controller/types';
-import { strings } from '../../../../../../locales/i18n';
+import I18n, { strings } from '../../../../../../locales/i18n';
+import { getIntlDateTimeFormatter } from '../../../../../util/intl';
 
 /**
  * Set of campaign types that have full UI support (details view, opt-in, etc.)
@@ -53,32 +54,18 @@ export function getCampaignStatus(campaign: CampaignDto): CampaignStatus {
   return 'complete';
 }
 
-const MONTHS = [
-  'January',
-  'February',
-  'March',
-  'April',
-  'May',
-  'June',
-  'July',
-  'August',
-  'September',
-  'October',
-  'November',
-  'December',
-];
-
 /**
- * Formats a date for display in campaign tiles.
+ * Formats a date for display in campaign tiles (localized month and day).
  *
  * @param date - The date to format
- * @returns Formatted date string (e.g., "March 15")
+ * @param locale - BCP 47 locale; defaults to the app locale
+ * @returns Formatted date string (e.g., "March 15" in en-US)
  */
-function formatCampaignDate(date: Date): string {
-  const month = MONTHS[date.getMonth()];
-  const day = date.getDate();
-
-  return `${month} ${day}`;
+function formatCampaignDate(date: Date, locale: string = I18n.locale): string {
+  return getIntlDateTimeFormatter(locale, {
+    month: 'long',
+    day: 'numeric',
+  }).format(date);
 }
 
 /**

tests/scripts/update-e2e-fixture.sh

@@ -10,7 +10,7 @@ TARGET_FILE="tests/framework/fixtures/json/default-fixture.json"
 if [ ! -f "$REPORT_FILE" ]; then
   echo "Error: $REPORT_FILE not found."
   echo "Run the fixture validation test first:"
-  echo "  yarn detox test tests/regression/fixtures/fixture-validation.spec.ts -c <config>"
+  echo "  yarn detox test tests/smoke/fixtures/fixture-validation.spec.ts -c <config>"
   exit 1
 fi