Merge branch 'main' into TSA-114-traders-list-leaderboard

Author: zone-live

.github/workflows/build-and-upload-to-testflight.yml

@@ -4,6 +4,21 @@ name: Build and upload to TestFlight
 # Summary metadata is passed from build.yml outputs (no second checkout for version parsing).
 #
 on:
+  workflow_call:
+    inputs:
+      source_branch:
+        description: 'Branch, tag, or SHA to build'
+        required: true
+        type: string
+      environment:
+        description: 'Build environment / track (exp, beta, rc)'
+        required: true
+        type: string
+      testflight_group:
+        description: 'TestFlight external testing group'
+        required: false
+        type: string
+        default: 'MetaMask BETA & Release Candidates'
   workflow_dispatch:
     inputs:
       source_branch:

.github/workflows/build.yml

@@ -333,8 +333,10 @@ jobs:
       - name: Set Android environment variables
         if: matrix.platform == 'android'
         run: |
-          echo "ANDROID_HOME=/opt/android-sdk" >> "$GITHUB_ENV"
-          echo "ANDROID_SDK_ROOT=/opt/android-sdk" >> "$GITHUB_ENV"
+          {
+            echo "ANDROID_HOME=/opt/android-sdk"
+            echo "ANDROID_SDK_ROOT=/opt/android-sdk"
+          } >> "$GITHUB_ENV"
 
       - name: Setup Java
         if: matrix.platform == 'android'
@@ -497,9 +499,10 @@ jobs:
         id: meta
         run: |
           REF="${{ needs.prepare.outputs.checkout_ref_for_setup }}"
-          echo "checkout_ref=$REF" >> "$GITHUB_OUTPUT"
-          echo "built_commit_sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
-          echo "semantic_version=$(node -p "require('./package.json').version")" >> "$GITHUB_OUTPUT"
-          # versionCode 4138 (no '=' in this repo)
           VC=$(awk '/versionCode[[:space:]]/{print $2; exit}' android/app/build.gradle | tr -d '\r')
-          echo "android_version_code=$VC" >> "$GITHUB_OUTPUT"
+          {
+            echo "checkout_ref=$REF"
+            echo "built_commit_sha=$(git rev-parse HEAD)"
+            echo "semantic_version=$(node -p "require('./package.json').version")"
+            echo "android_version_code=$VC"
+          } >> "$GITHUB_OUTPUT"

.yarnrc.yml

@@ -12,7 +12,6 @@ plugins:
 
 npmAuditIgnoreAdvisories:
   - 1109627 # TODO: Upgrade @react-native-community/cli to 17.0.1+ when ready. Suppressing for now to unblock CI.
-  - 1112455 # lodash prototype pollution in _.unset and _.omit. No fix available yet (latest is 4.17.21, affected <=4.17.22). Suppressing for now to unblock CI. https://github.com/advisories/GHSA-xxjr-mmjv-4gpg
   - 1113402 # bn.js affected by an infinite loop. No fix available yet (latest is 5.2.1, affected <=5.2.3). Suppressing for now to unblock CI. https://github.com/advisories/GHSA-378v-28hj-76wf
   - 1113441 # bn.js affected by an infinite loop. No fix available yet (latest is 5.2.1, affected <=5.2.3). Suppressing for now to unblock CI. https://github.com/advisories/GHSA-378v-28hj-76wf
   - 1113442 # bn.js affected by an infinite loop. No fix available yet (latest is 5.2.1, affected <=5.2.3). Suppressing for now to unblock CI. https://github.com/advisories/GHSA-378v-28hj-76wf

app/component-library/components/BottomSheets/BottomSheet/BottomSheet.tsx

@@ -48,6 +48,7 @@ const BottomSheet = forwardRef<BottomSheetRef, BottomSheetProps>(
       shouldNavigateBack = true,
       isFullscreen = false,
       keyboardAvoidingViewEnabled = true,
+      panGestureHandlerProps,
       ...props
     },
     ref,
