diff --git a/components/BottomModal.tsx b/components/BottomModal.tsx index f496cfd23..bccee3057 100644 --- a/components/BottomModal.tsx +++ b/components/BottomModal.tsx @@ -90,7 +90,6 @@ const BottomModal = forwardRef( const renderFooter = (): ReactElement> | ComponentType | undefined => { // Footer is not working correctly on Android yet. - if (Platform.OS === 'android') return undefined; if (!footer) return undefined; if (React.isValidElement(footer)) { @@ -104,6 +103,8 @@ const BottomModal = forwardRef( return undefined; }; + const FooterComponent = Platform.OS !== 'android' && renderFooter(); + return ( ( onPresent={onPresent} onSizeChange={onSizeChange} grabber={isGrabberVisible} - FooterComponent={renderFooter()} + // Footer is not working correctly on Android yet. + FooterComponent={FooterComponent as ReactElement} {...props} blurTint="regular" accessibilityViewIsModal > {children} {renderTopRightButton()} - {renderFooter() as ReactNode} + {Platform.OS === 'android' && (renderFooter() as ReactNode)} ); }, diff --git a/screen/send/SendDetails.tsx b/screen/send/SendDetails.tsx index c8207a457..4bd412335 100644 --- a/screen/send/SendDetails.tsx +++ b/screen/send/SendDetails.tsx @@ -1284,32 +1284,36 @@ const SendDetails = () => { } > - {options.map(({ label, time, fee, rate, active, disabled }) => ( - { - setFeePrecalc(fp => ({ ...fp, current: fee })); - feeModalRef.current?.dismiss(); - setCustomFee(rate.toString()); - }} - style={[styles.feeModalItem, active && styles.feeModalItemActive, active && !disabled && stylesHook.feeModalItemActive]} - > - - {label} - - ~{time} + + {options.map(({ label, time, fee, rate, active, disabled }) => ( + { + setFeePrecalc(fp => ({ ...fp, current: fee })); + feeModalRef.current?.dismiss(); + setCustomFee(rate.toString()); + }} + style={[styles.feeModalItem, active && styles.feeModalItemActive, active && !disabled && stylesHook.feeModalItemActive]} + > + + + {label} + + + ~{time} + - - - {fee && formatFee(fee)} - - {rate} {loc.units.sat_vbyte} - - - - ))} + + {fee && formatFee(fee)} + + {rate} {loc.units.sat_vbyte} + + + + ))} + ); }; @@ -1655,7 +1659,9 @@ const styles = StyleSheet.create({ }, modalContent: { margin: 22, + minHeight: 370, }, + paddingTop80: { paddingTop: 80 }, optionsContent: { padding: 22, }, diff --git a/screen/wallets/ViewEditMultisigCosigners.tsx b/screen/wallets/ViewEditMultisigCosigners.tsx index 12a791b85..516d58fc2 100644 --- a/screen/wallets/ViewEditMultisigCosigners.tsx +++ b/screen/wallets/ViewEditMultisigCosigners.tsx @@ -400,7 +400,6 @@ const ViewEditMultisigCosigners: React.FC = () => { )} { - - {loc.multisig.this_is_cosigners_xpub} {Platform.OS === 'ios' ? loc.multisig.this_is_cosigners_xpub_airdrop : ''} - - - - + footerDefaultMargins + footer={ { > - + } + > + + {loc.multisig.this_is_cosigners_xpub} {Platform.OS === 'ios' ? loc.multisig.this_is_cosigners_xpub_airdrop : ''} + + + ); }; @@ -661,8 +661,7 @@ const styles = StyleSheet.create({ newKeyModalContent: { paddingHorizontal: 22, paddingTop: 32, - justifyContent: 'center', - minHeight: 300, + minHeight: 370, }, modalContent: { padding: 22, @@ -679,14 +678,13 @@ const styles = StyleSheet.create({ exportButton: { height: 48, borderRadius: 8, - flex: 1, justifyContent: 'center', paddingHorizontal: 16, }, headerText: { fontSize: 15, color: '#13244D' }, mainBlock: { marginHorizontal: 16 }, alignItemsCenter: { alignItems: 'center' }, - squareButtonWrapper: { height: 50, width: 250 }, + shareModalHeight: { minHeight: 300 }, tipKeys: { fontSize: 15, fontWeight: '600', diff --git a/screen/wallets/addMultisigStep2.js b/screen/wallets/addMultisigStep2.js index 8ff0e7d09..e47a31ae7 100644 --- a/screen/wallets/addMultisigStep2.js +++ b/screen/wallets/addMultisigStep2.js @@ -567,42 +567,72 @@ const WalletsAddMultisigStep2 = () => { const renderMnemonicsModal = () => { return ( - - - - - - - - - {loc.formatString(loc.multisig.vault_key, { number: vaultKeyData.keyIndex })} - - + :