chore: merge from develop to preview

mobile/src/features/Swap/useCases/ListOrders/ListOrders.tsx

@@ -3,8 +3,7 @@ import {isLeft, parseNumberFromText, truncateString} from '@yoroi/common'
 import {infoExtractName} from '@yoroi/portfolio'
 import {atoms as a, useTheme} from '@yoroi/theme'
 import {Api, Portfolio, Swap} from '@yoroi/types'
-import {useSelectedWallet} from '@yoroi/wallet-manager'
-import {useWalletManager} from '@yoroi/wallet-manager'
+import {useSelectedWallet, useWalletManager} from '@yoroi/wallet-manager'
 
 import * as React from 'react'
 import {ErrorBoundary} from 'react-error-boundary'

mobile/src/ui/ModalError/ModalError.tsx

@@ -13,6 +13,7 @@ import {View} from 'react-native'
 import {useStrings} from '~/kernel/i18n/useStrings'
 import {Button, ButtonType} from '~/ui/Button/Button'
 import {Icon} from '~/ui/Icon'
+import {useModal} from '~/ui/Modal/context/ModalContext'
 import {Space} from '~/ui/Space/Space'
 import {Text} from '~/ui/Text/Text'
 
@@ -25,8 +26,17 @@ type Props = {
 export const ModalError = ({error, resetErrorBoundary, onCancel}: Props) => {
   const strings = useStrings()
   const {palette: p} = useTheme()
+  const {closeModal} = useModal()
   const message = getErrorMessage(error, strings)
 
+  const handleCancel = React.useCallback(() => {
+    if (onCancel) {
+      onCancel()
+    } else {
+      closeModal()
+    }
+  }, [onCancel, closeModal])
+
   return (
     <>
       <View style={[a.flex_grow, a.align_center, a.justify_center]}>
@@ -49,8 +59,9 @@ export const ModalError = ({error, resetErrorBoundary, onCancel}: Props) => {
         <Button
           size="S"
           type={ButtonType.Secondary}
-          onPress={onCancel}
+          onPress={handleCancel}
           title={strings.global.cancel}
+          disabled={false}
         />
 
         <Space.Width.lg />