Merge branch 'ci/bitrise-message-check' of https://github.com/MetaMas…

…k/metamask-mobile into ci/bitrise-message-check
MetaMask · Feb 27, 2024 · 7827395 · 7827395
2 parents 5bbfe61 + 64045e9
commit 7827395
Show file tree

Hide file tree

Showing 79 changed files with 1,872 additions and 1,085 deletions.
diff --git a/app/component-library/components/BottomSheets/BottomSheet/BottomSheet.tsx b/app/component-library/components/BottomSheets/BottomSheet/BottomSheet.tsx
@@ -39,6 +39,7 @@ const BottomSheet = forwardRef<BottomSheetRef, BottomSheetProps>(
       isInteractable = true,
       shouldNavigateBack = true,
       isFullscreen = false,
+      customMarginTop,
       ...props
     },
     ref,
@@ -105,6 +106,7 @@ const BottomSheet = forwardRef<BottomSheetRef, BottomSheetProps>(
           isInteractable={isInteractable}
           onClose={onCloseCB}
           onOpen={onOpenCB}
+          customMarginTop={customMarginTop}
           ref={bottomSheetDialogRef}
           isFullscreen={isFullscreen}
         >

diff --git a/app/component-library/components/BottomSheets/BottomSheet/README.md b/app/component-library/components/BottomSheets/BottomSheet/README.md
@@ -22,6 +22,14 @@ Boolean that indicates if sheet is swippable. This affects whether or not tappin
 | :-------------------------------------------------- | :------------------------------------------------------ | :----------------------------------------------------- |
 | boolean                                             | No                                                      | true                                                   |
 
+
+### `customMarginTop`
+
+Configure height of the modal by setting the distance between top of modal and top of screen.
+| <span style="color:gray;font-size:14px">TYPE</span> | <span style="color:gray;font-size:14px">REQUIRED</span> | <span style="color:gray;font-size:14px">DEFAULT</span> |
+| :-------------------------------------------------- | :------------------------------------------------------ | :----------------------------------------------------- |
+| number                                             | No                                                      | 250
+
 ### `children`
 
 Content to wrap in sheet.

diff --git a/...ry/components/BottomSheets/BottomSheet/foundation/BottomSheetDialog/BottomSheetDialog.tsx b/...ry/components/BottomSheets/BottomSheet/foundation/BottomSheetDialog/BottomSheetDialog.tsx
@@ -60,6 +60,7 @@ const BottomSheetDialog = forwardRef<
       isInteractable = true,
       onClose,
       onOpen,
+      customMarginTop,
       ...props
     },
     ref,
@@ -68,9 +69,10 @@ const BottomSheetDialog = forwardRef<
       useSafeAreaInsets();
     const { y: frameY } = useSafeAreaFrame();
     const { height: screenHeight } = useWindowDimensions();
+    const marginTop = customMarginTop ?? DEFAULT_BOTTOMSHEETDIALOG_MARGINTOP;
     const maxSheetHeight = isFullscreen
       ? screenHeight - screenTopPadding
