Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@stackchain
stackchain committed Mar 25, 2023
1 parent e6f1e1a commit 0f0c687
Show file tree
Hide file tree
Showing 24 changed files with 329 additions and 179 deletions.
4 changes: 2 additions & 2 deletions .storybook/storybook.requires.js
View file
Expand Up @@ -101,8 +101,8 @@ const getStories = () => {
"./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/StartTx/InputReceiver/ReadQRCodeScreen.stories.tsx": require("../src/features/Send/useCases/StartTx/InputReceiver/ReadQRCodeScreen.stories.tsx"),
"./src/features/Send/useCases/StartTx/StartTxScreen.stories.tsx": require("../src/features/Send/useCases/StartTx/StartTxScreen.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 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
6 changes: 3 additions & 3 deletions src/TxHistory/TxHistoryNavigator.tsx
View file
Expand Up @@ -9,8 +9,8 @@ import {ConfirmTxScreen} from '../features/Send/useCases/ConfirmTx/ConfirmTxScre
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/StartTx/InputReceiver/ReadQRCodeScreen'
import {StartTxScreen} from '../features/Send/useCases/StartTx/StartTxScreen'
import {ReadQRCodeScreen} from '../features/Send/useCases/StartMultiTokenTx/InputReceiver/ReadQRCodeScreen'
import {StartMultiTokenTxScreen} from '../features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen'
import {
defaultStackNavigationOptions,
defaultStackNavigationOptionsV2,
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

0 comments on commit 0f0c687

Please sign in to comment.