chore: CR updates

Emurgo · Jan 28, 2025 · e3d7ab2 · e3d7ab2
1 parent 197b35c
commit e3d7ab2
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 40 deletions.
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx
@@ -1,6 +1,6 @@
 import {useTheme} from '@yoroi/theme'
 import {Chain, Portfolio} from '@yoroi/types'
-import React from 'react'
+import * as React from 'react'
 import {StyleSheet, View} from 'react-native'
 
 import {Button, ButtonType} from '../../../../components/Button/Button'

diff --git a/apps/wallet-mobile/src/features/Swap/SwapNavigator.tsx b/apps/wallet-mobile/src/features/Swap/SwapNavigator.tsx
@@ -1,7 +1,7 @@
 import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs'
 import {EventArg} from '@react-navigation/native'
 import {useTheme} from '@yoroi/theme'
-import React from 'react'
+import * as React from 'react'
 import {Keyboard, StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 

diff --git a/apps/wallet-mobile/src/features/Swap/common/Provider/Provider.tsx b/apps/wallet-mobile/src/features/Swap/common/Provider/Provider.tsx
@@ -1,7 +1,7 @@
 import {getProviderUrl} from '@yoroi/swap'
 import {useTheme} from '@yoroi/theme'
 import {Swap} from '@yoroi/types'
-import React from 'react'
+import * as React from 'react'
 import {Linking, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 
 import {Spacer} from '../../../../components/Spacer/Spacer'
@@ -10,13 +10,14 @@ import {ProviderIcon} from './ProviderIcon'
 export const Provider = ({
   provider,
   append = '',
-  noLink = false,
+  preventOpenLink = false,
 }: {
   provider: Swap.Provider
   append?: string
-  noLink?: boolean
+  preventOpenLink?: boolean
 }) => {
   const styles = useStyles()
+  const formattedName = `${provider.charAt(0).toUpperCase()}${provider.slice(1).replace(/-/, ' ')}${append}`
 
   return (
     <View style={styles.container}>
@@ -27,11 +28,9 @@ export const Provider = ({
       <TouchableOpacity
         onPress={() => Linking.openURL(getProviderUrl(provider))}
         style={styles.button}
-        disabled={noLink}
+        disabled={preventOpenLink}
       >
-        <Text style={[styles.text, !noLink && styles.link]}>{`${provider.charAt(0).toUpperCase()}${provider
-          .slice(1)
-          .replace(/-/, ' ')}${append}`}</Text>
+        <Text style={[styles.text, !preventOpenLink && styles.link]}>{formattedName}</Text>
       </TouchableOpacity>
     </View>
   )
@@ -41,8 +40,8 @@ const useStyles = () => {
   const {color, atoms} = useTheme()
   const styles = StyleSheet.create({
     button: {
-      alignItems: 'center',
-      justifyContent: 'center',
+      ...atoms.align_center,
+      ...atoms.justify_center,
     },
     text: {
       ...atoms.py_2xs,
@@ -53,8 +52,8 @@ const useStyles = () => {
       color: color.text_primary_medium,
     },
     container: {
-      flexDirection: 'row',
-      alignItems: 'center',
+      ...atoms.flex_row,
+      ...atoms.align_center,
     },
   })
 

diff --git a/apps/wallet-mobile/src/features/Swap/common/Provider/ProviderIcon.tsx b/apps/wallet-mobile/src/features/Swap/common/Provider/ProviderIcon.tsx
@@ -1,5 +1,5 @@
 import {Swap} from '@yoroi/types'
-import React, {FunctionComponent} from 'react'
+import * as React from 'react'
 
 import {Icon} from '../../../../components/Icon'
 
@@ -13,7 +13,7 @@ export const ProviderIcon = ({provider, size}: Props) => {
   return <IconVariant size={size} />
 }
 
-const icons: Record<Swap.Provider, FunctionComponent<{size?: number}>> = {
+const icons: Record<Swap.Provider, React.FunctionComponent<{size?: number}>> = {
   [Swap.Provider.Muesliswap_v2]: Icon.MuesliSwap,
   [Swap.Provider.Muesliswap_clp]: Icon.MuesliSwap,
   [Swap.Provider.Minswap_v1]: Icon.MinSwap,

diff --git a/apps/wallet-mobile/src/features/Swap/common/SwapProvider.tsx b/apps/wallet-mobile/src/features/Swap/common/SwapProvider.tsx
@@ -2,7 +2,7 @@ import {primaryTokenId} from '@yoroi/portfolio'
 import {swapManagerMaker, swapStorageMaker} from '@yoroi/swap'
 import {Api, Portfolio, Swap} from '@yoroi/types'
 import {produce} from 'immer'
-import React from 'react'
+import * as React from 'react'
 import {TextInput} from 'react-native'
 import {useQuery} from 'react-query'
 
@@ -476,7 +476,7 @@ type SwapState = {
 
 export type SwapContext = SwapState & {
   providers: Swap.ProvidersResponse
-  tokenInfos: Map<`${string}.${string}`, Portfolio.Token.Info>
+  tokenInfos: Map<Portfolio.Token.Id, Portfolio.Token.Info>
   tokenInInputRef: React.RefObject<TextInput> | undefined
   tokenOutInputRef: React.RefObject<TextInput> | undefined
   wantedPriceInputRef: React.RefObject<TextInput> | undefined
@@ -492,7 +492,7 @@ export type SwapContext = SwapState & {
 const SwapContext = React.createContext<SwapContext>({
   ...defaultState,
   providers: [],
-  tokenInfos: new Map<`${string}.${string}`, Portfolio.Token.Info>(),
+  tokenInfos: new Map<Portfolio.Token.Id, Portfolio.Token.Info>(),
   tokenInInputRef: undefined,
   tokenOutInputRef: undefined,
   wantedPriceInputRef: undefined,

diff --git a/apps/wallet-mobile/src/features/Swap/useCases/CreateOrder/ProviderSplits.tsx b/apps/wallet-mobile/src/features/Swap/useCases/CreateOrder/ProviderSplits.tsx
@@ -31,7 +31,7 @@ export const ProviderSplits = () => {
             <Provider
               provider={dex}
               append={`${swapForm.selectedDex.isTouched ? '' : ` ${strings.autoPool}`}`}
-              noLink
+              preventOpenLink
             />
           )}
         </View>

diff --git a/apps/wallet-mobile/src/features/Swap/useCases/CreateOrder/SelectProviderScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/CreateOrder/SelectProviderScreen.tsx
@@ -1,6 +1,6 @@
 import {useNavigation} from '@react-navigation/native'
 import {useTheme} from '@yoroi/theme'
-import React from 'react'
+import * as React from 'react'
 import {FlatList, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
@@ -32,7 +32,7 @@ export const SelectProviderScreen = () => {
             }}
           >
             <View style={styles.row}>
-              <Provider provider={item.provider} noLink />
+              <Provider provider={item.provider} preventOpenLink />
 
               <Text style={styles.aggregator}>{item.aggregator}</Text>
             </View>

diff --git a/apps/wallet-mobile/src/features/Swap/useCases/CreateOrder/StartSwapOrderScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/CreateOrder/StartSwapOrderScreen.tsx
@@ -33,6 +33,11 @@ export const StartSwapOrderScreen = () => {
   const navigate = useNavigateTo()
   const {openModal} = useModal()
 
+  const amount = balances.records.get(swapForm.tokenInInput.tokenId ?? 'unknown.') ?? {
+    info: swapForm.tokenInfos.get(swapForm.tokenInInput.tokenId ?? 'unknown.'),
+    quantity: balances.records.get(swapForm.tokenInInput.tokenId ?? 'unknown.')?.quantity,
+  }
+
   return (
     <View style={[styles.root, styles.flex]}>
       <ScrollView style={styles.padding}>
@@ -76,12 +81,7 @@ export const StartSwapOrderScreen = () => {
               label={strings.swapFrom}
               onChange={(value) => swapForm.dispatch({type: 'TokenInAmountChanged', value})}
               value={swapForm.tokenInInput.value}
-              amount={
-                balances.records.get(swapForm.tokenInInput.tokenId ?? 'unknown.') ?? {
-                  info: swapForm.tokenInfos.get(swapForm.tokenInInput.tokenId ?? 'unknown.'),
-                  quantity: balances.records.get(swapForm.tokenInInput.tokenId ?? 'unknown.')?.quantity,
-                }
-              }
+              amount={amount}
               wallet={wallet}
               navigateTo={navigate.selectSellToken}
               touched={swapForm.tokenInInput.isTouched}

diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ListOrders/ListOrders.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ListOrders/ListOrders.tsx
@@ -1,7 +1,7 @@
 import {isLeft} from '@yoroi/common'
 import {useTheme} from '@yoroi/theme'
 import {Api, Portfolio, Swap} from '@yoroi/types'
-import React from 'react'
+import * as React from 'react'
 import {ErrorBoundary} from 'react-error-boundary'
 import {useIntl} from 'react-intl'
 import {FlatList, Linking, StyleSheet, Text, TouchableOpacity, View} from 'react-native'

diff --git a/apps/wallet-mobile/src/features/Swap/useCases/Manager/ManagerConfig.tsx b/apps/wallet-mobile/src/features/Swap/useCases/Manager/ManagerConfig.tsx
@@ -1,6 +1,6 @@
 import {useTheme} from '@yoroi/theme'
 import {Swap} from '@yoroi/types'
-import React from 'react'
+import * as React from 'react'
 import {StyleSheet, Text, View} from 'react-native'
 
 import {Button, ButtonType} from '../../../../components/Button/Button'

diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/ReviewSwap.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/ReviewSwap.tsx
@@ -1,5 +1,5 @@
 import {useTheme} from '@yoroi/theme'
-import React from 'react'
+import * as React from 'react'
 import {StyleSheet, useWindowDimensions, View, ViewProps} from 'react-native'
 import {ScrollView} from 'react-native-gesture-handler'
 import {SafeAreaView} from 'react-native-safe-area-context'

diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/TransactionSummary.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/TransactionSummary.tsx
@@ -1,6 +1,6 @@
 import {useTheme} from '@yoroi/theme'
 import {capitalize} from 'lodash'
-import React from 'react'
+import * as React from 'react'
 import {StyleSheet, Text, View} from 'react-native'
 
 import {Divider} from '../../../../components/Divider/Divider'

diff --git a/packages/swap/src/adapters/api/dexhunter/api-maker.ts b/packages/swap/src/adapters/api/dexhunter/api-maker.ts
@@ -211,13 +211,14 @@ const baseUrls = {
 } as const
 
 const apiPaths = {
-  tokens: '/swap/tokens', // GET
-  cancel: '/swap/cancel', // POST
-  estimate: '/swap/estimate', // POST
-  limitBuild: '/swap/limit/build', // POST
-  limitEstimate: '/swap/limit/estimate', // POST
-  orders: ({address}: {address: string}) => `/swap/orders/${address}`, // GET
-  reverseEstimate: '/swap/reverseEstimate', // POST
-  build: '/swap/build', // POST
-  sign: '/swap/sign', // POST
+  tokens: '/swap/tokens',
+  orders: ({address}: {address: string}) => `/swap/orders/${address}`,
+
+  cancel: '/swap/cancel',
+  estimate: '/swap/estimate',
+  limitBuild: '/swap/limit/build',
+  limitEstimate: '/swap/limit/estimate',
+  reverseEstimate: '/swap/reverseEstimate',
+  build: '/swap/build',
+  sign: '/swap/sign',
 } as const
diff --git a/packages/swap/src/adapters/api/dexhunter/transformers.ts b/packages/swap/src/adapters/api/dexhunter/transformers.ts
@@ -54,6 +54,7 @@ const transformSplit = ({
   priceDistortion: price_distortion,
   priceImpact: price_impact,
 })
+
 export const transformersMaker = ({
   primaryTokenInfo,
   address,

diff --git a/packages/swap/src/adapters/api/muesliswap/transformers.ts b/packages/swap/src/adapters/api/muesliswap/transformers.ts
@@ -32,7 +32,9 @@ export const transformersMaker = ({
 
             const isPrimary = id === primaryTokenInfo.id
             if (isPrimary) return primaryTokenInfo
+
             if (decimals === null) return null
+
             return {
               id,
               fingerprint: '',