diff --git a/packages/mobile/src/transactions/TransferFeedItem.tsx b/packages/mobile/src/transactions/TransferFeedItem.tsx index 4dbe3a371dd..e348645d403 100644 --- a/packages/mobile/src/transactions/TransferFeedItem.tsx +++ b/packages/mobile/src/transactions/TransferFeedItem.tsx @@ -166,7 +166,7 @@ export function TransferFeedItem(props: Props) { - {title} + {title} - {!!info && {info}} + {!!info && {info}} {isPending && ( @@ -239,13 +239,17 @@ const styles = StyleSheet.create({ }, titleContainer: { flexDirection: 'row', - marginTop: 3, + marginTop: -1, }, title: { + ...fontStyles.semiBold, fontSize: 15, - lineHeight: 20, color: colors.dark, }, + info: { + ...fontStyles.comment, + marginTop: -2, + }, amount: { marginLeft: 'auto', paddingLeft: 10, diff --git a/packages/mobile/src/transactions/__snapshots__/TransactionFeed.test.tsx.snap b/packages/mobile/src/transactions/__snapshots__/TransactionFeed.test.tsx.snap index b9d68909729..bf81e787ee8 100644 --- a/packages/mobile/src/transactions/__snapshots__/TransactionFeed.test.tsx.snap +++ b/packages/mobile/src/transactions/__snapshots__/TransactionFeed.test.tsx.snap @@ -274,22 +274,17 @@ exports[`renders for gold to dollar exchange properly 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemSentTitle @@ -320,7 +315,7 @@ exports[`renders for gold to dollar exchange properly 1`] = ` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > @@ -708,22 +703,17 @@ exports[`renders for gold to dollar exchange properly 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemNetworkFeeTitle @@ -754,7 +744,7 @@ exports[`renders for gold to dollar exchange properly 1`] = ` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > @@ -1207,22 +1197,17 @@ exports[`renders for loading 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemSentTitle @@ -1253,7 +1238,7 @@ exports[`renders for loading 1`] = ` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > @@ -1641,22 +1626,17 @@ exports[`renders for loading 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemNetworkFeeTitle @@ -1687,7 +1667,7 @@ exports[`renders for loading 1`] = ` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > @@ -1930,22 +1910,17 @@ exports[`renders for no transactions 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemSentTitle @@ -1976,7 +1951,7 @@ exports[`renders for no transactions 1`] = ` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > @@ -2364,22 +2339,17 @@ exports[`renders for no transactions 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemNetworkFeeTitle @@ -2410,7 +2380,7 @@ exports[`renders for no transactions 1`] = ` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > @@ -2653,22 +2623,17 @@ exports[`renders for standbyTransactions 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemSentTitle @@ -2699,7 +2664,7 @@ exports[`renders for standbyTransactions 1`] = ` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > @@ -3087,22 +3052,17 @@ exports[`renders for standbyTransactions 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemNetworkFeeTitle @@ -3133,7 +3093,7 @@ exports[`renders for standbyTransactions 1`] = ` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > diff --git a/packages/mobile/src/transactions/__snapshots__/TransferFeedItem.test.tsx.snap b/packages/mobile/src/transactions/__snapshots__/TransferFeedItem.test.tsx.snap index c84547051c9..c7e8d92a463 100644 --- a/packages/mobile/src/transactions/__snapshots__/TransferFeedItem.test.tsx.snap +++ b/packages/mobile/src/transactions/__snapshots__/TransferFeedItem.test.tsx.snap @@ -63,22 +63,17 @@ exports[`transfer feed item renders correctly for <0.000001 network fee 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemNetworkFeeTitle @@ -109,7 +104,7 @@ exports[`transfer feed item renders correctly for <0.000001 network fee 1`] = ` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > @@ -219,22 +214,17 @@ exports[`transfer feed item renders correctly for faucet 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemFaucetTitle @@ -265,7 +255,7 @@ exports[`transfer feed item renders correctly for faucet 1`] = ` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > @@ -405,22 +395,17 @@ exports[`transfer feed item renders correctly for known received 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > John Doe @@ -577,22 +562,17 @@ exports[`transfer feed item renders correctly for known sent 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > John Doe @@ -719,22 +699,17 @@ exports[`transfer feed item renders correctly for network fee 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemNetworkFeeTitle @@ -765,7 +740,7 @@ exports[`transfer feed item renders correctly for network fee 1`] = ` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > @@ -905,22 +880,17 @@ exports[`transfer feed item renders correctly for received 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemReceivedTitle @@ -1047,22 +1017,17 @@ exports[`transfer feed item renders correctly for received invite 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemInviteReceivedTitle @@ -1093,7 +1058,7 @@ exports[`transfer feed item renders correctly for received invite 1`] = ` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > @@ -1233,22 +1198,17 @@ exports[`transfer feed item renders correctly for received with encrypted commen style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemReceivedTitle @@ -1279,7 +1239,7 @@ exports[`transfer feed item renders correctly for received with encrypted commen "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > @@ -1419,22 +1379,17 @@ exports[`transfer feed item renders correctly for sent 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemSentTitle @@ -1561,22 +1516,17 @@ exports[`transfer feed item renders correctly for sent invite 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemInviteSentTitle @@ -1607,7 +1557,7 @@ exports[`transfer feed item renders correctly for sent invite 1`] = ` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > @@ -1747,22 +1697,17 @@ exports[`transfer feed item renders correctly for sent transaction 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemSentTitle @@ -1793,7 +1738,7 @@ exports[`transfer feed item renders correctly for sent transaction 1`] = ` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > @@ -1933,22 +1878,17 @@ exports[`transfer feed item renders correctly for sent with encrypted comment 1` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemSentTitle @@ -1979,7 +1919,7 @@ exports[`transfer feed item renders correctly for sent with encrypted comment 1` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > @@ -2089,22 +2029,17 @@ exports[`transfer feed item renders correctly for verification fee 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemVerificationFeeTitle @@ -2135,7 +2070,7 @@ exports[`transfer feed item renders correctly for verification fee 1`] = ` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > @@ -2264,22 +2199,17 @@ exports[`transfer feed item renders correctly for verification reward 1`] = ` style={ Object { "flexDirection": "row", - "marginTop": 3, + "marginTop": -1, } } > feedItemVerificationRewardTitle @@ -2310,7 +2240,7 @@ exports[`transfer feed item renders correctly for verification reward 1`] = ` "color": "#81868B", "fontFamily": "Hind-Regular", "fontSize": 15, - "lineHeight": 20, + "marginTop": -2, } } > diff --git a/packages/react-components/styles/fonts.tsx b/packages/react-components/styles/fonts.tsx index c33ca4c6e3c..855c92f1a68 100644 --- a/packages/react-components/styles/fonts.tsx +++ b/packages/react-components/styles/fonts.tsx @@ -216,7 +216,6 @@ export const fontStyles = StyleSheet.create({ }, comment: { fontSize: 15, - lineHeight: 20, fontFamily: HindSilguri.Regular, color: colors.darkSecondary, },