Merge branch 'main' into fix/direct-musd-vault-7702-mobile

Author: asalsys

.github/guidelines/E2E_DECISION_TREE.md

@@ -46,6 +46,10 @@ Runs only when all of the following are true:
 - Label `skip-e2e` can be added to the PR to skip E2E tests (and builds) in case of infra issues.
 - Using this label should be exceptional in case of CI friction and urgencies. Verify new changes and regressions manually before merging.
 
+## (Exceptional) force Appium iOS smoke tests on PRs
+
+Appium iOS smoke tests are skipped on PRs by default (they still run on every `main` push/schedule). To also run them on a PR, add the `run-appium-ios-tests` label. Smart E2E Selection still controls which suites run. CI re-runs automatically when the label is added or removed.
+
 ## E2E flakiness detection in PRs
 
 Flakiness detection is applied to modified E2E test files in PRs:

.github/guidelines/LABELING_GUIDELINES.md

@@ -43,6 +43,10 @@ Using any of these labels should be exceptional in case of CI friction and urgen
 
 - **run-performance-tests**: Forces the PR performance E2E workflow to run (all performance tests on Android low-profile devices), even when Smart E2E Selection would skip them (e.g. no performance-relevant changes detected, `skip-e2e`, or `pr-not-ready-for-e2e`). Adding or removing this label re-triggers CI. Not honored on fork PRs.
 
+### Force Appium iOS Smoke Tests
+
+- **run-appium-ios-tests**: Also runs Appium iOS smoke tests on a PR (normally they run only on `main` push/schedule). Uses the same Smart E2E Selection tags as Detox/Appium Android — it does not bypass path filters, build gates, or AI tag selection. Remove `pr-not-ready-for-e2e` when the PR is ready for E2E validation. Adding or removing this label re-triggers CI. Not honored on fork PRs.
+
 ### Block merge if any is present
 
 - **needs-qa**: The PR requires a full manual QA prior to being merged and added to a release.

.github/workflows/ci.yml

@@ -1231,18 +1231,29 @@ jobs:
 
   appium-smoke-tests-ios:
     name: 'Appium Smoke Tests (iOS)'
+    # Main push/schedule: always run when the iOS build succeeded.
+    # PRs: skipped by default; add run-appium-ios-tests to also run Appium iOS
+    # (same smart-selected tags as other E2E jobs).
     if: >-
       ${{
         !cancelled() &&
-        github.ref == 'refs/heads/main' &&
-        (github.event_name == 'push' || github.event_name == 'schedule') &&
-        needs.ios-tests-ready.result == 'success'
+        needs.ios-tests-ready.result == 'success' &&
+        (
+          (
+            github.ref == 'refs/heads/main' &&
+            (github.event_name == 'push' || github.event_name == 'schedule')
+          ) ||
+          (
+            github.event_name == 'pull_request' &&
+            needs.get_requirements.outputs.run_appium_ios == 'true'
+          )
+        )
       }}
     permissions:
       contents: read
       checks: write
       id-token: write
-    needs: [ios-tests-ready, smart-e2e-selection]
+    needs: [get_requirements, ios-tests-ready, smart-e2e-selection]
     uses: ./.github/workflows/run-appium-smoke-tests-ios.yml
     with:
       build_type: 'main'

.github/workflows/get-requirements.yml

@@ -29,6 +29,9 @@ on:
       run_performance:
         description: 'Whether performance E2E tests should be forced to run via the run-performance-tests PR label'
         value: ${{ jobs.detect-changes.outputs.run_performance }}
+      run_appium_ios:
+        description: 'Whether Appium iOS smoke tests should also run on a PR via the run-appium-ios-tests label'
+        value: ${{ jobs.detect-changes.outputs.run_appium_ios }}
 
 jobs:
   detect-changes:
@@ -44,6 +47,7 @@ jobs:
       block_merge_for_e2e_readiness: ${{ steps.set-outputs.outputs.block_merge }}
       run_smart_e2e_selection: ${{ steps.set-outputs.outputs.run_smart_e2e_selection }}
       run_performance: ${{ steps.set-outputs.outputs.run_performance }}
