diff --git a/apps/wallet-mobile/android/app/src/main/AndroidManifest.xml b/apps/wallet-mobile/android/app/src/main/AndroidManifest.xml
index 2737d66c55..4b9dc445eb 100644
--- a/apps/wallet-mobile/android/app/src/main/AndroidManifest.xml
+++ b/apps/wallet-mobile/android/app/src/main/AndroidManifest.xml
@@ -21,15 +21,13 @@
-
+
-
-
-
+
diff --git a/apps/wallet-mobile/index.js b/apps/wallet-mobile/index.js
index 6f7b0b0843..bf8437e34c 100644
--- a/apps/wallet-mobile/index.js
+++ b/apps/wallet-mobile/index.js
@@ -4,11 +4,13 @@ import 'react-native-gesture-handler' // required by react-navigation
import './global'
import './src/i18n/polyfills' // https://formatjs.io/docs/polyfills
import BigNumber from 'bignumber.js'
+import {enableMapSet} from 'immer'
import {AppRegistry} from 'react-native'
import {name} from './app.json'
import {YoroiApp} from './src/YoroiApp'
+enableMapSet()
BigNumber.config({DECIMAL_PLACES: 19, EXPONENTIAL_AT: [-10, 40]})
AppRegistry.registerComponent(name, () => YoroiApp)
diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index 92753fb9c5..10bef414ca 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -99,7 +99,7 @@
"@emurgo/csl-mobile-bridge": "6.0.0-alpha.4",
"@emurgo/react-native-blockies-svg": "^0.0.2",
"@emurgo/react-native-hid": "^5.15.6",
- "@emurgo/yoroi-lib": "0.15.0",
+ "@emurgo/yoroi-lib": "0.15.1",
"@formatjs/intl-datetimeformat": "^6.7.0",
"@formatjs/intl-getcanonicallocales": "^2.1.0",
"@formatjs/intl-locale": "^3.2.1",
@@ -125,7 +125,7 @@
"@yoroi/api": "1.5.1",
"@yoroi/common": "1.5.1",
"@yoroi/exchange": "2.0.0",
- "@yoroi/links": "1.5.1",
+ "@yoroi/links": "1.5.3",
"@yoroi/resolver": "2.0.4",
"@yoroi/staking": "1.5.1",
"@yoroi/swap": "1.5.2",
diff --git a/apps/wallet-mobile/src/AppNavigator.tsx b/apps/wallet-mobile/src/AppNavigator.tsx
index ed0f138b04..d34c68b5d9 100644
--- a/apps/wallet-mobile/src/AppNavigator.tsx
+++ b/apps/wallet-mobile/src/AppNavigator.tsx
@@ -15,6 +15,7 @@ import {ModalProvider} from './components/Modal/ModalContext'
import {ModalScreen} from './components/Modal/ModalScreen'
import {AgreementChangedNavigator, InitializationNavigator} from './features/Initialization'
import {LegalAgreement, useLegalAgreement} from './features/Initialization/common'
+import {useDeepLinkWatcher} from './features/Links/common/useDeepLinkWatcher'
import {CONFIG, LINKING_CONFIG, LINKING_PREFIXES} from './legacy/config'
import {DeveloperScreen} from './legacy/DeveloperScreen'
import {AppRoutes} from './navigation'
@@ -27,9 +28,11 @@ const Stack = createStackNavigator()
const navRef = React.createRef>()
export const AppNavigator = () => {
+ useDeepLinkWatcher()
const strings = useStrings()
const [routeName, setRouteName] = React.useState()
+ // NOTE: mind some routes are handled by the event listener
const enableDeepLink = routeName === 'history-list'
const linking = {
diff --git a/apps/wallet-mobile/src/IntialLinkManagerProvider.tsx b/apps/wallet-mobile/src/IntialLinkManagerProvider.tsx
deleted file mode 100644
index 7acd78bb23..0000000000
--- a/apps/wallet-mobile/src/IntialLinkManagerProvider.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import * as React from 'react'
-import {Linking} from 'react-native'
-
-const IntialLinkContext = React.createContext<
- {initialUrl: string | null; setInitialUrl: (initialUrl: string | null) => void} | undefined
->(undefined)
-
-export const InitialLinkProvider: React.FC = ({children}) => {
- const [initialUrl, setInitialUrl] = React.useState(null)
-
- // app is open
- React.useEffect(() => {
- const getUrl = ({url}: {url: string | null}) => {
- if (url !== null) setInitialUrl(url)
- }
- Linking.addEventListener('url', getUrl)
- return () => Linking.removeAllListeners('url')
- }, [])
-
- // app is closed
- React.useEffect(() => {
- const getInitialURL = async () => {
- const url = await Linking.getInitialURL()
- if (url !== null) setInitialUrl(url)
- }
-
- getInitialURL()
- }, [])
-
- return {children}
-}
-
-export const useInitialLink = () => React.useContext(IntialLinkContext) || missingProvider()
-
-const missingProvider = () => {
- throw new Error('InitialLinkProvider is missing')
-}
diff --git a/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx b/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx
index 9cae0ac17c..db4051dd6c 100644
--- a/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx
+++ b/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx
@@ -24,7 +24,6 @@ import {Boundary, Icon, Spacer} from '../components'
import {claimApiMaker} from '../features/Claim/module/api'
import {ClaimProvider} from '../features/Claim/module/ClaimProvider'
import {ShowSuccessScreen} from '../features/Claim/useCases/ShowSuccessScreen'
-import {useNavigateTo} from '../features/Exchange/common/useNavigateTo'
import {CreateExchangeOrderScreen} from '../features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeOrderScreen'
import {SelectProviderFromListScreen} from '../features/Exchange/useCases/SelectProviderFromListScreen/SelectProviderFromListScreen'
import {ShowExchangeResultOrderScreen} from '../features/Exchange/useCases/ShowExchangeResultOrderScreen/ShowExchangeResultOrderScreen'
@@ -126,8 +125,6 @@ export const TxHistoryNavigator = () => {
// navigator components
const headerRightHistory = React.useCallback(() => , [])
- const navigateTo = useNavigateTo()
-
// exchange
const exchangeManager = React.useMemo(() => {
const api = exchangeApiMaker({
@@ -254,9 +251,8 @@ export const TxHistoryNavigator = () => {
headerShown: false,
}}
name="exchange-result"
- >
- {() => }
-
+ component={ShowExchangeResultOrderScreen}
+ />
{
const Stack = createStackNavigator()
export const WalletNavigator = () => {
- const {initialUrl} = useInitialLink()
- const {resetToWalletSelection} = useWalletNavigation()
+ const initialRouteName = useInitialRouteName()
+
+ // initialRoute doens't update the state of the navigator, only at first render
+ // https://reactnavigation.org/docs/auth-flow/
+ if (initialRouteName === 'exchange-result') {
+ return (
+
+
+
+ )
+ }
return (
-
- {() => }
-
-
@@ -187,6 +198,13 @@ export const WalletNavigator = () => {
)
}
+const useInitialRouteName = () => {
+ const {action} = useLinks()
+ const routeName: keyof WalletStackRoutes =
+ action?.info.useCase === 'order/show-create-result' ? 'exchange-result' : 'wallet-selection'
+ return routeName
+}
+
const messages = defineMessages({
transactionsButton: {
id: 'components.common.navigation.transactionsButton',
diff --git a/apps/wallet-mobile/src/YoroiApp.tsx b/apps/wallet-mobile/src/YoroiApp.tsx
index cbaae8db6e..e117eca827 100644
--- a/apps/wallet-mobile/src/YoroiApp.tsx
+++ b/apps/wallet-mobile/src/YoroiApp.tsx
@@ -1,4 +1,5 @@
import {AsyncStorageProvider} from '@yoroi/common'
+import {LinksProvider} from '@yoroi/links'
import {ThemeProvider} from '@yoroi/theme'
import React from 'react'
import {LogBox, Platform, StyleSheet, UIManager} from 'react-native'
@@ -14,7 +15,6 @@ import {ErrorBoundary} from './components/ErrorBoundary'
import {CurrencyProvider} from './features/Settings/Currency/CurrencyContext'
import {LanguageProvider} from './i18n'
import {InitApp} from './InitApp'
-import {InitialLinkProvider} from './IntialLinkManagerProvider'
import {CONFIG} from './legacy/config'
import {setLogLevel} from './legacy/logging'
import {makeMetricsManager, MetricsProvider} from './metrics/metricsManager'
@@ -62,9 +62,9 @@ export const YoroiApp = () => {
-
+
-
+
diff --git a/apps/wallet-mobile/src/features/Exchange/common/useNavigateTo.tsx b/apps/wallet-mobile/src/features/Exchange/common/useNavigateTo.tsx
index fea0659455..a8227d7193 100644
--- a/apps/wallet-mobile/src/features/Exchange/common/useNavigateTo.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/common/useNavigateTo.tsx
@@ -35,13 +35,3 @@ export const useNavigateTo = () => {
}),
}).current
}
-
-export type ExchangeInitRoutes = {
- exchange: {
- coin: string
- coinAmount: number
- fiat: number
- fiatAmount: number
- status: string
- }
-}
diff --git a/apps/wallet-mobile/src/features/Exchange/useCases/ShowExchangeResultOrderScreen/ShowExchangeResultOrderScreen.stories.tsx b/apps/wallet-mobile/src/features/Exchange/useCases/ShowExchangeResultOrderScreen/ShowExchangeResultOrderScreen.stories.tsx
index c037568dbb..e3cd5506b5 100644
--- a/apps/wallet-mobile/src/features/Exchange/useCases/ShowExchangeResultOrderScreen/ShowExchangeResultOrderScreen.stories.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/useCases/ShowExchangeResultOrderScreen/ShowExchangeResultOrderScreen.stories.tsx
@@ -1,73 +1,54 @@
-import {NavigationRouteContext, RouteProp} from '@react-navigation/native'
-import {actions} from '@storybook/addon-actions'
import {storiesOf} from '@storybook/react-native'
import {exchangeDefaultState, ExchangeProvider, successManagerMock} from '@yoroi/exchange'
-import {produce} from 'immer'
+import {LinksProvider} from '@yoroi/links'
import React from 'react'
import {ModalProvider} from '../../../../components'
-import {InitialLinkProvider, useInitialLink} from '../../../../IntialLinkManagerProvider'
import {SelectedWalletProvider} from '../../../../SelectedWallet'
import {mocks as walletMocks} from '../../../../yoroi-wallets/mocks'
-import {ExchangeInitRoutes} from '../../common/useNavigateTo'
import {ShowExchangeResultOrderScreen} from './ShowExchangeResultOrderScreen'
-storiesOf('Exchange ShowExchangeResultOrderScreen', module)
- .addDecorator((story) => {story()})
- .add('no params', () => )
- .add('no info', () => actions('onClose')} />)
- .add('with params', () => )
-
-const Init = () => {
- const {setInitialUrl} = useInitialLink()
- const initialState = produce(exchangeDefaultState, (draft) => {
- draft.orderType = 'buy'
- })
-
- React.useEffect(() => {
- setInitialUrl(
- 'yoroi://ramp-on-off/result?&status=success&fiatAmount=10000&coinAmount=5000&coin=ADA&fiat=USD&provider=encryptus',
- )
- }, [setInitialUrl])
+storiesOf('Exchange ShowExchangeResultOrderScreen', module).add('with deep link data', () => )
+const WithDeepLinkData = () => {
return (
-
- actions('onClose')} />
-
+
+
+
+
+
)
}
-
-const WithParams = () => {
- const {setInitialUrl} = useInitialLink()
- const params: RouteProp['params'] = {
- coin: 'ADA',
- coinAmount: 100,
- fiat: 990,
- fiatAmount: 199,
- status: 'success',
- }
- const initialState = produce(exchangeDefaultState, (draft) => {
- draft.orderType = 'buy'
- })
-
- React.useEffect(() => {
- setInitialUrl(
- 'yoroi://ramp-on-off/result?&status=success&fiatAmount=10000&coinAmount=5000&coin=ADA&fiat=USD&provider=encryptus',
- )
- }, [setInitialUrl])
- return (
-
-
-
-
- actions('onClose')} />
-
-
-
-
- )
-}
diff --git a/apps/wallet-mobile/src/features/Exchange/useCases/ShowExchangeResultOrderScreen/ShowExchangeResultOrderScreen.tsx b/apps/wallet-mobile/src/features/Exchange/useCases/ShowExchangeResultOrderScreen/ShowExchangeResultOrderScreen.tsx
index 7b62d7a7f8..162b01e922 100644
--- a/apps/wallet-mobile/src/features/Exchange/useCases/ShowExchangeResultOrderScreen/ShowExchangeResultOrderScreen.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/useCases/ShowExchangeResultOrderScreen/ShowExchangeResultOrderScreen.tsx
@@ -1,3 +1,5 @@
+import {exchangeApiMaker, exchangeManagerMaker, ExchangeProvider} from '@yoroi/exchange'
+import {LinksYoroiExchangeShowCreateResultParams, useLinks} from '@yoroi/links'
import {useTheme} from '@yoroi/theme'
import * as React from 'react'
import {StyleSheet, TouchableOpacity, View} from 'react-native'
@@ -5,7 +7,7 @@ import {SafeAreaView} from 'react-native-safe-area-context'
import {Button, Icon, Spacer, Text, useModal} from '../../../../components'
import {useStatusBar} from '../../../../components/hooks/useStatusBar'
-import {useInitialLink} from '../../../../IntialLinkManagerProvider'
+import {useWalletNavigation} from '../../../../navigation'
import {DescribeAction} from '../../common/DescribeAction/DescribeAction'
import {useStrings} from '../../common/useStrings'
import {BanxaLogo} from '../../illustrations/BanxaLogo'
@@ -13,82 +15,99 @@ import {EncryptusLogo} from '../../illustrations/EncryptusLogo'
import {WalletAssetImage} from '../../illustrations/WalletAssetImage'
import {ContentResult} from './ContentResult/ContentResult'
-export const ShowExchangeResultOrderScreen = ({onClose}: {onClose: () => void}) => {
+export const ShowExchangeResultOrderScreen = () => {
const strings = useStrings()
const styles = useStyles()
const {openModal} = useModal()
+ const {resetToWalletSelection} = useWalletNavigation()
+ const {action, actionFinished} = useLinks()
- const {setInitialUrl, initialUrl} = useInitialLink()
+ // exchange
+ const exchangeManager = React.useMemo(() => {
+ const api = exchangeApiMaker({
+ isProduction: action?.info?.params?.isSandbox !== true,
+ partner: 'yoroi',
+ })
+
+ const manager = exchangeManagerMaker({api})
+ return manager
+ }, [action?.info?.params?.isSandbox])
+
+ // NOTE: should never happen, caller should handle it
+ if (action == null || action.info.useCase !== 'order/show-create-result') return null
+ const params: LinksYoroiExchangeShowCreateResultParams = action.info.params
const handleOnClose = () => {
- setInitialUrl(null)
- onClose()
+ actionFinished()
+ resetToWalletSelection()
}
const handleOnShowDetails = () => {
openModal(strings.buySellCrypto, )
}
- const {showOrderDetails, params, Logo, name, showProviderDetails} = sanitizeParams(initialUrl)
+ const {showOrderDetails, Logo, name, showProviderDetails} = sanitizeParams(params)
return (
-
-
-
+
+
+
+
+
+
+
+
+ {strings.congrats}
-
+ {showOrderDetails && (
+ <>
+
+
+
+
+
+
+ )}
+
-
- {strings.congrats}
+
{showOrderDetails && (
<>
-
+
+ {`${params?.coinAmount ?? 0} ${params?.coin ?? ''}`}
+
-
-
-
+
+
+
+ {`${params?.fiatAmount ?? 0} ${params?.fiat ?? ''}`}
+
)}
-
-
-
- {showOrderDetails && (
- <>
-
- {`${params?.coinAmount ?? 0} ${params?.coin ?? ''}`}
-
-
-
-
-
- {`${params?.fiatAmount ?? 0} ${params?.fiat ?? ''}`}
-
-
- )}
+ {showProviderDetails && (
+ <>
+
- {showProviderDetails && (
- <>
-
+
+
+
-
-
-
+
-
+ {name}
+
+
+
+ )}
+
- {name}
-
-
-
- )}
-
-
-
-
-
-
+
+
+
+
+
)
}
@@ -102,37 +121,15 @@ const providerName = {
banxa: 'Banxa',
} as const
-const sanitizeParams = (url: string | null) => {
- const urlSearchParams = url !== null ? new URLSearchParams(url) : null
- const params =
- urlSearchParams !== null
- ? {
- coin: urlSearchParams.get('coin'),
- coinAmount: urlSearchParams.get('coinAmount'),
- fiat: urlSearchParams.get('fiat'),
- fiatAmount: urlSearchParams.get('fiatAmount'),
- provider: urlSearchParams.get('provider'),
- status: urlSearchParams.get('status'),
- orderType: urlSearchParams.get('orderType'),
- // NOTE: it passes the params below to get it back
- isProduction: urlSearchParams.get('isProduction'),
- // NOTE: later it should open the used wallet and then display
- walletName: urlSearchParams.get('walletName'), // we avoid id - security reasons
- }
- : null
-
+const sanitizeParams = (params: LinksYoroiExchangeShowCreateResultParams) => {
const showOrderDetails =
- params != null &&
- params.coin != null &&
- params.coinAmount != null &&
- params.fiat != null &&
- params.fiatAmount != null
+ params.coin != null && params.coinAmount != null && params.fiat != null && params.fiatAmount != null
const Logo = providerLogo[params?.provider as keyof typeof providerLogo]
const name = providerName[params?.provider as keyof typeof providerName]
const showProviderDetails = Logo != null && name != null
- return {params, showOrderDetails, Logo, name, showProviderDetails}
+ return {showOrderDetails, Logo, name, showProviderDetails}
}
const useStyles = () => {
diff --git a/apps/wallet-mobile/src/features/Links/common/constants.ts b/apps/wallet-mobile/src/features/Links/common/constants.ts
new file mode 100644
index 0000000000..e3a014324c
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Links/common/constants.ts
@@ -0,0 +1,6 @@
+import {freeze} from 'immer'
+
+export const knownApps: Readonly> = freeze(
+ new Map(__DEV__ ? [['yoroi', {name: 'Yoroi Test', vkey: 'w1'}]] : []),
+ true,
+)
diff --git a/apps/wallet-mobile/src/features/Links/common/useDeepLinkWatcher.tsx b/apps/wallet-mobile/src/features/Links/common/useDeepLinkWatcher.tsx
new file mode 100644
index 0000000000..91e57ef44f
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Links/common/useDeepLinkWatcher.tsx
@@ -0,0 +1,48 @@
+import {linksYoroiParser, useLinks} from '@yoroi/links'
+import * as React from 'react'
+import {Linking} from 'react-native'
+
+import {Logger} from '../../../yoroi-wallets/logging'
+
+export const useDeepLinkWatcher = () => {
+ const links = useLinks()
+
+ const processLink = React.useCallback(
+ (url: string) => {
+ if (links.action !== null) {
+ Logger.debug('useDeepLinksWatcher :: action in progress, ignoring...')
+ return
+ }
+ const action = linksYoroiParser(url)
+ if (action == null) {
+ Logger.debug('useDeepLinksWatcher :: link is malformated, ignoring...')
+ return
+ }
+ if (action.params?.isSandbox === true && __DEV__ === false) {
+ Logger.debug('useDeepLinksWatcher :: link is sandboxed, ignoring...')
+ return
+ }
+ // TODO: implement isTrusted if signature was provided and doesn't match with authorization ignore it
+ Logger.debug('action', JSON.stringify(action, null, 2))
+ links.actionStarted({info: action, isTrusted: false})
+ },
+ [links],
+ )
+
+ React.useEffect(() => {
+ const getUrl = ({url}: {url: string | null}) => {
+ if (url !== null) processLink(url)
+ }
+ Linking.addEventListener('url', getUrl)
+ return () => Linking.removeAllListeners('url')
+ }, [processLink])
+
+ // app is closed
+ React.useEffect(() => {
+ const getInitialURL = async () => {
+ const url = await Linking.getInitialURL()
+ if (url !== null) processLink(url)
+ }
+ getInitialURL()
+ }, [processLink])
+}
diff --git a/apps/wallet-mobile/src/features/Receive/common/useStrings.tsx b/apps/wallet-mobile/src/features/Receive/common/useStrings.tsx
index 8330b98faa..5a4f056ba5 100644
--- a/apps/wallet-mobile/src/features/Receive/common/useStrings.tsx
+++ b/apps/wallet-mobile/src/features/Receive/common/useStrings.tsx
@@ -30,6 +30,10 @@ export const useStrings = () => {
infoAddressLimit: intl.formatMessage(messages.infoAddressLimit),
multiplePresentation: intl.formatMessage(messages.multiplePresentation),
multiplePresentationDetails: intl.formatMessage(messages.multiplePresentationDetails),
+ singleOrMultiple: intl.formatMessage(messages.singleOrMultiple),
+ singleOrMultipleDetails: intl.formatMessage(messages.singleOrMultipleDetails),
+ selectMultiple: intl.formatMessage(messages.selectMultiple),
+ singleAddressWallet: intl.formatMessage(messages.singleAddressWallet),
yoroiZendesk: intl.formatMessage(messages.yoroiZendesk),
ok: intl.formatMessage(messages.ok),
}
@@ -142,6 +146,23 @@ export const messages = defineMessages({
defaultMessage:
'!!!Enables Yoroi to manage various addresses in one place, enhancing privacy and providing organisational benefits.',
},
+ singleOrMultiple: {
+ id: 'components.receive.receivescreen.singleOrMultiple',
+ defaultMessage: '!!!Single or multiple address?',
+ },
+ singleOrMultipleDetails: {
+ id: 'components.receive.receivescreen.singleOrMultipleDetails',
+ defaultMessage:
+ '!!!Single keeps things simple and secure. Multiple may offer some extra privacy. For most users, single address is the way to go! You can always change it in settings.',
+ },
+ selectMultiple: {
+ id: 'components.receive.receivescreen.selectMultiple',
+ defaultMessage: '!!!Select multiple instead',
+ },
+ singleAddressWallet: {
+ id: 'components.receive.receivescreen.singleAddressWallet',
+ defaultMessage: '!!!Single address wallet',
+ },
ok: {
id: 'global.ok',
defaultMessage: '!!!OK',
diff --git a/apps/wallet-mobile/src/features/Receive/useCases/DescribeSelectedAddressScreen.tsx b/apps/wallet-mobile/src/features/Receive/useCases/DescribeSelectedAddressScreen.tsx
index b8a849158b..c8f67649f3 100644
--- a/apps/wallet-mobile/src/features/Receive/useCases/DescribeSelectedAddressScreen.tsx
+++ b/apps/wallet-mobile/src/features/Receive/useCases/DescribeSelectedAddressScreen.tsx
@@ -2,25 +2,36 @@ import {useFocusEffect} from '@react-navigation/native'
import {useTheme} from '@yoroi/theme'
import _ from 'lodash'
import * as React from 'react'
-import {ScrollView, StyleSheet, View} from 'react-native'
+import {ScrollView, StyleSheet, Text, View} from 'react-native'
import {SafeAreaView} from 'react-native-safe-area-context'
import Icon from '../../../assets/img/copy.png'
-import {Button, Spacer} from '../../../components'
+import {Button, Spacer, useModal} from '../../../components'
+import {useStatusBar} from '../../../components/hooks/useStatusBar'
import {useCopy} from '../../../legacy/useCopy'
import {useMetrics} from '../../../metrics/metricsManager'
import {isEmptyString} from '../../../utils'
+import {useAddressModeManager} from '../../../wallet-manager/useAddressModeManager'
import {AddressDetailCard} from '../common/AddressDetailCard/AddressDetailCard'
import {useReceive} from '../common/ReceiveProvider'
import {SkeletonAdressDetail} from '../common/SkeletonAddressDetail/SkeletonAddressDetail'
+import {useMultipleAddressesInfo} from '../common/useMultipleAddressesInfo'
import {useNavigateTo} from '../common/useNavigateTo'
+import {useReceiveAddressesStatus} from '../common/useReceiveAddressesStatus'
import {useStrings} from '../common/useStrings'
+import {QRs} from '../illustrations/QRs'
export const DescribeSelectedAddressScreen = () => {
const strings = useStrings()
const {styles, colors} = useStyles()
const navigate = useNavigateTo()
const {selectedAddress} = useReceive()
+ const {isSingle, addressMode} = useAddressModeManager()
+ const addresses = useReceiveAddressesStatus(addressMode)
+ const isMultipleAddressesUsed = addresses.used.length > 1
+ const {isShowingMultipleAddressInfo} = useMultipleAddressesInfo()
+ const {openModal} = useModal()
+
const {track} = useMetrics()
const [isCopying, copy] = useCopy()
@@ -31,6 +42,13 @@ export const DescribeSelectedAddressScreen = () => {
copy(selectedAddress)
}
+ React.useEffect(() => {
+ isSingle &&
+ isMultipleAddressesUsed &&
+ isShowingMultipleAddressInfo &&
+ openModal(strings.singleOrMultiple, , modalHeight)
+ }, [isShowingMultipleAddressInfo, isSingle, isMultipleAddressesUsed, openModal, strings.singleOrMultiple])
+
useFocusEffect(
React.useCallback(() => {
track.receivePageViewed()
@@ -73,8 +91,57 @@ export const DescribeSelectedAddressScreen = () => {
)
}
+const modalHeight = 520
+const Modal = () => {
+ const {styles, colors} = useStyles()
+ const strings = useStrings()
+ const {enableMultipleMode} = useAddressModeManager()
+
+ const {hideMultipleAddressesInfo} = useMultipleAddressesInfo()
+
+ const {closeModal} = useModal()
+
+ const handleOnMultiple = () => {
+ enableMultipleMode()
+ handleOnSingle()
+ }
+
+ const handleOnSingle = () => {
+ hideMultipleAddressesInfo()
+ closeModal()
+ }
+
+ return (
+
+
+
+ {strings.singleOrMultipleDetails}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
const useStyles = () => {
const {theme} = useTheme()
+ useStatusBar()
const styles = StyleSheet.create({
root: {
@@ -82,6 +149,19 @@ const useStyles = () => {
backgroundColor: theme.color.gray.min,
padding: 16,
},
+ modal: {
+ flex: 1,
+ backgroundColor: theme.color['bottom-sheet-background'],
+ alignItems: 'center',
+ justifyContent: 'space-between',
+ },
+ buttonContainer: {
+ alignSelf: 'stretch',
+ backgroundColor: theme.color.gray.min,
+ },
+ details: {
+ ...theme.typography['body-1-l-regular'],
+ },
address: {
flex: 1,
alignItems: 'center',
@@ -93,6 +173,7 @@ const useStyles = () => {
const colors = {
buttonBackgroundBlue: theme.color.primary[600],
+ details: theme.color.gray[900],
}
return {styles, colors} as const
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx
index c561f28b06..85cf0aa9c1 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx
@@ -1,4 +1,5 @@
import {useFocusEffect} from '@react-navigation/native'
+import {isString} from '@yoroi/common'
import {getPoolUrlByProvider} from '@yoroi/swap'
import {useTheme} from '@yoroi/theme'
import {Balance, Swap} from '@yoroi/types'
@@ -8,6 +9,7 @@ import {capitalize} from 'lodash'
import React from 'react'
import {useIntl} from 'react-intl'
import {StyleSheet, TouchableOpacity, View} from 'react-native'
+import Config from 'react-native-config'
import {FlatList} from 'react-native-gesture-handler'
import {
@@ -58,6 +60,9 @@ const findCompletedOrderTx = (transactions: TransactionInfo[]): MappedRawOrder[]
.reduce((acc, sentTx) => {
const result: TxMetadataInfo = {}
receivedTransactions.forEach((receivedTx) => {
+ if (hasFrontendFeeReturn(receivedTx)) {
+ return
+ }
receivedTx.inputs.forEach((input) => {
if (Boolean(input.id) && input?.id?.slice(0, -1) === sentTx?.id && receivedTx.inputs.length > 1) {
result['id'] = sentTx?.id
@@ -77,6 +82,18 @@ const findCompletedOrderTx = (transactions: TransactionInfo[]): MappedRawOrder[]
return filteredTx.filter((tx) => tx.metadata !== null).sort(compareByDate)
}
+const hasFrontendFeeReturn = (tx: TransactionInfo): boolean => {
+ const addresses = tx.inputs.map((input) => input.address).filter(Boolean)
+
+ const frontendFeeMainnetAddress = Config['FRONTEND_FEE_ADDRESS_MAINNET']
+ const frontendFeePreprodAddress = Config['FRONTEND_FEE_ADDRESS_PREPROD']
+
+ const containsMainnetFeeAddress = isString(frontendFeeMainnetAddress) && addresses.includes(frontendFeeMainnetAddress)
+ const containsPreprodFeeAddress = isString(frontendFeePreprodAddress) && addresses.includes(frontendFeePreprodAddress)
+
+ return containsMainnetFeeAddress || containsPreprodFeeAddress
+}
+
export const CompletedOrders = () => {
const strings = useStrings()
const styles = useStyles()
diff --git a/apps/wallet-mobile/src/i18n/locales/en-US.json b/apps/wallet-mobile/src/i18n/locales/en-US.json
index 30df55a86d..c5601ca889 100644
--- a/apps/wallet-mobile/src/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/i18n/locales/en-US.json
@@ -239,6 +239,10 @@
"components.receive.receivescreen.usedAddress": "Used",
"components.receive.receivescreen.multiplePresentation": "Meet multiple addresses in Yoroi",
"components.receive.receivescreen.multiplePresentationDetails": "Enables Yoroi to manage various addresses in one place, enhancing privacy and providing organisational benefits.",
+ "components.receive.receivescreen.singleOrMultiple": "Single or multiple address?",
+ "components.receive.receivescreen.singleOrMultipleDetails": "Single keeps things simple and secure. Multiple may offer some extra privacy. For most users, single address is the way to go! You can always change it in settings.",
+ "components.receive.receivescreen.selectMultiple": "Select multiple instead",
+ "components.receive.receivescreen.singleAddressWallet": "Single address wallet",
"components.receive.receivescreen.learnAboutYoroi": "Learn more about this in Yoroi Zendesk",
"components.receive.receivescreen.infoAddressLimit": "You have already reached your 20 addresses limit. If you need to operate with more than 20 addresses, reach out to us via ",
"components.send.addressreaderqr.text": "Scan recipients QR code to add a wallet address",
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts
index 825994841d..4b329290ae 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts
@@ -322,7 +322,7 @@ export const generateCIP30UtxoCbor = async (utxo: RawUtxo) => {
const txHash = await CardanoMobile.TransactionHash.fromBytes(Buffer.from(utxo.tx_hash, 'hex'))
if (!txHash) throw new Error('Invalid tx hash')
- const index = parseInt(utxo.utxo_id.split(':')[1] || '0', 10)
+ const index = utxo.tx_index
const input = await CardanoMobile.TransactionInput.new(txHash, index)
const address = await CardanoMobile.Address.fromBech32(utxo.receiver)
if (!address) throw new Error('Invalid address')
diff --git a/packages/links/README.md b/packages/links/README.md
index 30bdf03937..753f6d8acb 100644
--- a/packages/links/README.md
+++ b/packages/links/README.md
@@ -1,16 +1,20 @@
# @yoroi/links
## Overview
+
This package provides type-safe way to create and parse cryptocurrency-related links based on its URI definition (ABNF). It is designed to support different types of operations. It supports Cardano operations such as claims and legacy transfers within its blockchain ecosystem. It also allows to interpret and build crypto links.
## Features
+
- **Custom URI Scheme Handling**: Supports the 'web+cardano' URI scheme, tailored for Cardano blockchain interactions.
- **Type-Safe Link Creation and Parsing**: Utilizes TypeScript for ensuring the integrity and correctness of link structures.
- **Configurable for Different Operations/Chains**: Includes configurations for claim operations (`configCardanoClaimV1`) and legacy transfers (`configCardanoLegacyTransfer`), it can be extended.
- **Yoroi Deep Links**: Supports the 'yoroi' URI scheme, tailored for interation with Yoroi.
## Installation
+
How to install the package, e.g., via npm or yarn:
+
```bash
npm install @yoroi/links
# or
@@ -18,99 +22,115 @@ yarn add @yoroi/links
```
## Cardano Usage
+
### Importing the Module
+
```typescript
-import { linksCardanoModuleMaker, configCardanoClaimV1 } from '@yoroi/links';
+import {linksCardanoModuleMaker, configCardanoClaimV1} from '@yoroi/links'
```
### How to create a link
+
```typescript
-const { create } = linksCardanoModuleMaker();
+const {create} = linksCardanoModuleMaker()
const cardanoLink = create({
config: configCardanoClaimV1,
params: {
- faucet_url: "https://someendpoint/airdrop",
- code: "CardanoSummit2024",
- other: "other param"
- }
-});
+ faucet_url: 'https://someendpoint/airdrop',
+ code: 'CardanoSummit2024',
+ other: 'other param',
+ },
+})
-console.log(cardanoLink.link);
+console.log(cardanoLink.link)
```
### How to parse a link
+
```typescript
-const { parse } = linksCardanoModuleMaker();
+const {parse} = linksCardanoModuleMaker()
-const parsedLink = parse('web+cardano://claim/v1?code=123&faucet_url=http://example.com');
-console.log(parsedLink);
+const parsedLink = parse(
+ 'web+cardano://claim/v1?code=123&faucet_url=http://example.com',
+)
+console.log(parsedLink)
```
### API reference
-#### Interface
+#### Interface
+
- `create`: Creates a crypto link based on the provided configuration and parameters.
- `parse`: Parses a given string into a Link object if supported, otherwise will throw.
#### Built-in configurations
+
- `configCardanoClaimV1`: Configuration for Cardano `claim` operations. [CIP99](https://github.com/cardano-foundation/CIPs/pull/546/files)
- `configCardanoLegacyTransfer`: Configuration for Cardano `legacy` transfers. [CIP13](https://cips.cardano.org/cips/cip13/)
#### Supported Schemes and Authorities
-| Scheme | Authority | Description |
-|----------------|-----------|---------------------------------------------|
-| `web+cardano` | `claim` | Used for proof of onboarding / airdrops |
-| `web+cardano` | ` ` | Used for legacy payment requests |
-
+| Scheme | Authority | Description |
+| ------------- | --------- | --------------------------------------- |
+| `web+cardano` | `claim` | Used for proof of onboarding / airdrops |
+| `web+cardano` | ` ` | Used for legacy payment requests |
## Yoroi Usage
+
+**Important** Yoroi uses in query string arrays as name[index], e.g `whateverArray[0]=1&whateverArray[1]=`
+
### Importing the Module
+
```typescript
-import { linksYoroiModuleMaker, linksCardanoModuleMaker, configCardanoLegacyTransfer } from '@yoroi/links';
+import {
+ linksYoroiModuleMaker,
+ linksCardanoModuleMaker,
+ configCardanoLegacyTransfer,
+} from '@yoroi/links'
```
### How to create a link
+
```typescript
-const { create } = linksCardanoModuleMaker();
-const { transfer } = linksYoroiModuleMaker('yoroi');
+const {create} = linksCardanoModuleMaker()
+const {transfer} = linksYoroiModuleMaker('yoroi')
const cardanoLink = create({
config: configCardanoLegacyTransfer,
params: {
amount: 1,
- address: "$stackchain"
- }
-});
+ address: '$stackchain',
+ },
+})
const yoroiPaymentRequestWithAdaLink = transfer.request.adaWithLink({
link: cardanoLink.link,
business: 'exchange',
partnerId: 'encryptus',
authorization: 'uuid-v4',
- redirectTo: 'https://my.amazing.web/?amountRequested=1&session=03bf4dd213d'
+ redirectTo: 'https://my.amazing.web/?amountRequested=1&session=03bf4dd213d',
})
-console.log(yoroiPaymentRequestWithAdaLink);
+console.log(yoroiPaymentRequestWithAdaLink)
```
### Supported Schemes and Authorities
-| Scheme | Authority | Description |
-|-----------------|------------|---------------------------------------------|
-| `yoroi` `https` | `transfer` | Used for requesting payments |
-| `yoroi` `https` | `exchange` | Used for iteracting with exchanges |
-| `yoroi` `https` | `dapp` | **soon** |
-
+| Scheme | Authority | Path | Description |
+| --------------- | ------------------ | ---------- | ---------------------------------- |
+| `yoroi` `https` | `yoroi-wallet.com` | `transfer` | Used for requesting payments |
+| `yoroi` `https` | `yoroi-wallet.com` | `exchange` | Used for iteracting with exchanges |
+| `yoroi` `https` | `yoroi-wallet.com` | `dapp` | **soon** |
## Testing the deep & universal links developing
+
```shell
# iOS
-xcrun simctl openurl booted "https://yoroi-wallet.com/w1/transfer/request/ada?amount=1&address=$stackchain"
+xcrun simctl openurl booted "https://yoroi-wallet.com/w1/transfer/request/ada?target[0]=%24stackchain"
# Android
-adb shell am start -W -a android.intent.action.VIEW -d "yoroi://yoroi-wallet.com/w1/transfer/request/ada?amount=1&address=$stackchain"
+adb shell am start -W -a android.intent.action.VIEW -d "yoroi://yoroi-wallet.com/w1/transfer/request/ada?amount=1&address=%24$stackchain"
```
## Schemas
@@ -121,15 +141,16 @@ Yoroi validates deeplinks and univeral links in a stricted way, missing params i
This schema is designed for adding information about how Yoroi should behave, even though all are flagged as optional, it will change how Yoroi respondes to it, and for some funnels it might block the user, or trigger some red alerts about dangerous actions. It includes the following fields:
-- `business`: Only 'exchange' for now, it is used only to display the right UI, based on partner.
-- `isProduction`: A boolean indicating whether it should be using production (mainnet), or if testnet wallets and actions are ok.
-- `partnerId`: A string with a maximum length of 20 characters. I.e "encryptus".
+- `isSandbox`: A boolean indicating the environment, when `true` deeplinks only work on non-production builds.
+- `isTestnet`: A boolean that restrics whether it should list only `mainnet` wallets or testnets wallets.
+- `appId`: A string with a maximum length of 40 characters that identifies that app.
- `redirectTo`: Yoroi may present a link button or automatic redirect the user based on funnel.
-- `authorization`: All actions initiated within Yoroi will provide an authorization, that works along with the wallet used.
+- `authorization`: All actions initiated within Yoroi will provide an authorization, that works along with the wallet used.
- `message`: Yoroi may present this message for some actions, be descriptive and concise around the action needed from Yoroi, otherwise users might reject your request.
-- `walletName`: As the authorization, when provided, is expected back. Otherwise just set `isProduction` so Yoroi will know how to ask users to open their right wallet.
+- `walletId`: As the authorization, when provided, is expected back. Otherwise just set `isProduction` so Yoroi will know how to ask users to open their right wallet.
+- `signature`: Partner signature, it changes many behaviours inside Yoroi, specially regarding warning and dangerous messages.
-### `LinksYoroiExchangeShowCreateResulSchema`
+### `LinksYoroiExchangeShowCreateResultSchema`
This schema validates data for the creation result of a order to exchange coins, the link includes the following fields:
@@ -137,9 +158,9 @@ This schema validates data for the creation result of a order to exchange coins,
- `coin`: The coin ticker, Cardano ADA.
- `fiatAmount`: The amount of fiat currency.
- `fiat`: The fiat ticker, ie. USD.
-- `status`: 'success' | 'error' Indicates to Yoroi the message to display, if you need to include an explanation use the `message` param.
+- `status`: 'success' | 'failed' | 'pending' Indicates to Yoroi the message to display, if you need to include an explanation use the `message` param.
- It also merges all fields from `PartnerInfoSchema`.
-
+- `orderType`: 'buy' | 'sell' The order type.
### `LinksYoroiTransferRequestAdaSchema`
@@ -149,20 +170,20 @@ This schema is for validating transfer requests of ADA and includes the followin
- `receiver`: A string with a maximum length of 256 characters, it can be a wallet address or any domain name for your wallet address.
- `datum` (optional) A CBOR string with a maximum length of 1024 characters.
- `amounts`: An array of objects (with a minimum of 1 and maximum of 10 elements) where each object contains:
- - `tokenId`: A string with a maximum length of 256 characters, represented by `policyId` and `assetName` in hex, separated by a `.`, for ADA pass `.` only.
+ - `tokenId`: A string with a maximum length of 256 characters, represented by `policyId` and `assetName` in hex, separated by a `.`, for ADA both are valid `.` or ` ` empty string.
- `quantity`: A string with a maximum length of 80 characters, atomic, Cardano Lovelaces.
- `memo` (optional): A string with a maximum length of 256 characters, stored in the wallet local storage wallet, it is not included in the transaction.
- It also merges all fields from `PartnerInfoSchema`.
-
-### `LinksYoroiTransferRequestAdaWithUrlSchema`
+### `LinksYoroiTransferRequestAdaWithLinkSchema`
This schema validates transfer requests that include a URL and has the following fields:
- `link`: A URL string with a maximum length of 2048 characters, it supports the CIP13 for Cardano legacy transfer, that can also be created by this module.
## For more
-- [BIP-21](https://github.com/bitcoin/bips/blob/master/bip-0021.mediawiki)
+
+- [BIP-21](https://github.com/bitcoin/bips/blob/master/bip-0021.mediawiki)
- [EIP-681](https://eips.ethereum.org/EIPS/eip-681)
- [URI](https://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=&cad=rja&uact=8&ved=2ahUKEwiGtpWV-eOCAxVSmokEHdBOAn0QFnoECBQQAQ&url=https%3A%2F%2Fen.wikipedia.org%2Fwiki%2FUniform_Resource_Identifier&usg=AOvVaw2i8uSyn7gtMV9bW4Nmh4dK&opi=89978449)
- [ABNF](https://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=&cad=rja&uact=8&ved=2ahUKEwjYq-3u-OOCAxVxvokEHTx1CqsQFnoECBIQAQ&url=https%3A%2F%2Fen.wikipedia.org%2Fwiki%2FAugmented_Backus%25E2%2580%2593Naur_form&usg=AOvVaw3GEFuH6Hby-NUw6cxQpQUz&opi=89978449)
diff --git a/packages/links/package.json b/packages/links/package.json
index a7a2374024..0c601e30d8 100644
--- a/packages/links/package.json
+++ b/packages/links/package.json
@@ -1,6 +1,6 @@
{
"name": "@yoroi/links",
- "version": "1.5.1",
+ "version": "1.5.3",
"description": "The package for managing links of Yoroi SDK",
"keywords": [
"yoroi",
diff --git a/packages/links/src/index.ts b/packages/links/src/index.ts
index 7d130b0c1b..450590aa4e 100644
--- a/packages/links/src/index.ts
+++ b/packages/links/src/index.ts
@@ -5,3 +5,8 @@ export * from './cardano/constants'
export * from './yoroi/module'
export * from './yoroi/types'
export * from './yoroi/constants'
+export * from './yoroi/links-parser'
+
+export * from './translators/reactjs/hooks/useLinks'
+export * from './translators/reactjs/provider/LinksProvider'
+export * from './translators/reactjs/state/state'
diff --git a/packages/links/src/translators/reactjs/hooks/useLinks.tsx b/packages/links/src/translators/reactjs/hooks/useLinks.tsx
new file mode 100644
index 0000000000..01fffbe690
--- /dev/null
+++ b/packages/links/src/translators/reactjs/hooks/useLinks.tsx
@@ -0,0 +1,5 @@
+import * as React from 'react'
+
+import {LinksContext} from '../provider/LinksProvider'
+
+export const useLinks = () => React.useContext(LinksContext)
diff --git a/packages/links/src/translators/reactjs/provider/LinksProvider.test.tsx b/packages/links/src/translators/reactjs/provider/LinksProvider.test.tsx
new file mode 100644
index 0000000000..e6be8a146f
--- /dev/null
+++ b/packages/links/src/translators/reactjs/provider/LinksProvider.test.tsx
@@ -0,0 +1,71 @@
+import * as React from 'react'
+import {renderHook, act} from '@testing-library/react-hooks'
+
+import {enableMapSet} from 'immer'
+enableMapSet()
+
+import {LinksProvider} from './LinksProvider'
+import {useLinks} from '../hooks/useLinks'
+import {mocks} from '../state/state.mocks'
+
+describe('LinksProvider', () => {
+ beforeEach(() => {
+ jest.clearAllMocks()
+ })
+
+ it('AuthorizationsChanged', () => {
+ const wrapper = ({children}: any) => (
+ {children}
+ )
+
+ const {result} = renderHook(() => useLinks(), {
+ wrapper,
+ })
+
+ act(() => {
+ result.current.authorizationsChanged('walletId', 'authorization')
+ })
+
+ expect(result.current.authorizations).toEqual(
+ new Map([['walletId', 'authorization']]),
+ )
+ })
+
+ it('ActionStarted', () => {
+ const wrapper = ({children}: any) => (
+ {children}
+ )
+
+ const {result} = renderHook(() => useLinks(), {
+ wrapper,
+ })
+
+ act(() => {
+ result.current.actionStarted({
+ info: mocks.exchangeActionInfo,
+ isTrusted: false,
+ })
+ })
+
+ expect(result.current.action).toEqual({
+ info: mocks.exchangeActionInfo,
+ isTrusted: false,
+ })
+ })
+
+ it('ActionFinished', () => {
+ const wrapper = ({children}: any) => (
+ {children}
+ )
+
+ const {result} = renderHook(() => useLinks(), {
+ wrapper,
+ })
+
+ act(() => {
+ result.current.actionFinished()
+ })
+
+ expect(result.current.action).toBeNull()
+ })
+})
diff --git a/packages/links/src/translators/reactjs/provider/LinksProvider.tsx b/packages/links/src/translators/reactjs/provider/LinksProvider.tsx
new file mode 100644
index 0000000000..491fb15fde
--- /dev/null
+++ b/packages/links/src/translators/reactjs/provider/LinksProvider.tsx
@@ -0,0 +1,57 @@
+import * as React from 'react'
+import {
+ LinksActionType,
+ LinksActions,
+ LinksState,
+ defaultLinksActions,
+ defaultLinksState,
+ linksReducer,
+} from '../state/state'
+import {LinksYoroiAction} from '../../../yoroi/types'
+
+type LinksProviderContext = React.PropsWithChildren
+
+const initialLinksProvider: LinksProviderContext = {
+ ...defaultLinksState,
+ ...defaultLinksActions,
+}
+
+export const LinksContext =
+ React.createContext(initialLinksProvider)
+
+export const LinksProvider = ({
+ children,
+ initialState,
+}: {
+ children: React.ReactNode
+ initialState?: LinksState
+}) => {
+ const [state, dispatch] = React.useReducer(linksReducer, {
+ ...defaultLinksState,
+ ...initialState,
+ })
+ const actions = React.useRef({
+ authorizationsChanged: (walletId: string, authorization: string) => {
+ dispatch({
+ type: LinksActionType.AthorizationsChanged,
+ walletId,
+ authorization,
+ })
+ },
+ actionFinished: () => {
+ dispatch({type: LinksActionType.ActionFinished})
+ },
+ actionStarted: (action: LinksYoroiAction) => {
+ dispatch({type: LinksActionType.ActionStarted, action})
+ },
+ }).current
+
+ const context = React.useMemo(
+ () => ({...state, ...actions}),
+ [state, actions],
+ )
+
+ return (
+ {children}
+ )
+}
diff --git a/packages/links/src/translators/reactjs/state/state.mocks.ts b/packages/links/src/translators/reactjs/state/state.mocks.ts
new file mode 100644
index 0000000000..acf3a58794
--- /dev/null
+++ b/packages/links/src/translators/reactjs/state/state.mocks.ts
@@ -0,0 +1,30 @@
+import {freeze} from 'immer'
+
+import {LinksYoroiActionInfo} from '../../../yoroi/types'
+
+const exchangeActionInfo: LinksYoroiActionInfo = {
+ feature: 'exchange',
+ version: 1,
+ useCase: 'order/show-create-result',
+ params: {
+ coin: 'ADA',
+ coinAmount: 1,
+ fiat: 'USD',
+ fiatAmount: 1,
+ provider: 'encryputs',
+ status: 'success',
+ appId: 'a386e806-92f4-4796-ad61-7a1485b6e745',
+ authorization: 'fca6fc26-abc6-4cdc-bdce-5910cc3c0a01',
+ isSandbox: true,
+ message: 'Your order number 131234 is under processing, bare with us.',
+ redirectTo: 'https://yoroi-wallet.com/about',
+ orderType: 'buy',
+ },
+}
+
+export const mocks = freeze(
+ {
+ exchangeActionInfo,
+ },
+ true,
+)
diff --git a/packages/links/src/translators/reactjs/state/state.test.ts b/packages/links/src/translators/reactjs/state/state.test.ts
new file mode 100644
index 0000000000..8593832c01
--- /dev/null
+++ b/packages/links/src/translators/reactjs/state/state.test.ts
@@ -0,0 +1,52 @@
+import {enableMapSet} from 'immer'
+
+import {
+ linksReducer,
+ defaultLinksState,
+ LinksActionType,
+ LinksAction,
+} from './state'
+import {mocks} from './state.mocks'
+
+enableMapSet()
+
+describe('linksReducer', () => {
+ it('should handle ActionStarted', () => {
+ const action: LinksAction = {
+ type: LinksActionType.ActionStarted,
+ action: {
+ info: mocks.exchangeActionInfo,
+ isTrusted: true,
+ },
+ }
+
+ const newState = linksReducer(defaultLinksState, action)
+
+ expect(newState.action).toEqual(action.action)
+ })
+
+ it('should handle ActionFinished', () => {
+ const action: LinksAction = {
+ type: LinksActionType.ActionFinished,
+ }
+
+ const newState = linksReducer(defaultLinksState, action)
+
+ // Assert the expected changes in the state
+ expect(newState.action).toBeNull()
+ })
+
+ it('should handle AthorizationsChanged', () => {
+ const walletId = 'exampleWalletId'
+ const authorization = 'exampleAuthorization'
+ const action: LinksAction = {
+ type: LinksActionType.AthorizationsChanged,
+ walletId,
+ authorization,
+ }
+
+ const newState = linksReducer(defaultLinksState, action)
+
+ expect(newState.authorizations.get(walletId)).toEqual(authorization)
+ })
+})
diff --git a/packages/links/src/translators/reactjs/state/state.ts b/packages/links/src/translators/reactjs/state/state.ts
new file mode 100644
index 0000000000..50123cda94
--- /dev/null
+++ b/packages/links/src/translators/reactjs/state/state.ts
@@ -0,0 +1,78 @@
+import {Nullable} from '@yoroi/types'
+import {freeze, produce} from 'immer'
+
+import {LinksYoroiAction} from '../../../yoroi/types'
+
+export type LinksState = Readonly<{
+ // walletId -> authorization (handle 1 per wallet at time)
+ authorizations: ReadonlyMap
+
+ action: Nullable
+}>
+
+export type LinksActions = Readonly<{
+ actionStarted: (action: LinksYoroiAction) => void
+ actionFinished: () => void
+ authorizationsChanged: (walletId: string, authorizations: string) => void
+}>
+
+export enum LinksActionType {
+ ActionStarted = 'actionStarted',
+ ActionFinished = 'actionFinished',
+ AthorizationsChanged = 'authorizationsChanged',
+}
+
+export type LinksAction =
+ | {
+ type: LinksActionType.ActionStarted
+ action: LinksYoroiAction
+ }
+ | {
+ type: LinksActionType.ActionFinished
+ }
+ | {
+ type: LinksActionType.AthorizationsChanged
+ walletId: string
+ authorization: string
+ }
+
+export const defaultLinksState: LinksState = freeze(
+ {
+ action: null,
+ authorizations: new Map(),
+ },
+ true,
+)
+
+export const defaultLinksActions: LinksActions = freeze(
+ {
+ actionFinished: missingInit,
+ actionStarted: missingInit,
+ authorizationsChanged: missingInit,
+ },
+ true,
+)
+
+export const linksReducer = (
+ state: Readonly,
+ action: Readonly,
+) => {
+ return produce(state, (draft) => {
+ switch (action.type) {
+ case LinksActionType.ActionStarted:
+ draft.action = action.action
+ break
+ case LinksActionType.ActionFinished:
+ draft.action = null
+ break
+ case LinksActionType.AthorizationsChanged:
+ draft.authorizations.set(action.walletId, action.authorization)
+ break
+ }
+ })
+}
+
+/* istanbul ignore next */
+function missingInit() {
+ console.error('[@yoroi/links] missing initialization')
+}
diff --git a/packages/links/src/yoroi/constants.ts b/packages/links/src/yoroi/constants.ts
index 335139b1ec..313081bb07 100644
--- a/packages/links/src/yoroi/constants.ts
+++ b/packages/links/src/yoroi/constants.ts
@@ -6,7 +6,7 @@ export const configYoroiTransferRequestAda: Readonly<
authority: 'yoroi-wallet.com',
version: 'w1',
path: 'transfer/request/ada',
-}
+} as const
export const configYoroiTransferRequestAdaWithLink: Readonly<
Omit
@@ -14,12 +14,12 @@ export const configYoroiTransferRequestAdaWithLink: Readonly<
authority: 'yoroi-wallet.com',
version: 'w1',
path: 'transfer/request/ada-with-link',
-}
+} as const
-export const configYoroiOrderShowCreateResult: Readonly<
+export const configYoroiExchangeOrderShowCreateResult: Readonly<
Omit
> = {
authority: 'yoroi-wallet.com',
version: 'w1',
path: 'exchange/order/show-create-result',
-}
+} as const
diff --git a/packages/links/src/yoroi/helpers.test.ts b/packages/links/src/yoroi/helpers.test.ts
new file mode 100644
index 0000000000..988f75b2cb
--- /dev/null
+++ b/packages/links/src/yoroi/helpers.test.ts
@@ -0,0 +1,105 @@
+import {
+ convertObjectToSearchParams,
+ convertSearchParamsToObject,
+} from './helpers'
+
+describe('convertSearchParamsToObject', () => {
+ it('should convert URLSearchParams to object', () => {
+ const params = new URLSearchParams()
+ params.append('key1', 'value1')
+ params.append('key2', 'value2')
+ params.append('key3[0]', 'value3')
+ params.append('key3[1]', 'value4')
+
+ const result = convertSearchParamsToObject(params)
+
+ expect(result).toEqual({
+ key1: 'value1',
+ key2: 'value2',
+ key3: ['value3', 'value4'],
+ })
+ })
+
+ it('should handle JSON values', () => {
+ const params = new URLSearchParams()
+ params.append('key1', JSON.stringify({nestedKey: 'nestedValue'}))
+ params.append('key2', JSON.stringify([1, 2, 3]))
+
+ const result = convertSearchParamsToObject(params)
+
+ expect(result).toEqual({
+ key1: {nestedKey: 'nestedValue'},
+ key2: [1, 2, 3],
+ })
+ })
+
+ it('should handle non-JSON values', () => {
+ const params = new URLSearchParams()
+ params.append('key1', 'value1')
+ params.append('key2', 'value2')
+
+ const result = convertSearchParamsToObject(params)
+
+ expect(result).toEqual({
+ key1: 'value1',
+ key2: 'value2',
+ })
+ })
+
+ it('should handle array indices', () => {
+ const params = new URLSearchParams()
+ params.append('key[0]', 'value1')
+ params.append('key[1]', 'value2')
+
+ const result = convertSearchParamsToObject(params)
+
+ expect(result).toEqual({
+ key: ['value1', 'value2'],
+ })
+ })
+})
+
+describe('convertObjectToSearchParams', () => {
+ it('should convert object to URLSearchParams', () => {
+ const obj = {
+ key1: 'value1',
+ key2: 'value2',
+ key3: ['value3', 'value4'],
+ }
+
+ const result = convertObjectToSearchParams(obj)
+
+ expect(result.get('key1')).toBe('value1')
+ expect(result.get('key2')).toBe('value2')
+ expect(result.get('key3[0]')).toBe('value3')
+ expect(result.get('key3[1]')).toBe('value4')
+ })
+
+ it('should handle nested objects', () => {
+ const obj = {
+ key1: {nestedKey: 'nestedValue'},
+ key2: [1, 2, 3],
+ }
+
+ const result = convertObjectToSearchParams(obj)
+
+ expect(result.get('key1')).toBe(JSON.stringify({nestedKey: 'nestedValue'}))
+ expect(result.get('key2[0]')).toBe('1')
+ expect(result.get('key2[1]')).toBe('2')
+ expect(result.get('key2[2]')).toBe('3')
+ })
+
+ it('should handle non-string values', () => {
+ const obj = {
+ key1: 123,
+ key2: true,
+ key3: null,
+ }
+
+ const result = convertObjectToSearchParams(obj)
+
+ expect(result.get('key1')).toBe('123')
+ expect(result.get('key2')).toBe('true')
+ expect(result.get('key3')).toBe('null')
+ })
+})
diff --git a/packages/links/src/yoroi/helpers.ts b/packages/links/src/yoroi/helpers.ts
new file mode 100644
index 0000000000..005d2fff90
--- /dev/null
+++ b/packages/links/src/yoroi/helpers.ts
@@ -0,0 +1,58 @@
+export const convertSearchParamsToObject = (
+ params: URLSearchParams,
+): Record => {
+ const obj: Record = {}
+
+ params.forEach((value, key) => {
+ const decodedValue = decodeURIComponent(value)
+ // drop the index from the key if it exists e.g "targets[0]" -> "targets"
+ const isArray = key.match(/\[\d+\]$/)
+ const normalizedKey = key.replace(/\[\d+\]$/, '')
+
+ try {
+ const parsedValue = JSON.parse(decodedValue)
+ // check if the key (without index) already exists
+ if (obj.hasOwnProperty(normalizedKey)) {
+ obj[normalizedKey].push(parsedValue)
+ } else {
+ obj[normalizedKey] = isArray ? [parsedValue] : parsedValue
+ }
+ } catch (e) {
+ // it means it's not a JSON string
+ if (obj.hasOwnProperty(normalizedKey)) {
+ obj[normalizedKey].push(decodedValue)
+ } else {
+ obj[normalizedKey] = isArray ? [decodedValue] : decodedValue
+ }
+ }
+ })
+
+ return obj
+}
+
+export const convertObjectToSearchParams = (
+ obj: Record,
+): URLSearchParams => {
+ const queryParams = new URLSearchParams()
+ const appendParam = (key: string, value: unknown): void => {
+ if (Array.isArray(value)) {
+ value.forEach((item, index) => {
+ // for objects in an array, we'll stringify each object
+ // use a modified key to reflect the structure e.g. targets[0]
+ if (typeof item === 'object' && item !== null) {
+ appendParam(`${key}[${index}]`, JSON.stringify(item))
+ } else {
+ appendParam(`${key}[${index}]`, item)
+ }
+ })
+ } else if (typeof value === 'object' && value !== null) {
+ queryParams.append(key, JSON.stringify(value))
+ } else {
+ queryParams.append(key, String(value))
+ }
+ }
+ Object.entries(obj).forEach(([key, value]) => {
+ appendParam(key, value)
+ })
+ return queryParams
+}
diff --git a/packages/links/src/yoroi/links-builder.ts b/packages/links/src/yoroi/links-builder.ts
index 542065865b..5c1d4e8638 100644
--- a/packages/links/src/yoroi/links-builder.ts
+++ b/packages/links/src/yoroi/links-builder.ts
@@ -1,8 +1,8 @@
import {Links} from '@yoroi/types'
-import {z, ZodTypeAny} from 'zod'
+import {ZodTypeAny} from 'zod'
-import {linksCardanoModuleMaker} from '../cardano/module'
import {SchemaInfer} from './types'
+import {convertObjectToSearchParams} from './helpers'
export const linksYoroiBuilder = (
schema: T,
@@ -17,21 +17,7 @@ export const linksYoroiBuilder = (
)
}
- const queryParams = new URLSearchParams()
-
- const appendParam = (key: string, value: unknown) => {
- if (Array.isArray(value)) {
- value.forEach((item) => appendParam(key, item))
- } else if (typeof value === 'object') {
- queryParams.append(key, JSON.stringify(value))
- } else {
- queryParams.append(key, String(value))
- }
- }
-
- Object.entries(result.data).forEach(([key, value]) => {
- appendParam(key, value)
- })
+ const queryParams = convertObjectToSearchParams(result.data)
const {scheme, authority, path, version} = config
const url = new URL(
@@ -42,65 +28,3 @@ export const linksYoroiBuilder = (
return {create}
}
-
-const PartnerInfoSchema = z.object({
- business: z.literal('exchange').optional(),
- isProduction: z.boolean().optional(),
- partnerId: z.string().max(20).optional(),
- redirectTo: z.string().url().max(2048).optional(),
- authorization: z.string().max(256).optional(),
- message: z.string().max(256).optional(),
- walletName: z.string().max(40).optional(),
-})
-
-export const LinksYoroiExchangeShowCreateResulSchema = z
- .object({
- provider: z.string().max(20),
- coinAmount: z.number().nonnegative(),
- coin: z.string().max(20),
- fiatAmount: z.number().nonnegative(),
- fiat: z.string().max(20),
- status: z.string().max(20),
- })
- .merge(PartnerInfoSchema)
- .strict()
-
-export const LinksYoroiTransferRequestAdaSchema = z
- .object({
- targets: z
- .array(
- z.object({
- receiver: z.string().max(256),
- datum: z.string().max(1024).optional(),
- amounts: z
- .array(
- z.object({
- tokenId: z.string().max(256),
- quantity: z.string().max(80),
- }),
- )
- .max(10)
- .min(1),
- }),
- )
- .max(5)
- .min(1),
- memo: z.string().max(256).optional(),
- })
- .merge(PartnerInfoSchema)
- .strict()
-
-export const LinksYoroiTransferRequestAdaWithUrlSchema = z
- .object({
- link: z.string().url().max(2048),
- })
- .merge(PartnerInfoSchema)
- .strict()
- .refine((check) => {
- try {
- linksCardanoModuleMaker().parse(check.link)
- return true
- } catch {
- return false
- }
- })
diff --git a/packages/links/src/yoroi/links-parser.test.ts b/packages/links/src/yoroi/links-parser.test.ts
new file mode 100644
index 0000000000..ba4cb6c8bd
--- /dev/null
+++ b/packages/links/src/yoroi/links-parser.test.ts
@@ -0,0 +1,112 @@
+import {linksYoroiParser} from './links-parser'
+import {linksYoroiModuleMaker} from './module'
+
+describe('linksYoroiParser', () => {
+ it('should parse transfer request ada', () => {
+ const links = linksYoroiModuleMaker('https')
+ const requestAdaLink = links.transfer.request.ada({
+ targets: [
+ {
+ receiver: 'exampleReceiver1',
+ datum: 'DEADDEAD',
+ amounts: [
+ {
+ tokenId: 'exampleTokenId.name1',
+ quantity: '10',
+ },
+ ],
+ },
+ {
+ receiver: 'exampleReceiver2',
+ amounts: [
+ {
+ tokenId: 'exampleTokenId.name2',
+ quantity: '20',
+ },
+ ],
+ },
+ ],
+ memo: 'exampleMemo',
+ authorization: 'uuid-v4',
+ })
+ const result = linksYoroiParser(requestAdaLink)
+
+ expect(result).toEqual({
+ version: 1,
+ feature: 'transfer',
+ useCase: 'request/ada',
+ params: {
+ targets: [
+ {
+ receiver: 'exampleReceiver1',
+ datum: 'DEADDEAD',
+ amounts: [
+ {
+ tokenId: 'exampleTokenId.name1',
+ quantity: '10',
+ },
+ ],
+ },
+ {
+ receiver: 'exampleReceiver2',
+ amounts: [
+ {
+ tokenId: 'exampleTokenId.name2',
+ quantity: '20',
+ },
+ ],
+ },
+ ],
+ memo: 'exampleMemo',
+ authorization: 'uuid-v4',
+ },
+ })
+ })
+
+ it('should parse transfer request ada with link', () => {
+ const link =
+ 'yoroi://yoroi-wallet.com/w1/transfer/request/ada-with-link?link=web%2Bcardano%3Aaddr1qygnpgnmc4twqxe4qnj3pakudc0ysheqwflv8guwwlply7zptg3wjqz84kx3t4re4xpqvs3fu7mvsahwhyxd4q3qq90s7sgxnh%3Famount%3D10&authorization=uuid-v4'
+
+ const result = linksYoroiParser(link)
+
+ expect(result).toEqual({
+ version: 1,
+ feature: 'transfer',
+ useCase: 'request/ada-with-link',
+ params: {
+ link: 'web+cardano:addr1qygnpgnmc4twqxe4qnj3pakudc0ysheqwflv8guwwlply7zptg3wjqz84kx3t4re4xpqvs3fu7mvsahwhyxd4q3qq90s7sgxnh?amount=10',
+ authorization: 'uuid-v4',
+ },
+ })
+ })
+
+ it('should parse exchange show create result link', () => {
+ const link =
+ 'yoroi://yoroi-wallet.com/w1/exchange/order/show-create-result?provider=yoroi&coinAmount=10&coin=ADA&fiatAmount=100&fiat=USD&status=success&orderType=buy'
+
+ const result = linksYoroiParser(link)
+
+ expect(result).toEqual({
+ version: 1,
+ feature: 'exchange',
+ useCase: 'order/show-create-result',
+ params: {
+ provider: 'yoroi',
+ coinAmount: 10,
+ coin: 'ADA',
+ fiatAmount: 100,
+ fiat: 'USD',
+ status: 'success',
+ orderType: 'buy',
+ },
+ })
+ })
+
+ it('should return null for invalid link', () => {
+ const link = 'invalid-link'
+
+ const result = linksYoroiParser(link)
+
+ expect(result).toBeNull()
+ })
+})
diff --git a/packages/links/src/yoroi/links-parser.ts b/packages/links/src/yoroi/links-parser.ts
new file mode 100644
index 0000000000..98be334740
--- /dev/null
+++ b/packages/links/src/yoroi/links-parser.ts
@@ -0,0 +1,65 @@
+import {freeze} from 'immer'
+
+import {
+ LinksYoroiExchangeShowCreateResultSchema,
+ LinksYoroiTransferRequestAdaSchema,
+ LinksYoroiTransferRequestAdaWithLinkSchema,
+} from './validators'
+import {convertSearchParamsToObject} from './helpers'
+import {LinksYoroiActionInfo} from './types'
+
+export const linksYoroiParser = (
+ link: string,
+): Readonly | null => {
+ try {
+ const url = new URL(link)
+
+ switch (url.pathname) {
+ case `/w1/transfer/request/ada`: {
+ const objectFromParams = convertSearchParamsToObject(url.searchParams)
+ const params =
+ LinksYoroiTransferRequestAdaSchema.parse(objectFromParams)
+ return freeze(
+ {
+ version: 1,
+ feature: 'transfer',
+ useCase: 'request/ada',
+ params,
+ },
+ true,
+ )
+ }
+ case `/w1/transfer/request/ada-with-link`: {
+ const objectFromParams = convertSearchParamsToObject(url.searchParams)
+ const params =
+ LinksYoroiTransferRequestAdaWithLinkSchema.parse(objectFromParams)
+ return freeze(
+ {
+ version: 1,
+ feature: 'transfer',
+ useCase: 'request/ada-with-link',
+ params,
+ },
+ true,
+ )
+ }
+ case `/w1/exchange/order/show-create-result`: {
+ const objectFromParams = convertSearchParamsToObject(url.searchParams)
+ const params =
+ LinksYoroiExchangeShowCreateResultSchema.parse(objectFromParams)
+ return freeze(
+ {
+ version: 1,
+ feature: 'exchange',
+ useCase: 'order/show-create-result',
+ params,
+ },
+ true,
+ )
+ }
+ }
+ // NOTE: for now Yoroi just ignores invalid links
+ } catch (error) {}
+
+ return null
+}
diff --git a/packages/links/src/yoroi/module.test.ts b/packages/links/src/yoroi/module.test.ts
index 54b531109c..734a1098e0 100644
--- a/packages/links/src/yoroi/module.test.ts
+++ b/packages/links/src/yoroi/module.test.ts
@@ -4,7 +4,7 @@ import {linksYoroiModuleMaker} from './module'
import {
LinksYoroiExchangeShowCreateResultParams,
LinksYoroiTransferRequestAdaParams,
- LinksYoroiTransferRequestAdaWithUrlParams,
+ LinksYoroiTransferRequestAdaWithLinkParams,
} from './types'
describe('linksYoroiModuleMaker', () => {
@@ -19,6 +19,7 @@ describe('linksYoroiModuleMaker', () => {
fiatAmount: 100,
fiat: 'USD',
status: 'success',
+ orderType: 'buy',
}
const createOrderShowResultLink = exchange.order.showCreateResult(
@@ -26,7 +27,7 @@ describe('linksYoroiModuleMaker', () => {
)
const expected =
- 'yoroi://yoroi-wallet.com/w1/exchange/order/show-create-result?provider=yoroi&coinAmount=10&coin=ADA&fiatAmount=100&fiat=USD&status=success'
+ 'yoroi://yoroi-wallet.com/w1/exchange/order/show-create-result?provider=yoroi&coinAmount=10&coin=ADA&fiatAmount=100&fiat=USD&status=success&orderType=buy'
expect(createOrderShowResultLink).toEqual(expected)
})
@@ -46,6 +47,15 @@ describe('linksYoroiModuleMaker', () => {
},
],
},
+ {
+ receiver: 'exampleReceiver2',
+ amounts: [
+ {
+ tokenId: 'exampleTokenId2',
+ quantity: '20',
+ },
+ ],
+ },
],
memo: 'exampleMemo',
authorization: 'uuid-v4',
@@ -55,10 +65,10 @@ describe('linksYoroiModuleMaker', () => {
transferRequestAdaParams,
)
const expectedTransferRequestAdaLink =
- 'yoroi://yoroi-wallet.com/w1/transfer/request/ada?targets=%7B%22receiver%22%3A%22exampleReceiver%22%2C%22datum%22%3A%22DEADDEAD%22%2C%22amounts%22%3A%5B%7B%22tokenId%22%3A%22exampleTokenId%22%2C%22quantity%22%3A%2210%22%7D%5D%7D&memo=exampleMemo&authorization=uuid-v4'
+ 'yoroi://yoroi-wallet.com/w1/transfer/request/ada?targets%5B0%5D=%7B%22receiver%22%3A%22exampleReceiver%22%2C%22datum%22%3A%22DEADDEAD%22%2C%22amounts%22%3A%5B%7B%22tokenId%22%3A%22exampleTokenId%22%2C%22quantity%22%3A%2210%22%7D%5D%7D&targets%5B1%5D=%7B%22receiver%22%3A%22exampleReceiver2%22%2C%22amounts%22%3A%5B%7B%22tokenId%22%3A%22exampleTokenId2%22%2C%22quantity%22%3A%2220%22%7D%5D%7D&memo=exampleMemo&authorization=uuid-v4'
expect(transferRequestAdaLink).toEqual(expectedTransferRequestAdaLink)
- const wrongAdaLink: LinksYoroiTransferRequestAdaWithUrlParams = {
+ const wrongAdaLink: LinksYoroiTransferRequestAdaWithLinkParams = {
link: 'exampleLink',
authorization: 'uuid-v4',
}
@@ -73,7 +83,7 @@ describe('linksYoroiModuleMaker', () => {
},
})
- const requestAdaWithLinkParams: LinksYoroiTransferRequestAdaWithUrlParams =
+ const requestAdaWithLinkParams: LinksYoroiTransferRequestAdaWithLinkParams =
{
link: correctAdaLink.link,
authorization: 'uuid-v4',
diff --git a/packages/links/src/yoroi/module.ts b/packages/links/src/yoroi/module.ts
index 965f347d08..b3fa0a33d3 100644
--- a/packages/links/src/yoroi/module.ts
+++ b/packages/links/src/yoroi/module.ts
@@ -1,17 +1,17 @@
import {Links} from '@yoroi/types'
import {freeze} from 'immer'
+import {linksYoroiBuilder} from './links-builder'
import {
- LinksYoroiExchangeShowCreateResulSchema,
- LinksYoroiTransferRequestAdaSchema,
- LinksYoroiTransferRequestAdaWithUrlSchema,
- linksYoroiBuilder,
-} from './links-builder'
-import {
- configYoroiOrderShowCreateResult,
+ configYoroiExchangeOrderShowCreateResult,
configYoroiTransferRequestAda,
configYoroiTransferRequestAdaWithLink,
} from './constants'
+import {
+ LinksYoroiExchangeShowCreateResultSchema,
+ LinksYoroiTransferRequestAdaSchema,
+ LinksYoroiTransferRequestAdaWithLinkSchema,
+} from './validators'
export const linksYoroiModuleMaker = (
scheme: Links.YoroiUriConfig['scheme'],
@@ -19,8 +19,8 @@ export const linksYoroiModuleMaker = (
const exchange = {
order: {
showCreateResult: linksYoroiBuilder(
- LinksYoroiExchangeShowCreateResulSchema,
- {...configYoroiOrderShowCreateResult, scheme},
+ LinksYoroiExchangeShowCreateResultSchema,
+ {...configYoroiExchangeOrderShowCreateResult, scheme},
).create,
},
}
@@ -33,7 +33,7 @@ export const linksYoroiModuleMaker = (
}).create,
adaWithLink: linksYoroiBuilder(
- LinksYoroiTransferRequestAdaWithUrlSchema,
+ LinksYoroiTransferRequestAdaWithLinkSchema,
{
...configYoroiTransferRequestAdaWithLink,
scheme,
diff --git a/packages/links/src/yoroi/types.ts b/packages/links/src/yoroi/types.ts
index 5fdb267240..c5f2a83b71 100644
--- a/packages/links/src/yoroi/types.ts
+++ b/packages/links/src/yoroi/types.ts
@@ -1,18 +1,44 @@
import {ZodSchema} from 'zod'
+
import {
- LinksYoroiExchangeShowCreateResulSchema,
+ LinksYoroiExchangeShowCreateResultSchema,
LinksYoroiTransferRequestAdaSchema,
- LinksYoroiTransferRequestAdaWithUrlSchema,
-} from './links-builder'
+ LinksYoroiTransferRequestAdaWithLinkSchema,
+} from './validators'
export type SchemaInfer = T extends ZodSchema ? U : never
export type LinksYoroiExchangeShowCreateResultParams = SchemaInfer<
- typeof LinksYoroiExchangeShowCreateResulSchema
+ typeof LinksYoroiExchangeShowCreateResultSchema
>
export type LinksYoroiTransferRequestAdaParams = SchemaInfer<
typeof LinksYoroiTransferRequestAdaSchema
>
-export type LinksYoroiTransferRequestAdaWithUrlParams = SchemaInfer<
- typeof LinksYoroiTransferRequestAdaWithUrlSchema
+export type LinksYoroiTransferRequestAdaWithLinkParams = SchemaInfer<
+ typeof LinksYoroiTransferRequestAdaWithLinkSchema
>
+
+export type LinksYoroiActionInfo =
+ | {
+ version: 1
+ feature: 'transfer'
+ useCase: 'request/ada-with-link'
+ params: LinksYoroiTransferRequestAdaWithLinkParams
+ }
+ | {
+ version: 1
+ feature: 'transfer'
+ useCase: 'request/ada'
+ params: LinksYoroiTransferRequestAdaParams
+ }
+ | {
+ version: 1
+ feature: 'exchange'
+ useCase: 'order/show-create-result'
+ params: LinksYoroiExchangeShowCreateResultParams
+ }
+
+export type LinksYoroiAction = {
+ info: LinksYoroiActionInfo
+ isTrusted: boolean
+}
diff --git a/packages/links/src/yoroi/validators.ts b/packages/links/src/yoroi/validators.ts
new file mode 100644
index 0000000000..c5afe449d7
--- /dev/null
+++ b/packages/links/src/yoroi/validators.ts
@@ -0,0 +1,71 @@
+import z from 'zod'
+
+import {linksCardanoModuleMaker} from '../cardano/module'
+
+const PartnerInfoSchema = z.object({
+ isSandbox: z.boolean().optional(),
+ isTestnet: z.boolean().optional(),
+ appId: z.string().max(40).optional(),
+ redirectTo: z.string().url().max(2048).optional(),
+ message: z.string().max(256).optional(),
+ walletId: z.string().max(40).optional(),
+ authorization: z.string().max(256).optional(),
+ signature: z.string().max(256).optional(),
+})
+
+export const LinksYoroiExchangeShowCreateResultSchema = z
+ .object({
+ provider: z.string().max(20),
+ coinAmount: z.number().nonnegative(),
+ coin: z.string().max(20),
+ fiatAmount: z.number().nonnegative(),
+ fiat: z.string().max(20),
+ status: z.union([
+ z.literal('success'),
+ z.literal('pending'),
+ z.literal('failed'),
+ ]),
+ orderType: z.union([z.literal('buy'), z.literal('sell')]),
+ })
+ .merge(PartnerInfoSchema)
+ .strict()
+
+export const LinksYoroiTransferRequestAdaSchema = z
+ .object({
+ targets: z
+ .array(
+ z.object({
+ receiver: z.string().max(256),
+ datum: z.string().max(1024).optional(),
+ amounts: z
+ .array(
+ z.object({
+ tokenId: z.string().max(256),
+ quantity: z.string().max(80),
+ }),
+ )
+ .max(10)
+ .min(1),
+ }),
+ )
+ .max(5)
+ .min(1),
+ memo: z.string().max(256).optional(),
+ })
+ .merge(PartnerInfoSchema)
+ .strict()
+
+export const LinksYoroiTransferRequestAdaWithLinkSchema = z
+ .object({
+ link: z.string().url().max(2048),
+ })
+ .merge(PartnerInfoSchema)
+ .strict()
+ .refine((check) => {
+ try {
+ linksCardanoModuleMaker().parse(check.link)
+ return true
+ } catch {
+ return false
+ }
+ })
diff --git a/packages/swap/package.json b/packages/swap/package.json
index c873c25d0a..3632d1f06b 100644
--- a/packages/swap/package.json
+++ b/packages/swap/package.json
@@ -140,7 +140,7 @@
},
"devDependencies": {
"@commitlint/config-conventional": "^17.0.2",
- "@emurgo/yoroi-lib": "0.15.0",
+ "@emurgo/yoroi-lib": "0.15.1",
"@react-native-async-storage/async-storage": "^1.19.3",
"@react-native-community/eslint-config": "^3.0.2",
"@release-it/conventional-changelog": "^5.0.0",
@@ -172,7 +172,7 @@
"typescript": "^5.3.3"
},
"peerDependencies": {
- "@emurgo/yoroi-lib": "0.15.0",
+ "@emurgo/yoroi-lib": "0.15.1",
"@react-native-async-storage/async-storage": ">= 1.19.3 <= 1.20.0",
"immer": "^10.0.2",
"react": ">= 16.8.0 <= 19.0.0",
diff --git a/packages/theme/src/ThemeProvider.tsx b/packages/theme/src/ThemeProvider.tsx
index 9ebdfffbc2..23103c999e 100644
--- a/packages/theme/src/ThemeProvider.tsx
+++ b/packages/theme/src/ThemeProvider.tsx
@@ -10,21 +10,25 @@ export const ThemeProvider = ({children}: {children: React.ReactNode}) => {
'light',
)
- const selectColorScheme = (themeColor: 'light' | 'dark') => {
- setColorScheme(themeColor)
- }
-
- const theme = themes[colorScheme]
- const isDark = colorScheme === 'dark'
- const isLight = colorScheme === 'light'
-
- return (
-
- {children}
-
+ const selectColorScheme = React.useCallback(
+ (themeColor: 'light' | 'dark') => {
+ setColorScheme(themeColor)
+ },
+ [],
)
+
+ const value = React.useMemo(
+ () => ({
+ theme: themes[colorScheme],
+ colorScheme,
+ selectColorScheme,
+ isLight: colorScheme === 'dark',
+ isDark: colorScheme === 'light',
+ }),
+ [colorScheme, selectColorScheme],
+ )
+
+ return {children}
}
export const useTheme = () =>
diff --git a/yarn.lock b/yarn.lock
index efb6f24c7f..b2e33690ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2762,10 +2762,10 @@
"@ledgerhq/logs" "^5.15.0"
rxjs "^6.5.5"
-"@emurgo/yoroi-lib@0.15.0":
- version "0.15.0"
- resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.0.tgz#d4f00ac95f4083849ae2c51501abdd1f9efeed91"
- integrity sha512-Zl95cbs0SKcVfUFWtFBRZF7enOvi1wk9oWNkf0Ejf5mJrDUU+TCr8r1hwqQXN6ixkVeOdgUUvzRSkjDTol5jsQ==
+"@emurgo/yoroi-lib@0.15.1":
+ version "0.15.1"
+ resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.1.tgz#fdaa2be49067ab5be840f7eb64a8d92f94b37238"
+ integrity sha512-aCH+w0MMwFhyl0UBt8r/MmAsdKtYWibP/9GIJPQxmCi0HMLornRm/laRyINsaXyoNvsej85Mb2V+ItTs2fu7Mw==
dependencies:
"@cardano-foundation/ledgerjs-hw-app-cardano" "^6.0.0"
"@emurgo/cross-csl-core" "^4.2.0"