Skip to content

Commit

Permalink
Merge branch 'chore/mat-ui' into refactor/extract-search-logic-from-n…
Browse files Browse the repository at this point in the history 
…fts-part2
  • Loading branch information
@banklesss
banklesss committed Mar 27, 2023
2 parents 4639f7d + 165deea commit 5e6747e
Show file tree
Hide file tree
Showing 47 changed files with 2,452 additions and 51 deletions.
16 changes: 8 additions & 8 deletions .storybook/storybook.requires.js
View file
Expand Up @@ -95,6 +95,14 @@ const getStories = () => {
"./src/Dashboard/WithdrawStakingRewards/ConfirmTx/ConfirmTxWithPassword.stories.tsx": require("../src/Dashboard/WithdrawStakingRewards/ConfirmTx/ConfirmTxWithPassword.stories.tsx"),
"./src/Dashboard/WithdrawStakingRewards/TransferSummary/TransferSummary.stories.tsx": require("../src/Dashboard/WithdrawStakingRewards/TransferSummary/TransferSummary.stories.tsx"),
"./src/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.stories.tsx": require("../src/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.stories.tsx"),
"./src/features/Send/useCases/ConfirmTx/ConfirmTxScreen.stories.tsx": require("../src/features/Send/useCases/ConfirmTx/ConfirmTxScreen.stories.tsx"),
"./src/features/Send/useCases/ListSelectedTokens/AddToken/AddToken.stories.tsx": require("../src/features/Send/useCases/ListSelectedTokens/AddToken/AddToken.stories.tsx"),
"./src/features/Send/useCases/ListSelectedTokens/AddToken/SelectTokenFromListScreen.stories.tsx": require("../src/features/Send/useCases/ListSelectedTokens/AddToken/SelectTokenFromListScreen.stories.tsx"),
"./src/features/Send/useCases/ListSelectedTokens/DeleteToken.stories.tsx": require("../src/features/Send/useCases/ListSelectedTokens/DeleteToken.stories.tsx"),
"./src/features/Send/useCases/ListSelectedTokens/EditAmount/EditAmountScreen.stories.tsx": require("../src/features/Send/useCases/ListSelectedTokens/EditAmount/EditAmountScreen.stories.tsx"),
"./src/features/Send/useCases/ListSelectedTokens/ListSelectedTokensScreen.stories.tsx": require("../src/features/Send/useCases/ListSelectedTokens/ListSelectedTokensScreen.stories.tsx"),
"./src/features/Send/useCases/StartMultiTokenTx/InputReceiver/ReadQRCodeScreen.stories.tsx": require("../src/features/Send/useCases/StartMultiTokenTx/InputReceiver/ReadQRCodeScreen.stories.tsx"),
"./src/features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen.stories.tsx": require("../src/features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen.stories.tsx"),
"./src/FirstRun/LanguagePickerScreen/LanguagePickerScreen.stories.tsx": require("../src/FirstRun/LanguagePickerScreen/LanguagePickerScreen.stories.tsx"),
"./src/FirstRun/TermsOfServiceScreen/TermsOfServiceScreen.stories.tsx": require("../src/FirstRun/TermsOfServiceScreen/TermsOfServiceScreen.stories.tsx"),
"./src/HW/Instructions/Instructions.stories.tsx": require("../src/HW/Instructions/Instructions.stories.tsx"),
Expand All @@ -112,14 +120,6 @@ const getStories = () => {
"./src/Receive/ReceiveScreen.stories.tsx": require("../src/Receive/ReceiveScreen.stories.tsx"),
"./src/Search/SearchBar.stories.tsx": require("../src/Search/SearchBar.stories.tsx"),
"./src/SelectedWallet/WalletSelection/WalletSelectionScreen.stories.tsx": require("../src/SelectedWallet/WalletSelection/WalletSelectionScreen.stories.tsx"),
"./src/Send/useCases/ConfirmTx/ConfirmTxScreen.stories.tsx": require("../src/Send/useCases/ConfirmTx/ConfirmTxScreen.stories.tsx"),
"./src/Send/useCases/ListSelectedTokens/AddToken/AddToken.stories.tsx": require("../src/Send/useCases/ListSelectedTokens/AddToken/AddToken.stories.tsx"),
"./src/Send/useCases/ListSelectedTokens/AddToken/SelectTokenFromListScreen.stories.tsx": require("../src/Send/useCases/ListSelectedTokens/AddToken/SelectTokenFromListScreen.stories.tsx"),
"./src/Send/useCases/ListSelectedTokens/DeleteToken.stories.tsx": require("../src/Send/useCases/ListSelectedTokens/DeleteToken.stories.tsx"),
"./src/Send/useCases/ListSelectedTokens/EditAmountScreen.stories.tsx": require("../src/Send/useCases/ListSelectedTokens/EditAmountScreen.stories.tsx"),
"./src/Send/useCases/ListSelectedTokens/ListSelectedTokensScreen.stories.tsx": require("../src/Send/useCases/ListSelectedTokens/ListSelectedTokensScreen.stories.tsx"),
"./src/Send/useCases/StartTx/InputReceiver/ReadQRCodeScreen.stories.tsx": require("../src/Send/useCases/StartTx/InputReceiver/ReadQRCodeScreen.stories.tsx"),
"./src/Send/useCases/StartTx/StartTxScreen.stories.tsx": require("../src/Send/useCases/StartTx/StartTxScreen.stories.tsx"),
"./src/Settings/ApplicationSettings/ApplicationSettingsScreen.stories.tsx": require("../src/Settings/ApplicationSettings/ApplicationSettingsScreen.stories.tsx"),
"./src/Settings/ChangeLanguage/ChangeLanguageScreen.stories.tsx": require("../src/Settings/ChangeLanguage/ChangeLanguageScreen.stories.tsx"),
"./src/Settings/ChangePassword/ChangePasswordScreen.stories.tsx": require("../src/Settings/ChangePassword/ChangePasswordScreen.stories.tsx"),
Expand Down
48 changes: 24 additions & 24 deletions ios/emurgo.xcodeproj/project.pbxproj
View file
Expand Up @@ -1237,7 +1237,7 @@
BUNDLE_ID_SUFFIX = "";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 430;
CURRENT_PROJECT_VERSION = 431;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = F8NVT2G2L4;
ENABLE_BITCODE = NO;
Expand All @@ -1261,7 +1261,7 @@
INFOPLIST_PREPROCESS = NO;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 4.9.10;
MARKETING_VERSION = 4.10.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1287,7 +1287,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 430;
CURRENT_PROJECT_VERSION = 431;
DEVELOPMENT_TEAM = F8NVT2G2L4;
ENABLE_BITCODE = NO;
HEADER_SEARCH_PATHS = (
Expand All @@ -1310,7 +1310,7 @@
INFOPLIST_PREPROCESS = NO;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 4.9.10;
MARKETING_VERSION = 4.10.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1333,7 +1333,7 @@
BUNDLE_DISPLAY_NAME = Yoroi;
BUNDLE_ID_SUFFIX = "";
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 430;
CURRENT_PROJECT_VERSION = 431;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = F8NVT2G2L4;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -1361,7 +1361,7 @@
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
MARKETING_VERSION = 4.9.10;
MARKETING_VERSION = 4.10.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1384,7 +1384,7 @@
BUNDLE_DISPLAY_NAME = "Yoroi Staging";
BUNDLE_ID_SUFFIX = .staging;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 430;
CURRENT_PROJECT_VERSION = 431;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = F8NVT2G2L4;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -1412,7 +1412,7 @@
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
MARKETING_VERSION = 4.9.10;
MARKETING_VERSION = 4.10.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1437,7 +1437,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 430;
CURRENT_PROJECT_VERSION = 431;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
HEADER_SEARCH_PATHS = (
Expand All @@ -1464,7 +1464,7 @@
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
MARKETING_VERSION = 4.9.10;
MARKETING_VERSION = 4.10.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1487,7 +1487,7 @@
BUNDLE_DISPLAY_NAME = "Yoroi Staging";
BUNDLE_ID_SUFFIX = .staging;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 430;
CURRENT_PROJECT_VERSION = 431;
DEVELOPMENT_TEAM = F8NVT2G2L4;
ENABLE_BITCODE = NO;
HEADER_SEARCH_PATHS = (
Expand All @@ -1514,7 +1514,7 @@
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
MARKETING_VERSION = 4.9.10;
MARKETING_VERSION = 4.10.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1723,7 +1723,7 @@
BUNDLE_ID_SUFFIX = .staging;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 430;
CURRENT_PROJECT_VERSION = 431;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = F8NVT2G2L4;
ENABLE_BITCODE = NO;
Expand All @@ -1747,7 +1747,7 @@
INFOPLIST_PREPROCESS = NO;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 4.9.10;
MARKETING_VERSION = 4.10.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1871,7 +1871,7 @@
BUNDLE_ID_SUFFIX = .staging;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 430;
CURRENT_PROJECT_VERSION = 431;
DEVELOPMENT_TEAM = F8NVT2G2L4;
ENABLE_BITCODE = NO;
HEADER_SEARCH_PATHS = (
Expand All @@ -1894,7 +1894,7 @@
INFOPLIST_PREPROCESS = NO;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 4.9.10;
MARKETING_VERSION = 4.10.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1956,7 +1956,7 @@
BUNDLE_ID_SUFFIX = "";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 430;
CURRENT_PROJECT_VERSION = 431;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = F8NVT2G2L4;
ENABLE_BITCODE = NO;
Expand All @@ -1980,7 +1980,7 @@
INFOPLIST_PREPROCESS = NO;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 4.9.10;
MARKETING_VERSION = 4.10.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -2005,7 +2005,7 @@
BUNDLE_ID_SUFFIX = .staging;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 430;
CURRENT_PROJECT_VERSION = 431;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = F8NVT2G2L4;
ENABLE_BITCODE = NO;
Expand All @@ -2029,7 +2029,7 @@
INFOPLIST_PREPROCESS = NO;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 4.9.10;
MARKETING_VERSION = 4.10.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -2055,7 +2055,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 430;
CURRENT_PROJECT_VERSION = 431;
DEVELOPMENT_TEAM = F8NVT2G2L4;
ENABLE_BITCODE = NO;
HEADER_SEARCH_PATHS = (
Expand All @@ -2078,7 +2078,7 @@
INFOPLIST_PREPROCESS = NO;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 4.9.10;
MARKETING_VERSION = 4.10.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -2102,7 +2102,7 @@
BUNDLE_ID_SUFFIX = .staging;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 430;
CURRENT_PROJECT_VERSION = 431;
DEVELOPMENT_TEAM = F8NVT2G2L4;
ENABLE_BITCODE = NO;
HEADER_SEARCH_PATHS = (
Expand All @@ -2125,7 +2125,7 @@
INFOPLIST_PREPROCESS = NO;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 4.9.10;
MARKETING_VERSION = 4.10.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
5 changes: 1 addition & 4 deletions src/Nfts/NftsNavigator.tsx
View file
Expand Up @@ -19,10 +19,7 @@ export const NftsNavigator = () => {

const Routes = () => {
const strings = useStrings()
const {searchHeaderOptions} = useSearchHeaderOptions({
placeHolderText: strings.search,
title: strings.title,
})
const {searchHeaderOptions} = useSearchHeaderOptions({placeHolderText: strings.search, title: strings.title})

return (
<Stack.Navigator>
Expand Down
2 changes: 1 addition & 1 deletion src/TxHistory/ActionsBanner.tsx
View file
Expand Up @@ -5,10 +5,10 @@ import {Alert, StyleSheet, Text, TouchableOpacity, View} from 'react-native'

import {Icon, Spacer} from '../components'
import {features} from '../features'
import {useSend} from '../features/Send/common/SendContext'
import {actionMessages} from '../i18n/global-messages'
import {TxHistoryRouteNavigation} from '../navigation'
import {useSelectedWallet} from '../SelectedWallet'
import {useSend} from '../Send/shared/SendContext'
import {COLORS} from '../theme'

const ACTION_PROPS = {
Expand Down
2 changes: 1 addition & 1 deletion src/TxHistory/TxHistory.stories.tsx
View file
Expand Up @@ -2,8 +2,8 @@ import {storiesOf} from '@storybook/react-native'
import React from 'react'

import {QueryProvider} from '../../.storybook/decorators'
import {SendProvider} from '../features/Send/common/SendContext'
import {SelectedWalletProvider} from '../SelectedWallet'
import {SendProvider} from '../Send/shared/SendContext'
import {mocks} from '../yoroi-wallets/mocks'
import {TxHistory} from './TxHistory'

Expand Down
16 changes: 8 additions & 8 deletions src/TxHistory/TxHistoryNavigator.tsx
View file
Expand Up @@ -4,6 +4,13 @@ import {defineMessages, useIntl} from 'react-intl'
import {StyleSheet, Text, TouchableOpacity, TouchableOpacityProps} from 'react-native'

import {Boundary, Icon} from '../components'
import {SendProvider} from '../features/Send/common/SendContext'
import {ConfirmTxScreen} from '../features/Send/useCases/ConfirmTx/ConfirmTxScreen'
import {SelectTokenFromListScreen} from '../features/Send/useCases/ListSelectedTokens/AddToken/SelectTokenFromListScreen'
import {EditAmountScreen} from '../features/Send/useCases/ListSelectedTokens/EditAmount/EditAmountScreen'
import {ListSelectedTokensScreen} from '../features/Send/useCases/ListSelectedTokens/ListSelectedTokensScreen'
import {ReadQRCodeScreen} from '../features/Send/useCases/StartMultiTokenTx/InputReceiver/ReadQRCodeScreen'
import {StartMultiTokenTxScreen} from '../features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen'
import {
defaultStackNavigationOptions,
defaultStackNavigationOptionsV2,
Expand All @@ -12,13 +19,6 @@ import {
} from '../navigation'
import {ReceiveScreen} from '../Receive/ReceiveScreen'
import {useSelectedWallet} from '../SelectedWallet'
import {SendProvider} from '../Send/shared/SendContext'
import {ConfirmTxScreen} from '../Send/useCases/ConfirmTx/ConfirmTxScreen'
import {SelectTokenFromListScreen} from '../Send/useCases/ListSelectedTokens/AddToken/SelectTokenFromListScreen'
import {EditAmountScreen} from '../Send/useCases/ListSelectedTokens/EditAmountScreen'
import {ListSelectedTokensScreen} from '../Send/useCases/ListSelectedTokens/ListSelectedTokensScreen'
import {ReadQRCodeScreen} from '../Send/useCases/StartTx/InputReceiver/ReadQRCodeScreen'
import {StartTxScreen} from '../Send/useCases/StartTx/StartTxScreen'
import {COLORS} from '../theme'
import {useWalletName} from '../yoroi-wallets'
import {ModalInfo} from './ModalInfo'
Expand Down Expand Up @@ -85,7 +85,7 @@ export const TxHistoryNavigator = () => {
>
{() => (
<Boundary>
<StartTxScreen />
<StartMultiTokenTxScreen />
</Boundary>
)}
</Stack.Screen>
Expand Down
7 changes: 4 additions & 3 deletions src/components/Banner/Banner.tsx
View file
@@ -1,5 +1,5 @@
import * as React from 'react'
import {StyleSheet, TouchableOpacity, View} from 'react-native'
import {StyleSheet, TouchableOpacity, View, ViewStyle} from 'react-native'

import {COLORS} from '../../theme'
import {Text} from '../Text'
Expand All @@ -10,10 +10,11 @@ type Props = {
label?: string
error?: boolean
children?: React.ReactNode
containerStyle?: ViewStyle
}

export const Banner = ({error, text, boldText, label, children}: Props) => (
<View style={[styles.banner, error === true && styles.bannerError]}>
export const Banner = ({error, text, boldText, label, children, containerStyle}: Props) => (
<View style={[styles.banner, error === true && styles.bannerError, containerStyle]}>
{label != null && (
<Text error={error} small style={styles.label}>
{label}
Expand Down
30 changes: 30 additions & 0 deletions src/features/Send/common/ScannerButton.tsx
View file
@@ -0,0 +1,30 @@
import {useNavigation} from '@react-navigation/native'
import React from 'react'
import {TouchableOpacity} from 'react-native'

import {Icon} from '../../../components'
import {TxHistoryRouteNavigation} from '../../../navigation'
import {COLORS} from '../../../theme'

type Props = {
disabled?: boolean
}
export const ScannerButton = ({disabled}: Props) => {
const navigateTo = useNavigateTo()

const color = disabled ? COLORS.TEXT_INPUT : 'black'

return (
<TouchableOpacity onPress={navigateTo.reader} disabled={disabled}>
<Icon.Qr color={color} size={30} />
</TouchableOpacity>
)
}

const useNavigateTo = () => {
const navigation = useNavigation<TxHistoryRouteNavigation>()

return {
reader: () => navigation.navigate('send-read-qr-code'),
}
}

0 comments on commit 5e6747e

Please sign in to comment.