diff --git a/src/components/Button.tsx b/src/components/Button.tsx index d8ae4c6e4..524893181 100644 --- a/src/components/Button.tsx +++ b/src/components/Button.tsx @@ -65,6 +65,7 @@ const Button = ({ return { ...textStyle, ...(text && icon && { marginLeft: 8 }), + ...(text && !icon && { maxWidth: '100%', textAlign: 'center' }), // on android text sometimes get shrinked. So if there is no icon, make sure it takes the full width ...(variant === 'primary' ? {} : { color: white80 }), ...(disabled && !icon && { color: white32 }), ...Platform.select({ diff --git a/src/components/HeadlinesWidget.tsx b/src/components/HeadlinesWidget.tsx index 01a0ad941..f54ee3379 100644 --- a/src/components/HeadlinesWidget.tsx +++ b/src/components/HeadlinesWidget.tsx @@ -121,7 +121,9 @@ const HeadlinesWidget = ({ activeOpacity={0.9} hitSlop={{ right: 15, bottom: 15, left: 15 }} onPress={(): void => { - if (link) openAppURL(link); + if (link) { + openAppURL(link); + } }}> diff --git a/src/components/SuggestionCard.tsx b/src/components/SuggestionCard.tsx index 831f0da3f..1361b7da0 100644 --- a/src/components/SuggestionCard.tsx +++ b/src/components/SuggestionCard.tsx @@ -187,7 +187,7 @@ const styles = StyleSheet.create({ width: CARD_SIZE, height: CARD_SIZE, borderRadius: CARD_BORDER_RADIUS, - paddingHorizontal: 16, + paddingHorizontal: 15, paddingBottom: 14, }, pressable: { diff --git a/src/screens/Settings/ElectrumConfig/index.tsx b/src/screens/Settings/ElectrumConfig/index.tsx index 119da0aac..52e87e601 100644 --- a/src/screens/Settings/ElectrumConfig/index.tsx +++ b/src/screens/Settings/ElectrumConfig/index.tsx @@ -31,6 +31,7 @@ import { EProtocol } from 'beignet'; import { refreshWallet, rescanAddresses } from '../../../utils/wallet'; import { EAvailableNetwork } from '../../../utils/networks'; import { updateActivityList } from '../../../store/utils/activity'; +import useBreakpoints from '../../../styles/breakpoints'; type RadioButtonItem = { label: string; value: EProtocol }; @@ -87,6 +88,7 @@ const ElectrumConfig = ({ navigation, }: SettingsScreenProps<'ElectrumConfig'>): ReactElement => { const { t } = useTranslation('settings'); + const br = useBreakpoints(); const dispatch = useAppDispatch(); const selectedNetwork = useAppSelector(selectedNetworkSelector); const customElectrumPeers = useAppSelector((state) => { @@ -337,7 +339,7 @@ const ElectrumConfig = ({ /> - +