-      : screenHeight - screenTopPadding - DEFAULT_BOTTOMSHEETDIALOG_MARGINTOP;
+      : screenHeight - screenTopPadding - marginTop;
     const { styles } = useStyles(styleSheet, {
       maxSheetHeight,
       screenBottomPadding,

diff --git a/...mponents/BottomSheets/BottomSheet/foundation/BottomSheetDialog/BottomSheetDialog.types.ts b/...mponents/BottomSheets/BottomSheet/foundation/BottomSheetDialog/BottomSheetDialog.types.ts
@@ -27,6 +27,10 @@ export interface BottomSheetDialogProps extends ViewProps {
    * Optional callback that gets triggered when sheet is opened.
    */
   onOpen?: (hasPendingAction?: boolean) => void;
+  /**
+   * Customize the top margin of the sheet.
+   */
+  customMarginTop?: number;
 }
 
 export interface BottomSheetDialogRef {

diff --git a/app/component-library/components/Navigation/TabBar/TabBar.tsx b/app/component-library/components/Navigation/TabBar/TabBar.tsx
@@ -12,10 +12,10 @@ import { useStyles } from '../../../hooks';
 import generateTestId from '../../../../../wdio/utils/generateTestId';
 import Routes from '../../../../constants/navigation/Routes';
 import { useTheme } from '../../../../util/theme';
-import Analytics from '../../../../core/Analytics/Analytics';
 import { MetaMetricsEvents } from '../../../../core/Analytics';
 import { selectChainId } from '../../../../selectors/networkController';
 import { getDecimalChainId } from '../../../../util/networks';
+import { useMetrics } from '../../../../components/hooks/useMetrics';
 
 // Internal dependencies.
 import { TabBarProps } from './TabBar.types';
@@ -27,6 +27,7 @@ import OnboardingWizard from '../../../../components/UI/OnboardingWizard';
 
 const TabBar = ({ state, descriptors, navigation }: TabBarProps) => {
   const { colors } = useTheme();
+  const { trackEvent } = useMetrics();
   const { bottom: bottomInset } = useSafeAreaInsets();
   const { styles } = useStyles(styleSheet, { bottomInset });
   const chainId = useSelector(selectChainId);
@@ -73,13 +74,10 @@ const TabBar = ({ state, descriptors, navigation }: TabBarProps) => {
             navigation.navigate(Routes.MODAL.ROOT_MODAL_FLOW, {
               screen: Routes.MODAL.WALLET_ACTIONS,
             });
-            Analytics.trackEventWithParameters(
-              MetaMetricsEvents.ACTIONS_BUTTON_CLICKED,
-              {
-                text: '',
-                chain_id: getDecimalChainId(chainId),
-              },
-            );
+            trackEvent(MetaMetricsEvents.ACTIONS_BUTTON_CLICKED, {
+              text: '',
+              chain_id: getDecimalChainId(chainId),
+            });
             break;
           case Routes.BROWSER_VIEW:
             navigation.navigate(Routes.BROWSER.HOME, {
@@ -127,7 +125,7 @@ const TabBar = ({ state, descriptors, navigation }: TabBarProps) => {
         />
       );
     },
-    [state, descriptors, navigation, colors, chainId],
+    [state, descriptors, navigation, colors, chainId, trackEvent],
   );
 
   const renderTabBarItems = useCallback(

diff --git a/app/component-library/components/Tags/TagUrl/TagUrl.styles.ts b/app/component-library/components/Tags/TagUrl/TagUrl.styles.ts
@@ -37,6 +37,8 @@ const styleSheet = (params: { theme: Theme; vars: TagUrlStyleSheetVars }) => {
     ) as ViewStyle,
     favicon: {
       marginRight: 8,
+      width: 24,
+      height: 24,
     },
     label: {
       color: colors.text.alternative,

diff --git a/app/component-library/components/Tags/TagUrl/__snapshots__/TagUrl.test.tsx.snap b/app/component-library/components/Tags/TagUrl/__snapshots__/TagUrl.test.tsx.snap
@@ -26,7 +26,9 @@ exports[`TagUrl should render correctly 1`] = `
     size="32"
     style={
       Object {
+        "height": 24,
         "marginRight": 8,
+        "width": 24,
       }
     }
     variant="Favicon"

diff --git a/app/components/Nav/App/index.js b/app/components/Nav/App/index.js
@@ -99,6 +99,8 @@ import AsyncStorage from '../../../store/async-storage-wrapper';
 import ShowIpfsGatewaySheet from '../../Views/ShowIpfsGatewaySheet/ShowIpfsGatewaySheet';
 import ShowDisplayNftMediaSheet from '../../Views/ShowDisplayMediaNFTSheet/ShowDisplayNFTMediaSheet';
 import AmbiguousAddressSheet from '../../../../app/components/Views/Settings/Contacts/AmbiguousAddressSheet/AmbiguousAddressSheet';
+import SDKDisconnectModal from '../../../../app/components/Views/SDKDisconnectModal/SDKDisconnectModal';
+import SDKSessionModal from '../../../../app/components/Views/SDKSessionModal/SDKSessionModal';
 import { MetaMetrics } from '../../../core/Analytics';
 import trackErrorAsAnalytics from '../../../util/metrics/TrackError/trackErrorAsAnalytics';
 
@@ -552,6 +554,14 @@ const App = ({ userLoggedIn }) => {
         name={Routes.SHEET.SDK_FEEDBACK}
         component={SDKFeedbackModal}
       />
+      <Stack.Screen
+        name={Routes.SHEET.SDK_MANAGE_CONNECTIONS}
+        component={SDKSessionModal}
+      />
+      <Stack.Screen
+        name={Routes.SHEET.SDK_DISCONNECT}
+        component={SDKDisconnectModal}
+      />
       <Stack.Screen
         name={Routes.SHEET.ACCOUNT_CONNECT}
         component={AccountConnect}

diff --git a/app/components/Nav/Main/index.js b/app/components/Nav/Main/index.js
@@ -78,7 +78,7 @@ import {
   stopIncomingTransactionPolling,
 } from '../../../util/transaction-controller';
 ///: BEGIN:ONLY_INCLUDE_IF(snaps)
-import { SnapsExecutionWebView } from '../../UI/SnapsExecutionWebView';
+import { SnapsExecutionWebView } from '../../../lib/snaps';
 ///: END:ONLY_INCLUDE_IF
 
 const Stack = createStackNavigator();

diff --git a/app/components/UI/AccountApproval/showWarningBanner.tsx b/app/components/UI/AccountApproval/showWarningBanner.tsx
@@ -17,8 +17,8 @@ import {
   IconSize,
 } from '../../../component-library/components/Icons/Icon';
 import { CONNECTING_TO_A_DECEPTIVE_SITE } from '../../../constants/urls';
-import AnalyticsV2 from '../../../util/analyticsV2';
 import { AccordionHeaderHorizontalAlignment } from '../../../component-library/components/Accordions/Accordion';
+import { MetaMetrics } from '../../../core/Analytics';
 
 const descriptionArray = [
   strings('accounts.fake_metamask'),
@@ -28,11 +28,14 @@ const descriptionArray = [
 
 const goToLearnMore = () => {
   Linking.openURL(CONNECTING_TO_A_DECEPTIVE_SITE);
-  AnalyticsV2.trackEvent('EXTERNAL_LINK_CLICKED', {
-    location: 'dapp_connection_request',
-    text: 'Learn More',
-    url_domain: CONNECTING_TO_A_DECEPTIVE_SITE,
-  });
+  MetaMetrics.getInstance().trackEvent(
+    { category: 'EXTERNAL_LINK_CLICKED' },
+    {
+      location: 'dapp_connection_request',
+      text: 'Learn More',
+      url_domain: CONNECTING_TO_A_DECEPTIVE_SITE,
+    },
+  );
 };
 
 const ShowWarningBanner = () => {

diff --git a/app/components/UI/SnapsExecutionWebView/SnapsExecutionWebView.tsx b/app/components/UI/SnapsExecutionWebView/SnapsExecutionWebView.tsx
diff --git a/app/components/UI/SnapsExecutionWebView/index.ts b/app/components/UI/SnapsExecutionWebView/index.ts
diff --git a/app/components/UI/Swaps/index.js b/app/components/UI/Swaps/index.js
@@ -39,7 +39,6 @@ import {
   swapsTokensWithBalanceSelector,
   swapsTopAssetsSelector,
 } from '../../../reducers/swaps';
-import Analytics from '../../../core/Analytics/Analytics';
 import Device from '../../../util/device';
 import Engine from '../../../core/Engine';
 import AppConstants from '../../../core/AppConstants';
@@ -88,6 +87,7 @@ import {
   SWAP_MAX_SLIPPAGE,
 } from '../../../../wdio/screen-objects/testIDs/Screens/QuoteView.js';
 import { getDecimalChainId } from '../../../util/networks';
+import { useMetrics } from '../../../components/hooks/useMetrics';
 
 const createStyles = (colors) =>
   StyleSheet.create({
@@ -203,6 +203,7 @@ function SwapsAmountView({
   const navigation = useNavigation();
   const route = useRoute();
   const { colors } = useTheme();
+  const { trackAnonymousEvent } = useMetrics();
   const styles = createStyles(colors);
 
   const previousSelectedAddress = useRef();
@@ -286,15 +287,8 @@ function SwapsAmountView({
               )?.symbol,
               chain_id: getDecimalChainId(chainId),
             };
-            Analytics.trackEventWithParameters(
-              MetaMetricsEvents.SWAPS_OPENED,
-              {},
-            );
-            Analytics.trackEventWithParameters(
-              MetaMetricsEvents.SWAPS_OPENED,
-              parameters,
-              true,
-            );
+
+            trackAnonymousEvent(MetaMetricsEvents.SWAPS_OPENED, parameters);
           });
         } else {
           navigation.pop();