This commit is contained in:
ncoelho 2020-12-09 13:13:20 +01:00
parent c2ff15d53b
commit 9a7f07decb
4 changed files with 51 additions and 36 deletions

View File

@ -59,6 +59,7 @@ export const BlueDefaultTheme = {
newBlue: '#007AFF',
redBG: '#F8D2D2',
redText: '#D0021B',
newBlue: '#0070FF',
},
};

View File

@ -463,7 +463,9 @@
"input_path": "Input derivation path",
"input_path_explain": "skip to use default one ({default})",
"view_edit_cosigners_title": "Edit Cosigners",
"ms_help": "Help"
"ms_help": "Help",
"ms_help_title": "How Multisig Vaults work. Tips and tricks",
"ms_help_text": "A wallet with multiple keys, to exponentially increase security or for shared custody."
},
"cc": {
"change": "change",

View File

@ -1,16 +1,28 @@
import React, { useState, useEffect } from 'react';
import { ScrollView, StyleSheet } from 'react-native';
import { View, Text, ScrollView, StyleSheet } from 'react-native';
import { useNavigation, useRoute, useTheme } from '@react-navigation/native';
import { SafeBlueArea, BlueCard, BlueText, BlueNavigationStyle, BlueSpacing20, BlueLoading } from '../../BlueComponents';
/** @type {AppStorage} */
const styles = StyleSheet.create({
root: {
flex: 1,
},
});
import loc from '../../loc';
const WalletsAddMultisigHelp = () => {
const [isLoading, setIsLoading] = useState(true);
const { colors } = useTheme();
const stylesHook = StyleSheet.create({
root: {
backgroundColor: colors.elevated,
},
intro: {
backgroundColor: colors.newBlue,
},
introTitle:{
color: colors.inverseForegroundColor,
},
introText:{
color: colors.inverseForegroundColor,
},
});
useEffect(() => {
setIsLoading(false);
@ -21,39 +33,35 @@ const WalletsAddMultisigHelp = () => {
) : (
<SafeBlueArea forceInset={{ horizontal: 'always' }} style={styles.root}>
<ScrollView>
<BlueCard>
<BlueText>MIT License</BlueText>
<BlueSpacing20 />
<BlueText>Copyright (c) 2018-2020 BlueWallet Services</BlueText>
<BlueSpacing20 />
<BlueText>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files
(the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify,
merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
</BlueText>
<BlueSpacing20 />
<View style={[styles.intro, stylesHook.intro]}>
<Text style={[styles.introTitle, stylesHook.introTitle]}>
{loc.multisig.ms_help_title}
</Text>
<Text style={[styles.introText, stylesHook.introText]}>
{loc.multisig.ms_help_text}
</Text>
</View>
<View style={[styles.tip, stylesHook.tip]}>
<Text style={[styles.introTip, stylesHook.introTip]}></Text>
</View>
<BlueText>
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
</BlueText>
<BlueSpacing20 />
<BlueText>
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
</BlueText>
</BlueCard>
</ScrollView>
</SafeBlueArea>
);
};
const styles = StyleSheet.create({
root: {
flex: 1,
},
});
WalletsAddMultisigHelp.navigationOptions = () => ({
...BlueNavigationStyle(),
title: 'License',
title: '',
headerStyle: {
backgroundColor: '#000000',
},
});
export default WalletsAddMultisigHelp;

View File

@ -665,9 +665,9 @@ const WalletsAddMultisigStep2 = () => {
<StatusBar barStyle="light-content" />
{renderHelp()}
<FlatList data={data.current} renderItem={_renderKeyItem} keyExtractor={(_item, index) => `${index}`} />
<View style={[styles.wrapBox]}>
<FlatList data={data.current} renderItem={_renderKeyItem} keyExtractor={(_item, index) => `${index}`} />
</View>
{renderMnemonicsModal()}
{renderProvideMnemonicsModal()}
@ -688,6 +688,10 @@ const styles = StyleSheet.create({
marginHorizontal: 20,
marginVertical: 24,
},
wrapBox: {
flex: 1,
marginVertical: 24,
},
buttonBottom: {
marginHorizontal: 20,
flex: 0.12,