feat: add error message to retry modal

app/components/UI/Transactions/RetryModal/index.tsx

@@ -1,9 +1,11 @@
+import Text, {
+  TextVariant,
+} from '../../../../component-library/components/Texts/Text';
 import React from 'react';
-import { StyleSheet, View, Text } from 'react-native';
-import { fontStyles } from '../../../../styles/common';
-import ActionModal from '../../ActionModal';
+import { StyleSheet, View } from 'react-native';
 import { strings } from '../../../../../locales/i18n';
 import { useTheme } from '../../../../util/theme';
+import ActionModal from '../../ActionModal';
 
 const createStyles = (colors: any) =>
   StyleSheet.create({
@@ -20,28 +22,34 @@ const createStyles = (colors: any) =>
       width: '100%',
     },
     modalText: {
-      ...(fontStyles.normal as any),
-      fontSize: 14,
       textAlign: 'center',
       paddingVertical: 8,
       color: colors.text.default,
     },
     modalTitle: {
-      ...(fontStyles.bold as any),
-      fontSize: 22,
       textAlign: 'center',
       color: colors.text.default,
     },
+    modalErrText: {
+      textAlign: 'center',
+      paddingVertical: 8,
+      color: colors.error.default,
+    },
   });
 
 interface Props {
   retryIsOpen: boolean;
   onConfirmPress: () => void;
   onCancelPress: () => void;
-  errorMsg: string;
+  errorMsg?: string;
 }
 
-const RetryModal = ({ retryIsOpen, onConfirmPress, onCancelPress }: Props) => {
+const RetryModal = ({
+  retryIsOpen,
+  onConfirmPress,
+  onCancelPress,
+  errorMsg,
+}: Props) => {
   const { colors } = useTheme();
   const styles = createStyles(colors);
 
@@ -56,12 +64,18 @@ const RetryModal = ({ retryIsOpen, onConfirmPress, onCancelPress }: Props) => {
       onRequestClose={onCancelPress}
     >
       <View style={styles.modalView}>
-        <Text style={styles.modalTitle}>
+        <Text variant={TextVariant.HeadingLG} style={styles.modalTitle}>
           {strings('transaction_update_retry_modal.title')}
         </Text>
-        <Text style={styles.modalText}>
-          {strings('transaction_update_retry_modal.text')}
-        </Text>
+        {errorMsg ? (
+          <Text variant={TextVariant.BodyMD} style={styles.modalErrText}>
+            {errorMsg}
+          </Text>
+        ) : (
+          <Text variant={TextVariant.BodyMD} style={styles.modalText}>
+            {strings('transaction_update_retry_modal.text')}
+          </Text>
+        )}
       </View>
     </ActionModal>
   );

app/components/UI/Transactions/index.js

@@ -60,6 +60,11 @@ import {
 import { selectContractExchangeRates } from '../../../selectors/tokenRatesController';
 import { selectAccounts } from '../../../selectors/accountTrackerController';
 import { selectSelectedAddress } from '../../../selectors/preferencesController';
+import {
+  TransactionError,
+  CancelTransactionError,
+  SpeedupTransactionError,
+} from '../../../core/Transaction/TransactionError';
 
 const createStyles = (colors, typography) =>
   StyleSheet.create({
@@ -469,28 +474,32 @@ class Transactions extends PureComponent {
 
   handleSpeedUpTransactionFailure = (e) => {
     const speedUpTxId = this.speedUpTxId;
+    const message = e instanceof TransactionError ? e.message : undefined;
     Logger.error(e, { message: `speedUpTransaction failed `, speedUpTxId });
-    InteractionManager.runAfterInteractions(this.toggleRetry(e));
+    InteractionManager.runAfterInteractions(this.toggleRetry(message));
     this.setState({
-      errorMsg: e.message,
       speedUp1559IsOpen: false,
       speedUpIsOpen: false,
     });
   };
 
   handleCancelTransactionFailure = (e) => {
     const cancelTxId = this.cancelTxId;
+    const message = e instanceof TransactionError ? e.message : undefined;
     Logger.error(e, { message: `cancelTransaction failed `, cancelTxId });
-    InteractionManager.runAfterInteractions(this.toggleRetry(e));
+    InteractionManager.runAfterInteractions(this.toggleRetry(message));
     this.setState({
-      errorMsg: e.message,
       cancel1559IsOpen: false,
       cancelIsOpen: false,
     });
   };
 
   speedUpTransaction = async (transactionObject) => {
     try {
+      if (transactionObject?.error) {
+        throw new SpeedupTransactionError(transactionObject.error);
+      }
+
       await Engine.context.TransactionController.speedUpTransaction(
         this.speedUpTxId,
         transactionObject?.suggestedMaxFeePerGasHex && {
@@ -519,6 +528,10 @@ class Transactions extends PureComponent {
 
   cancelTransaction = async (transactionObject) => {
     try {
+      if (transactionObject?.error) {
+        throw new CancelTransactionError(transactionObject.error);
+      }
+
       await Engine.context.TransactionController.stopTransaction(
         this.cancelTxId,
         transactionObject?.suggestedMaxFeePerGasHex && {
@@ -743,9 +756,10 @@ class Transactions extends PureComponent {
         )}
 
         <RetryModal
-          onCancelPress={this.toggleRetry}
+          onCancelPress={() => this.toggleRetry(undefined)}
           onConfirmPress={this.retry}
           retryIsOpen={this.state.retryIsOpen}
+          errorMsg={this.state.errorMsg}
         />
       </View>
     );

app/core/Transaction/TransactionError.ts

@@ -0,0 +1,26 @@
+class TransactionError extends Error {
+  constructor(message: string) {
+    super(message);
+
+    Object.setPrototypeOf(this, TransactionError.prototype);
+
+    this.name = this.constructor.name;
+
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, this.constructor);
+    }
+  }
+}
+
+class ApproveTransactionError extends TransactionError {}
+
+class CancelTransactionError extends TransactionError {}
+
+class SpeedupTransactionError extends TransactionError {}
+
+export {
+  TransactionError,
+  CancelTransactionError,
+  ApproveTransactionError,
+  SpeedupTransactionError,
+};