diff --git a/.github/actions/wallet-mobile/action.yml b/.github/actions/wallet-mobile/action.yml
index f186ba075a..bffe957b67 100644
--- a/.github/actions/wallet-mobile/action.yml
+++ b/.github/actions/wallet-mobile/action.yml
@@ -5,7 +5,7 @@ inputs:
node-version:
description: "Node.js version to use"
required: true
- default: "16.19.0"
+ default: "18.19.1"
runs:
using: "composite"
@@ -18,7 +18,7 @@ runs:
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
shell: bash
- - uses: actions/cache@v2
+ - uses: actions/cache@v3
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
diff --git a/.tool-versions b/.tool-versions
index 0f29bd47c8..def9920653 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,4 +1,4 @@
-nodejs 18.0.0
+nodejs 18.19.1
rust 1.69.0
java adoptopenjdk-17.0.10+7
ruby 3.2.2
diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
index 9795ba0634..ede4e04f23 100644
--- a/apps/wallet-mobile/.storybook/storybook.requires.js
+++ b/apps/wallet-mobile/.storybook/storybook.requires.js
@@ -129,6 +129,10 @@ const getStories = () => {
"./src/features/Initialization/InitialScreen/InitialScreen.stories.tsx": require("../src/features/Initialization/InitialScreen/InitialScreen.stories.tsx"),
"./src/features/Initialization/LanguagePickerScreen/LanguagePickerScreen.stories.tsx": require("../src/features/Initialization/LanguagePickerScreen/LanguagePickerScreen.stories.tsx"),
"./src/features/Initialization/TermsOfServiceChangedScreen/TermsOfServiceChangedScreen.stories.tsx": require("../src/features/Initialization/TermsOfServiceChangedScreen/TermsOfServiceChangedScreen.stories.tsx"),
+ "./src/features/Links/useCases/AskToOpenAWalletScreen/AskToOpenAWalletScreen.stories.tsx": require("../src/features/Links/useCases/AskToOpenAWalletScreen/AskToOpenAWalletScreen.stories.tsx"),
+ "./src/features/Links/useCases/AskToRedirect/AskToRedirectScreen.stories.tsx": require("../src/features/Links/useCases/AskToRedirect/AskToRedirectScreen.stories.tsx"),
+ "./src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/RequestedAdaPaymentWithLink.stories.tsx": require("../src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/RequestedAdaPaymentWithLink.stories.tsx"),
+ "./src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/ShowDisclaimer/ShowDisclaimer.stories.tsx": require("../src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/ShowDisclaimer/ShowDisclaimer.stories.tsx"),
"./src/features/Menu/Menu.stories.tsx": require("../src/features/Menu/Menu.stories.tsx"),
"./src/features/Receive/common/AddressDetailCard/AddressDetailCard.stories.tsx": require("../src/features/Receive/common/AddressDetailCard/AddressDetailCard.stories.tsx"),
"./src/features/Receive/common/AddressModal/AddressModal.stories.tsx": require("../src/features/Receive/common/AddressModal/AddressModal.stories.tsx"),
diff --git a/apps/wallet-mobile/.tool-versions b/apps/wallet-mobile/.tool-versions
index 0f29bd47c8..def9920653 100644
--- a/apps/wallet-mobile/.tool-versions
+++ b/apps/wallet-mobile/.tool-versions
@@ -1,4 +1,4 @@
-nodejs 18.0.0
+nodejs 18.19.1
rust 1.69.0
java adoptopenjdk-17.0.10+7
ruby 3.2.2
diff --git a/apps/wallet-mobile/scripts/request-ada-with-link-android.sh b/apps/wallet-mobile/scripts/request-ada-with-link-android.sh
new file mode 100755
index 0000000000..7bda088cf4
--- /dev/null
+++ b/apps/wallet-mobile/scripts/request-ada-with-link-android.sh
@@ -0,0 +1,3 @@
+#!/bin/zsh
+
+adb shell am start -W -a android.intent.action.VIEW -d "yoroi://yoroi-wallet.com/w1/transfer/request/ada-with-link?link=web%252Bcardano%253Aaddr_test1qzp3w455j8hdusjyv38rkr3cas9hyydfkr3tpwsz2yt8mqxr3y3kdut55a40jff00qmg74686vz44v6k363md06qkq0qgvjva0%253Famount%253D10\&isSandbox=true\&isTestnet=false\&appId=yoroi\&message=hi+there\&walletId=c4832ba5-c03e-4bd8-93ee-52536f1b1747\&authorization=ac0692d3-bf34-44e2-b57d-53e4ce47666b\&signature=4B7C8DB8B485D176D426980EE8A0D8A600B305AE2D7DC835B537657E2DAE110A6F7C0A641EAA623A8C43568BFC9DDCED5CBEA5AD6768BDE89F084EEDDBEBA36A\&redirectTo=https%253A%252F%252Fyoroi-wallet.com"
diff --git a/apps/wallet-mobile/scripts/request-ada-with-link-ios.sh b/apps/wallet-mobile/scripts/request-ada-with-link-ios.sh
new file mode 100755
index 0000000000..d49da4c42e
--- /dev/null
+++ b/apps/wallet-mobile/scripts/request-ada-with-link-ios.sh
@@ -0,0 +1,4 @@
+#!/bin/zsh
+
+xcrun simctl openurl booted "yoroi://yoroi-wallet.com/w1/transfer/request/ada-with-link?link=web%252Bcardano%253Aaddr_test1qzp3w455j8hdusjyv38rkr3cas9hyydfkr3tpwsz2yt8mqxr3y3kdut55a40jff00qmg74686vz44v6k363md06qkq0qgvjva0%253Famount%253D10&isSandbox=true&isTestnet=false&appId=yoroi&message=hi+there&walletId=c4832ba5-c03e-4bd8-93ee-52536f1b1747&authorization=ac0692d3-bf34-44e2-b57d-53e4ce47666b&signature=4B7C8DB8B485D176D426980EE8A0D8A600B305AE2D7DC835B537657E2DAE110A6F7C0A641EAA623A8C43568BFC9DDCED5CBEA5AD6768BDE89F084EEDDBEBA36A&redirectTo=https%253A%252F%252Fyoroi-wallet.com"
+
diff --git a/apps/wallet-mobile/src/AppNavigator.tsx b/apps/wallet-mobile/src/AppNavigator.tsx
index d34c68b5d9..f84f4543d4 100644
--- a/apps/wallet-mobile/src/AppNavigator.tsx
+++ b/apps/wallet-mobile/src/AppNavigator.tsx
@@ -1,6 +1,7 @@
import {NavigationContainer, NavigationContainerRef} from '@react-navigation/native'
import {createStackNavigator} from '@react-navigation/stack'
import {isString} from '@yoroi/common'
+import {TransferProvider} from '@yoroi/transfer'
import * as React from 'react'
import {defineMessages, useIntl} from 'react-intl'
import {Alert, AppState, AppStateStatus, InteractionManager, Platform} from 'react-native'
@@ -136,7 +137,9 @@ export const AppNavigator = () => {
{() => (
-
+
+
+
)}
diff --git a/apps/wallet-mobile/src/SelectedWallet/WalletSelection/WalletSelectionScreen.tsx b/apps/wallet-mobile/src/SelectedWallet/WalletSelection/WalletSelectionScreen.tsx
index da0c82c62d..fa3660a14e 100644
--- a/apps/wallet-mobile/src/SelectedWallet/WalletSelection/WalletSelectionScreen.tsx
+++ b/apps/wallet-mobile/src/SelectedWallet/WalletSelection/WalletSelectionScreen.tsx
@@ -9,6 +9,7 @@ import {useStatusBar} from '../../components/hooks/useStatusBar'
import {Icon} from '../../components/Icon'
import {PleaseWaitModal} from '../../components/PleaseWaitModal'
import {showErrorDialog} from '../../dialogs'
+import {useLinksRequestWallet} from '../../features/Links/common/useLinksRequestWallet'
import globalMessages, {errorMessages} from '../../i18n/global-messages'
import {isNightly} from '../../legacy/config'
import {useMetrics} from '../../metrics/metricsManager'
@@ -27,6 +28,7 @@ import {useSetSelectedWallet, useSetSelectedWalletMeta} from '../Context'
import {WalletListItem} from './WalletListItem'
export const WalletSelectionScreen = () => {
+ useLinksRequestWallet()
const strings = useStrings()
const {navigateToTxHistory} = useWalletNavigation()
const walletManager = useWalletManager()
@@ -48,14 +50,7 @@ export const WalletSelectionScreen = () => {
onSuccess: ([wallet, walletMeta]) => {
selectWalletMeta(walletMeta)
selectWallet(wallet)
-
- // fixes modal issue
- // https://github.com/facebook/react-native/issues/32329
- // https://github.com/facebook/react-native/issues/33733
- // https://github.com/facebook/react-native/issues/29319
- InteractionManager.runAfterInteractions(() => {
- navigateToTxHistory()
- })
+ navigateToTxHistory()
},
onError: (error) => {
InteractionManager.runAfterInteractions(() => {
diff --git a/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx b/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx
index db4051dd6c..ad2313f006 100644
--- a/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx
+++ b/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx
@@ -13,7 +13,6 @@ import {
swapStorageMaker,
} from '@yoroi/swap'
import {Theme, useTheme} from '@yoroi/theme'
-import {TransferProvider} from '@yoroi/transfer'
import {Resolver, Swap} from '@yoroi/types'
import _ from 'lodash'
import React from 'react'
@@ -138,299 +137,296 @@ export const TxHistoryNavigator = () => {
return (
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+ {() => (
+
+
+
+ )}
+
+
+
+
+
+
+
+
+
+ {() => (
+
+
+
+ )}
+
+
+
+ {() => (
+
+
+
+ )}
+
+
+
+ {() => (
+
+
+
+ )}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {() => (
+
+
+
+ )}
+
+
+
+ {() => (
+
+
+
+ )}
+
+
+
+ {() => (
+
+
+
+ )}
+
+
+
-
-
-
- {() => (
-
-
-
- )}
-
-
-
-
-
-
-
-
-
- {() => (
-
-
-
- )}
-
-
-
- {() => (
-
-
-
- )}
-
-
-
- {() => (
-
-
-
- )}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {() => (
-
-
-
- )}
-
-
-
- {() => (
-
-
-
- )}
-
-
-
- {() => (
-
-
-
- )}
-
-
-
- {() => (
-
-
-
- )}
-
-
-
-
-
-
-
-
- ,
- }}
- />
-
-
-
- null}}
- />
-
-
-
- {strings.receiveInfoText}
-
-
-
-
-
-
-
+ {() => (
+
+
+
+ )}
+
+
+
+
+
+
+
+
+ ,
+ }}
+ />
+
+
+
+ null}}
+ />
+
+
+
+ {strings.receiveInfoText}
+
+
+
+
+
+
)
}
diff --git a/apps/wallet-mobile/src/WalletNavigator.tsx b/apps/wallet-mobile/src/WalletNavigator.tsx
index fdcbb2466a..532e5f8566 100644
--- a/apps/wallet-mobile/src/WalletNavigator.tsx
+++ b/apps/wallet-mobile/src/WalletNavigator.tsx
@@ -1,7 +1,6 @@
import {createBottomTabNavigator} from '@react-navigation/bottom-tabs'
import {RouteProp, useFocusEffect} from '@react-navigation/native'
import {createStackNavigator} from '@react-navigation/stack'
-import {useLinks} from '@yoroi/links'
import React from 'react'
import {defineMessages, useIntl} from 'react-intl'
import {Keyboard, Platform} from 'react-native'
@@ -10,6 +9,8 @@ import {VotingRegistration} from './Catalyst'
import {Icon, OfflineBanner} from './components'
import {DashboardNavigator} from './Dashboard'
import {ShowExchangeResultOrderScreen} from './features/Exchange/useCases/ShowExchangeResultOrderScreen/ShowExchangeResultOrderScreen'
+import {useLinksRequestAction} from './features/Links/common/useLinksRequestAction'
+import {useLinksShowActionResult} from './features/Links/common/useLinksShowActionResult'
import {MenuNavigator} from './features/Menu'
import {SettingsScreenNavigator} from './features/Settings'
import {GovernanceNavigator} from './features/Staking/Governance'
@@ -154,14 +155,14 @@ const WalletTabNavigator = () => {
const Stack = createStackNavigator()
export const WalletNavigator = () => {
- const initialRouteName = useInitialRouteName()
+ const initialRoute = useLinksShowActionResult()
+ useLinksRequestAction()
- // initialRoute doens't update the state of the navigator, only at first render
+ // initialRoute doesn't update the state of the navigator, only at first render
// https://reactnavigation.org/docs/auth-flow/
- if (initialRouteName === 'exchange-result') {
+ if (initialRoute === 'exchange-result') {
return (
{
return (
{
)
}
-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/components/ConfirmTx/ConfirmTx.tsx b/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx
index c14389343d..6c0396adb3 100644
--- a/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx
+++ b/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx
@@ -269,6 +269,7 @@ export const ConfirmTx = ({
{...buttonProps}
disabled={isConfirmationDisabled || isProcessing || disabled}
testID="confirmTxButton"
+ shelleyTheme
/>
diff --git a/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeOrderScreen.tsx b/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeOrderScreen.tsx
index 6f6bfc9cb0..417e7a25ea 100644
--- a/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeOrderScreen.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeOrderScreen.tsx
@@ -38,9 +38,10 @@ export const CreateExchangeOrderScreen = () => {
const {orderType, canExchange, providerId, provider, amount, referralLink: managerReferralLink} = useExchange()
const providers = useExchangeProvidersByOrderType({orderType, providerListByOrderType: provider.list.byOrderType})
- const providerSelected = Object.fromEntries(providers)[providerId]
- const fee = providerSelected.supportedOrders?.[orderType]?.fee ?? 0
- const Logo = providerSelected.id === 'banxa' ? BanxaLogo : EncryptusLogo
+ const providerSelected = new Map(providers).get(providerId)
+ const fee = providerSelected?.supportedOrders[orderType]?.fee ?? 0
+
+ const Logo = providerSelected?.id === 'banxa' ? BanxaLogo : EncryptusLogo
const wallet = useSelectedWallet()
@@ -127,7 +128,7 @@ export const CreateExchangeOrderScreen = () => {
}
rightAdornment={}
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 162b01e922..8115688553 100644
--- a/apps/wallet-mobile/src/features/Exchange/useCases/ShowExchangeResultOrderScreen/ShowExchangeResultOrderScreen.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/useCases/ShowExchangeResultOrderScreen/ShowExchangeResultOrderScreen.tsx
@@ -1,5 +1,5 @@
import {exchangeApiMaker, exchangeManagerMaker, ExchangeProvider} from '@yoroi/exchange'
-import {LinksYoroiExchangeShowCreateResultParams, useLinks} from '@yoroi/links'
+import {LinksExchangeShowCreateResultParams, useLinks} from '@yoroi/links'
import {useTheme} from '@yoroi/theme'
import * as React from 'react'
import {StyleSheet, TouchableOpacity, View} from 'react-native'
@@ -35,7 +35,7 @@ export const ShowExchangeResultOrderScreen = () => {
// 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 params: LinksExchangeShowCreateResultParams = action.info.params
const handleOnClose = () => {
actionFinished()
@@ -121,7 +121,7 @@ const providerName = {
banxa: 'Banxa',
} as const
-const sanitizeParams = (params: LinksYoroiExchangeShowCreateResultParams) => {
+const sanitizeParams = (params: LinksExchangeShowCreateResultParams) => {
const showOrderDetails =
params.coin != null && params.coinAmount != null && params.fiat != null && params.fiatAmount != null
diff --git a/apps/wallet-mobile/src/features/Links/common/constants.ts b/apps/wallet-mobile/src/features/Links/common/constants.ts
index e3a014324c..75019f22f1 100644
--- a/apps/wallet-mobile/src/features/Links/common/constants.ts
+++ b/apps/wallet-mobile/src/features/Links/common/constants.ts
@@ -1,6 +1,6 @@
import {freeze} from 'immer'
-export const knownApps: Readonly> = freeze(
+export const trustedApps: 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
index 91e57ef44f..7ed597f6f7 100644
--- a/apps/wallet-mobile/src/features/Links/common/useDeepLinkWatcher.tsx
+++ b/apps/wallet-mobile/src/features/Links/common/useDeepLinkWatcher.tsx
@@ -5,28 +5,24 @@ import {Linking} from 'react-native'
import {Logger} from '../../../yoroi-wallets/logging'
export const useDeepLinkWatcher = () => {
- const links = useLinks()
+ const {actionStarted} = 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) {
+ const parsedAction = linksYoroiParser(url)
+ if (parsedAction == null) {
Logger.debug('useDeepLinksWatcher :: link is malformated, ignoring...')
return
}
- if (action.params?.isSandbox === true && __DEV__ === false) {
+ if (parsedAction.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})
+ Logger.debug('parsedAction', JSON.stringify(parsedAction, null, 2))
+ actionStarted({info: parsedAction, isTrusted: false})
},
- [links],
+ [actionStarted],
)
React.useEffect(() => {
diff --git a/apps/wallet-mobile/src/features/Links/common/useLinksRequestAction.tsx b/apps/wallet-mobile/src/features/Links/common/useLinksRequestAction.tsx
new file mode 100644
index 0000000000..d6340edb16
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Links/common/useLinksRequestAction.tsx
@@ -0,0 +1,101 @@
+import {linksCardanoModuleMaker, LinksTransferRequestAdaWithLinkParams, LinksYoroiAction, useLinks} from '@yoroi/links'
+import {useTransfer} from '@yoroi/transfer'
+import * as React from 'react'
+import {InteractionManager, Keyboard} from 'react-native'
+
+import {useModal} from '../../../components/Modal/ModalContext'
+import {useSelectedWalletContext} from '../../../SelectedWallet'
+import {Logger} from '../../../yoroi-wallets/logging'
+import {asQuantity, Quantities} from '../../../yoroi-wallets/utils/utils'
+import {RequestedAdaPaymentWithLinkScreen} from '../useCases/RequestedAdaPaymentWithLinkScreen/RequestedAdaPaymentWithLinkScreen'
+import {useNavigateTo} from './useNavigationTo'
+import {useStrings} from './useStrings'
+
+const heightBreakpoint = 467
+export const useLinksRequestAction = () => {
+ const strings = useStrings()
+ const {action, actionFinished} = useLinks()
+ const {openModal, closeModal} = useModal()
+ const [wallet] = useSelectedWalletContext()
+ const navigateTo = useNavigateTo()
+
+ const {memoChanged, receiverResolveChanged, amountChanged, reset, redirectToChanged} = useTransfer()
+ const startTransferWithLink = React.useCallback(
+ (action: LinksYoroiAction, decimals: number) => {
+ Logger.debug('startTransferWithLink', action, decimals)
+ if (action.info.useCase === 'request/ada-with-link') {
+ reset()
+ try {
+ const link = decodeURIComponent(action.info.params.link)
+ const parsedCardanoLink = linksCardanoModuleMaker().parse(link)
+ if (parsedCardanoLink) {
+ const redirectTo = action.info.params.redirectTo
+ if (redirectTo != null) redirectToChanged(decodeURIComponent(redirectTo))
+
+ const {address: receiver, amount, memo} = parsedCardanoLink.params
+ const ptAmount = Quantities.integer(asQuantity(amount ?? 0), decimals)
+ memoChanged(memo ?? '')
+ receiverResolveChanged(receiver ?? '')
+ amountChanged(ptAmount)
+ closeModal()
+ actionFinished()
+ navigateTo.startTransfer()
+ }
+ } catch (error) {
+ // TODO: revisit it should display an alert
+ closeModal()
+ actionFinished()
+ Logger.error('Error parsing Cardano link', error)
+ }
+ }
+ },
+ [
+ actionFinished,
+ amountChanged,
+ closeModal,
+ memoChanged,
+ navigateTo,
+ receiverResolveChanged,
+ redirectToChanged,
+ reset,
+ ],
+ )
+
+ const openRequestedPaymentAdaWithLink = React.useCallback(
+ ({params, isTrusted}: {params: LinksTransferRequestAdaWithLinkParams; isTrusted: boolean}, decimals: number) => {
+ Keyboard.dismiss()
+ const title = isTrusted ? strings.trustedPaymentRequestedTitle : strings.untrustedPaymentRequestedTitle
+ const handleOnContinue = () =>
+ startTransferWithLink(
+ {
+ info: {
+ version: 1,
+ feature: 'transfer',
+ useCase: 'request/ada-with-link',
+ params,
+ },
+ isTrusted,
+ },
+ decimals,
+ )
+
+ const content = (
+
+ )
+
+ openModal(title, content, heightBreakpoint)
+ },
+ [strings.trustedPaymentRequestedTitle, strings.untrustedPaymentRequestedTitle, startTransferWithLink, openModal],
+ )
+
+ React.useEffect(() => {
+ InteractionManager.runAfterInteractions(() => {
+ if (action?.info.useCase === 'request/ada-with-link' && wallet != null) {
+ openRequestedPaymentAdaWithLink(
+ {params: action.info.params, isTrusted: action.isTrusted},
+ wallet.primaryTokenInfo.decimals ?? 0,
+ )
+ }
+ })
+ }, [action?.info.params, action?.info.useCase, action?.isTrusted, openRequestedPaymentAdaWithLink, wallet])
+}
diff --git a/apps/wallet-mobile/src/features/Links/common/useLinksRequestRedirect.tsx b/apps/wallet-mobile/src/features/Links/common/useLinksRequestRedirect.tsx
new file mode 100644
index 0000000000..1188df6470
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Links/common/useLinksRequestRedirect.tsx
@@ -0,0 +1,28 @@
+import * as React from 'react'
+import {InteractionManager, Keyboard} from 'react-native'
+
+import {useModal} from '../../../components/Modal/ModalContext'
+import {isEmptyString} from '../../../utils/utils'
+import {AskToRedirectScreen} from '../useCases/AskToRedirect/AskToRedirectScreen'
+import {useStrings} from './useStrings'
+
+const heightBreakpoint = 367
+export const useLinksRequestRedirect = (redirectTo?: string) => {
+ const strings = useStrings()
+ const {openModal} = useModal()
+
+ const askToRedirect = React.useCallback(
+ (link: string) => {
+ Keyboard.dismiss()
+ const content =
+ openModal(strings.askToRedirectTitle, content, heightBreakpoint)
+ },
+ [openModal, strings.askToRedirectTitle],
+ )
+
+ React.useEffect(() => {
+ InteractionManager.runAfterInteractions(() => {
+ if (!isEmptyString(redirectTo)) askToRedirect(redirectTo)
+ })
+ }, [redirectTo, askToRedirect])
+}
diff --git a/apps/wallet-mobile/src/features/Links/common/useLinksRequestWallet.tsx b/apps/wallet-mobile/src/features/Links/common/useLinksRequestWallet.tsx
new file mode 100644
index 0000000000..5b095a2ffd
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Links/common/useLinksRequestWallet.tsx
@@ -0,0 +1,29 @@
+import {useLinks} from '@yoroi/links'
+import * as React from 'react'
+import {InteractionManager, Keyboard} from 'react-native'
+
+import {useModal} from '../../../components/Modal/ModalContext'
+import {useSelectedWalletContext} from '../../../SelectedWallet'
+import {AskToOpenWalletScreen} from '../useCases/AskToOpenAWalletScreen/AskToOpenAWalletScreen'
+import {useStrings} from './useStrings'
+
+const heightBreakpoint = 367
+export const useLinksRequestWallet = () => {
+ const strings = useStrings()
+ const {openModal} = useModal()
+ const [wallet] = useSelectedWalletContext()
+ const {action} = useLinks()
+
+ const askToOpenAWallet = React.useCallback(() => {
+ Keyboard.dismiss()
+ const content =
+ openModal(strings.askToOpenAWalletTitle, content, heightBreakpoint)
+ }, [openModal, strings.askToOpenAWalletTitle])
+
+ React.useEffect(() => {
+ InteractionManager.runAfterInteractions(() => {
+ const isWalletRequested = action?.info.useCase === 'request/ada-with-link' && wallet == null
+ if (isWalletRequested) askToOpenAWallet()
+ })
+ }, [askToOpenAWallet, action?.info.useCase, wallet])
+}
diff --git a/apps/wallet-mobile/src/features/Links/common/useLinksShowActionResult.tsx b/apps/wallet-mobile/src/features/Links/common/useLinksShowActionResult.tsx
new file mode 100644
index 0000000000..5c53508296
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Links/common/useLinksShowActionResult.tsx
@@ -0,0 +1,11 @@
+import {useLinks} from '@yoroi/links'
+import * as React from 'react'
+
+export const useLinksShowActionResult = () => {
+ const {action} = useLinks()
+ const initialRoute = action?.info.useCase === 'order/show-create-result' ? 'exchange-result' : 'wallet-selection'
+
+ return React.useMemo(() => {
+ return initialRoute
+ }, [initialRoute])
+}
diff --git a/apps/wallet-mobile/src/features/Links/common/useNavigationTo.tsx b/apps/wallet-mobile/src/features/Links/common/useNavigationTo.tsx
new file mode 100644
index 0000000000..7eeffa6c27
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Links/common/useNavigationTo.tsx
@@ -0,0 +1,11 @@
+import * as React from 'react'
+
+import {useWalletNavigation} from '../../../navigation'
+
+export const useNavigateTo = () => {
+ const walletNavigation = useWalletNavigation()
+
+ return React.useRef({
+ startTransfer: () => walletNavigation.navigateToStartTransfer(),
+ } as const).current
+}
diff --git a/apps/wallet-mobile/src/features/Links/common/useStrings.ts b/apps/wallet-mobile/src/features/Links/common/useStrings.ts
new file mode 100644
index 0000000000..82faa31d35
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Links/common/useStrings.ts
@@ -0,0 +1,67 @@
+import * as React from 'react'
+import {defineMessages, useIntl} from 'react-intl'
+
+import globalMessages from '../../../i18n/global-messages'
+
+export const useStrings = () => {
+ const intl = useIntl()
+
+ return React.useRef({
+ trustedPaymentRequestedTitle: intl.formatMessage(messages.trustedPaymentRequestedTitle),
+ trustedPaymentRequestedDescription: intl.formatMessage(messages.trustedPaymentRequestedDescription),
+ untrustedPaymentRequestedTitle: intl.formatMessage(messages.untrustedPaymentRequestedTitle),
+ untrustedPaymentRequestedDescription: intl.formatMessage(messages.untrustedPaymentRequestedDescription),
+
+ askToOpenAWalletTitle: intl.formatMessage(messages.askToOpenAWalletTitle),
+ askToOpenAWalletDescription: intl.formatMessage(messages.askToOpenAWalletDescription),
+ askToRedirectTitle: intl.formatMessage(messages.askToRedirectTitle),
+ askToRedirectDescription: intl.formatMessage(messages.askToRedirectDescription),
+
+ unknown: intl.formatMessage(globalMessages.unknown),
+ disclaimer: intl.formatMessage(globalMessages.disclaimer),
+
+ ok: intl.formatMessage(globalMessages.ok),
+ cancel: intl.formatMessage(globalMessages.cancel),
+ continue: intl.formatMessage(globalMessages.continue),
+ } as const).current
+}
+
+export const messages = Object.freeze(
+ defineMessages({
+ trustedPaymentRequestedTitle: {
+ id: 'links.trusted.paymentRequested.title',
+ defaultMessage: '!!!Payment requested',
+ },
+ trustedPaymentRequestedDescription: {
+ id: 'links.trusted.paymentRequested.description',
+ defaultMessage: '!!!A payment has been requested.',
+ },
+ untrustedPaymentRequestedTitle: {
+ id: 'links.untrusted.paymentRequested.title',
+ defaultMessage: '!!!Payment requested',
+ },
+ untrustedPaymentRequestedDescription: {
+ id: 'links.untrusted.paymentRequested.description',
+ defaultMessage: '!!!A payment has been requested.',
+ },
+
+ askToOpenAWalletTitle: {
+ id: 'links.askToOpenAWallet.title',
+ defaultMessage: '!!!Open a wallet',
+ },
+ askToOpenAWalletDescription: {
+ id: 'links.askToOpenAWallet.description',
+ defaultMessage: '!!!To continue, open a wallet.',
+ },
+
+ askToRedirectTitle: {
+ id: 'links.askToRedirect.title',
+ defaultMessage: '!!!Redirect available',
+ },
+ askToRedirectDescription: {
+ id: 'links.askToRedirect.description',
+ defaultMessage:
+ '!!!The caller that request this action has provided a way for Yoroi to return to their application, would you like to be redirected?',
+ },
+ }),
+)
diff --git a/apps/wallet-mobile/src/features/Links/useCases/AskToOpenAWalletScreen/AskToOpenAWalletScreen.stories.tsx b/apps/wallet-mobile/src/features/Links/useCases/AskToOpenAWalletScreen/AskToOpenAWalletScreen.stories.tsx
new file mode 100644
index 0000000000..1b79bd1998
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Links/useCases/AskToOpenAWalletScreen/AskToOpenAWalletScreen.stories.tsx
@@ -0,0 +1,21 @@
+import {storiesOf} from '@storybook/react-native'
+import React from 'react'
+import {StyleSheet, View} from 'react-native'
+
+import {ModalProvider} from '../../../../components'
+import {AskToOpenWalletScreen} from './AskToOpenAWalletScreen'
+
+storiesOf('Links AskToOpenAWallet', module)
+ .addDecorator((story) => (
+
+ {story()}
+
+ ))
+ .add('initial', () => )
+
+const styles = StyleSheet.create({
+ container: {
+ flex: 1,
+ padding: 16,
+ },
+})
diff --git a/apps/wallet-mobile/src/features/Links/useCases/AskToOpenAWalletScreen/AskToOpenAWalletScreen.tsx b/apps/wallet-mobile/src/features/Links/useCases/AskToOpenAWalletScreen/AskToOpenAWalletScreen.tsx
new file mode 100644
index 0000000000..9cfcae0d2c
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Links/useCases/AskToOpenAWalletScreen/AskToOpenAWalletScreen.tsx
@@ -0,0 +1,65 @@
+import {useLinks} from '@yoroi/links'
+import {useTheme} from '@yoroi/theme'
+import * as React from 'react'
+import {ScrollView, StyleSheet, Text, View, ViewProps} from 'react-native'
+import {SafeAreaView} from 'react-native-safe-area-context'
+
+import {Button, Spacer, useModal} from '../../../../components'
+import {useStrings} from '../../common/useStrings'
+
+export const AskToOpenWalletScreen = () => {
+ const strings = useStrings()
+ const {styles} = useStyles()
+ const {closeModal} = useModal()
+ const {actionFinished} = useLinks()
+
+ const handleOnCancel = () => {
+ actionFinished()
+ closeModal()
+ }
+
+ // TODO: revisit check with product size and copy
+ return (
+
+
+ {strings.askToOpenAWalletDescription}
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+const Actions = (props: ViewProps) =>
+
+const useStyles = () => {
+ const {theme} = useTheme()
+ const {color} = theme
+ const styles = StyleSheet.create({
+ root: {
+ flex: 1,
+ backgroundColor: color.gray.min,
+ },
+ actions: {
+ flexDirection: 'row',
+ justifyContent: 'space-between',
+ },
+ text: {
+ ...theme.typography['body-2-m-regular'],
+ color: theme.color.gray.max,
+ },
+ })
+ const colors = {
+ danger: color.magenta[500],
+ warning: color.yellow[500],
+ }
+ return {styles, colors}
+}
diff --git a/apps/wallet-mobile/src/features/Links/useCases/AskToRedirect/AskToRedirectScreen.stories.tsx b/apps/wallet-mobile/src/features/Links/useCases/AskToRedirect/AskToRedirectScreen.stories.tsx
new file mode 100644
index 0000000000..2df6dd4f4f
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Links/useCases/AskToRedirect/AskToRedirectScreen.stories.tsx
@@ -0,0 +1,21 @@
+import {storiesOf} from '@storybook/react-native'
+import * as React from 'react'
+import {StyleSheet, View} from 'react-native'
+
+import {ModalProvider} from '../../../../components'
+import {AskToRedirectScreen} from './AskToRedirectScreen'
+
+storiesOf('Links AskToRedirect', module)
+ .addDecorator((story) => (
+
+ {story()}
+
+ ))
+ .add('initial', () => )
+
+const styles = StyleSheet.create({
+ container: {
+ flex: 1,
+ padding: 16,
+ },
+})
diff --git a/apps/wallet-mobile/src/features/Links/useCases/AskToRedirect/AskToRedirectScreen.tsx b/apps/wallet-mobile/src/features/Links/useCases/AskToRedirect/AskToRedirectScreen.tsx
new file mode 100644
index 0000000000..5b1e31d61a
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Links/useCases/AskToRedirect/AskToRedirectScreen.tsx
@@ -0,0 +1,63 @@
+import {useTheme} from '@yoroi/theme'
+import * as React from 'react'
+import {Linking, ScrollView, StyleSheet, Text, View, ViewProps} from 'react-native'
+import {SafeAreaView} from 'react-native-safe-area-context'
+
+import {Button, Spacer, useModal} from '../../../../components'
+import {useStrings} from '../../common/useStrings'
+
+export const AskToRedirectScreen = ({link}: {link: string}) => {
+ const strings = useStrings()
+ const {styles} = useStyles()
+ const {closeModal} = useModal()
+
+ const handleOnConfirm = () => {
+ closeModal()
+ Linking.openURL(link)
+ }
+
+ // TODO: revisit check with product size and copy
+ return (
+
+
+ {strings.askToRedirectDescription}
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+const Actions = (props: ViewProps) =>
+
+const useStyles = () => {
+ const {theme} = useTheme()
+ const {color} = theme
+ const styles = StyleSheet.create({
+ root: {
+ flex: 1,
+ backgroundColor: color.gray.min,
+ },
+ actions: {
+ flexDirection: 'row',
+ justifyContent: 'space-between',
+ },
+ text: {
+ ...theme.typography['body-2-m-regular'],
+ color: theme.color.gray.max,
+ },
+ })
+ const colors = {
+ danger: color.magenta[500],
+ warning: color.yellow[500],
+ }
+ return {styles, colors}
+}
diff --git a/apps/wallet-mobile/src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/RequestedAdaPaymentWithLink.stories.tsx b/apps/wallet-mobile/src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/RequestedAdaPaymentWithLink.stories.tsx
new file mode 100644
index 0000000000..6106760ffb
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/RequestedAdaPaymentWithLink.stories.tsx
@@ -0,0 +1,35 @@
+import {action} from '@storybook/addon-actions'
+import {storiesOf} from '@storybook/react-native'
+import * as React from 'react'
+import {StyleSheet, View} from 'react-native'
+
+import {RequestedAdaPaymentWithLinkScreen} from './RequestedAdaPaymentWithLinkScreen'
+
+storiesOf('Links ShowDisclaimer', module)
+ .addDecorator((story) => {story()})
+ .add('trusted source', () => (
+
+ ))
+ .add('untrusted source', () => (
+
+ ))
+
+const styles = StyleSheet.create({
+ container: {
+ flex: 1,
+ padding: 16,
+ },
+})
diff --git a/apps/wallet-mobile/src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/RequestedAdaPaymentWithLinkScreen.tsx b/apps/wallet-mobile/src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/RequestedAdaPaymentWithLinkScreen.tsx
new file mode 100644
index 0000000000..7dee40e46d
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/RequestedAdaPaymentWithLinkScreen.tsx
@@ -0,0 +1,99 @@
+import {LinksTransferRequestAdaWithLinkParams, useLinks} from '@yoroi/links'
+import {useTheme} from '@yoroi/theme'
+import * as React from 'react'
+import {ScrollView, StyleSheet, Text, View, ViewProps} from 'react-native'
+import {SafeAreaView} from 'react-native-safe-area-context'
+
+import {Button, Spacer, useModal} from '../../../../components'
+import {isEmptyString} from '../../../../utils/utils'
+import {useStrings} from '../../common/useStrings'
+import {ShowDisclaimer} from './ShowDisclaimer/ShowDisclaimer'
+
+export const RequestedAdaPaymentWithLinkScreen = ({
+ params,
+ isTrusted,
+ onContinue,
+}: {
+ params: LinksTransferRequestAdaWithLinkParams
+ isTrusted?: boolean
+ onContinue: () => void
+}) => {
+ const strings = useStrings()
+ const {styles} = useStyles()
+ const {actionFinished} = useLinks()
+ const {closeModal} = useModal()
+
+ // TODO: revisit check with product
+ const disclaimerStyle = isTrusted ? styles.text : styles.text
+ const description = isTrusted
+ ? strings.trustedPaymentRequestedDescription
+ : strings.untrustedPaymentRequestedDescription
+
+ const handleOnCancel = () => {
+ actionFinished()
+ closeModal()
+ }
+
+ return (
+
+
+
+ {description}
+
+
+
+
+ {/* TODO: revisit SHOW the app name or unknown */}
+ {/* TODO: revisit SHOW verified / not verified icon and text */}
+ {/* TODO: revisit SHOW if it was initialized by Yoroi -> authorization */}
+ {/* TODO: revisit SHOW if it was initialized by Wallet -> walletId -> name */}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+const Message = ({message}: {message?: string}) =>
+ !isEmptyString(message) && (
+ <>
+ {message}
+
+
+
+ )
+const Actions = (props: ViewProps) =>
+
+const useStyles = () => {
+ const {theme} = useTheme()
+ const {color} = theme
+ const styles = StyleSheet.create({
+ root: {
+ flex: 1,
+ backgroundColor: color.gray.min,
+ },
+ actions: {
+ flexDirection: 'row',
+ justifyContent: 'space-between',
+ },
+ text: {
+ ...theme.typography['body-2-m-regular'],
+ color: theme.color.gray.max,
+ },
+ })
+ const colors = {
+ danger: color.magenta[500],
+ warning: color.yellow[500],
+ }
+ return {styles, colors}
+}
diff --git a/apps/wallet-mobile/src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/ShowDisclaimer/ShowDisclaimer.stories.tsx b/apps/wallet-mobile/src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/ShowDisclaimer/ShowDisclaimer.stories.tsx
new file mode 100644
index 0000000000..65266d9eba
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/ShowDisclaimer/ShowDisclaimer.stories.tsx
@@ -0,0 +1,20 @@
+import {storiesOf} from '@storybook/react-native'
+import * as React from 'react'
+import {StyleSheet, View} from 'react-native'
+
+import {ShowDisclaimer} from './ShowDisclaimer'
+
+storiesOf('Links ShowDisclaimer', module)
+ .addDecorator((story) => {story()})
+ .add('initial', () => (
+
+ <>
+
+ ))
+
+const styles = StyleSheet.create({
+ container: {
+ flex: 1,
+ padding: 16,
+ },
+})
diff --git a/apps/wallet-mobile/src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/ShowDisclaimer/ShowDisclaimer.tsx b/apps/wallet-mobile/src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/ShowDisclaimer/ShowDisclaimer.tsx
new file mode 100644
index 0000000000..82a8c5036a
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/ShowDisclaimer/ShowDisclaimer.tsx
@@ -0,0 +1,48 @@
+import {useTheme} from '@yoroi/theme'
+import * as React from 'react'
+import {StyleSheet, Text, View} from 'react-native'
+import LinearGradient from 'react-native-linear-gradient'
+
+type ShowDisclaimerProps = {
+ title: string
+ children: React.ReactNode
+}
+export const ShowDisclaimer = ({title, children}: ShowDisclaimerProps) => {
+ const {theme} = useTheme()
+ const styles = useStyles()
+
+ return (
+
+
+ {title}
+
+ {children}
+
+
+ )
+}
+
+const useStyles = () => {
+ const {theme} = useTheme()
+ const styles = StyleSheet.create({
+ container: {
+ paddingHorizontal: 16,
+ paddingVertical: 12,
+ },
+ gradient: {
+ opacity: 1,
+ borderRadius: 8,
+ },
+ title: {
+ ...theme.typography['body-1-l-regular'],
+ color: theme.color.gray.max,
+ fontWeight: '500',
+ },
+ })
+ return styles
+}
diff --git a/apps/wallet-mobile/src/features/Scan/common/useNavigateTo.tsx b/apps/wallet-mobile/src/features/Scan/common/useNavigateTo.tsx
index a623388a6d..b1724ac96b 100644
--- a/apps/wallet-mobile/src/features/Scan/common/useNavigateTo.tsx
+++ b/apps/wallet-mobile/src/features/Scan/common/useNavigateTo.tsx
@@ -1,15 +1,16 @@
import {useNavigation} from '@react-navigation/native'
import {useRef} from 'react'
-import {TxHistoryRouteNavigation} from '../../../navigation'
+import {TxHistoryRouteNavigation, useWalletNavigation} from '../../../navigation'
export const useNavigateTo = () => {
const navigation = useNavigation()
+ const walletNavigation = useWalletNavigation()
return useRef({
showCameraPermissionDenied: () => navigation.navigate('scan-show-camera-permission-denied'),
claimShowSuccess: () => navigation.navigate('claim-show-success'),
- send: () => navigation.navigate('send-start-tx'),
+ startTransfer: () => walletNavigation.navigateToStartTransfer(),
back: () => navigation.goBack(),
}).current
}
diff --git a/apps/wallet-mobile/src/features/Scan/common/useTriggerScanAction.tsx b/apps/wallet-mobile/src/features/Scan/common/useTriggerScanAction.tsx
index 9a65ef4ca4..1a0dfb1493 100644
--- a/apps/wallet-mobile/src/features/Scan/common/useTriggerScanAction.tsx
+++ b/apps/wallet-mobile/src/features/Scan/common/useTriggerScanAction.tsx
@@ -23,7 +23,7 @@ export const useTriggerScanAction = ({insideFeature}: {insideFeature: ScanFeatur
receiverResolveChanged,
amountChanged,
tokenSelectedChanged,
- reset: resetSendState,
+ reset: resetTransferState,
memoChanged,
} = useTransfer()
@@ -46,10 +46,7 @@ export const useTriggerScanAction = ({insideFeature}: {insideFeature: ScanFeatur
const trigger = (scanAction: ScanAction) => {
switch (scanAction.action) {
case 'send-single-pt': {
- navigateTo.back()
- navigateTo.send()
-
- if (insideFeature !== 'send') resetSendState()
+ if (insideFeature !== 'send') resetTransferState()
receiverResolveChanged(scanAction.receiver)
@@ -65,16 +62,17 @@ export const useTriggerScanAction = ({insideFeature}: {insideFeature: ScanFeatur
}
if ('memo' in scanAction.params) memoChanged(scanAction.params?.memo ?? '')
}
+
+ navigateTo.startTransfer()
break
}
case 'send-only-receiver': {
- navigateTo.back()
- navigateTo.send()
-
- if (insideFeature !== 'send') resetSendState()
+ if (insideFeature !== 'send') resetTransferState()
receiverResolveChanged(scanAction.receiver)
+
+ navigateTo.startTransfer()
break
}
@@ -97,7 +95,6 @@ export const useTriggerScanAction = ({insideFeature}: {insideFeature: ScanFeatur
)
openModal(stringsClaim.askConfirmationTitle, claimContent, 400)
-
break
}
}
diff --git a/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx b/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx
index 5688843252..f77de7d128 100644
--- a/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx
@@ -1,9 +1,11 @@
import {useTheme} from '@yoroi/theme'
+import {useTransfer} from '@yoroi/transfer'
import React from 'react'
import {StyleSheet, View} from 'react-native'
import {Button, Spacer, Text} from '../../../../../components'
import {useBlockGoBack, useWalletNavigation} from '../../../../../navigation'
+import {useLinksRequestRedirect} from '../../../../Links/common/useLinksRequestRedirect'
import {useStrings} from '../../../common/strings'
import {SubmittedTxImage} from './SubmittedTxImage'
@@ -12,6 +14,8 @@ export const SubmittedTxScreen = () => {
const strings = useStrings()
const styles = useStyles()
const {resetToTxHistory} = useWalletNavigation()
+ const {redirectTo} = useTransfer()
+ useLinksRequestRedirect(redirectTo)
return (
diff --git a/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/Summary/ReceiverInfo.tsx b/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/Summary/ReceiverInfo.tsx
index e04d6cdea1..d331fe7556 100644
--- a/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/Summary/ReceiverInfo.tsx
+++ b/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/Summary/ReceiverInfo.tsx
@@ -26,7 +26,7 @@ export const ReceiverInfo = ({target}: Props) => {
<>
- {receiver.selectedNameServer ? nameServerName[receiver.selectedNameServer] : ''}:
+ {receiver.selectedNameServer != null ? nameServerName[receiver.selectedNameServer] : ''}:
diff --git a/apps/wallet-mobile/src/i18n/global-messages.ts b/apps/wallet-mobile/src/i18n/global-messages.ts
index ca03409afb..c73d1538be 100644
--- a/apps/wallet-mobile/src/i18n/global-messages.ts
+++ b/apps/wallet-mobile/src/i18n/global-messages.ts
@@ -635,6 +635,18 @@ export const currencyNames = defineMessages({
})
export default defineMessages({
+ continue: {
+ id: 'global.continue',
+ defaultMessage: '!!!Continue',
+ },
+ disclaimer: {
+ id: 'global.disclaimer',
+ defaultMessage: '!!!Disclaimer',
+ },
+ unknown: {
+ id: 'global.unknown',
+ defaultMessage: '!!!Unknown',
+ },
apply: {
id: 'global.apply',
defaultMessage: '!!!Apply',
diff --git a/apps/wallet-mobile/src/i18n/locales/en-US.json b/apps/wallet-mobile/src/i18n/locales/en-US.json
index 503864e893..536ebbd551 100644
--- a/apps/wallet-mobile/src/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/i18n/locales/en-US.json
@@ -649,6 +649,7 @@
"global.clear": "clear",
"global.close": "close",
"global.collateral": "Collateral",
+ "global.disclaimer": "Disclaimer",
"global.multipleAddresses": "Multiple addresses",
"global.singleAddress": "Single address",
"global.multipleAddressesInfo": "By enabling this you can operate with more wallet addresses",
@@ -746,7 +747,16 @@
"global.txLabels.submittingTx": "Submitting transaction",
"global.txLabels.transactions": "Transactions",
"global.txLabels.withdrawals": "Withdrawals",
+ "global.unknown": "Unknown",
"global.yoroiZendesk": "Yoroi Zendesk",
+ "links.askToOpenAWallet.title": "Open a wallet",
+ "links.askToOpenAWallet.description": "This action requires a wallet to be opened. Please open a wallet first.",
+ "links.askToRedirect.title": "Redirect available",
+ "links.askToRedirect.description": "The caller that request this action has provided a way for Yoroi to return to their application, would you like to be redirected?",
+ "links.trusted.paymentRequested.title": "Payment requested",
+ "links.trusted.paymentRequested.description": "A request from a trusted app has been made that requires your approval. While this source is recognized and generally considered safe, we advise you to review the details in the transaction screen carefully before submitting any transaction.",
+ "links.untrusted.paymentRequested.title": "Payment requested",
+ "links.untrusted.paymentRequested.description": "A request from an untrusted app has been made. Engaging with this request could pose potential security risk to your wallet. Do not proceed without verifying the authenticity of the request. If you didn't start this action, please cancel it.",
"menu.allWallets": "All Wallets",
"menu.appSettings": "App Settings",
"menu.catalystVoting": "Catalyst Voting",
diff --git a/apps/wallet-mobile/src/navigation.tsx b/apps/wallet-mobile/src/navigation.tsx
index 0740aa1758..f4a99c1bd1 100644
--- a/apps/wallet-mobile/src/navigation.tsx
+++ b/apps/wallet-mobile/src/navigation.tsx
@@ -434,6 +434,47 @@ export const useWalletNavigation = () => {
})
},
+ resetToStartTransfer: () => {
+ navigation.reset({
+ index: 0,
+ routes: [
+ {
+ name: 'app-root',
+ state: {
+ routes: [
+ {name: 'wallet-selection'},
+ {
+ name: 'main-wallet-routes',
+ state: {
+ routes: [
+ {
+ name: 'history',
+ state: {
+ routes: [{name: 'send-start-tx'}],
+ },
+ },
+ ],
+ },
+ },
+ ],
+ },
+ },
+ ],
+ })
+ },
+
+ navigateToStartTransfer: () => {
+ navigation.navigate('app-root', {
+ screen: 'main-wallet-routes',
+ params: {
+ screen: 'history',
+ params: {
+ screen: 'send-start-tx',
+ },
+ },
+ })
+ },
+
resetToWalletSelection: () => {
navigation.reset({
index: 0,
diff --git a/apps/wallet-mobile/translations/messages/src/AppNavigator.json b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
index 3ba51b4bd2..79a154e757 100644
--- a/apps/wallet-mobile/translations/messages/src/AppNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
@@ -4,14 +4,14 @@
"defaultMessage": "!!!Enter PIN",
"file": "src/AppNavigator.tsx",
"start": {
- "line": 186,
+ "line": 189,
"column": 17,
- "index": 6385
+ "index": 6519
},
"end": {
- "line": 189,
+ "line": 192,
"column": 3,
- "index": 6475
+ "index": 6609
}
},
{
@@ -19,14 +19,14 @@
"defaultMessage": "!!!Set PIN",
"file": "src/AppNavigator.tsx",
"start": {
- "line": 190,
+ "line": 193,
"column": 18,
- "index": 6495
+ "index": 6629
},
"end": {
- "line": 193,
+ "line": 196,
"column": 3,
- "index": 6593
+ "index": 6727
}
},
{
@@ -34,14 +34,14 @@
"defaultMessage": "!!!Auth with OS changes",
"file": "src/AppNavigator.tsx",
"start": {
- "line": 194,
+ "line": 197,
"column": 25,
- "index": 6620
+ "index": 6754
},
"end": {
- "line": 197,
+ "line": 200,
"column": 3,
- "index": 6734
+ "index": 6868
}
},
{
@@ -49,14 +49,14 @@
"defaultMessage": "!!!Auth with OS changed detected",
"file": "src/AppNavigator.tsx",
"start": {
- "line": 198,
+ "line": 201,
"column": 27,
- "index": 6763
+ "index": 6897
},
"end": {
- "line": 201,
+ "line": 204,
"column": 3,
- "index": 6884
+ "index": 7018
}
}
]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/SelectedWallet/WalletSelection/WalletSelectionScreen.json b/apps/wallet-mobile/translations/messages/src/SelectedWallet/WalletSelection/WalletSelectionScreen.json
index d1a01c7b58..6583b12c2b 100644
--- a/apps/wallet-mobile/translations/messages/src/SelectedWallet/WalletSelection/WalletSelectionScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/SelectedWallet/WalletSelection/WalletSelectionScreen.json
@@ -4,14 +4,14 @@
"defaultMessage": "!!!My wallets",
"file": "src/SelectedWallet/WalletSelection/WalletSelectionScreen.tsx",
"start": {
- "line": 112,
+ "line": 107,
"column": 10,
- "index": 4316
+ "index": 4148
},
"end": {
- "line": 115,
+ "line": 110,
"column": 3,
- "index": 4425
+ "index": 4257
}
},
{
@@ -19,14 +19,14 @@
"defaultMessage": "!!!Add wallet",
"file": "src/SelectedWallet/WalletSelection/WalletSelectionScreen.tsx",
"start": {
- "line": 116,
+ "line": 111,
"column": 19,
- "index": 4446
+ "index": 4278
},
"end": {
- "line": 119,
+ "line": 114,
"column": 3,
- "index": 4564
+ "index": 4396
}
},
{
@@ -34,14 +34,14 @@
"defaultMessage": "!!!Add wallet (Jormungandr ITN)",
"file": "src/SelectedWallet/WalletSelection/WalletSelectionScreen.tsx",
"start": {
- "line": 120,
+ "line": 115,
"column": 28,
- "index": 4594
+ "index": 4426
},
"end": {
- "line": 123,
+ "line": 118,
"column": 3,
- "index": 4739
+ "index": 4571
}
},
{
@@ -49,14 +49,14 @@
"defaultMessage": "!!!Loading wallet",
"file": "src/SelectedWallet/WalletSelection/WalletSelectionScreen.tsx",
"start": {
- "line": 124,
+ "line": 119,
"column": 17,
- "index": 4758
+ "index": 4590
},
"end": {
- "line": 127,
+ "line": 122,
"column": 3,
- "index": 4878
+ "index": 4710
}
},
{
@@ -64,14 +64,14 @@
"defaultMessage": "!!!Ask our support team",
"file": "src/SelectedWallet/WalletSelection/WalletSelectionScreen.tsx",
"start": {
- "line": 128,
+ "line": 123,
"column": 21,
- "index": 4901
+ "index": 4733
},
"end": {
- "line": 131,
+ "line": 126,
"column": 3,
- "index": 5031
+ "index": 4863
}
}
]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistoryNavigator.json b/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistoryNavigator.json
index a4294d8715..bfd52c0554 100644
--- a/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistoryNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistoryNavigator.json
@@ -4,14 +4,14 @@
"defaultMessage": "!!!Receive",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 439,
+ "line": 435,
"column": 16,
- "index": 17531
+ "index": 16865
},
"end": {
- "line": 442,
+ "line": 438,
"column": 3,
- "index": 17620
+ "index": 16954
}
},
{
@@ -19,14 +19,14 @@
"defaultMessage": "!!!Swap",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 443,
+ "line": 439,
"column": 13,
- "index": 17635
+ "index": 16969
},
"end": {
- "line": 446,
+ "line": 442,
"column": 3,
- "index": 17708
+ "index": 17042
}
},
{
@@ -34,14 +34,14 @@
"defaultMessage": "!!!Swap from",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 447,
+ "line": 443,
"column": 17,
- "index": 17727
+ "index": 17061
},
"end": {
- "line": 450,
+ "line": 446,
"column": 3,
- "index": 17804
+ "index": 17138
}
},
{
@@ -49,14 +49,14 @@
"defaultMessage": "!!!Swap to",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 451,
+ "line": 447,
"column": 15,
- "index": 17821
+ "index": 17155
},
"end": {
- "line": 454,
+ "line": 450,
"column": 3,
- "index": 17894
+ "index": 17228
}
},
{
@@ -64,14 +64,14 @@
"defaultMessage": "!!!Slippage Tolerance",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 455,
+ "line": 451,
"column": 21,
- "index": 17917
+ "index": 17251
},
"end": {
- "line": 458,
+ "line": 454,
"column": 3,
- "index": 18012
+ "index": 17346
}
},
{
@@ -79,14 +79,14 @@
"defaultMessage": "!!!Select pool",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 459,
+ "line": 455,
"column": 14,
- "index": 18028
+ "index": 17362
},
"end": {
- "line": 462,
+ "line": 458,
"column": 3,
- "index": 18109
+ "index": 17443
}
},
{
@@ -94,14 +94,14 @@
"defaultMessage": "!!!Send",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 463,
+ "line": 459,
"column": 13,
- "index": 18124
+ "index": 17458
},
"end": {
- "line": 466,
+ "line": 462,
"column": 3,
- "index": 18204
+ "index": 17538
}
},
{
@@ -109,14 +109,14 @@
"defaultMessage": "!!!Scan QR code address",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 467,
+ "line": 463,
"column": 18,
- "index": 18224
+ "index": 17558
},
"end": {
- "line": 470,
+ "line": 466,
"column": 3,
- "index": 18325
+ "index": 17659
}
},
{
@@ -124,14 +124,14 @@
"defaultMessage": "!!!Select asset",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 471,
+ "line": 467,
"column": 20,
- "index": 18347
+ "index": 17681
},
"end": {
- "line": 474,
+ "line": 470,
"column": 3,
- "index": 18436
+ "index": 17770
}
},
{
@@ -139,14 +139,14 @@
"defaultMessage": "!!!Selected tokens",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 475,
+ "line": 471,
"column": 26,
- "index": 18464
+ "index": 17798
},
"end": {
- "line": 478,
+ "line": 474,
"column": 3,
- "index": 18568
+ "index": 17902
}
},
{
@@ -154,14 +154,14 @@
"defaultMessage": "!!!Edit amount",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 479,
+ "line": 475,
"column": 19,
- "index": 18589
+ "index": 17923
},
"end": {
- "line": 482,
+ "line": 478,
"column": 3,
- "index": 18682
+ "index": 18016
}
},
{
@@ -169,14 +169,14 @@
"defaultMessage": "!!!Confirm",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 483,
+ "line": 479,
"column": 16,
- "index": 18700
+ "index": 18034
},
"end": {
- "line": 486,
+ "line": 482,
"column": 3,
- "index": 18786
+ "index": 18120
}
},
{
@@ -184,14 +184,14 @@
"defaultMessage": "!!!Share this address to receive payments. To protect your privacy, new addresses are generated automatically once you use them.",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 487,
+ "line": 483,
"column": 19,
- "index": 18807
+ "index": 18141
},
"end": {
- "line": 493,
+ "line": 489,
"column": 3,
- "index": 19045
+ "index": 18379
}
},
{
@@ -199,14 +199,14 @@
"defaultMessage": "!!!Confirm transaction",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 494,
+ "line": 490,
"column": 27,
- "index": 19074
+ "index": 18408
},
"end": {
- "line": 497,
+ "line": 493,
"column": 3,
- "index": 19167
+ "index": 18501
}
},
{
@@ -214,14 +214,14 @@
"defaultMessage": "!!!Please scan a QR code",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 498,
+ "line": 494,
"column": 13,
- "index": 19182
+ "index": 18516
},
"end": {
- "line": 501,
+ "line": 497,
"column": 3,
- "index": 19257
+ "index": 18591
}
},
{
@@ -229,14 +229,14 @@
"defaultMessage": "!!!Success",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 502,
+ "line": 498,
"column": 25,
- "index": 19284
+ "index": 18618
},
"end": {
- "line": 505,
+ "line": 501,
"column": 3,
- "index": 19358
+ "index": 18692
}
},
{
@@ -244,14 +244,14 @@
"defaultMessage": "!!!Request specific amount",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 506,
+ "line": 502,
"column": 18,
- "index": 19378
+ "index": 18712
},
"end": {
- "line": 509,
+ "line": 505,
"column": 3,
- "index": 19492
+ "index": 18826
}
},
{
@@ -259,14 +259,14 @@
"defaultMessage": "!!!Buy/Sell ADA",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 510,
+ "line": 506,
"column": 28,
- "index": 19522
+ "index": 18856
},
"end": {
- "line": 513,
+ "line": 509,
"column": 3,
- "index": 19618
+ "index": 18952
}
},
{
@@ -274,14 +274,14 @@
"defaultMessage": "!!!Buy provider",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 514,
+ "line": 510,
"column": 29,
- "index": 19649
+ "index": 18983
},
"end": {
- "line": 517,
+ "line": 513,
"column": 3,
- "index": 19757
+ "index": 19091
}
},
{
@@ -289,14 +289,14 @@
"defaultMessage": "!!!Sell provider",
"file": "src/TxHistory/TxHistoryNavigator.tsx",
"start": {
- "line": 518,
+ "line": 514,
"column": 30,
- "index": 19789
+ "index": 19123
},
"end": {
- "line": 521,
+ "line": 517,
"column": 3,
- "index": 19899
+ "index": 19233
}
}
]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/WalletNavigator.json b/apps/wallet-mobile/translations/messages/src/WalletNavigator.json
index 8ad2138a47..69ae9658fd 100644
--- a/apps/wallet-mobile/translations/messages/src/WalletNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/WalletNavigator.json
@@ -4,14 +4,14 @@
"defaultMessage": "!!!Transactions",
"file": "src/WalletNavigator.tsx",
"start": {
- "line": 208,
+ "line": 201,
"column": 22,
- "index": 7114
+ "index": 6957
},
"end": {
- "line": 211,
+ "line": 204,
"column": 3,
- "index": 7217
+ "index": 7060
}
},
{
@@ -19,14 +19,14 @@
"defaultMessage": "!!!Send",
"file": "src/WalletNavigator.tsx",
"start": {
- "line": 212,
+ "line": 205,
"column": 14,
- "index": 7233
+ "index": 7076
},
"end": {
- "line": 215,
+ "line": 208,
"column": 3,
- "index": 7332
+ "index": 7175
}
},
{
@@ -34,14 +34,14 @@
"defaultMessage": "!!!Receive",
"file": "src/WalletNavigator.tsx",
"start": {
- "line": 216,
+ "line": 209,
"column": 17,
- "index": 7351
+ "index": 7194
},
"end": {
- "line": 219,
+ "line": 212,
"column": 3,
- "index": 7456
+ "index": 7299
}
},
{
@@ -49,14 +49,14 @@
"defaultMessage": "!!!Dashboard",
"file": "src/WalletNavigator.tsx",
"start": {
- "line": 220,
+ "line": 213,
"column": 19,
- "index": 7477
+ "index": 7320
},
"end": {
- "line": 223,
+ "line": 216,
"column": 3,
- "index": 7574
+ "index": 7417
}
},
{
@@ -64,14 +64,14 @@
"defaultMessage": "!!!Delegate",
"file": "src/WalletNavigator.tsx",
"start": {
- "line": 224,
+ "line": 217,
"column": 18,
- "index": 7594
+ "index": 7437
},
"end": {
- "line": 227,
+ "line": 220,
"column": 3,
- "index": 7689
+ "index": 7532
}
},
{
@@ -79,14 +79,14 @@
"defaultMessage": "!!!Wallet",
"file": "src/WalletNavigator.tsx",
"start": {
- "line": 228,
+ "line": 221,
"column": 16,
- "index": 7707
+ "index": 7550
},
"end": {
- "line": 231,
+ "line": 224,
"column": 3,
- "index": 7805
+ "index": 7648
}
},
{
@@ -94,14 +94,14 @@
"defaultMessage": "!!!Staking",
"file": "src/WalletNavigator.tsx",
"start": {
- "line": 232,
+ "line": 225,
"column": 17,
- "index": 7824
+ "index": 7667
},
"end": {
- "line": 235,
+ "line": 228,
"column": 3,
- "index": 7889
+ "index": 7732
}
},
{
@@ -109,14 +109,14 @@
"defaultMessage": "!!!NFT Gallery",
"file": "src/WalletNavigator.tsx",
"start": {
- "line": 236,
+ "line": 229,
"column": 14,
- "index": 7905
+ "index": 7748
},
"end": {
- "line": 239,
+ "line": 232,
"column": 3,
- "index": 7999
+ "index": 7842
}
},
{
@@ -124,14 +124,14 @@
"defaultMessage": "!!!Menu",
"file": "src/WalletNavigator.tsx",
"start": {
- "line": 240,
+ "line": 233,
"column": 14,
- "index": 8015
+ "index": 7858
},
"end": {
- "line": 243,
+ "line": 236,
"column": 3,
- "index": 8067
+ "index": 7910
}
}
-]
\ No newline at end of file
+]
diff --git a/apps/wallet-mobile/translations/messages/src/features/Links/common/useStrings.json b/apps/wallet-mobile/translations/messages/src/features/Links/common/useStrings.json
new file mode 100644
index 0000000000..40eeacfc3b
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/features/Links/common/useStrings.json
@@ -0,0 +1,122 @@
+[
+ {
+ "id": "links.trusted.paymentRequested.title",
+ "defaultMessage": "!!!Payment requested",
+ "file": "src/features/Links/common/useStrings.ts",
+ "start": {
+ "line": 31,
+ "column": 34,
+ "index": 1360
+ },
+ "end": {
+ "line": 34,
+ "column": 5,
+ "index": 1463
+ }
+ },
+ {
+ "id": "links.trusted.paymentRequested.description",
+ "defaultMessage": "!!!A payment has been requested.",
+ "file": "src/features/Links/common/useStrings.ts",
+ "start": {
+ "line": 35,
+ "column": 40,
+ "index": 1505
+ },
+ "end": {
+ "line": 38,
+ "column": 5,
+ "index": 1626
+ }
+ },
+ {
+ "id": "links.untrusted.paymentRequested.title",
+ "defaultMessage": "!!!Payment requested",
+ "file": "src/features/Links/common/useStrings.ts",
+ "start": {
+ "line": 39,
+ "column": 36,
+ "index": 1664
+ },
+ "end": {
+ "line": 42,
+ "column": 5,
+ "index": 1769
+ }
+ },
+ {
+ "id": "links.untrusted.paymentRequested.description",
+ "defaultMessage": "!!!A payment has been requested.",
+ "file": "src/features/Links/common/useStrings.ts",
+ "start": {
+ "line": 43,
+ "column": 42,
+ "index": 1813
+ },
+ "end": {
+ "line": 46,
+ "column": 5,
+ "index": 1936
+ }
+ },
+ {
+ "id": "links.askToOpenAWallet.title",
+ "defaultMessage": "!!!Open a wallet",
+ "file": "src/features/Links/common/useStrings.ts",
+ "start": {
+ "line": 48,
+ "column": 27,
+ "index": 1966
+ },
+ "end": {
+ "line": 51,
+ "column": 5,
+ "index": 2057
+ }
+ },
+ {
+ "id": "links.askToOpenAWallet.description",
+ "defaultMessage": "!!!To continue, open a wallet.",
+ "file": "src/features/Links/common/useStrings.ts",
+ "start": {
+ "line": 52,
+ "column": 33,
+ "index": 2092
+ },
+ "end": {
+ "line": 55,
+ "column": 5,
+ "index": 2203
+ }
+ },
+ {
+ "id": "links.askToRedirect.title",
+ "defaultMessage": "!!!Redirect available",
+ "file": "src/features/Links/common/useStrings.ts",
+ "start": {
+ "line": 57,
+ "column": 24,
+ "index": 2230
+ },
+ "end": {
+ "line": 60,
+ "column": 5,
+ "index": 2323
+ }
+ },
+ {
+ "id": "links.askToRedirect.description",
+ "defaultMessage": "!!!The caller that request this action has provided a way for Yoroi to return to their application, would you like to be redirected?",
+ "file": "src/features/Links/common/useStrings.ts",
+ "start": {
+ "line": 61,
+ "column": 30,
+ "index": 2355
+ },
+ "end": {
+ "line": 65,
+ "column": 5,
+ "index": 2573
+ }
+ }
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/i18n/global-messages.json b/apps/wallet-mobile/translations/messages/src/i18n/global-messages.json
index 6825b64daa..14c6aa9285 100644
--- a/apps/wallet-mobile/translations/messages/src/i18n/global-messages.json
+++ b/apps/wallet-mobile/translations/messages/src/i18n/global-messages.json
@@ -49,14 +49,14 @@
"defaultMessage": "!!!Cancel",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 802,
+ "line": 814,
"column": 10,
- "index": 23602
+ "index": 23848
},
"end": {
- "line": 805,
+ "line": 817,
"column": 3,
- "index": 23665
+ "index": 23911
}
},
{
@@ -1204,14 +1204,14 @@
"defaultMessage": "!!!Feature not supported",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 711,
+ "line": 723,
"column": 16,
- "index": 21369
+ "index": 21615
},
"end": {
- "line": 714,
+ "line": 726,
"column": 3,
- "index": 21453
+ "index": 21699
}
},
{
@@ -1384,14 +1384,14 @@
"defaultMessage": "!!!Assets",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 739,
+ "line": 751,
"column": 15,
- "index": 22194
+ "index": 22440
},
"end": {
- "line": 742,
+ "line": 754,
"column": 3,
- "index": 22269
+ "index": 22515
}
},
{
@@ -1714,14 +1714,14 @@
"defaultMessage": "!!!Coming soon",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 695,
+ "line": 707,
"column": 14,
- "index": 21017
+ "index": 21263
},
"end": {
- "line": 698,
+ "line": 710,
"column": 3,
- "index": 21089
+ "index": 21335
}
},
{
@@ -1874,19 +1874,64 @@
"index": 19505
}
},
+ {
+ "id": "global.continue",
+ "defaultMessage": "!!!Continue",
+ "file": "src/i18n/global-messages.ts",
+ "start": {
+ "line": 638,
+ "column": 12,
+ "index": 19555
+ },
+ "end": {
+ "line": 641,
+ "column": 3,
+ "index": 19622
+ }
+ },
+ {
+ "id": "global.disclaimer",
+ "defaultMessage": "!!!Disclaimer",
+ "file": "src/i18n/global-messages.ts",
+ "start": {
+ "line": 642,
+ "column": 14,
+ "index": 19638
+ },
+ "end": {
+ "line": 645,
+ "column": 3,
+ "index": 19709
+ }
+ },
+ {
+ "id": "global.unknown",
+ "defaultMessage": "!!!Unknown",
+ "file": "src/i18n/global-messages.ts",
+ "start": {
+ "line": 646,
+ "column": 11,
+ "index": 19722
+ },
+ "end": {
+ "line": 649,
+ "column": 3,
+ "index": 19787
+ }
+ },
{
"id": "global.apply",
"defaultMessage": "!!!Apply",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 638,
+ "line": 650,
"column": 9,
- "index": 19552
+ "index": 19798
},
"end": {
- "line": 641,
+ "line": 653,
"column": 3,
- "index": 19613
+ "index": 19859
}
},
{
@@ -1894,14 +1939,14 @@
"defaultMessage": "!!!Max",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 642,
+ "line": 654,
"column": 7,
- "index": 19622
+ "index": 19868
},
"end": {
- "line": 645,
+ "line": 657,
"column": 3,
- "index": 19679
+ "index": 19925
}
},
{
@@ -1909,14 +1954,14 @@
"defaultMessage": "!!!All done!",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 646,
+ "line": 658,
"column": 11,
- "index": 19692
+ "index": 19938
},
"end": {
- "line": 649,
+ "line": 661,
"column": 3,
- "index": 19815
+ "index": 20061
}
},
{
@@ -1924,14 +1969,14 @@
"defaultMessage": "!!!Attention",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 650,
+ "line": 662,
"column": 13,
- "index": 19830
+ "index": 20076
},
"end": {
- "line": 653,
+ "line": 665,
"column": 3,
- "index": 19930
+ "index": 20176
}
},
{
@@ -1939,14 +1984,14 @@
"defaultMessage": "!!!Try again",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 654,
+ "line": 666,
"column": 12,
- "index": 19944
+ "index": 20190
},
"end": {
- "line": 657,
+ "line": 669,
"column": 3,
- "index": 20012
+ "index": 20258
}
},
{
@@ -1954,14 +1999,14 @@
"defaultMessage": "!!!Wallet name cannot exceed 40 letters",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 658,
+ "line": 670,
"column": 26,
- "index": 20040
+ "index": 20286
},
"end": {
- "line": 661,
+ "line": 673,
"column": 3,
- "index": 20150
+ "index": 20396
}
},
{
@@ -1969,14 +2014,14 @@
"defaultMessage": "!!!You already have a wallet with this name",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 662,
+ "line": 674,
"column": 35,
- "index": 20187
+ "index": 20433
},
"end": {
- "line": 665,
+ "line": 677,
"column": 3,
- "index": 20306
+ "index": 20552
}
},
{
@@ -1984,14 +2029,14 @@
"defaultMessage": "!!!Must be filled",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 666,
+ "line": 678,
"column": 31,
- "index": 20339
+ "index": 20585
},
"end": {
- "line": 669,
+ "line": 681,
"column": 3,
- "index": 20432
+ "index": 20678
}
},
{
@@ -2000,14 +2045,14 @@
"defaultMessage": "!!!please wait ...",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 670,
+ "line": 682,
"column": 14,
- "index": 20448
+ "index": 20694
},
"end": {
- "line": 674,
+ "line": 686,
"column": 3,
- "index": 20587
+ "index": 20833
}
},
{
@@ -2015,14 +2060,14 @@
"defaultMessage": "!!!Please confirm",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 675,
+ "line": 687,
"column": 17,
- "index": 20606
+ "index": 20852
},
"end": {
- "line": 678,
+ "line": 690,
"column": 3,
- "index": 20684
+ "index": 20930
}
},
{
@@ -2030,14 +2075,14 @@
"defaultMessage": "!!!Terms of use",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 679,
+ "line": 691,
"column": 7,
- "index": 20693
+ "index": 20939
},
"end": {
- "line": 682,
+ "line": 694,
"column": 3,
- "index": 20766
+ "index": 21012
}
},
{
@@ -2045,14 +2090,14 @@
"defaultMessage": "!!!OK",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 683,
+ "line": 695,
"column": 6,
- "index": 20774
+ "index": 21020
},
"end": {
- "line": 686,
+ "line": 698,
"column": 3,
- "index": 20829
+ "index": 21075
}
},
{
@@ -2060,14 +2105,14 @@
"defaultMessage": "!!!close",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 687,
+ "line": 699,
"column": 9,
- "index": 20840
+ "index": 21086
},
"end": {
- "line": 690,
+ "line": 702,
"column": 3,
- "index": 20901
+ "index": 21147
}
},
{
@@ -2075,14 +2120,14 @@
"defaultMessage": "!!!Available funds",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 691,
+ "line": 703,
"column": 18,
- "index": 20921
+ "index": 21167
},
"end": {
- "line": 694,
+ "line": 706,
"column": 3,
- "index": 21001
+ "index": 21247
}
},
{
@@ -2090,14 +2135,14 @@
"defaultMessage": "!!!Deprecated",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 699,
+ "line": 711,
"column": 14,
- "index": 21105
+ "index": 21351
},
"end": {
- "line": 702,
+ "line": 714,
"column": 3,
- "index": 21176
+ "index": 21422
}
},
{
@@ -2105,14 +2150,14 @@
"defaultMessage": "!!!Epoch",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 703,
+ "line": 715,
"column": 14,
- "index": 21192
+ "index": 21438
},
"end": {
- "line": 706,
+ "line": 718,
"column": 3,
- "index": 21266
+ "index": 21512
}
},
{
@@ -2120,14 +2165,14 @@
"defaultMessage": "!!!Learn more",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 707,
+ "line": 719,
"column": 13,
- "index": 21281
+ "index": 21527
},
"end": {
- "line": 710,
+ "line": 722,
"column": 3,
- "index": 21351
+ "index": 21597
}
},
{
@@ -2135,14 +2180,14 @@
"defaultMessage": "!!!Total",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 715,
+ "line": 727,
"column": 9,
- "index": 21464
+ "index": 21710
},
"end": {
- "line": 718,
+ "line": 730,
"column": 3,
- "index": 21525
+ "index": 21771
}
},
{
@@ -2150,14 +2195,14 @@
"defaultMessage": "!!!Total ADA",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 719,
+ "line": 731,
"column": 12,
- "index": 21539
+ "index": 21785
},
"end": {
- "line": 722,
+ "line": 734,
"column": 3,
- "index": 21607
+ "index": 21853
}
},
{
@@ -2165,14 +2210,14 @@
"defaultMessage": "!!!Stake pool name",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 723,
+ "line": 735,
"column": 17,
- "index": 21626
+ "index": 21872
},
"end": {
- "line": 726,
+ "line": 738,
"column": 3,
- "index": 21713
+ "index": 21959
}
},
{
@@ -2180,14 +2225,14 @@
"defaultMessage": "!!!Stake pool hash",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 727,
+ "line": 739,
"column": 17,
- "index": 21732
+ "index": 21978
},
"end": {
- "line": 730,
+ "line": 742,
"column": 3,
- "index": 21819
+ "index": 22065
}
},
{
@@ -2195,14 +2240,14 @@
"defaultMessage": "!!!We are experiencing synchronization issues.",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 731,
+ "line": 743,
"column": 37,
- "index": 21858
+ "index": 22104
},
"end": {
- "line": 734,
+ "line": 746,
"column": 3,
- "index": 21993
+ "index": 22239
}
},
{
@@ -2210,14 +2255,14 @@
"defaultMessage": "!!!We are experiencing synchronization issues. Pull to refresh",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 735,
+ "line": 747,
"column": 34,
- "index": 22029
+ "index": 22275
},
"end": {
- "line": 738,
+ "line": 750,
"column": 3,
- "index": 22177
+ "index": 22423
}
},
{
@@ -2225,14 +2270,14 @@
"defaultMessage": "!!!Register to vote",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 743,
+ "line": 755,
"column": 15,
- "index": 22286
+ "index": 22532
},
"end": {
- "line": 746,
+ "line": 758,
"column": 3,
- "index": 22371
+ "index": 22617
}
},
{
@@ -2240,14 +2285,14 @@
"defaultMessage": "!!!Participating requires at least {requiredBalance},but you only have {currentBalance}. Unwithdrawn rewards are not included in this amount",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 747,
+ "line": 759,
"column": 23,
- "index": 22396
+ "index": 22642
},
"end": {
- "line": 753,
+ "line": 765,
"column": 3,
- "index": 22644
+ "index": 22890
}
},
{
@@ -2255,14 +2300,14 @@
"defaultMessage": "!!! NFTs",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 754,
+ "line": 766,
"column": 8,
- "index": 22654
+ "index": 22900
},
"end": {
- "line": 757,
+ "line": 769,
"column": 3,
- "index": 22714
+ "index": 22960
}
},
{
@@ -2270,14 +2315,14 @@
"defaultMessage": "!!! Tokens",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 758,
+ "line": 770,
"column": 10,
- "index": 22726
+ "index": 22972
},
"end": {
- "line": 761,
+ "line": 773,
"column": 3,
- "index": 22790
+ "index": 23036
}
},
{
@@ -2285,14 +2330,14 @@
"defaultMessage": "!!! Assets",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 762,
+ "line": 774,
"column": 10,
- "index": 22802
+ "index": 23048
},
"end": {
- "line": 765,
+ "line": 777,
"column": 3,
- "index": 22866
+ "index": 23112
}
},
{
@@ -2300,14 +2345,14 @@
"defaultMessage": "!!! available",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 766,
+ "line": 778,
"column": 13,
- "index": 22881
+ "index": 23127
},
"end": {
- "line": 769,
+ "line": 781,
"column": 3,
- "index": 22951
+ "index": 23197
}
},
{
@@ -2315,14 +2360,14 @@
"defaultMessage": "!!! Dex",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 770,
+ "line": 782,
"column": 9,
- "index": 22962
+ "index": 23208
},
"end": {
- "line": 773,
+ "line": 785,
"column": 3,
- "index": 23022
+ "index": 23268
}
},
{
@@ -2330,14 +2375,14 @@
"defaultMessage": "!!! Price",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 774,
+ "line": 786,
"column": 9,
- "index": 23033
+ "index": 23279
},
"end": {
- "line": 777,
+ "line": 789,
"column": 3,
- "index": 23095
+ "index": 23341
}
},
{
@@ -2345,14 +2390,14 @@
"defaultMessage": "!!!All",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 778,
+ "line": 790,
"column": 7,
- "index": 23104
+ "index": 23350
},
"end": {
- "line": 781,
+ "line": 793,
"column": 3,
- "index": 23161
+ "index": 23407
}
},
{
@@ -2360,14 +2405,14 @@
"defaultMessage": "!!!Locked deposit",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 782,
+ "line": 794,
"column": 17,
- "index": 23180
+ "index": 23426
},
"end": {
- "line": 785,
+ "line": 797,
"column": 3,
- "index": 23258
+ "index": 23504
}
},
{
@@ -2375,14 +2420,14 @@
"defaultMessage": "!!!Locked deposit hint",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 786,
+ "line": 798,
"column": 21,
- "index": 23281
+ "index": 23527
},
"end": {
- "line": 789,
+ "line": 801,
"column": 3,
- "index": 23368
+ "index": 23614
}
},
{
@@ -2390,14 +2435,14 @@
"defaultMessage": "!!!Currency",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 790,
+ "line": 802,
"column": 12,
- "index": 23382
+ "index": 23628
},
"end": {
- "line": 793,
+ "line": 805,
"column": 3,
- "index": 23449
+ "index": 23695
}
},
{
@@ -2405,14 +2450,14 @@
"defaultMessage": "!!!Next",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 794,
+ "line": 806,
"column": 8,
- "index": 23459
+ "index": 23705
},
"end": {
- "line": 797,
+ "line": 809,
"column": 3,
- "index": 23518
+ "index": 23764
}
},
{
@@ -2420,14 +2465,14 @@
"defaultMessage": "!!!Error",
"file": "src/i18n/global-messages.ts",
"start": {
- "line": 798,
+ "line": 810,
"column": 9,
- "index": 23529
+ "index": 23775
},
"end": {
- "line": 801,
+ "line": 813,
"column": 3,
- "index": 23590
+ "index": 23836
}
}
]
\ No newline at end of file
diff --git a/packages/links/README.md b/packages/links/README.md
index 753f6d8acb..0da3b3ecb7 100644
--- a/packages/links/README.md
+++ b/packages/links/README.md
@@ -150,7 +150,7 @@ This schema is designed for adding information about how Yoroi should behave, ev
- `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.
-### `LinksYoroiExchangeShowCreateResultSchema`
+### `ExchangeShowCreateResultSchema`
This schema validates data for the creation result of a order to exchange coins, the link includes the following fields:
@@ -162,7 +162,7 @@ This schema validates data for the creation result of a order to exchange coins,
- It also merges all fields from `PartnerInfoSchema`.
- `orderType`: 'buy' | 'sell' The order type.
-### `LinksYoroiTransferRequestAdaSchema`
+### `TransferRequestAdaSchema`
This schema is for validating transfer requests of ADA and includes the following fields:
@@ -175,7 +175,7 @@ This schema is for validating transfer requests of ADA and includes the followin
- `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`.
-### `LinksYoroiTransferRequestAdaWithLinkSchema`
+### `TransferRequestAdaWithLinkSchema`
This schema validates transfer requests that include a URL and has the following fields:
diff --git a/packages/links/src/yoroi/links-builder.ts b/packages/links/src/yoroi/links-builder.ts
index 5c1d4e8638..67f22a6e17 100644
--- a/packages/links/src/yoroi/links-builder.ts
+++ b/packages/links/src/yoroi/links-builder.ts
@@ -5,11 +5,11 @@ import {SchemaInfer} from './types'
import {convertObjectToSearchParams} from './helpers'
export const linksYoroiBuilder = (
- schema: T,
+ encoder: T,
config: Links.YoroiUriConfig,
) => {
const create = (params: Readonly>) => {
- const result = schema.safeParse(params)
+ const result = encoder.safeParse(params)
if (!result.success) {
throw new Links.Errors.ParamsValidationFailed(
@@ -17,11 +17,11 @@ export const linksYoroiBuilder = (
)
}
- const queryParams = convertObjectToSearchParams(result.data)
+ const query = convertObjectToSearchParams(result.data)
const {scheme, authority, path, version} = config
const url = new URL(
- `${scheme}://${authority}/${version}/${path}?${queryParams.toString()}`,
+ `${scheme}://${authority}/${version}/${path}?${query.toString()}`,
)
return url.toString()
}
diff --git a/packages/links/src/yoroi/links-parser.test.ts b/packages/links/src/yoroi/links-parser.test.ts
index ba4cb6c8bd..726fc3a5e2 100644
--- a/packages/links/src/yoroi/links-parser.test.ts
+++ b/packages/links/src/yoroi/links-parser.test.ts
@@ -65,7 +65,7 @@ describe('linksYoroiParser', () => {
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'
+ 'yoroi://yoroi-wallet.com/w1/transfer/request/ada-with-link?link=web%252Bcardano%253Aaddr1qygnpgnmc4twqxe4qnj3pakudc0ysheqwflv8guwwlply7zptg3wjqz84kx3t4re4xpqvs3fu7mvsahwhyxd4q3qq90s7sgxnh%253Famount%253D10&authorization=uuid-v4'
const result = linksYoroiParser(link)
diff --git a/packages/links/src/yoroi/links-parser.ts b/packages/links/src/yoroi/links-parser.ts
index 98be334740..a6c3aca77f 100644
--- a/packages/links/src/yoroi/links-parser.ts
+++ b/packages/links/src/yoroi/links-parser.ts
@@ -1,9 +1,9 @@
import {freeze} from 'immer'
import {
- LinksYoroiExchangeShowCreateResultSchema,
- LinksYoroiTransferRequestAdaSchema,
- LinksYoroiTransferRequestAdaWithLinkSchema,
+ ExchangeShowCreateResultSchema,
+ TransferRequestAdaSchema,
+ TransferRequestAdaWithLinkSchema,
} from './validators'
import {convertSearchParamsToObject} from './helpers'
import {LinksYoroiActionInfo} from './types'
@@ -17,8 +17,7 @@ export const linksYoroiParser = (
switch (url.pathname) {
case `/w1/transfer/request/ada`: {
const objectFromParams = convertSearchParamsToObject(url.searchParams)
- const params =
- LinksYoroiTransferRequestAdaSchema.parse(objectFromParams)
+ const params = TransferRequestAdaSchema.parse(objectFromParams)
return freeze(
{
version: 1,
@@ -31,8 +30,7 @@ export const linksYoroiParser = (
}
case `/w1/transfer/request/ada-with-link`: {
const objectFromParams = convertSearchParamsToObject(url.searchParams)
- const params =
- LinksYoroiTransferRequestAdaWithLinkSchema.parse(objectFromParams)
+ const params = TransferRequestAdaWithLinkSchema.parse(objectFromParams)
return freeze(
{
version: 1,
@@ -45,8 +43,7 @@ export const linksYoroiParser = (
}
case `/w1/exchange/order/show-create-result`: {
const objectFromParams = convertSearchParamsToObject(url.searchParams)
- const params =
- LinksYoroiExchangeShowCreateResultSchema.parse(objectFromParams)
+ const params = ExchangeShowCreateResultSchema.parse(objectFromParams)
return freeze(
{
version: 1,
diff --git a/packages/links/src/yoroi/module.test.ts b/packages/links/src/yoroi/module.test.ts
index 734a1098e0..ec27d5009a 100644
--- a/packages/links/src/yoroi/module.test.ts
+++ b/packages/links/src/yoroi/module.test.ts
@@ -2,25 +2,24 @@ import {configCardanoLegacyTransfer} from '../cardano/constants'
import {linksCardanoModuleMaker} from '../cardano/module'
import {linksYoroiModuleMaker} from './module'
import {
- LinksYoroiExchangeShowCreateResultParams,
- LinksYoroiTransferRequestAdaParams,
- LinksYoroiTransferRequestAdaWithLinkParams,
+ LinksExchangeShowCreateResultParams,
+ LinksTransferRequestAdaParams,
+ LinksTransferRequestAdaWithLinkParams,
} from './types'
describe('linksYoroiModuleMaker', () => {
it('should create exchange links', () => {
const {exchange} = linksYoroiModuleMaker('yoroi')
- const createOrderShowResultParams: LinksYoroiExchangeShowCreateResultParams =
- {
- provider: 'yoroi',
- coinAmount: 10,
- coin: 'ADA',
- fiatAmount: 100,
- fiat: 'USD',
- status: 'success',
- orderType: 'buy',
- }
+ const createOrderShowResultParams: LinksExchangeShowCreateResultParams = {
+ provider: 'yoroi',
+ coinAmount: 10,
+ coin: 'ADA',
+ fiatAmount: 100,
+ fiat: 'USD',
+ status: 'success',
+ orderType: 'buy',
+ }
const createOrderShowResultLink = exchange.order.showCreateResult(
createOrderShowResultParams,
@@ -32,10 +31,10 @@ describe('linksYoroiModuleMaker', () => {
expect(createOrderShowResultLink).toEqual(expected)
})
- it('should create transfer links', () => {
+ it('should create transfer with links', () => {
const {transfer} = linksYoroiModuleMaker('yoroi')
- const transferRequestAdaParams: LinksYoroiTransferRequestAdaParams = {
+ const transferRequestAdaParams: LinksTransferRequestAdaParams = {
targets: [
{
receiver: 'exampleReceiver',
@@ -68,7 +67,7 @@ describe('linksYoroiModuleMaker', () => {
'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: LinksYoroiTransferRequestAdaWithLinkParams = {
+ const wrongAdaLink: LinksTransferRequestAdaWithLinkParams = {
link: 'exampleLink',
authorization: 'uuid-v4',
}
@@ -83,17 +82,38 @@ describe('linksYoroiModuleMaker', () => {
},
})
- const requestAdaWithLinkParams: LinksYoroiTransferRequestAdaWithLinkParams =
- {
- link: correctAdaLink.link,
- authorization: 'uuid-v4',
- }
+ const requestAdaWithLinkParams: LinksTransferRequestAdaWithLinkParams = {
+ link: correctAdaLink.link,
+ authorization: 'ac0692d3-bf34-44e2-b57d-53e4ce47666b',
+ message: 'hi there',
+ walletId: 'c4832ba5-c03e-4bd8-93ee-52536f1b1747',
+ appId: 'yoroi',
+ isSandbox: true,
+ isTestnet: false,
+ redirectTo: 'https://yoroi-wallet.com',
+ signature:
+ '4B7C8DB8B485D176D426980EE8A0D8A600B305AE2D7DC835B537657E2DAE110A6F7C0A641EAA623A8C43568BFC9DDCED5CBEA5AD6768BDE89F084EEDDBEBA36A',
+ }
const requestAdaWithLinkLink = transfer.request.adaWithLink(
requestAdaWithLinkParams,
)
const expectedRequestAdaWithLinkLink =
- 'yoroi://yoroi-wallet.com/w1/transfer/request/ada-with-link?link=web%2Bcardano%3Aaddr1qygnpgnmc4twqxe4qnj3pakudc0ysheqwflv8guwwlply7zptg3wjqz84kx3t4re4xpqvs3fu7mvsahwhyxd4q3qq90s7sgxnh%3Famount%3D10&authorization=uuid-v4'
+ 'yoroi://yoroi-wallet.com/w1/transfer/request/ada-with-link?link=web%252Bcardano%253Aaddr1qygnpgnmc4twqxe4qnj3pakudc0ysheqwflv8guwwlply7zptg3wjqz84kx3t4re4xpqvs3fu7mvsahwhyxd4q3qq90s7sgxnh%253Famount%253D10&isSandbox=true&isTestnet=false&appId=yoroi&message=hi+there&walletId=c4832ba5-c03e-4bd8-93ee-52536f1b1747&authorization=ac0692d3-bf34-44e2-b57d-53e4ce47666b&signature=4B7C8DB8B485D176D426980EE8A0D8A600B305AE2D7DC835B537657E2DAE110A6F7C0A641EAA623A8C43568BFC9DDCED5CBEA5AD6768BDE89F084EEDDBEBA36A&redirectTo=https%253A%252F%252Fyoroi-wallet.com'
expect(requestAdaWithLinkLink).toEqual(expectedRequestAdaWithLinkLink)
+
+ const requestAdaWithLinkParamsOnlyLink: LinksTransferRequestAdaWithLinkParams =
+ {
+ link: correctAdaLink.link,
+ }
+ const requestAdaWithLinkOnlyLink = transfer.request.adaWithLink(
+ requestAdaWithLinkParamsOnlyLink,
+ )
+ const expectedRequestAdaWithLinkOnlyLink =
+ 'yoroi://yoroi-wallet.com/w1/transfer/request/ada-with-link?link=web%252Bcardano%253Aaddr1qygnpgnmc4twqxe4qnj3pakudc0ysheqwflv8guwwlply7zptg3wjqz84kx3t4re4xpqvs3fu7mvsahwhyxd4q3qq90s7sgxnh%253Famount%253D10'
+
+ expect(requestAdaWithLinkOnlyLink).toEqual(
+ expectedRequestAdaWithLinkOnlyLink,
+ )
})
})
diff --git a/packages/links/src/yoroi/module.ts b/packages/links/src/yoroi/module.ts
index b3fa0a33d3..36f1365141 100644
--- a/packages/links/src/yoroi/module.ts
+++ b/packages/links/src/yoroi/module.ts
@@ -8,37 +8,34 @@ import {
configYoroiTransferRequestAdaWithLink,
} from './constants'
import {
- LinksYoroiExchangeShowCreateResultSchema,
- LinksYoroiTransferRequestAdaSchema,
- LinksYoroiTransferRequestAdaWithLinkSchema,
-} from './validators'
+ encodeExchangeShowCreateResult,
+ encodeTransferRequestAda,
+ encodeTransferRequestAdaWithLink,
+} from './transformers'
export const linksYoroiModuleMaker = (
scheme: Links.YoroiUriConfig['scheme'],
) => {
const exchange = {
order: {
- showCreateResult: linksYoroiBuilder(
- LinksYoroiExchangeShowCreateResultSchema,
- {...configYoroiExchangeOrderShowCreateResult, scheme},
- ).create,
+ showCreateResult: linksYoroiBuilder(encodeExchangeShowCreateResult, {
+ ...configYoroiExchangeOrderShowCreateResult,
+ scheme,
+ }).create,
},
}
const transfer = {
request: {
- ada: linksYoroiBuilder(LinksYoroiTransferRequestAdaSchema, {
+ ada: linksYoroiBuilder(encodeTransferRequestAda, {
...configYoroiTransferRequestAda,
scheme,
}).create,
- adaWithLink: linksYoroiBuilder(
- LinksYoroiTransferRequestAdaWithLinkSchema,
- {
- ...configYoroiTransferRequestAdaWithLink,
- scheme,
- },
- ).create,
+ adaWithLink: linksYoroiBuilder(encodeTransferRequestAdaWithLink, {
+ ...configYoroiTransferRequestAdaWithLink,
+ scheme,
+ }).create,
},
}
diff --git a/packages/links/src/yoroi/transformers.mocks.ts b/packages/links/src/yoroi/transformers.mocks.ts
new file mode 100644
index 0000000000..ccf09b97db
--- /dev/null
+++ b/packages/links/src/yoroi/transformers.mocks.ts
@@ -0,0 +1,101 @@
+import {freeze} from 'immer'
+import {
+ LinksExchangeShowCreateResultParams,
+ LinksTransferRequestAdaParams,
+ LinksTransferRequestAdaWithLinkParams,
+} from './types'
+
+const exchangeShowCreateResultParams: LinksExchangeShowCreateResultParams = {
+ coin: 'ADA',
+ coinAmount: 10,
+ fiat: 'USD',
+ fiatAmount: 100,
+ orderType: 'buy',
+ provider: 'yoroi',
+ status: 'success',
+}
+const exchangeShowCreateResultResult: LinksExchangeShowCreateResultParams = {
+ coin: 'ADA',
+ coinAmount: 10,
+ fiat: 'USD',
+ fiatAmount: 100,
+ orderType: 'buy',
+ provider: 'yoroi',
+ status: 'success',
+}
+
+const transferRequestAdaParams: LinksTransferRequestAdaParams = {
+ targets: [
+ {
+ amounts: [
+ {
+ quantity: '1000000',
+ tokenId: '.',
+ },
+ ],
+ datum: 'DEADDEAD',
+ receiver: '$stackchain',
+ },
+ {
+ amounts: [
+ {
+ quantity: '1000000',
+ tokenId: 'exampleTokenId.name2',
+ },
+ ],
+ receiver: 'stackchain.ada',
+ },
+ ],
+}
+const transferRequestAdaResult: LinksTransferRequestAdaParams = {
+ targets: [
+ {
+ amounts: [
+ {
+ quantity: '1000000',
+ tokenId: '.',
+ },
+ ],
+ datum: 'DEADDEAD',
+ receiver: '$stackchain',
+ },
+ {
+ amounts: [
+ {
+ quantity: '1000000',
+ tokenId: 'exampleTokenId.name2',
+ },
+ ],
+ receiver: 'stackchain.ada',
+ },
+ ],
+}
+
+const transferRequestAdaWithLinkParams: LinksTransferRequestAdaWithLinkParams =
+ {
+ link: 'web+cardano:addr1qygnpgnmc4twqxe4qnj3pakudc0ysheqwflv8guwwlply7zptg3wjqz84kx3t4re4xpqvs3fu7mvsahwhyxd4q3qq90s7sgxnh?amount=10',
+ }
+const transferRequestAdaWithLinkResult: LinksTransferRequestAdaWithLinkParams =
+ {
+ link: encodeURIComponent(
+ 'web+cardano:addr1qygnpgnmc4twqxe4qnj3pakudc0ysheqwflv8guwwlply7zptg3wjqz84kx3t4re4xpqvs3fu7mvsahwhyxd4q3qq90s7sgxnh?amount=10',
+ ),
+ }
+
+export const mocks = freeze(
+ {
+ exchangeShowCreateResult: {
+ params: exchangeShowCreateResultParams,
+ result: exchangeShowCreateResultResult,
+ },
+ transferRequestAda: {
+ params: transferRequestAdaParams,
+ result: transferRequestAdaResult,
+ },
+ transferRequestAdaWithLink: {
+ params: transferRequestAdaWithLinkParams,
+ result: transferRequestAdaWithLinkResult,
+ },
+ },
+ true,
+)
diff --git a/packages/links/src/yoroi/transformers.test.ts b/packages/links/src/yoroi/transformers.test.ts
new file mode 100644
index 0000000000..935b73ce22
--- /dev/null
+++ b/packages/links/src/yoroi/transformers.test.ts
@@ -0,0 +1,223 @@
+import {
+ decodeExchangeShowCreateResult,
+ decodeTransferRequestAda,
+ decodeTransferRequestAdaWithLink,
+ encodeExchangeShowCreateResult,
+ encodeTransferRequestAda,
+ encodeTransferRequestAdaWithLink,
+} from './transformers'
+import {mocks} from './transformers.mocks'
+
+describe('transformers', () => {
+ describe('encodeExchangeShowCreateResult', () => {
+ it('should encode redirectTo if it is a safe URL', () => {
+ const result = encodeExchangeShowCreateResult.parse({
+ ...mocks.exchangeShowCreateResult.params,
+ redirectTo: 'https://example.com',
+ })
+
+ expect(result).toEqual({
+ ...mocks.exchangeShowCreateResult.result,
+ redirectTo: encodeURIComponent('https://example.com'),
+ })
+ })
+
+ it('should throw if redirectTo is not a safe URL', () => {
+ expect(() =>
+ encodeExchangeShowCreateResult.parse({
+ ...mocks.exchangeShowCreateResult.params,
+ redirectTo:
+ "http://example.com/welcome?message=",
+ }),
+ ).toThrow()
+ })
+
+ it('should not encode redirectTo when not present', () => {
+ const result = encodeExchangeShowCreateResult.parse(
+ mocks.exchangeShowCreateResult.params,
+ )
+
+ expect(result).toEqual(mocks.exchangeShowCreateResult.result)
+ })
+ })
+
+ describe('decodeExchangeShowCreateResult', () => {
+ it('should decode redirectTo if it is a safe URL', () => {
+ const result = decodeExchangeShowCreateResult.parse({
+ ...mocks.exchangeShowCreateResult.result,
+ redirectTo: encodeURIComponent('https://example.com'),
+ })
+
+ expect(result).toEqual({
+ ...mocks.exchangeShowCreateResult.params,
+ redirectTo: 'https://example.com',
+ })
+ })
+
+ it('should throw if redirectTo is not a safe URL', () => {
+ expect(() =>
+ decodeExchangeShowCreateResult.parse({
+ ...mocks.exchangeShowCreateResult.result,
+ redirectTo:
+ 'http://example.com/welcome?message=',
+ }),
+ ).toThrow()
+ })
+
+ it('should not decode redirectTo when not present', () => {
+ const params = decodeExchangeShowCreateResult.parse(
+ mocks.exchangeShowCreateResult.result,
+ )
+
+ expect(params).toEqual(mocks.exchangeShowCreateResult.params)
+ })
+ })
+
+ describe('encodeTransferRequestAdaWithLink', () => {
+ it('should encode link', () => {
+ const result = encodeTransferRequestAdaWithLink.parse(
+ mocks.transferRequestAdaWithLink.params,
+ )
+
+ expect(result).toEqual(mocks.transferRequestAdaWithLink.result)
+ })
+
+ it('should encode redirectTo and link', () => {
+ const result = encodeTransferRequestAdaWithLink.parse({
+ ...mocks.transferRequestAdaWithLink.params,
+ redirectTo: 'https://example.com',
+ })
+
+ expect(result).toEqual({
+ ...mocks.transferRequestAdaWithLink.result,
+ redirectTo: encodeURIComponent('https://example.com'),
+ })
+ })
+
+ it('should throw if redirectTo is not a safe URL', () => {
+ expect(() =>
+ encodeTransferRequestAdaWithLink.parse({
+ ...mocks.transferRequestAdaWithLink.params,
+ redirectTo:
+ "http://example.com/welcome?message=",
+ }),
+ ).toThrow()
+ })
+
+ it('should throw if link is not a valid cardano link', () => {
+ expect(() =>
+ encodeTransferRequestAdaWithLink.parse({
+ ...mocks.transferRequestAdaWithLink.params,
+ link: 'invalid',
+ }),
+ ).toThrow()
+ })
+ })
+
+ describe('decodeTransferRequestAdaWithLink', () => {
+ it('should decode link', () => {
+ const result = decodeTransferRequestAdaWithLink.parse(
+ mocks.transferRequestAdaWithLink.result,
+ )
+
+ expect(result).toEqual(mocks.transferRequestAdaWithLink.params)
+ })
+
+ it('should decode redirectTo and link', () => {
+ const result = decodeTransferRequestAdaWithLink.parse({
+ ...mocks.transferRequestAdaWithLink.result,
+ redirectTo: encodeURIComponent('https://example.com'),
+ })
+
+ expect(result).toEqual({
+ ...mocks.transferRequestAdaWithLink.params,
+ redirectTo: 'https://example.com',
+ })
+ })
+
+ it('should throw if redirectTo is not a safe URL', () => {
+ expect(() =>
+ decodeTransferRequestAdaWithLink.parse({
+ ...mocks.transferRequestAdaWithLink.result,
+ redirectTo: encodeURIComponent(
+ 'http://example.com/welcome?message=',
+ ),
+ }),
+ ).toThrow()
+ })
+
+ it('should throw if link is not a valid cardano link', () => {
+ expect(() =>
+ decodeTransferRequestAdaWithLink.parse({
+ ...mocks.transferRequestAdaWithLink.result,
+ link: 'invalid',
+ }),
+ ).toThrow()
+ })
+ })
+
+ describe('encodeTransferRequestAda', () => {
+ it('should encode', () => {
+ const result = encodeTransferRequestAda.parse(
+ mocks.transferRequestAda.params,
+ )
+
+ expect(result).toEqual(mocks.transferRequestAda.result)
+ })
+
+ it('should throw if redirectTo is not a safe URL', () => {
+ expect(() =>
+ encodeTransferRequestAda.parse({
+ ...mocks.transferRequestAda.params,
+ redirectTo:
+ "http://example.com/welcome?message=",
+ }),
+ ).toThrow()
+ })
+
+ it('should encode with redirectTo', () => {
+ const result = encodeTransferRequestAda.parse({
+ ...mocks.transferRequestAda.params,
+ redirectTo: 'https://example.com',
+ })
+
+ expect(result).toEqual({
+ ...mocks.transferRequestAda.result,
+ redirectTo: encodeURIComponent('https://example.com'),
+ })
+ })
+ })
+
+ describe('decodeTransferRequestAda', () => {
+ it('should decode', () => {
+ const result = decodeTransferRequestAda.parse(
+ mocks.transferRequestAda.result,
+ )
+
+ expect(result).toEqual(mocks.transferRequestAda.params)
+ })
+
+ it('should throw if redirectTo is not a safe URL', () => {
+ expect(() =>
+ decodeTransferRequestAda.parse({
+ ...mocks.transferRequestAda.result,
+ redirectTo: encodeURIComponent(
+ 'http://example.com/welcome?message=',
+ ),
+ }),
+ ).toThrow()
+ })
+
+ it('should decode with redirectTo', () => {
+ const result = decodeTransferRequestAda.parse({
+ ...mocks.transferRequestAda.result,
+ redirectTo: encodeURIComponent('https://example.com'),
+ })
+
+ expect(result).toEqual({
+ ...mocks.transferRequestAda.params,
+ redirectTo: 'https://example.com',
+ })
+ })
+ })
+})
diff --git a/packages/links/src/yoroi/transformers.ts b/packages/links/src/yoroi/transformers.ts
new file mode 100644
index 0000000000..f7b0209b89
--- /dev/null
+++ b/packages/links/src/yoroi/transformers.ts
@@ -0,0 +1,131 @@
+import {linksCardanoModuleMaker} from '../cardano/module'
+import {
+ ExchangeShowCreateResultSchema,
+ TransferRequestAdaSchema,
+ TransferRequestAdaWithLinkSchema,
+ isUnsafeUrl,
+} from './validators'
+
+export const encodeExchangeShowCreateResult =
+ ExchangeShowCreateResultSchema.refine((toCheck) => {
+ if (toCheck.redirectTo != null && isUnsafeUrl(toCheck.redirectTo))
+ return false
+
+ return true
+ }).transform((toTransform) => {
+ if (toTransform.redirectTo != null) {
+ return {
+ ...toTransform,
+ redirectTo: encodeURIComponent(toTransform.redirectTo),
+ }
+ }
+ return toTransform
+ })
+export const decodeExchangeShowCreateResult =
+ ExchangeShowCreateResultSchema.refine((toCheck) => {
+ if (
+ toCheck.redirectTo != null &&
+ isUnsafeUrl(decodeURIComponent(toCheck.redirectTo))
+ )
+ return false
+
+ return true
+ }).transform((toTransform) => {
+ if (toTransform.redirectTo != null) {
+ return {
+ ...toTransform,
+ redirectTo: decodeURIComponent(toTransform.redirectTo),
+ }
+ }
+ return toTransform
+ })
+
+export const encodeTransferRequestAdaWithLink =
+ TransferRequestAdaWithLinkSchema.refine((toCheck) => {
+ if (toCheck.redirectTo != null && isUnsafeUrl(toCheck.redirectTo))
+ return false
+
+ try {
+ linksCardanoModuleMaker().parse(toCheck.link)
+ return true
+ } catch {
+ return false
+ }
+ }).transform((toTransform) => {
+ if (toTransform.redirectTo != null) {
+ return {
+ ...toTransform,
+ redirectTo: encodeURIComponent(toTransform.redirectTo),
+ link: encodeURIComponent(toTransform.link),
+ }
+ }
+ return {
+ ...toTransform,
+ link: encodeURIComponent(toTransform.link),
+ }
+ })
+
+export const decodeTransferRequestAdaWithLink =
+ TransferRequestAdaWithLinkSchema.refine((toCheck) => {
+ if (
+ toCheck.redirectTo != null &&
+ isUnsafeUrl(decodeURIComponent(toCheck.redirectTo))
+ )
+ return false
+
+ try {
+ linksCardanoModuleMaker().parse(decodeURIComponent(toCheck.link))
+ return true
+ } catch {
+ return false
+ }
+ }).transform((toTransform) => {
+ if (toTransform.redirectTo != null) {
+ return {
+ ...toTransform,
+ redirectTo: decodeURIComponent(toTransform.redirectTo),
+ link: decodeURIComponent(toTransform.link),
+ }
+ }
+ return {
+ ...toTransform,
+ link: decodeURIComponent(toTransform.link),
+ }
+ })
+
+export const encodeTransferRequestAda = TransferRequestAdaSchema.refine(
+ (toCheck) => {
+ if (toCheck.redirectTo != null && isUnsafeUrl(toCheck.redirectTo))
+ return false
+
+ return true
+ },
+).transform((toTransform) => {
+ if (toTransform.redirectTo != null) {
+ return {
+ ...toTransform,
+ redirectTo: encodeURIComponent(toTransform.redirectTo),
+ }
+ }
+ return toTransform
+})
+
+export const decodeTransferRequestAda = TransferRequestAdaSchema.refine(
+ (toCheck) => {
+ if (
+ toCheck.redirectTo != null &&
+ isUnsafeUrl(decodeURIComponent(toCheck.redirectTo))
+ )
+ return false
+
+ return true
+ },
+).transform((toTransform) => {
+ if (toTransform.redirectTo != null) {
+ return {
+ ...toTransform,
+ redirectTo: decodeURIComponent(toTransform.redirectTo),
+ }
+ }
+ return toTransform
+})
diff --git a/packages/links/src/yoroi/types.ts b/packages/links/src/yoroi/types.ts
index c5f2a83b71..2af15afd00 100644
--- a/packages/links/src/yoroi/types.ts
+++ b/packages/links/src/yoroi/types.ts
@@ -1,21 +1,21 @@
import {ZodSchema} from 'zod'
import {
- LinksYoroiExchangeShowCreateResultSchema,
- LinksYoroiTransferRequestAdaSchema,
- LinksYoroiTransferRequestAdaWithLinkSchema,
+ ExchangeShowCreateResultSchema,
+ TransferRequestAdaSchema,
+ TransferRequestAdaWithLinkSchema,
} from './validators'
export type SchemaInfer = T extends ZodSchema ? U : never
-export type LinksYoroiExchangeShowCreateResultParams = SchemaInfer<
- typeof LinksYoroiExchangeShowCreateResultSchema
+export type LinksExchangeShowCreateResultParams = SchemaInfer<
+ typeof ExchangeShowCreateResultSchema
>
-export type LinksYoroiTransferRequestAdaParams = SchemaInfer<
- typeof LinksYoroiTransferRequestAdaSchema
+export type LinksTransferRequestAdaParams = SchemaInfer<
+ typeof TransferRequestAdaSchema
>
-export type LinksYoroiTransferRequestAdaWithLinkParams = SchemaInfer<
- typeof LinksYoroiTransferRequestAdaWithLinkSchema
+export type LinksTransferRequestAdaWithLinkParams = SchemaInfer<
+ typeof TransferRequestAdaWithLinkSchema
>
export type LinksYoroiActionInfo =
@@ -23,19 +23,19 @@ export type LinksYoroiActionInfo =
version: 1
feature: 'transfer'
useCase: 'request/ada-with-link'
- params: LinksYoroiTransferRequestAdaWithLinkParams
+ params: LinksTransferRequestAdaWithLinkParams
}
| {
version: 1
feature: 'transfer'
useCase: 'request/ada'
- params: LinksYoroiTransferRequestAdaParams
+ params: LinksTransferRequestAdaParams
}
| {
version: 1
feature: 'exchange'
useCase: 'order/show-create-result'
- params: LinksYoroiExchangeShowCreateResultParams
+ params: LinksExchangeShowCreateResultParams
}
export type LinksYoroiAction = {
diff --git a/packages/links/src/yoroi/validators.ts b/packages/links/src/yoroi/validators.ts
index c5afe449d7..a5da48fcb0 100644
--- a/packages/links/src/yoroi/validators.ts
+++ b/packages/links/src/yoroi/validators.ts
@@ -1,19 +1,17 @@
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(),
+ redirectTo: z.string().max(2048).optional(),
})
-export const LinksYoroiExchangeShowCreateResultSchema = z
+export const ExchangeShowCreateResultSchema = z
.object({
provider: z.string().max(20),
coinAmount: z.number().nonnegative(),
@@ -30,7 +28,7 @@ export const LinksYoroiExchangeShowCreateResultSchema = z
.merge(PartnerInfoSchema)
.strict()
-export const LinksYoroiTransferRequestAdaSchema = z
+export const TransferRequestAdaSchema = z
.object({
targets: z
.array(
@@ -55,17 +53,11 @@ export const LinksYoroiTransferRequestAdaSchema = z
.merge(PartnerInfoSchema)
.strict()
-export const LinksYoroiTransferRequestAdaWithLinkSchema = z
+export const TransferRequestAdaWithLinkSchema = z
.object({
- link: z.string().url().max(2048),
+ link: z.string().max(2048),
})
.merge(PartnerInfoSchema)
.strict()
- .refine((check) => {
- try {
- linksCardanoModuleMaker().parse(check.link)
- return true
- } catch {
- return false
- }
- })
+
+export const isUnsafeUrl = (url: string) => url.startsWith('http:')
diff --git a/packages/transfer/src/translators/reactjs/provider/TransferProvider.test.tsx b/packages/transfer/src/translators/reactjs/provider/TransferProvider.test.tsx
index 8f22431589..9080b845a1 100644
--- a/packages/transfer/src/translators/reactjs/provider/TransferProvider.test.tsx
+++ b/packages/transfer/src/translators/reactjs/provider/TransferProvider.test.tsx
@@ -45,6 +45,16 @@ describe('TransferContext :: hooks', () => {
expect(result.current.memo).toBe('Test memo')
})
+ test('redirectToChanged', () => {
+ const {result} = renderHook(() => useTransfer(), {wrapper})
+
+ act(() => {
+ result.current.redirectToChanged('https://example.com')
+ })
+
+ expect(result.current.redirectTo).toBe('https://example.com')
+ })
+
test('tokenSelectedChanged', () => {
const {result} = renderHook(() => useTransfer(), {wrapper})
diff --git a/packages/transfer/src/translators/reactjs/provider/TransferProvider.tsx b/packages/transfer/src/translators/reactjs/provider/TransferProvider.tsx
index 9b04b0b236..e46080d137 100644
--- a/packages/transfer/src/translators/reactjs/provider/TransferProvider.tsx
+++ b/packages/transfer/src/translators/reactjs/provider/TransferProvider.tsx
@@ -66,6 +66,8 @@ export const TransferProvider = ({
dispatch({type: TransferActionType.AmountChanged, quantity}),
amountRemoved: (tokenId: string) =>
dispatch({type: TransferActionType.AmountRemoved, tokenId}),
+ redirectToChanged: (redirectTo) =>
+ dispatch({type: TransferActionType.RedirectToChanged, redirectTo}),
}).current
const context = React.useMemo(
diff --git a/packages/transfer/src/translators/reactjs/state/state.test.ts b/packages/transfer/src/translators/reactjs/state/state.test.ts
index 63bc3fb4e7..b309ba8ac6 100644
--- a/packages/transfer/src/translators/reactjs/state/state.test.ts
+++ b/packages/transfer/src/translators/reactjs/state/state.test.ts
@@ -50,6 +50,20 @@ describe('State Actions', () => {
})
})
+ describe('RedirectToChanged', () => {
+ it('set', () => {
+ const action: TransferAction = {
+ type: TransferActionType.RedirectToChanged,
+ redirectTo: 'https://yoroi-wallet.com?walletId={walletId}',
+ }
+ const state = combinedReducers(defaultTransferState, action)
+ expect(state).toEqual({
+ ...defaultTransferState,
+ redirectTo: 'https://yoroi-wallet.com?walletId={walletId}',
+ })
+ })
+ })
+
describe('TokenSelectedChanged', () => {
it('set', () => {
const action: TransferAction = {
@@ -89,6 +103,7 @@ describe('State Actions', () => {
selectedTokenId: '',
unsignedTx: undefined,
memo: '',
+ redirectTo: undefined,
targets: [
{
receiver: {
@@ -129,6 +144,7 @@ describe('State Actions', () => {
selectedTokenId: '',
memo: '',
unsignedTx: undefined,
+ redirectTo: undefined,
targets: [
{
receiver: {
@@ -205,6 +221,7 @@ describe('State Actions', () => {
selectedTargetIndex: 0,
selectedTokenId: '',
unsignedTx: undefined,
+ redirectTo: undefined,
memo: '',
targets: [
{
@@ -250,6 +267,7 @@ describe('State Actions', () => {
selectedTokenId: '',
memo: '',
unsignedTx: undefined,
+ redirectTo: undefined,
targets: [
{
receiver: {
@@ -300,6 +318,7 @@ describe('State Actions', () => {
selectedTokenId: '',
memo: '',
unsignedTx: undefined,
+ redirectTo: undefined,
targets: [
{
receiver: {
@@ -346,6 +365,7 @@ describe('State Actions', () => {
selectedTokenId: '',
memo: '',
unsignedTx: undefined,
+ redirectTo: undefined,
targets: [
{
receiver: {
@@ -390,6 +410,7 @@ describe('State Actions', () => {
selectedTokenId: '',
memo: '',
unsignedTx: undefined,
+ redirectTo: undefined,
targets: [
{
receiver: {
@@ -427,6 +448,7 @@ describe('State Actions', () => {
selectedTargetIndex: 0,
selectedTokenId: '',
unsignedTx: undefined,
+ redirectTo: undefined,
memo: '',
targets: [
{
@@ -546,6 +568,7 @@ describe('State Actions', () => {
selectedTargetIndex: 0,
selectedTokenId: '',
unsignedTx: undefined,
+ redirectTo: undefined,
memo: '',
targets: [
{
@@ -570,6 +593,7 @@ describe('State Actions', () => {
selectedTokenId: '',
memo: '',
unsignedTx: undefined,
+ redirectTo: undefined,
targets: [
{
receiver: {
@@ -599,6 +623,7 @@ describe('State Actions', () => {
selectedTokenId: 'fake-token-id',
memo: '',
unsignedTx: undefined,
+ redirectTo: undefined,
targets: [
{
receiver: {
@@ -675,6 +700,7 @@ describe('State Actions', () => {
selectedTokenId: 'fake-token-id',
memo: '',
unsignedTx: undefined,
+ redirectTo: undefined,
targets: [
{
receiver: {
@@ -710,6 +736,7 @@ describe('State Actions', () => {
selectedTokenId: 'fake-token-id',
memo: '',
unsignedTx: undefined,
+ redirectTo: undefined,
targets: [
{
receiver: {
diff --git a/packages/transfer/src/translators/reactjs/state/state.ts b/packages/transfer/src/translators/reactjs/state/state.ts
index 2717b3d6cb..bba8fe48bb 100644
--- a/packages/transfer/src/translators/reactjs/state/state.ts
+++ b/packages/transfer/src/translators/reactjs/state/state.ts
@@ -29,11 +29,15 @@ const transferReducer = (state: TransferState, action: TransferAction) => {
case TransferActionType.TokenSelectedChanged:
draft.selectedTokenId = action.tokenId
break
+ case TransferActionType.RedirectToChanged:
+ draft.redirectTo = action.redirectTo
+ break
case TransferActionType.Reset:
draft.selectedTokenId = defaultTransferState.selectedTokenId
draft.memo = defaultTransferState.memo
draft.unsignedTx = castDraft(defaultTransferState.unsignedTx)
draft.selectedTargetIndex = defaultTransferState.selectedTargetIndex
+ draft.redirectTo = defaultTransferState.redirectTo
draft.targets = defaultTransferState.targets
break
}
@@ -140,6 +144,7 @@ export const defaultTransferState: TransferState = freeze(
selectedTokenId: '',
unsignedTx: undefined,
memo: '',
+ redirectTo: undefined,
targets: [
{
receiver: {
@@ -171,6 +176,7 @@ const defaultStateActions: TransferActions = {
tokenSelectedChanged: missingInit,
reset: missingInit,
memoChanged: missingInit,
+ redirectToChanged: missingInit,
}
export const defaultTransferActions = {
@@ -184,6 +190,7 @@ export type TransferState = Readonly<{
unsignedTx: Chain.Cardano.UnsignedTx | undefined
memo: string
targets: Transfer.Targets
+ redirectTo: string | undefined
}>
export type TargetActions = Readonly<{
@@ -205,6 +212,7 @@ export type TransferActions = Readonly<{
tokenSelectedChanged: (tokenId: string) => void
reset: () => void
memoChanged: (memo: string) => void
+ redirectToChanged: (redirectTo: string | undefined) => void
}>
export type TargetAction = Readonly<
@@ -254,6 +262,10 @@ export type TransferAction = Readonly<
type: TransferActionType.UnsignedTxChanged
unsignedTx: Chain.Cardano.UnsignedTx | undefined
}
+ | {
+ type: TransferActionType.RedirectToChanged
+ redirectTo: string | undefined
+ }
>
export enum TransferActionType {
@@ -267,6 +279,7 @@ export enum TransferActionType {
Reset = 'reset',
MemoChanged = 'memoChanged',
UnsignedTxChanged = 'unsignedTxChanged',
+ RedirectToChanged = 'redirectToChanged',
}
/* istanbul ignore next */
diff --git a/packages/types/src/exchange/query-string.ts b/packages/types/src/exchange/query-string.ts
index 010259dee1..14eb3bf553 100644
--- a/packages/types/src/exchange/query-string.ts
+++ b/packages/types/src/exchange/query-string.ts
@@ -32,4 +32,13 @@ export type ExchangeReferralUrlQueryStringParams = {
/* wallet ADA balance */
balance?: string
+
+ /* device locale, used to send the message back when applied in the right language*/
+ locale?: string
+
+ /* authorization from yoroi side, used to sign to verify trusted partners */
+ authorization?: string
+
+ /* wallet id - when actions should start and end with the same wallet KYC */
+ walletId?: string
}
diff --git a/scripts/install-dev-pkg.sh b/scripts/install-dev-pkg.sh
new file mode 100644
index 0000000000..aaded7f8d5
--- /dev/null
+++ b/scripts/install-dev-pkg.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Verify the presence of the packages directory in the current path
+if [[ ! -d "packages" ]]; then
+ echo "Error: 'packages' directory not found in the current path."
+ return 1
+fi
+
+# Verify argument
+if [[ -z "$1" ]]; then
+ echo "Usage: $0"
+ return 1
+fi
+
+yarn workspace @yoroi/api add -D "$1"
+yarn workspace @yoroi/exchange add -D "$1"
+yarn workspace @yoroi/common add -D "$1"
+yarn workspace @yoroi/links add -D "$1"
+yarn workspace @yoroi/resolver add -D "$1"
+yarn workspace @yoroi/staking add -D "$1"
+yarn workspace @yoroi/swap add -D "$1"
+yarn workspace @yoroi/theme add -D "$1"
+yarn workspace @yoroi/transfer add -D "$1"
+yarn workspace @yoroi/types add -D "$1"
+yarn workspace @yoroi/wallet-mobile add -D "$1"
+
+
diff --git a/yarn.lock b/yarn.lock
index d1bf357753..3b5fcc12f2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2903,7 +2903,7 @@
structured-headers "^0.4.1"
tar "^6.0.5"
tempy "^0.7.1"
- terminal-link "^2.1.1"
+ terminal-link "2.1.1"
text-table "^0.2.0"
url-join "4.0.0"
wrap-ansi "^7.0.0"
@@ -3733,7 +3733,7 @@
slash "^3.0.0"
string-length "^4.0.1"
strip-ansi "^6.0.0"
- terminal-link "^2.0.0"
+ terminal-link "2.1.1"
v8-to-istanbul "^9.0.1"
"@jest/reporters@^29.6.1":
@@ -21717,7 +21717,16 @@ string-natural-compare@^3.0.1:
resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+ version "4.2.3"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+ integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+ dependencies:
+ emoji-regex "^8.0.0"
+ is-fullwidth-code-point "^3.0.0"
+ strip-ansi "^6.0.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -21830,7 +21839,7 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -21858,6 +21867,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
dependencies:
ansi-regex "^4.1.0"
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+ integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+ dependencies:
+ ansi-regex "^5.0.1"
+
strip-ansi@^7.0.1:
version "7.1.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -22194,9 +22210,9 @@ tempy@^0.7.1:
type-fest "^0.16.0"
unique-string "^2.0.0"
-terminal-link@^2.0.0, terminal-link@^2.1.1:
+terminal-link@2.1.1:
version "2.1.1"
- resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2-m.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
+ resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
dependencies:
ansi-escapes "^4.2.1"
@@ -23488,7 +23504,7 @@ workerpool@6.2.1:
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -23524,6 +23540,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
string-width "^4.1.0"
strip-ansi "^6.0.0"
+wrap-ansi@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+ integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+ dependencies:
+ ansi-styles "^4.0.0"
+ string-width "^4.1.0"
+ strip-ansi "^6.0.0"
+
wrappy@1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"