Skip to content

Commit

Permalink
[Wallet] Fix top of emojis cut off in the activity feed (#1243)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeanregisser
jeanregisser authored Oct 8, 2019
1 parent ff03623 commit 222ab26
Show file tree
Hide file tree
Showing 4 changed files with 158 additions and 265 deletions.
12 changes: 8 additions & 4 deletions packages/mobile/src/transactions/TransferFeedItem.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export function TransferFeedItem(props: Props) {
</View>
<View style={styles.contentContainer}>
<View style={styles.titleContainer}>
<Text style={[fontStyles.semiBold, styles.title]}>{title}</Text>
<Text style={styles.title}>{title}</Text>
<Text
style={[
currencyStyle.direction === '-'
Expand All @@ -184,7 +184,7 @@ export function TransferFeedItem(props: Props) {
: getMoneyDisplayValue(props.value)}
</Text>
</View>
{!!info && <Text style={fontStyles.comment}>{info}</Text>}
{!!info && <Text style={styles.info}>{info}</Text>}
<View style={[styles.statusContainer, !!info && styles.statusContainerUnderComment]}>
{isPending && (
<Text style={[fontStyles.bodySmall, styles.transactionStatus]}>
Expand Down Expand Up @@ -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,
Expand Down
152 changes: 56 additions & 96 deletions packages/mobile/src/transactions/__snapshots__/TransactionFeed.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,22 +274,17 @@ exports[`renders for gold to dollar exchange properly 1`] = `
style={
Object {
"flexDirection": "row",
"marginTop": 3,
"marginTop": -1,
}
}
>
<Text
style={
Array [
Object {
"fontFamily": "Hind-SemiBold",
},
Object {
"color": "#2E3338",
"fontSize": 15,
"lineHeight": 20,
},
]
Object {
"color": "#2E3338",
"fontFamily": "Hind-SemiBold",
"fontSize": 15,
}
}
>
feedItemSentTitle
Expand Down Expand Up @@ -320,7 +315,7 @@ exports[`renders for gold to dollar exchange properly 1`] = `
"color": "#81868B",
"fontFamily": "Hind-Regular",
"fontSize": 15,
"lineHeight": 20,
"marginTop": -2,
}
}
>
Expand Down Expand Up @@ -708,22 +703,17 @@ exports[`renders for gold to dollar exchange properly 1`] = `
style={
Object {
"flexDirection": "row",
"marginTop": 3,
"marginTop": -1,
}
}
>
<Text
style={
Array [
Object {
"fontFamily": "Hind-SemiBold",
},
Object {
"color": "#2E3338",
"fontSize": 15,
"lineHeight": 20,
},
]
Object {
"color": "#2E3338",
"fontFamily": "Hind-SemiBold",
"fontSize": 15,
}
}
>
feedItemNetworkFeeTitle
Expand Down Expand Up @@ -754,7 +744,7 @@ exports[`renders for gold to dollar exchange properly 1`] = `
"color": "#81868B",
"fontFamily": "Hind-Regular",
"fontSize": 15,
"lineHeight": 20,
"marginTop": -2,
}
}
>
Expand Down Expand Up @@ -1207,22 +1197,17 @@ exports[`renders for loading 1`] = `
style={
Object {
"flexDirection": "row",
"marginTop": 3,
"marginTop": -1,
}
}
>
<Text
style={
Array [
Object {
"fontFamily": "Hind-SemiBold",
},
Object {
"color": "#2E3338",
"fontSize": 15,
"lineHeight": 20,
},
]
Object {
"color": "#2E3338",
"fontFamily": "Hind-SemiBold",
"fontSize": 15,
}
}
>
feedItemSentTitle
Expand Down Expand Up @@ -1253,7 +1238,7 @@ exports[`renders for loading 1`] = `
"color": "#81868B",
"fontFamily": "Hind-Regular",
"fontSize": 15,
"lineHeight": 20,
"marginTop": -2,
}
}
>
Expand Down Expand Up @@ -1641,22 +1626,17 @@ exports[`renders for loading 1`] = `
style={
Object {
"flexDirection": "row",
"marginTop": 3,
"marginTop": -1,
}
}
>
<Text
style={
Array [
Object {
"fontFamily": "Hind-SemiBold",
},
Object {
"color": "#2E3338",
"fontSize": 15,
"lineHeight": 20,
},
]
Object {
"color": "#2E3338",
"fontFamily": "Hind-SemiBold",
"fontSize": 15,
}
}
>
feedItemNetworkFeeTitle
Expand Down Expand Up @@ -1687,7 +1667,7 @@ exports[`renders for loading 1`] = `
"color": "#81868B",
"fontFamily": "Hind-Regular",
"fontSize": 15,
"lineHeight": 20,
"marginTop": -2,
}
}
>
Expand Down Expand Up @@ -1930,22 +1910,17 @@ exports[`renders for no transactions 1`] = `
style={
Object {
"flexDirection": "row",
"marginTop": 3,
"marginTop": -1,
}
}
>
<Text
style={
Array [
Object {
"fontFamily": "Hind-SemiBold",
},
Object {
"color": "#2E3338",
"fontSize": 15,
"lineHeight": 20,
},
]
Object {
"color": "#2E3338",
"fontFamily": "Hind-SemiBold",
"fontSize": 15,
}
}
>
feedItemSentTitle
Expand Down Expand Up @@ -1976,7 +1951,7 @@ exports[`renders for no transactions 1`] = `
"color": "#81868B",
"fontFamily": "Hind-Regular",
"fontSize": 15,
"lineHeight": 20,
"marginTop": -2,
}
}
>
Expand Down Expand Up @@ -2364,22 +2339,17 @@ exports[`renders for no transactions 1`] = `
style={
Object {
"flexDirection": "row",
"marginTop": 3,
"marginTop": -1,
}
}
>
<Text
style={
Array [
Object {
"fontFamily": "Hind-SemiBold",
},
Object {
"color": "#2E3338",
"fontSize": 15,
"lineHeight": 20,
},
]
Object {
"color": "#2E3338",
"fontFamily": "Hind-SemiBold",
"fontSize": 15,
}
}
>
feedItemNetworkFeeTitle
Expand Down Expand Up @@ -2410,7 +2380,7 @@ exports[`renders for no transactions 1`] = `
"color": "#81868B",
"fontFamily": "Hind-Regular",
"fontSize": 15,
"lineHeight": 20,
"marginTop": -2,
}
}
>
Expand Down Expand Up @@ -2653,22 +2623,17 @@ exports[`renders for standbyTransactions 1`] = `
style={
Object {
"flexDirection": "row",
"marginTop": 3,
"marginTop": -1,
}
}
>
<Text
style={
Array [
Object {
"fontFamily": "Hind-SemiBold",
},
Object {
"color": "#2E3338",
"fontSize": 15,
"lineHeight": 20,
},
]
Object {
"color": "#2E3338",
"fontFamily": "Hind-SemiBold",
"fontSize": 15,
}
}
>
feedItemSentTitle
Expand Down Expand Up @@ -2699,7 +2664,7 @@ exports[`renders for standbyTransactions 1`] = `
"color": "#81868B",
"fontFamily": "Hind-Regular",
"fontSize": 15,
"lineHeight": 20,
"marginTop": -2,
}
}
>
Expand Down Expand Up @@ -3087,22 +3052,17 @@ exports[`renders for standbyTransactions 1`] = `
style={
Object {
"flexDirection": "row",
"marginTop": 3,
"marginTop": -1,
}
}
>
<Text
style={
Array [
Object {
"fontFamily": "Hind-SemiBold",
},
Object {
"color": "#2E3338",
"fontSize": 15,
"lineHeight": 20,
},
]
Object {
"color": "#2E3338",
"fontFamily": "Hind-SemiBold",
"fontSize": 15,
}
}
>
feedItemNetworkFeeTitle
Expand Down Expand Up @@ -3133,7 +3093,7 @@ exports[`renders for standbyTransactions 1`] = `
"color": "#81868B",
"fontFamily": "Hind-Regular",
"fontSize": 15,
"lineHeight": 20,
"marginTop": -2,
}
}
>
Expand Down
Loading

0 comments on commit 222ab26

Please sign in to comment.