+      run_appium_ios: ${{ steps.set-outputs.outputs.run_appium_ios }}
     env:
       # For a `pull_request` event, the head commit hash is `github.event.pull_request.head.sha`.
       # For a `push` event, the head commit hash is `github.sha`.
@@ -90,6 +94,7 @@ jobs:
             echo "LABEL_BLOCKS_MERGE=false"
             echo "SKIP_SMART_SELECTION=false"
             echo "RUN_PERFORMANCE=false"
+            echo "RUN_APPIUM_IOS=false"
           } >> "$GITHUB_OUTPUT"
 
           LABELS=$(gh pr view "$PR_NUMBER" --json labels --jq '.labels[].name')
@@ -117,6 +122,11 @@ jobs:
             echo "-> RUN_PERFORMANCE=true due to 'run-performance-tests' label on PR"
           fi
 
+          if echo "$LABELS" | grep -qx "run-appium-ios-tests"; then
+            echo "RUN_APPIUM_IOS=true" >> "$GITHUB_OUTPUT"
+            echo "-> RUN_APPIUM_IOS=true due to 'run-appium-ios-tests' label on PR"
+          fi
+
       - name: Filter changed files
         id: filter
         if: steps.skip-merge-queue.outputs.up-to-date != 'true'
@@ -135,6 +145,7 @@ jobs:
           SHOULD_SKIP_E2E: ${{ steps.skip-e2e-tag.outputs.SKIP == 'true' || steps.check-labels.outputs.SKIP_E2E == 'true' }}
           LABEL_BLOCKS_MERGE: ${{ steps.check-labels.outputs.LABEL_BLOCKS_MERGE }}
           RUN_PERFORMANCE_LABEL: ${{ steps.check-labels.outputs.RUN_PERFORMANCE }}
+          RUN_APPIUM_IOS_LABEL: ${{ steps.check-labels.outputs.RUN_APPIUM_IOS }}
           ALL_CHANGES_COUNT: ${{ steps.filter.outputs.all_changes_count }}
           ALL_CHANGES_FILES: ${{ github.event_name == 'pull_request' && steps.filter.outputs.all_changes_files || '' }}
           IGNORABLE_COUNT: ${{ steps.filter.outputs.e2e_ignorable_count }}
@@ -208,6 +219,13 @@ jobs:
             CHANGED="$ALL_CHANGES_FILES"
           fi
 
+          RUN_APPIUM_IOS=false
+          if [[ "$GITHUB_EVENT_NAME" == "pull_request" && \
+                "$IS_FORK" != "true" && \
+                "$RUN_APPIUM_IOS_LABEL" == "true" ]]; then
+            RUN_APPIUM_IOS=true
+          fi
+
           E2E_NEEDED=false
           [[ "$ANDROID" == "true" || "$IOS" == "true" ]] && E2E_NEEDED=true
 
@@ -246,6 +264,7 @@ jobs:
             echo "run_smart_e2e_selection=$RUN_SMART"
             echo "block_merge=$BLOCK_MERGE"
             echo "run_performance=$RUN_PERF"
+            echo "run_appium_ios=$RUN_APPIUM_IOS"
           } >> "$GITHUB_OUTPUT"
 
           {

.github/workflows/rerun-ci-on-skipped-e2e-labels.yml

@@ -18,7 +18,8 @@ jobs:
        github.event.label.name == 'skip-e2e-flakiness-detection' ||
        github.event.label.name == 'pr-not-ready-for-e2e' ||
        github.event.label.name == 'force-builds' ||
-       github.event.label.name == 'run-performance-tests')
+       github.event.label.name == 'run-performance-tests' ||
+       github.event.label.name == 'run-appium-ios-tests')
     runs-on: ubuntu-latest
     permissions:
       actions: write

app/components/Nav/App/App.tsx

