Merge 8981289 into eba1880

BirthdayResearch · Aug 7, 2021 · 4294354 · 4294354
2 parents eba1880 + 8981289
commit 4294354
Show file tree

Hide file tree

Showing 40 changed files with 668 additions and 185 deletions.
diff --git a/...s/LoadingNavigator/LoadingScreen.test.tsx → app/components/LoadingScreen.test.tsx b/...s/LoadingNavigator/LoadingScreen.test.tsx → app/components/LoadingScreen.test.tsx
diff --git a/...creens/LoadingNavigator/LoadingScreen.tsx → app/components/LoadingScreen.tsx b/...creens/LoadingNavigator/LoadingScreen.tsx → app/components/LoadingScreen.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react'
 import { View } from 'react-native'
 import Spinner from 'react-native-loading-spinner-overlay'
-import { tailwind } from '../../tailwind'
-import { translate } from '../../translations'
+import { tailwind } from '../tailwind'
+import { translate } from '../translations'
 
 export default function LoadingScreen (props: { message?: string }): JSX.Element {
   const { message } = props

diff --git a/...__snapshots__/LoadingScreen.test.tsx.snap → ...__snapshots__/LoadingScreen.test.tsx.snap b/...__snapshots__/LoadingScreen.test.tsx.snap → ...__snapshots__/LoadingScreen.test.tsx.snap
diff --git a/app/screens/AppNavigator/screens/Balances/ConvertScreen.tsx b/app/screens/AppNavigator/screens/Balances/ConvertScreen.tsx
@@ -15,14 +15,14 @@ import { Logging } from '../../../../api'
 import { Text, TextInput, View } from '../../../../components'
 import { Button } from '../../../../components/Button'
 import { getTokenIcon } from '../../../../components/icons/tokens/_index'
+import LoadingScreen from '../../../../components/LoadingScreen'
 import { SectionTitle } from '../../../../components/SectionTitle'
 import { AmountButtonTypes, SetAmountButton } from '../../../../components/SetAmountButton'
 import { useTokensAPI } from '../../../../hooks/wallet/TokensAPI'
 import { RootState } from '../../../../store'
 import { hasTxQueued, transactionQueue } from '../../../../store/transaction'
 import { tailwind } from '../../../../tailwind'
 import { translate } from '../../../../translations'
-import LoadingScreen from '../../../LoadingNavigator/LoadingScreen'
 import { BalanceParamList } from './BalancesNavigator'
 
 export type ConversionMode = 'utxosToAccount' | 'accountToUtxos'

diff --git a/app/screens/AppNavigator/screens/Balances/screens/TokenDetailScreen.tsx b/app/screens/AppNavigator/screens/Balances/screens/TokenDetailScreen.tsx
@@ -38,7 +38,13 @@ export function TokenDetailScreen ({ route, navigation }: Props): JSX.Element {
         </Text>
         <NumberFormat
           value={token.amount} decimalScale={8} thousandSeparator displayType='text' suffix={` ${token.symbol}`}
-          renderText={(value) => <Text style={tailwind('text-2xl font-bold')}>{value}</Text>}
+          renderText={(value) => (
+            <Text
+              testID='token_detail_amount'
+              style={tailwind('text-2xl font-bold')}
+            >{value}
+            </Text>
+          )}
         />
       </View>
       <SectionTitle

diff --git a/...reens/AppNavigator/screens/Balances/screens/__snapshots__/TokenDetailScreen.test.tsx.snap b/...reens/AppNavigator/screens/Balances/screens/__snapshots__/TokenDetailScreen.test.tsx.snap
diff --git a/app/screens/AppNavigator/screens/Dex/DexAddLiquidity.tsx b/app/screens/AppNavigator/screens/Dex/DexAddLiquidity.tsx
@@ -9,12 +9,12 @@ import NumberFormat from 'react-number-format'
 import { Text, TextInput, View } from '../../../../components'
 import { Button } from '../../../../components/Button'
 import { getTokenIcon } from '../../../../components/icons/tokens/_index'
+import LoadingScreen from '../../../../components/LoadingScreen'
 import { SectionTitle } from '../../../../components/SectionTitle'
 import { AmountButtonTypes, SetAmountButton } from '../../../../components/SetAmountButton'
 import { useTokensAPI } from '../../../../hooks/wallet/TokensAPI'
 import { tailwind } from '../../../../tailwind'
 import { translate } from '../../../../translations'
-import LoadingScreen from '../../../LoadingNavigator/LoadingScreen'
 import { DexParamList } from './DexNavigator'
 
 type Props = StackScreenProps<DexParamList, 'AddLiquidity'>

diff --git a/app/screens/AppNavigator/screens/Dex/PoolSwap/PoolSwapScreen.tsx b/app/screens/AppNavigator/screens/Dex/PoolSwap/PoolSwapScreen.tsx
@@ -14,6 +14,7 @@ import { Logging } from '../../../../../api'
 import { Text, TextInput } from '../../../../../components'
 import { Button } from '../../../../../components/Button'
 import { getTokenIcon } from '../../../../../components/icons/tokens/_index'
+import LoadingScreen from '../../../../../components/LoadingScreen'
 import { SectionTitle } from '../../../../../components/SectionTitle'
 import { AmountButtonTypes, SetAmountButton } from '../../../../../components/SetAmountButton'
 import { useWallet } from '../../../../../contexts/WalletContext'
@@ -22,7 +23,6 @@ import { RootState } from '../../../../../store'
 import { hasTxQueued, transactionQueue } from '../../../../../store/transaction_queue'
 import { tailwind } from '../../../../../tailwind'
 import { translate } from '../../../../../translations'
-import LoadingScreen from '../../../../LoadingNavigator/LoadingScreen'
 import { DexParamList } from '../DexNavigator'
 
 interface DerivedTokenState {

diff --git a/app/screens/AppNavigator/screens/Settings/screens/AboutScreen.test.tsx b/app/screens/AppNavigator/screens/Settings/screens/AboutScreen.test.tsx
@@ -0,0 +1,13 @@
+import { fireEvent, render } from "@testing-library/react-native"
+import * as React from 'react'
+import { Linking } from 'react-native'
+import { AboutScreen } from "./AboutScreen";
+
+it('<AboutScreen /> should match snapshot', async () => {
+  const tree = render(<AboutScreen />)
+  expect(tree.toJSON()).toMatchSnapshot()
+  const privacyPolicy = await tree.findByTestId('privacy_policy_button')
+  fireEvent.press(privacyPolicy)
+  expect(Linking.canOpenURL).toBeCalled()
+})
+