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 2fcdb2e1..d1493c14 100644 --- a/src/components/listitems/ListItemAction.tsx +++ b/src/components/listitems/ListItemAction.tsx @@ -79,7 +79,7 @@ export const ListItemAction = ({ /> )} - + {label} diff --git a/src/components/listitems/ListItemRadioWithAmount.tsx b/src/components/listitems/ListItemRadioWithAmount.tsx index bbe927bf..bd18bd8d 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 "./PressableListItemBase"; export type ListItemRadioWithAmountProps = { @@ -56,45 +56,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 319080dc..a4892ba0 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 a94901ff..c6913381 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, } } > @@ -945,7 +946,7 @@ exports[`Test List Item Components - Experimental Enabled ListItemRadioWithAmou > label - @@ -1036,13 +1032,6 @@ exports[`Test List Item Components - Experimental Enabled ListItemRadioWithAmou /> - @@ -1095,13 +1086,6 @@ exports[`Test List Item Components - Experimental Enabled ListItemRadioWithAmou > € 1.000,00 - @@ -1379,13 +1365,6 @@ exports[`Test List Item Components - Experimental Enabled ListItemRadioWithAmou > € 1.000,00 - @@ -1952,7 +1932,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, @@ -2075,7 +2055,7 @@ exports[`Test List Item Components ListItemInfoCopy Snapshot 1`] = ` { "color": "#0B3EE3", "fontFamily": "Titillium Sans Pro", - "fontSize": 18, + "fontSize": 17, "fontStyle": "normal", "fontWeight": "600", "lineHeight": 24, @@ -2243,7 +2223,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, @@ -2473,7 +2453,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, @@ -2635,7 +2615,7 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 1`] = ` > label - @@ -2726,13 +2701,6 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 1`] = ` /> - @@ -2775,7 +2745,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, @@ -2785,13 +2755,6 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 1`] = ` > € 1.000,00 - @@ -3059,7 +3024,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, @@ -3069,13 +3034,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) => (