@@ -33,7 +33,10 @@ import { getVersion } from 'react-native-device-info';
 import { Authentication } from '../../../core/';
 import { colors as importedColors } from '../../../styles/common';
 import Routes from '../../../constants/navigation/Routes';
-import { clearNativeStackNavigatorOptions } from '../../../constants/navigation/clearStackNavigatorOptions';
+import {
+  clearNativeStackNavigatorOptions,
+  slideFromRightNativeOptions,
+} from '../../../constants/navigation/clearStackNavigatorOptions';
 import ModalConfirmation from '../../../component-library/components/Modals/ModalConfirmation';
 import Toast, {
   ToastContext,
@@ -1110,7 +1113,8 @@ const AppFlow = () => {
         name={Routes.MULTICHAIN_ACCOUNTS.ADDRESS_LIST}
         component={MultichainAddressList}
         options={{
-          animation: 'slide_from_right',
+          ...slideFromRightNativeOptions,
+          presentation: 'card',
           contentStyle: { backgroundColor: colors.background.default },
         }}
       />

app/components/UI/AssetOverview/Price/Price.styles.tsx

@@ -50,7 +50,7 @@ const styleSheet = (params: { theme: Theme }) =>
       width: '100%',
       alignSelf: 'stretch',
       paddingTop: 12,
-      paddingBottom: 16,
+      paddingBottom: 8,
       flexDirection: 'column',
       alignItems: 'flex-start',
       gap: 10,

app/components/UI/Charts/AdvancedChart/webview/chartLogic.js

@@ -3467,7 +3467,7 @@ function createStudyLegendOverlay() {
   const div = document.createElement('div');
   div.id = 'study-legend-overlay';
   div.style.cssText =
-    'position:absolute;top:21px;left:' +
+    'position:absolute;top:1px;left:' +
     LEGEND_OVERLAY_LEFT_PX +
     'px;z-index:5;pointer-events:none;' +
     'display:flex;flex-wrap:wrap;align-items:flex-start;column-gap:8px;row-gap:2px;';

app/components/UI/Charts/AdvancedChart/webview/chartLogicString.ts

@@ -3476,7 +3476,7 @@ function createStudyLegendOverlay() {
   const div = document.createElement('div');
   div.id = 'study-legend-overlay';
   div.style.cssText =
-    'position:absolute;top:21px;left:' +
+    'position:absolute;top:1px;left:' +
     LEGEND_OVERLAY_LEFT_PX +
     'px;z-index:5;pointer-events:none;' +
     'display:flex;flex-wrap:wrap;align-items:flex-start;column-gap:8px;row-gap:2px;';

app/util/networks/index.js

@@ -244,6 +244,9 @@ export const isLineaMainnet = (networkType) => networkType === LINEA_MAINNET;
 export const isLineaMainnetChainId = (chainId) =>
   chainId === CHAIN_IDS.LINEA_MAINNET;
 
+export const isPolygonMainnetChainId = (chainId) =>
+  chainId === NETWORKS_CHAIN_ID.POLYGON;
+
 export const isMonadMainnetChainId = (chainId) => chainId === CHAIN_IDS.MONAD;
 
 export const isSolanaMainnet = (chainId) => chainId === SolScope.Mainnet;
@@ -348,7 +351,7 @@ export const isTestNet = (chainId) => TESTNET_CHAIN_IDS.includes(chainId);
 
 /**
  * Returns whether the network can be deleted by the user.
- * Aligns with NetworkSelector: mainnet, Linea mainnet, and testnets cannot be removed.
+ * Aligns with NetworkSelector: default networks and testnets cannot be removed.
  *
  * @param {string} chainId - The chain ID to check (e.g. '0x1', '0x89').
  * @returns {boolean} True if the network can be deleted, false otherwise.
@@ -359,6 +362,7 @@ export const canDeleteNetwork = (chainId) =>
       !isTestNet(chainId) &&
       !isMainNet(chainId) &&
       !isLineaMainnetChainId(chainId) &&
+      !isPolygonMainnetChainId(chainId) &&
       !isMonadMainnetChainId(chainId),
   );