@@ -163,6 +164,7 @@ const BottomSheet = forwardRef<BottomSheetRef, BottomSheetProps>(
           isFullscreen={isFullscreen}
           style={style}
           keyboardAvoidingViewEnabled={keyboardAvoidingViewEnabled}
+          panGestureHandlerProps={panGestureHandlerProps}
         >
           {children}
         </BottomSheetDialog>

app/component-library/components/BottomSheets/BottomSheet/foundation/BottomSheetDialog/BottomSheetDialog.test.tsx

@@ -56,7 +56,7 @@ describe('BottomSheetDialog', () => {
         <Text>Test Child</Text>
       </BottomSheetDialog>,
     );
-    expect(getByText('Test Child')).toBeTruthy();
+    expect(getByText('Test Child')).toBeOnTheScreen();
   });
   it('should call onOpen when onOpenDialog ref is called', () => {
     const onOpenMock = jest.fn();
@@ -110,4 +110,26 @@ describe('BottomSheetDialog', () => {
     expect(onCloseMock).toHaveBeenCalled();
   });
   //   Note: Add Gesture tests when react-native-gesture-handler gets updated
+
+  describe('panGestureHandlerProps', () => {
+    it('passes props to the PanGestureHandler via panGestureHandlerProps', () => {
+      const { getByTestId } = render(
+        <BottomSheetDialog
+          panGestureHandlerProps={{ testID: 'pan-gesture-handler' }}
+        >
+          <Text>Test Child</Text>
+        </BottomSheetDialog>,
+      );
+      expect(getByTestId('pan-gesture-handler')).toBeOnTheScreen();
+    });
+
+    it('renders normally when panGestureHandlerProps is undefined', () => {
+      const { getByText } = render(
+        <BottomSheetDialog panGestureHandlerProps={undefined}>
+          <Text>No Handler Props</Text>
+        </BottomSheetDialog>,
+      );
+      expect(getByText('No Handler Props')).toBeOnTheScreen();
+    });
+  });
 });

app/component-library/components/BottomSheets/BottomSheet/foundation/BottomSheetDialog/BottomSheetDialog.tsx

@@ -65,6 +65,7 @@ const BottomSheetDialog = forwardRef<
       keyboardAvoidingViewEnabled = true,
       onClose,
       onOpen,
+      panGestureHandlerProps,
       style,
       ...props
     },
@@ -245,6 +246,7 @@ const BottomSheetDialog = forwardRef<
         <PanGestureHandler
           enabled={isInteractable}
           onGestureEvent={gestureHandler}
+          {...panGestureHandlerProps}
         >
           <Animated.View
             onLayout={updateSheetHeight}

app/component-library/components/BottomSheets/BottomSheet/foundation/BottomSheetDialog/BottomSheetDialog.types.ts

@@ -1,5 +1,6 @@
 // Third party dependencies.
 import { StyleProp, ViewProps, ViewStyle } from 'react-native';
+import { PanGestureHandlerProps } from 'react-native-gesture-handler';
 
 /**
  * BottomSheetDialog component props.
@@ -32,6 +33,16 @@ export interface BottomSheetDialogProps extends ViewProps {
    * Optional callback that gets triggered when sheet is opened.
    */
   onOpen?: (hasPendingAction?: boolean) => void;
