Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix#1668 wrapping of empty chirp error message #1762

Merged
merged 2 commits into from
Mar 11, 2024
Merged

Fix#1668 wrapping of empty chirp error message #1762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32ab508
Add flexShrink: 1, to fix the error message wrapping issue
ljankoschek Feb 27, 2024
e8e7e50
Fix typo in empty chirp error message
ljankoschek Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions fe1-web/src/features/social/components/TextInputChirp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const styles = StyleSheet.create({
display: 'flex',
flexDirection: 'column',
flexGrow: 1,
flexShrink: 1,
} as ViewStyle,
textInput: {
alignContent: 'flex-end',
Expand Down
6 changes: 5 additions & 1 deletion fe1-web/src/features/social/components/__tests__/__snapshots__/NewChirp.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ exports[`NewChirp renders correctly 1`] = `
"display": "flex",
"flexDirection": "column",
"flexGrow": 1,
"flexShrink": 1,
}
}
>
Expand Down Expand Up @@ -221,6 +222,7 @@ exports[`NewChirp shows the error message on empty trimmed message 1`] = `
"display": "flex",
"flexDirection": "column",
"flexGrow": 1,
"flexShrink": 1,
}
}
>
Expand Down Expand Up @@ -278,7 +280,7 @@ exports[`NewChirp shows the error message on empty trimmed message 1`] = `
]
}
>
You chirp will be cropped to an empty chirp. You cannot send an empty chirp.
Your chirp will be cropped to an empty chirp. You cannot send an empty chirp.
</Text>
<View
style={
Expand Down Expand Up @@ -421,6 +423,7 @@ exports[`NewChirp shows the modal on trimmed chirp and closes it 1`] = `
"display": "flex",
"flexDirection": "column",
"flexGrow": 1,
"flexShrink": 1,
}
}
>
Expand Down Expand Up @@ -778,6 +781,7 @@ exports[`NewChirp shows the modal on trimmed chirp and closes it 2`] = `
"display": "flex",
"flexDirection": "column",
"flexGrow": 1,
"flexShrink": 1,
}
}
>
Expand Down
5 changes: 5 additions & 0 deletions fe1-web/src/features/social/components/__tests__/__snapshots__/TextInputChirp.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ exports[`TextInputChirp renders correctly when writing less than 300 chars 1`] =
"display": "flex",
"flexDirection": "column",
"flexGrow": 1,
"flexShrink": 1,
}
}
>
Expand Down Expand Up @@ -212,6 +213,7 @@ exports[`TextInputChirp renders correctly when writing more than 300 chars 1`] =
"display": "flex",
"flexDirection": "column",
"flexGrow": 1,
"flexShrink": 1,
}
}
>
Expand Down Expand Up @@ -391,6 +393,7 @@ exports[`TextInputChirp renders correctly with placeholder 1`] = `
"display": "flex",
"flexDirection": "column",
"flexGrow": 1,
"flexShrink": 1,
}
}
>
Expand Down Expand Up @@ -550,6 +553,7 @@ exports[`TextInputChirp renders correctly with undefined public key 1`] = `
"display": "flex",
"flexDirection": "column",
"flexGrow": 1,
"flexShrink": 1,
}
}
>
Expand Down Expand Up @@ -715,6 +719,7 @@ exports[`TextInputChirp renders correctly without placeholder 1`] = `
"display": "flex",
"flexDirection": "column",
"flexGrow": 1,
"flexShrink": 1,
}
}
>
Expand Down
1 change: 1 addition & 0 deletions fe1-web/src/features/social/screens/__tests__/__snapshots__/SocialHome.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ exports[`SocialHome renders correctly 1`] = `
"display": "flex",
"flexDirection": "column",
"flexGrow": 1,
"flexShrink": 1,
}
}
>
Expand Down
2 changes: 1 addition & 1 deletion fe1-web/src/resources/strings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ namespace STRINGS {
export const social_media_create_chirp_no_pop_token =
'In order to post chirps, you first need to participate in a roll-call.';
export const social_media_empty_chirp =
'You chirp will be cropped to an empty chirp. You cannot send an empty chirp.';
'Your chirp will be cropped to an empty chirp. You cannot send an empty chirp.';
export const social_media_user_list_unavailable =
'In order to see other roll call participants you yourself first need to participate in one.';
export const social_media_your_profile_unavailable =
Expand Down
Loading