Merge pull request #2845 from BlueWallet/uifix

FIX: Styling for Sign/Verify
This commit is contained in:
GLaDOS 2021-03-25 12:31:50 +00:00 committed by GitHub
commit a9eeb54985
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 28 deletions

View File

@ -579,7 +579,7 @@ const styleCopyTextToClipboard = StyleSheet.create({
export const SafeBlueArea = props => {
const { style, ...nonStyleProps } = props;
const { colors } = useTheme();
const baseStyle = { flex: 1, backgroundColor: colors.background }
const baseStyle = { flex: 1, backgroundColor: colors.background };
return <SafeAreaView forceInset={{ horizontal: 'always' }} style={[baseStyle, style]} {...nonStyleProps} />;
};

View File

@ -249,13 +249,13 @@ PODS:
- React
- react-native-blur (0.8.0):
- React
- react-native-camera (3.42.0):
- react-native-camera (3.43.0):
- React-Core
- react-native-camera/RCT (= 3.42.0)
- react-native-camera/RN (= 3.42.0)
- react-native-camera/RCT (3.42.0):
- react-native-camera/RCT (= 3.43.0)
- react-native-camera/RN (= 3.43.0)
- react-native-camera/RCT (3.43.0):
- React-Core
- react-native-camera/RN (3.42.0):
- react-native-camera/RN (3.43.0):
- React-Core
- react-native-document-picker (3.5.4):
- React
@ -263,7 +263,7 @@ PODS:
- React
- react-native-idle-timer (2.1.6):
- React-Core
- react-native-image-picker (3.1.4):
- react-native-image-picker (3.2.1):
- React-Core
- react-native-is-catalyst (1.0.0):
- React
@ -276,7 +276,7 @@ PODS:
- react-native-tcp-socket (3.7.1):
- CocoaAsyncSocket
- React
- react-native-webview (11.2.1):
- react-native-webview (11.2.3):
- React-Core
- react-native-widget-center (0.0.4):
- React
@ -345,7 +345,7 @@ PODS:
- React
- RemobileReactNativeQrcodeLocalImage (1.0.4):
- React
- RNCAsyncStorage (1.13.4):
- RNCAsyncStorage (1.14.1):
- React-Core
- RNCClipboard (1.7.0):
- React-Core
@ -355,17 +355,17 @@ PODS:
- React-Core
- RNDefaultPreference (1.4.3):
- React
- RNDeviceInfo (8.0.1):
- RNDeviceInfo (8.0.2):
- React-Core
- RNFS (2.16.6):
- React
- RNGestureHandler (1.9.0):
- RNGestureHandler (1.10.3):
- React-Core
- RNHandoff (0.0.3):
- React
- RNInAppBrowser (3.5.1):
- React-Core
- RNLocalize (2.0.1):
- RNLocalize (2.0.2):
- React-Core
- RNPrivacySnapshot (1.0.0):
- React
@ -377,14 +377,14 @@ PODS:
- React-Core
- RNReanimated (1.13.2):
- React-Core
- RNScreens (2.17.1):
- RNScreens (2.18.0):
- React-Core
- RNSecureKeyStore (1.0.0):
- React
- RNSentry (1.9.0):
- React-Core
- Sentry (~> 5.2.0)
- RNShare (5.1.3):
- RNShare (5.1.4):
- React-Core
- RNSVG (12.1.0):
- React
@ -697,17 +697,17 @@ SPEC CHECKSUMS:
React-jsinspector: 8e68ffbfe23880d3ee9bafa8be2777f60b25cbe2
react-native-blue-crypto: 23f1558ad3d38d7a2edb7e2f6ed1bc520ed93e56
react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c
react-native-camera: d145df27a9178041b48b839b80ad79c9ef373fbd
react-native-camera: c2cb270b2546bb6d99352455676cd01a1cbeb1d5
react-native-document-picker: c5752781fbc0c126c627c1549b037c139444a4cf
react-native-fingerprint-scanner: c68136ca57e3704d7bdf5faa554ea535ce15b1d0
react-native-idle-timer: 97b8283237d45146a7a5c25bdebe9e1e85f3687b
react-native-image-picker: 248afb60a0c5a24153cb7c7483b257f30541323b
react-native-image-picker: 0c28bf3cb089cfe840bc5cc9fac3dcc10f2188d9
react-native-is-catalyst: 52ee70e0123c82419dd4ce47dc4cc94b22467512
react-native-randombytes: 45ae693012df24c9a07a5e578b3b567c01468581
react-native-safe-area-context: 86612d2c9a9e94e288319262d10b5f93f0b395f5
react-native-slider: b733e17fdd31186707146debf1f04b5d94aa1a93
react-native-tcp-socket: 96a4f104cdcc9c6621aafe92937f163d88447c5b
react-native-webview: dbe6c1ad149740f0e2d84a963f1d3c3e77f2d99c
react-native-webview: 36561eaf7508e67f72d8c959b713bac841f3652e
react-native-widget-center: 0f81d17beb163e7fb5848b06754d7d277fe7d99a
React-RCTActionSheet: 53ea72699698b0b47a6421cb1c8b4ab215a774aa
React-RCTAnimation: 1befece0b5183c22ae01b966f5583f42e69a83c2
@ -721,26 +721,26 @@ SPEC CHECKSUMS:
ReactCommon: 4167844018c9ed375cc01a843e9ee564399e53c3
RealmJS: 5195064e9aeccf94ae3756bd9d0f2301b9074b07
RemobileReactNativeQrcodeLocalImage: 57aadc12896b148fb5e04bc7c6805f3565f5c3fa
RNCAsyncStorage: 0701cb7395f06d744184641241888a0eec0e2f2a
RNCAsyncStorage: 1ab3f6ec0bc2c676dad4a00471d4c9d1a2cf68a2
RNCClipboard: dac13db8b1ce9b998f1cbc7ca33440113602847f
RNCMaskedView: f5c7d14d6847b7b44853f7acb6284c1da30a3459
RNCPushNotificationIOS: 5b1cf9ad2aaa107ecb92d5d2d7005ba521b2b97a
RNDefaultPreference: 21816c0a6f61a2829ccc0cef034392e9b509ee5f
RNDeviceInfo: 54401b60514387f9120ab8265be5ed9103d842b9
RNDeviceInfo: 71696ed3282a5058d08378a17d78d7367d9496e5
RNFS: 2bd9eb49dc82fa9676382f0585b992c424cd59df
RNGestureHandler: 9b7e605a741412e20e13c512738a31bd1611759b
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
RNHandoff: d3b0754cca3a6bcd9b25f544f733f7f033ccf5fa
RNInAppBrowser: 3733c1aa6699983a1c9b4963e85d5e5a48ad297e
RNLocalize: dcf0fdb332b37b0d24178e876a7ce4dbbc9c838d
RNLocalize: 47e22ef8c36df1d572e42a87c8ae22e3fcf551dd
RNPrivacySnapshot: 71919dde3c6a29dd332115409c2aec564afee8f4
RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93
RNRate: 2b31dad120cd1b78e33c6034808561c386a3dddf
RNReactNativeHapticFeedback: 653a8c126a0f5e88ce15ffe280b3ff37e1fbb285
RNReanimated: e03f7425cb7a38dcf1b644d680d1bfc91c3337ad
RNScreens: b6c9607e6fe47c1b6e2f1910d2acd46dd7ecea3a
RNScreens: f0d7a2a440a8ba9f4574ca1ddb3368f473891be4
RNSecureKeyStore: f1ad870e53806453039f650720d2845c678d89c8
RNSentry: 1adaa43b01c6a3ab5091d4d1add66b7c58558898
RNShare: d98667ee0277d9cd068041e5f316a5fe67aa8536
RNShare: 8af5349f05fc042d230674dd650d19789187ff9c
RNSVG: ce9d996113475209013317e48b05c21ee988d42e
RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59
RNWatch: e4c5d19506c94506860032fb68aedd5991beb985
@ -752,4 +752,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 070fb164a2dfb94605ea7862fd9b1c25e95ff046
COCOAPODS: 1.10.0
COCOAPODS: 1.10.1

View File

@ -88,7 +88,7 @@ const SignVerify = () => {
if (loading)
return (
<View style={[styles.loading]}>
<View style={[stylesHooks.root, styles.loading]}>
<ActivityIndicator />
</View>
);
@ -196,7 +196,10 @@ const SignVerify = () => {
);
};
SignVerify.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.addresses.sign_title }));
SignVerify.navigationOptions = navigationStyle({ closeButton: true, headerLeft: null }, opts => ({
...opts,
title: loc.addresses.sign_title,
}));
export default SignVerify;

View File

@ -155,8 +155,7 @@ it('HD (BIP49) can create TX', async () => {
tx = bitcoin.Transaction.fromHex(txNew.tx.toHex());
assert.strictEqual(tx.outs.length, 2);
assert.ok(tx.outs[0].value > 50000);
assert.strictEqual(tx.outs[1].value, 25000
);
assert.strictEqual(tx.outs[1].value, 25000);
});
it('Segwit HD (BIP49) can fetch balance with many used addresses in hierarchy', async function () {