+  /**
+   * Optional props forwarded directly to the underlying `PanGestureHandler`.
+   * Provides access to all `PanGestureHandler` configuration (e.g.
+   * `simultaneousHandlers`, `activeOffsetY`, `failOffsetX`) so consumers are
+   * not limited to a single prop subset.
+   */
+  panGestureHandlerProps?: Omit<
+    PanGestureHandlerProps,
+    'onGestureEvent' | 'enabled'
+  >;
 }
 
 export interface BottomSheetDialogRef {

app/components/UI/Carousel/fetchCarouselSlidesFromContentful.ts

@@ -75,15 +75,13 @@ export async function fetchCarouselSlidesFromContentful(): Promise<{
     return { prioritySlides: [], regularSlides: [] };
   }
 
-  const host = `https://${domain}/spaces/${spaceId}/environments/${environment}/entries`;
-
   // First try through the Contentful Client
   try {
     const contentfulClient = createClient({
       space: spaceId,
       accessToken,
       environment,
-      host,
+      host: domain,
     });
 
     const entries = await contentfulClient.getEntries({
@@ -102,7 +100,8 @@ export async function fetchCarouselSlidesFromContentful(): Promise<{
 
   // Otherwise fallback to URL fetch
   try {
-    const url = new URL(`${host}`);
+    const fallbackHost = `https://${domain}/spaces/${spaceId}/environments/${environment}/entries`;
+    const url = new URL(fallbackHost);
     url.searchParams.set('access_token', accessToken);
     url.searchParams.set('content_type', CONTENT_TYPE);
     url.searchParams.set('fields.showInMobile', 'true');

app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.test.tsx

@@ -495,6 +495,12 @@ jest.mock('../../hooks', () => ({
     isClosing: false,
   })),
   usePerpsMarkets: () => mockUsePerpsMarketsImpl(),
+  usePerpsMarketData: jest.fn(() => ({
+    marketData: null,
+    isLoading: false,
+    error: null,
+    refetch: jest.fn(),
+  })),
   usePerpsTrading: jest.fn(() => ({
     placeOrder: jest.fn(),
     cancelOrder: jest.fn(),
@@ -1482,6 +1488,63 @@ describe('PerpsMarketDetailsView', () => {
       });
     });
 
+    it('passes marketData defaults to order screen when available', async () => {
+      const { useSelector } = jest.requireMock('react-redux');
+      const { usePerpsMarketData } = jest.requireMock('../../hooks');
+      const mockSelectPerpsEligibility = jest.requireMock(
+        '../../selectors/perpsController',
+      ).selectPerpsEligibility;
+      useSelector.mockImplementation((selector: unknown) => {
+        if (selector === mockSelectPerpsEligibility) {
+          return true;
+        }
+        return undefined;
+      });
+
+      usePerpsMarketData.mockReturnValue({
+        marketData: { szDecimals: 4, maxLeverage: 50 },
+        isLoading: false,
+        error: null,
+        refetch: jest.fn(),
+      });
+
+      try {
+        const { getByTestId } = renderWithProvider(
+          <PerpsConnectionProvider>
+            <PerpsMarketDetailsView />
+          </PerpsConnectionProvider>,
+          {
+            state: initialState,
+          },
+        );
+
+        const longButton = getByTestId(
+          PerpsMarketDetailsViewSelectorsIDs.LONG_BUTTON,
+        );
+        await act(async () => {
+          fireEvent.press(longButton);
+        });
+
+        expect(mockNavigateToOrder).toHaveBeenCalledTimes(1);
+        expect(mockNavigateToOrder).toHaveBeenCalledWith(
+          expect.objectContaining({
+            direction: 'long',
+            asset: 'BTC',
+            source: 'perp_asset_screen',
+            defaultSzDecimals: 4,
+            defaultMaxLeverage: 50,
+          }),
+        );
+      } finally {
+        usePerpsMarketData.mockReturnValue({
+          marketData: null,
+          isLoading: false,
+          error: null,
+          refetch: jest.fn(),
+        });
+      }
+    });
+
     it('navigates to short order screen when short button is pressed and user is eligible', async () => {
       const { useSelector } = jest.requireMock('react-redux');
       const mockSelectPerpsEligibility = jest.requireMock(

app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.tsx

@@ -96,6 +96,7 @@ import {
   usePerpsNavigation,
   usePositionManagement,
   usePerpsTrading,
+  usePerpsMarketData,
 } from '../../hooks';
 import { useConfirmNavigation } from '../../../../Views/confirmations/hooks/useConfirmNavigation';
 import { useDefaultPayWithTokenWhenNoPerpsBalance } from '../../hooks/useDefaultPayWithTokenWhenNoPerpsBalance';
@@ -638,6 +639,10 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
     }
   };
 
+  const { marketData } = usePerpsMarketData({
+    asset: market?.symbol || '',
+  });
+
   const handleWatchlistPress = useCallback(() => {
     if (!market?.symbol) return;
 
@@ -715,9 +720,12 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
         direction,
         asset: market.symbol,
         source: PERPS_EVENT_VALUE.SOURCE.PERP_ASSET_SCREEN,
+        defaultSzDecimals: marketData?.szDecimals,
+        defaultMaxLeverage: marketData?.maxLeverage,
       });
     },
     [
+      marketData,
       isEligible,
       existingPosition,
       navigation,