Merge branch 'main' into release/7.16.0

MetaMask · Feb 28, 2024 · e7c3c4b · e7c3c4b
2 parents b3f356b + 672475e
commit e7c3c4b
Show file tree

Hide file tree

Showing 80 changed files with 4,566 additions and 1,892 deletions.
diff --git a/...mponent-library/components-temp/CustomSpendCap/__snapshots__/CustomSpendCap.test.tsx.snap b/...mponent-library/components-temp/CustomSpendCap/__snapshots__/CustomSpendCap.test.tsx.snap
@@ -89,7 +89,8 @@ exports[`CustomSpendCap should match snapshot 1`] = `
       </View>
     </View>
     <Text
-      accessibilityRole="text"
+      accessibilityRole="link"
+      accessible={true}
       onPress={[Function]}
       onPressIn={[Function]}
       onPressOut={[Function]}
@@ -220,7 +221,8 @@ exports[`CustomSpendCap should match snapshot 1`] = `
       This allows the third party to spend all your token balance until it reaches the cap or you revoke the spending cap. If this is not intended, consider setting a lower spending cap.
        
       <Text
-        accessibilityRole="text"
+        accessibilityRole="link"
+        accessible={true}
         onPress={[Function]}
         onPressIn={[Function]}
         onPressOut={[Function]}

diff --git a/app/component-library/components/Banners/Banner/__snapshots__/Banner.test.tsx.snap b/app/component-library/components/Banners/Banner/__snapshots__/Banner.test.tsx.snap
@@ -151,6 +151,8 @@ exports[`Banner should render correctly with a close button 1`] = `
       Sample Banner Description
     </Text>
     <TouchableOpacity
+      accessibilityRole="button"
+      accessible={true}
       activeOpacity={1}
       onPress={[Function]}
       onPressIn={[Function]}
@@ -385,6 +387,8 @@ exports[`Banner should render correctly with an action button 1`] = `
       Sample Banner Description
     </Text>
     <TouchableOpacity
+      accessibilityRole="button"
+      accessible={true}
       activeOpacity={1}
       onPress={[Function]}
       onPressIn={[Function]}

diff --git a/...ry/components/Banners/Banner/variants/BannerAlert/__snapshots__/BannerAlert.test.tsx.snap b/...ry/components/Banners/Banner/variants/BannerAlert/__snapshots__/BannerAlert.test.tsx.snap
@@ -73,7 +73,8 @@ exports[`BannerAlert should render BannerAlert 1`] = `
       Sample Banner Alert Description
     </Text>
     <Text
-      accessibilityRole="text"
+      accessibilityRole="link"
+      accessible={true}
       onPress={[Function]}
       onPressIn={[Function]}
       onPressOut={[Function]}

diff --git a/...ibrary/components/Banners/Banner/variants/BannerTip/__snapshots__/BannerTip.test.tsx.snap b/...ibrary/components/Banners/Banner/variants/BannerTip/__snapshots__/BannerTip.test.tsx.snap
@@ -83,7 +83,8 @@ exports[`BannerTip should render default settings correctly 1`] = `
       Sample Banner Tip Description
     </Text>
     <Text
-      accessibilityRole="text"
+      accessibilityRole="link"
+      accessible={true}
       onPress={[Function]}
       onPressIn={[Function]}
       onPressOut={[Function]}

diff --git a/app/component-library/components/BottomSheets/BottomSheet/BottomSheet.constants.ts b/app/component-library/components/BottomSheets/BottomSheet/BottomSheet.constants.ts
diff --git a/app/component-library/components/BottomSheets/BottomSheet/BottomSheet.tsx b/app/component-library/components/BottomSheets/BottomSheet/BottomSheet.tsx
@@ -39,7 +39,6 @@ const BottomSheet = forwardRef<BottomSheetRef, BottomSheetProps>(
       isInteractable = true,
       shouldNavigateBack = true,
       isFullscreen = false,
-      customMarginTop,
       ...props
     },
     ref,
