mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2024-11-20 18:21:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2445 from BlueWallet/safearea

Browse Source 
FIX: Dont use SafeAreaView on non-macOS
This commit is contained in:
GLaDOS 2021-01-05 02:43:11 +00:00 committed by GitHub
commit 761d4fc7c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
screen/settings/settings.js
View File

@ -20,7 +20,7 @@ const Settings = () => {
return (
<ScrollView style={styles.root}>
<StatusBar barStyle="default" />
<BlueHeaderDefaultSub leftText={loc.settings.header}/>
<BlueHeaderDefaultSub leftText={loc.settings.header} />
<BlueListItem title={loc.settings.general} onPress={() => navigate('GeneralSettings')} chevron />
<BlueListItem title={loc.settings.currency} onPress={() => navigate('Currency')} chevron />
<BlueListItem title={loc.settings.language} onPress={() => navigate('Language')} chevron />

18
screen/wallets/list.js
View File

@ -24,15 +24,14 @@ import ActionSheet from '../ActionSheet';
import Clipboard from '@react-native-community/clipboard';
import loc from '../../loc';
import { FContainer, FButton } from '../../components/FloatButtons';
import { getSystemName, isTablet } from 'react-native-device-info';
import { isTablet } from 'react-native-device-info';
import { useFocusEffect, useNavigation, useRoute, useTheme } from '@react-navigation/native';
import { BlueStorageContext } from '../../blue_modules/storage-context';
import isCatalyst from 'react-native-is-catalyst';
import { isCatalyst, isMacCatalina } from '../../blue_modules/environment';
const A = require('../../blue_modules/analytics');
const fs = require('../../blue_modules/fs');
const WalletsListSections = { CAROUSEL: 'CAROUSEL', LOCALTRADER: 'LOCALTRADER', TRANSACTIONS: 'TRANSACTIONS' };
const isDesktop = getSystemName() === 'Mac OS X';
const WalletsList = () => {
const walletsCarousel = useRef();
@ -234,7 +233,7 @@ const WalletsList = () => {
const renderLocalTrader = () => {
if (carouselData.every(wallet => wallet === false)) return null;
if (carouselData.length > 0 && !carouselData.some(wallet => wallet.type === PlaceholderWallet.type)) {
return (
const button = (
<TouchableOpacity
onPress={() => {
navigate('HodlHodl', { screen: 'HodlHodl' });
@ -250,6 +249,7 @@ const WalletsList = () => {
</View>
</TouchableOpacity>
);
return isLargeScreen ? <SafeAreaView>{button}</SafeAreaView> : button;
} else {
return null;
}
@ -324,7 +324,7 @@ const WalletsList = () => {
<FContainer>
<FButton
onPress={onScanButtonPressed}
onLongPress={isDesktop ? undefined : sendButtonLongPress}
onLongPress={isMacCatalina ? undefined : sendButtonLongPress}
icon={<Image resizeMode="stretch" source={scanImage} />}
text={loc.send.details_scan}
/>
@ -340,7 +340,7 @@ const WalletsList = () => {
};
const onScanButtonPressed = () => {
if (isDesktop) {
if (isMacCatalina) {
fs.showActionSheet().then(onBarScanned);
} else {
navigate('ScanQRCodeRoot', {
@ -368,7 +368,7 @@ const WalletsList = () => {
const sendButtonLongPress = async () => {
const isClipboardEmpty = (await Clipboard.getString()).replace(' ', '').length === 0;
if (Platform.OS === 'ios') {
if (isDesktop) {
if (isMacCatalina) {
fs.showActionSheet().then(onBarScanned);
} else {
const options = [loc._.cancel, loc.wallets.list_long_choose, loc.wallets.list_long_scan];
@ -436,7 +436,7 @@ const WalletsList = () => {
};
return (
<SafeAreaView style={styles.root} onLayout={onLayout}>
<View style={styles.root} onLayout={onLayout}>
<StatusBar barStyle="default" />
<View style={[styles.walletsListWrapper, stylesHook.walletsListWrapper]}>
<SectionList
@ -456,7 +456,7 @@ const WalletsList = () => {
/>
{renderScanButton()}
</View>
</SafeAreaView>
</View>
);
};

33
screen/wallets/viewEditMultisigCosigners.js
View File

@ -463,17 +463,29 @@ const ViewEditMultisigCosigners = () => {
</View>
);
const howMany = <Badge value={wallet.getM()} badgeStyle={[styles.tipLabel, stylesHook.tipLabel]} textStyle={[styles.tipLabelText, stylesHook.tipLabelText]} />;
const howMany = (
<Badge
value={wallet.getM()}
badgeStyle={[styles.tipLabel, stylesHook.tipLabel]}
textStyle={[styles.tipLabelText, stylesHook.tipLabelText]}
/>
);
const andHere = <Badge value={wallet.howManySignaturesCanWeMake()} badgeStyle={[styles.tipLabel, stylesHook.tipLabel]} textStyle={[styles.tipLabelText, stylesHook.tipLabelText]} />;
const andHere = (
<Badge
value={wallet.howManySignaturesCanWeMake()}
badgeStyle={[styles.tipLabel, stylesHook.tipLabel]}
textStyle={[styles.tipLabelText, stylesHook.tipLabelText]}
/>
);
const tipKeys = () => {
return (
<View>
<BlueSpacing20 />
<Text style={[styles.tipKeys, stylesHook.tipKeys]}>
{loc.formatString(loc.multisig.signatures_required_to_spend, {number: howMany} )}
{loc.formatString(loc.multisig.signatures_we_can_make, { number: andHere} )}
{loc.formatString(loc.multisig.signatures_required_to_spend, { number: howMany })}
{loc.formatString(loc.multisig.signatures_we_can_make, { number: andHere })}
</Text>
<BlueSpacing10 />
<BlueSpacing20 />
@ -491,9 +503,14 @@ const ViewEditMultisigCosigners = () => {
behavior={Platform.OS === 'ios' ? 'padding' : null}
keyboardVerticalOffset={62}
style={[styles.mainBlock, styles.root]}
>
<FlatList ListHeaderComponent={tipKeys} data={data.current} extraData={vaultKeyData} renderItem={_renderKeyItem} keyExtractor={(_item, index) => `${index}`} />
>
<FlatList
ListHeaderComponent={tipKeys}
data={data.current}
extraData={vaultKeyData}
renderItem={_renderKeyItem}
keyExtractor={(_item, index) => `${index}`}
/>
<BlueSpacing10 />
{footer}
<BlueSpacing40 />
@ -613,7 +630,7 @@ const styles = StyleSheet.create({
},
tipLabelText: {
fontWeight: '500',
}
},
});
ViewEditMultisigCosigners.navigationOptions = ({ navigation }) => ({