Merge branch 'main' into chore/ts-coverage-views-1

MetaMask · Aug 16, 2024 · 9e00585 · 9e00585
2 parents e77d333 + c1108ce
commit 9e00585
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/app/components/Views/QRScanner/index.tsx b/app/components/Views/QRScanner/index.tsx
@@ -325,7 +325,7 @@ const QRScanner = () => {
       >
         <SafeAreaView style={styles.innerView}>
           <TouchableOpacity style={styles.closeIcon} onPress={goBack}>
-            <Icon name={'ios-close'} size={50} color={styles.closeIcon.color} />
+            <Icon name="ios-close" size={50} color={styles.closeIcon.color} />
           </TouchableOpacity>
           <Image source={frameImage} style={styles.frame} />
           <Text style={styles.text}>{strings('qr_scanner.scanning')}</Text>

diff --git a/app/components/Views/Quiz/SRPQuiz/SRPQuiz.tsx b/app/components/Views/Quiz/SRPQuiz/SRPQuiz.tsx
@@ -53,7 +53,7 @@ const SRPQuiz = () => {
   };
 
   const wrongAnswerIcon = useCallback(
-    (): Element => (
+    (): React.ReactElement => (
       <Icon
         size={IconSize.Xl}
         name={IconName.Danger}
@@ -64,7 +64,7 @@ const SRPQuiz = () => {
   );
 
   const rightAnswerIcon = useCallback(
-    (): Element => (
+    (): React.ReactElement => (
       <Icon
         size={IconSize.Xl}
         name={IconName.Confirmation}
@@ -115,14 +115,14 @@ const SRPQuiz = () => {
     );
   }, [trackEvent]);
 
-  const questionOne = useCallback((): Element => {
+  const questionOne = useCallback((): React.ReactElement => {
     trackEvent(MetaMetricsEvents.SRP_REVEAL_FIRST_QUESTION_SEEN, {});
     return (
       <QuizContent
         header={`1 ${strings('srp_security_quiz.of')} 2`}
         title={{
           content: strings('srp_security_quiz.question_one.question'),
-          testId: SecurityQuizQuestionOneModalSelectorsText.QUIZ_QUESTION_ONE,
+          testID: SecurityQuizQuestionOneModalSelectorsText.QUIZ_QUESTION_ONE,
         }}
         buttons={[
           {
@@ -150,7 +150,7 @@ const SRPQuiz = () => {
     );
   }, [trackEvent]);
 
-  const rightAnswerQuestionOne = useCallback((): Element => {
+  const rightAnswerQuestionOne = useCallback((): React.ReactElement => {
     trackEvent(MetaMetricsEvents.SRP_REVEAL_FIRST_QUESTION_RIGHT_ASNWER, {});
     return (
       <QuizContent
@@ -184,7 +184,7 @@ const SRPQuiz = () => {
     );
   }, [rightAnswerIcon, styles.rightText, trackEvent]);
 
-  const wrongAnswerQuestionOne = useCallback((): Element => {
+  const wrongAnswerQuestionOne = useCallback((): React.ReactElement => {
     trackEvent(MetaMetricsEvents.SRP_REVEAL_FIRST_QUESTION_WRONG_ANSWER, {});
     return (
       <QuizContent
@@ -218,7 +218,7 @@ const SRPQuiz = () => {
     );
   }, [styles.wrongText, wrongAnswerIcon, trackEvent]);
 
-  const questionTwo = useCallback((): Element => {
+  const questionTwo = useCallback((): React.ReactElement => {
     trackEvent(MetaMetricsEvents.SRP_REVEAL_SECOND_QUESTION_SEEN, {});
     return (
       <QuizContent
@@ -252,7 +252,7 @@ const SRPQuiz = () => {
     );
   }, [trackEvent]);
 
-  const rightAnswerQuestionTwo = useCallback((): Element => {
+  const rightAnswerQuestionTwo = useCallback((): React.ReactElement => {
     trackEvent(MetaMetricsEvents.SRP_REVEAL_SECOND_QUESTION_RIGHT_ASNWER, {});
     return (
       <QuizContent
@@ -291,7 +291,7 @@ const SRPQuiz = () => {
     trackEvent,
   ]);
 
-  const wrongAnswerQuestionTwo = useCallback((): Element => {
+  const wrongAnswerQuestionTwo = useCallback((): React.ReactElement => {
     trackEvent(MetaMetricsEvents.SRP_REVEAL_SECOND_QUESTION_WRONG_ANSWER, {});
     return (
       <QuizContent

diff --git a/app/components/Views/SDK/SDKSessionModal/SDKSessionModal.tsx b/app/components/Views/SDK/SDKSessionModal/SDKSessionModal.tsx
@@ -2,8 +2,8 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 
 // External dependencies
-import { ThemeColors } from '@metamask/design-tokens/dist/js/themes/types';
-import { ThemeTypography } from '@metamask/design-tokens/dist/js/typography';
+import type { ThemeColors } from '@metamask/design-tokens/dist/types/js/themes/types';
+import type { ThemeTypography } from '@metamask/design-tokens/dist/types/js/typography';
 import { useNavigation } from '@react-navigation/native';
 import { StyleSheet, View } from 'react-native';
 import { EdgeInsets, useSafeAreaInsets } from 'react-native-safe-area-context';