@@ -106,7 +105,6 @@ 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
@@ -23,13 +23,6 @@ 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/...ents/BottomSheets/BottomSheet/foundation/BottomSheetDialog/BottomSheetDialog.constants.ts b/...ents/BottomSheets/BottomSheet/foundation/BottomSheetDialog/BottomSheetDialog.constants.ts
@@ -18,7 +18,3 @@ export const DEFAULT_BOTTOMSHEETDIALOG_SWIPETHRESHOLD_DURATION =
  * This indicates that 60% of the sheet needs to be offscreen to meet the distance threshold.
  */
 export const DEFAULT_BOTTOMSHEETDIALOG_DISMISSTHRESHOLD = 0.6;
-/**
- * Minimum spacing reserved for the overlay tappable area.
- */
-export const DEFAULT_BOTTOMSHEETDIALOG_MARGINTOP = 250;
diff --git a/...ry/components/BottomSheets/BottomSheet/foundation/BottomSheetDialog/BottomSheetDialog.tsx b/...ry/components/BottomSheets/BottomSheet/foundation/BottomSheetDialog/BottomSheetDialog.tsx
@@ -41,7 +41,6 @@ import {
   DEFAULT_BOTTOMSHEETDIALOG_DISPLAY_DURATION,
   DEFAULT_BOTTOMSHEETDIALOG_DISMISSTHRESHOLD,
   DEFAULT_BOTTOMSHEETDIALOG_SWIPETHRESHOLD_DURATION,
-  DEFAULT_BOTTOMSHEETDIALOG_MARGINTOP,
 } from './BottomSheetDialog.constants';
 import styleSheet from './BottomSheetDialog.styles';
 import {
@@ -60,7 +59,6 @@ const BottomSheetDialog = forwardRef<
       isInteractable = true,
       onClose,
       onOpen,
-      customMarginTop,
       ...props
     },
     ref,
@@ -69,10 +67,7 @@ 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 - marginTop;
+    const maxSheetHeight = screenHeight - screenTopPadding;
     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,10 +27,6 @@ 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/...ts/BottomSheet/foundation/BottomSheetDialog/__snapshots__/BottomSheetDialog.test.tsx.snap b/...ts/BottomSheet/foundation/BottomSheetDialog/__snapshots__/BottomSheetDialog.test.tsx.snap
@@ -30,7 +30,7 @@ exports[`BottomSheetDialog should render correctly 1`] = `
           "borderTopLeftRadius": 8,
           "borderTopRightRadius": 8,
           "borderWidth": 1,
-          "maxHeight": 1083,
+          "maxHeight": 1333,
           "overflow": "hidden",
           "paddingBottom": 3,
           "shadowColor": "#0000001A",

diff --git a/...y/components/BottomSheets/BottomSheetFooter/__snapshots__/BottomSheetFooter.test.tsx.snap b/...y/components/BottomSheets/BottomSheetFooter/__snapshots__/BottomSheetFooter.test.tsx.snap
@@ -13,6 +13,8 @@ exports[`BottomSheetFooter should render snapshot correctly 1`] = `
   testID="bottomsheetfooter"
 >
   <TouchableOpacity
+    accessibilityRole="button"
+    accessible={true}
     activeOpacity={1}
     onPress={[Function]}
     onPressIn={[Function]}
@@ -52,6 +54,8 @@ exports[`BottomSheetFooter should render snapshot correctly 1`] = `
     </Text>
   </TouchableOpacity>
   <TouchableOpacity
+    accessibilityRole="button"
+    accessible={true}
     activeOpacity={1}
     onPress={[Function]}
     onPressIn={[Function]}

diff --git a/app/component-library/components/Buttons/Button/foundation/ButtonBase/ButtonBase.tsx b/app/component-library/components/Buttons/Button/foundation/ButtonBase/ButtonBase.tsx
@@ -45,6 +45,8 @@ const ButtonBase = ({
       activeOpacity={1}
       onPress={onPress}
       style={styles.base}
+      accessibilityRole="button"
+      accessible
       {...props}
     >
       {startIconName && (
@@ -59,6 +61,7 @@ const ButtonBase = ({
         <Text
           variant={DEFAULT_BUTTONBASE_LABEL_TEXTVARIANT}
           style={styles.label}
+          accessibilityRole="none"
         >
           {label}
         </Text>

diff --git a/...ry/components/Buttons/Button/foundation/ButtonBase/__snapshots__/ButtonBase.test.tsx.snap b/...ry/components/Buttons/Button/foundation/ButtonBase/__snapshots__/ButtonBase.test.tsx.snap
@@ -2,6 +2,8 @@
 
 exports[`ButtonBase should render correctly 1`] = `
 <TouchableOpacity
