diff --git a/src/components/banner/__test__/__snapshots__/banner.test.tsx.snap b/src/components/banner/__test__/__snapshots__/banner.test.tsx.snap index a52d7b63..42e0e1d1 100644 --- a/src/components/banner/__test__/__snapshots__/banner.test.tsx.snap +++ b/src/components/banner/__test__/__snapshots__/banner.test.tsx.snap @@ -361,7 +361,7 @@ exports[`Test Banner Components Banner Snapshot 1`] = ` { "color": "#031344", "fontFamily": "Titillium Sans Pro", - "fontSize": 18, + "fontSize": 17, "fontStyle": "normal", "fontWeight": "600", "lineHeight": 24, diff --git a/src/components/listitems/ListItemAction.tsx b/src/components/listitems/ListItemAction.tsx index ee18cf5a..50b80d47 100644 --- a/src/components/listitems/ListItemAction.tsx +++ b/src/components/listitems/ListItemAction.tsx @@ -135,7 +135,7 @@ export const ListItemAction = ({ /> )} - + {label} diff --git a/src/components/listitems/ListItemRadioWithAmount.tsx b/src/components/listitems/ListItemRadioWithAmount.tsx index 70a61025..d8c562c5 100644 --- a/src/components/listitems/ListItemRadioWithAmount.tsx +++ b/src/components/listitems/ListItemRadioWithAmount.tsx @@ -1,11 +1,11 @@ import * as React from "react"; -import { StyleSheet, View } from "react-native"; +import { View } from "react-native"; import RNReactNativeHapticFeedback from "react-native-haptic-feedback"; import { IOColors, useIOTheme } from "../../core"; import { Icon } from "../icons"; import { AnimatedRadio } from "../radio/AnimatedRadio"; -import { HSpacer, VSpacer } from "../spacer"; -import { H6, BodySmall } from "../typography"; +import { HStack } from "../stack"; +import { BodySmall, H6 } from "../typography"; import { PressableListItemBase } from "./PressableListItemsBase"; export type ListItemRadioWithAmountProps = { @@ -55,45 +55,29 @@ export const ListItemRadioWithAmount = ({ }} > - +
{label} - +
{isSuggested && ( - <> - - - - - - {suggestReason} - - - + + + + {suggestReason} + + )}
-
{formattedAmountString}
- -
+ ); }; - -const styles = StyleSheet.create({ - rowCenter: { - flexDirection: "row", - alignItems: "center" - } -}); diff --git a/src/components/listitems/ListItemTransaction.tsx b/src/components/listitems/ListItemTransaction.tsx index 30a45c34..a32904e7 100644 --- a/src/components/listitems/ListItemTransaction.tsx +++ b/src/components/listitems/ListItemTransaction.tsx @@ -146,13 +146,9 @@ export const ListItemTransaction = ({
)} - +
{title} - +
{subtitle} diff --git a/src/components/listitems/__test__/__snapshots__/listitem.test.tsx.snap b/src/components/listitems/__test__/__snapshots__/listitem.test.tsx.snap index 39780df4..4caf5acb 100644 --- a/src/components/listitems/__test__/__snapshots__/listitem.test.tsx.snap +++ b/src/components/listitems/__test__/__snapshots__/listitem.test.tsx.snap @@ -73,6 +73,7 @@ exports[`Test List Item Components - Experimental Enabled ListItemAction Snapsh style={ { "flexGrow": 1, + "flexShrink": 1, } } > @@ -942,7 +943,7 @@ exports[`Test List Item Components - Experimental Enabled ListItemRadioWithAmou > label - @@ -1033,13 +1029,6 @@ exports[`Test List Item Components - Experimental Enabled ListItemRadioWithAmou /> - @@ -1092,13 +1083,6 @@ exports[`Test List Item Components - Experimental Enabled ListItemRadioWithAmou > € 1.000,00 - @@ -1376,13 +1362,6 @@ exports[`Test List Item Components - Experimental Enabled ListItemRadioWithAmou > € 1.000,00 - @@ -1949,7 +1929,7 @@ exports[`Test List Item Components ListItemInfo Snapshot 1`] = ` { "color": "#0E0F13", "fontFamily": "Titillium Sans Pro", - "fontSize": 18, + "fontSize": 17, "fontStyle": "normal", "fontWeight": "600", "lineHeight": 24, @@ -2071,7 +2051,7 @@ exports[`Test List Item Components ListItemInfoCopy Snapshot 1`] = ` { "color": "#0073E6", "fontFamily": "Titillium Sans Pro", - "fontSize": 18, + "fontSize": 17, "fontStyle": "normal", "fontWeight": "600", "lineHeight": 24, @@ -2238,7 +2218,7 @@ exports[`Test List Item Components ListItemNav Snapshot 1`] = ` { "color": "#0E0F13", "fontFamily": "Titillium Sans Pro", - "fontSize": 18, + "fontSize": 17, "fontStyle": "normal", "fontWeight": "600", "lineHeight": 24, @@ -2467,7 +2447,7 @@ exports[`Test List Item Components ListItemNavAlert Snapshot 1`] = ` { "color": "#0E0F13", "fontFamily": "Titillium Sans Pro", - "fontSize": 18, + "fontSize": 17, "fontStyle": "normal", "fontWeight": "600", "lineHeight": 24, @@ -2629,7 +2609,7 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 1`] = ` > label - @@ -2720,13 +2695,6 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 1`] = ` /> - @@ -2769,7 +2739,7 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 1`] = ` { "color": "#0B3EE3", "fontFamily": "Titillium Sans Pro", - "fontSize": 18, + "fontSize": 17, "fontStyle": "normal", "fontWeight": "600", "lineHeight": 24, @@ -2779,13 +2749,6 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 1`] = ` > € 1.000,00 - @@ -3053,7 +3018,7 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 2`] = ` { "color": "#0B3EE3", "fontFamily": "Titillium Sans Pro", - "fontSize": 18, + "fontSize": 17, "fontStyle": "normal", "fontWeight": "600", "lineHeight": 24, @@ -3063,13 +3028,6 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 2`] = ` > € 1.000,00 - ; +type A11YRelatedProps = Pick< + ViewProps, + "pointerEvents" | "accessibilityElementsHidden" | "importantForAccessibility" +>; + type Stack = PropsWithChildren<{ space?: IOSpacer; style?: AllowedStyleProps; -}>; +}> & + A11YRelatedProps; type BaseStack = Stack & { orientation: "vertical" | "horizontal"; @@ -25,9 +31,11 @@ const Stack = ({ space, style, orientation = "vertical", - children + children, + ...props }: BaseStack) => (