+  accessibilityRole="button"
+  accessible={true}
   activeOpacity={1}
   onPress={[Function]}
   style={
@@ -28,6 +30,7 @@ exports[`ButtonBase should render correctly 1`] = `
     }
   />
   <Text
+    accessibilityRole="none"
     style={
       Object {
         "color": "#24272A",
@@ -42,6 +45,8 @@ exports[`ButtonBase should render correctly 1`] = `
 
 exports[`ButtonBase should render correctly when disabled 1`] = `
 <TouchableOpacity
+  accessibilityRole="button"
+  accessible={true}
   activeOpacity={1}
   disabled={true}
   onPress={[Function]}
@@ -70,6 +75,7 @@ exports[`ButtonBase should render correctly when disabled 1`] = `
     }
   />
   <Text
+    accessibilityRole="none"
     style={
       Object {
         "color": "#24272A",

diff --git a/app/component-library/components/Buttons/Button/variants/ButtonLink/ButtonLink.tsx b/app/component-library/components/Buttons/Button/variants/ButtonLink/ButtonLink.tsx
@@ -80,6 +80,7 @@ const ButtonLink: React.FC<ButtonLinkProps> = ({
           onPressIn={triggerOnPressedIn}
           onPressOut={triggerOnPressedOut}
           accessibilityRole="link"
+          accessible
           {...props}
         >
           {renderLabel()}

diff --git a/...rary/components/Buttons/Button/variants/ButtonLink/__snapshots__/ButtonLink.test.tsx.snap b/...rary/components/Buttons/Button/variants/ButtonLink/__snapshots__/ButtonLink.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`Link should render correctly 1`] = `
 <Fragment>
   <Text
     accessibilityRole="link"
+    accessible={true}
     onPress={[Function]}
     onPressIn={[Function]}
     onPressOut={[Function]}

diff --git a/app/component-library/components/Texts/Text/Text.tsx b/app/component-library/components/Texts/Text/Text.tsx
@@ -21,7 +21,7 @@ const Text: React.FC<TextProps> = ({
 }) => {
   const { styles } = useStyles(styleSheet, { variant, style, color });
   return (
-    <RNText {...props} style={styles.base} accessibilityRole="text">
+    <RNText accessibilityRole="text" {...props} style={styles.base}>
       {children}
     </RNText>
   );

diff --git a/app/components/Nav/App/index.js b/app/components/Nav/App/index.js
@@ -31,7 +31,6 @@ import branch from 'react-native-branch';
 import AppConstants from '../../../core/AppConstants';
 import Logger from '../../../util/Logger';
 import { routingInstrumentation } from '../../../util/sentry/utils';
-import Analytics from '../../../core/Analytics/Analytics';
 import { connect, useDispatch } from 'react-redux';
 import {
   CURRENT_APP_VERSION,
@@ -370,13 +369,12 @@ const App = ({ userLoggedIn }) => {
   }, [dispatch, handleDeeplink, navigator, queueOfHandleDeeplinkFunctions]);
 
   useEffect(() => {
-    const initAnalytics = async () => {
+    const initMetrics = async () => {
       await MetaMetrics.getInstance().configure();
-      await Analytics.init();
     };
 
-    initAnalytics().catch((err) => {
-      Logger.error(err, 'Error initializing analytics');
+    initMetrics().catch((err) => {
+      Logger.error(err, 'Error initializing MetaMetrics');
     });
   }, []);
 

diff --git a/app/components/UI/CollectibleModal/__snapshots__/CollectibleModal.test.tsx.snap b/app/components/UI/CollectibleModal/__snapshots__/CollectibleModal.test.tsx.snap
@@ -192,6 +192,8 @@ exports[`CollectibleModal should render correctly 1`] = `
             }
           >
             <TouchableOpacity
+              accessibilityRole="button"
+              accessible={true}
               activeOpacity={1}
               onPress={[Function]}
               onPressIn={[Function]}

diff --git a/app/components/UI/Navbar/index.js b/app/components/UI/Navbar/index.js
@@ -169,14 +169,17 @@ export function getTransactionsNavbarOptions(
  *
  * @param {string} title - Title in string format
  * @param {Object} navigation - Navigation object required to push new views
+ * @param isFullScreenModal
+ * @param themeColors
+ * @param {IMetaMetricsEvent} navigationPopEvent
  * @returns {Object} - Corresponding navbar options containing title and headerTitleStyle
  */
 export function getNavigationOptionsTitle(
   title,
   navigation,
   isFullScreenModal,
   themeColors,
-  navigationPopEvent = undefined,
+  navigationPopEvent = null,
 ) {
   const innerStyles = StyleSheet.create({
     headerStyle: {

diff --git a/app/components/UI/NetworkModal/__snapshots__/index.test.tsx.snap b/app/components/UI/NetworkModal/__snapshots__/index.test.tsx.snap
@@ -504,6 +504,8 @@ exports[`NetworkDetails renders correctly 1`] = `
               testID="bottomsheetfooter"
             >
               <TouchableOpacity
+                accessibilityRole="button"
+                accessible={true}
                 activeOpacity={1}
                 onPress={[Function]}
                 onPressIn={[Function]}
@@ -543,6 +545,8 @@ exports[`NetworkDetails renders correctly 1`] = `
                 </Text>
               </TouchableOpacity>
               <TouchableOpacity
+                accessibilityRole="button"
+                accessible={true}
                 activeOpacity={1}
                 onPress={[Function]}
                 onPressIn={[Function]}

diff --git a/...components/UI/NetworkVerificationInfo/__snapshots__/NetworkVerificationInfo.test.tsx.snap b/...components/UI/NetworkVerificationInfo/__snapshots__/NetworkVerificationInfo.test.tsx.snap
@@ -463,6 +463,8 @@ exports[`NetworkVerificationInfo renders correctly 1`] = `
     testID="bottomsheetfooter"
   >
     <TouchableOpacity
+      accessibilityRole="button"
+      accessible={true}
       activeOpacity={1}
       onPressIn={[Function]}
       onPressOut={[Function]}
@@ -501,6 +503,8 @@ exports[`NetworkVerificationInfo renders correctly 1`] = `
       </Text>
     </TouchableOpacity>
     <TouchableOpacity
+      accessibilityRole="button"
+      accessible={true}
       activeOpacity={1}
       onPressIn={[Function]}
       onPressOut={[Function]}

diff --git a/app/components/UI/OptinMetrics/index.js b/app/components/UI/OptinMetrics/index.js
@@ -20,8 +20,10 @@ import { connect } from 'react-redux';
 import { clearOnboardingEvents } from '../../../actions/onboarding';
 import { ONBOARDING_WIZARD } from '../../../constants/storage';
 import AppConstants from '../../../core/AppConstants';
-import { Analytics, MetaMetricsEvents } from '../../../core/Analytics';
-import { withMetricsAwareness } from '../../hooks/useMetrics';
+import {
+  MetaMetricsEvents,
+  withMetricsAwareness,
+} from '../../hooks/useMetrics';
 
 import DefaultPreference from 'react-native-default-preference';
 import { ThemeContext } from '../../../util/theme';
@@ -272,7 +274,6 @@ class OptinMetrics extends PureComponent {
       // and disable analytics
       clearOnboardingEvents();
       await metrics.enable(false);
-      Analytics.disableInstance();
     }, 200);
     this.continue();
   };