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

Dev peerly #165

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

Dev peerly #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dbe3556
Added 150 character minimum length in description box
omkar-20 Dec 19, 2024
8fee0d5
Added error message in constant file
omkar-20 Dec 20, 2024
989ae41
Added description text in constant file
omkar-20 Dec 20, 2024
f8ba538
Merge branch 'dev-peerly' into feature/description_min_char
omkar-20 Dec 20, 2024
eb73335
reduced description font size
omkar-20 Dec 20, 2024
7754cbe
Merge pull request #164 from omkar-20/feature/description_min_char
omkar-20 Dec 20, 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
2 changes: 2 additions & 0 deletions src/app/Peerly/constants/message.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ export default {
'Your objection reason has been submitted successfully. We appreciate your feedback.',
REWARD_SUCCESS:
'Your rewards has been submitted successfully. We appreciate your feedback.',
MIN_DESCRIPTION_LENGTH: 'Description must be at least 150 characters long.',
NOTE: 'Note:'
};
28 changes: 21 additions & 7 deletions src/app/Peerly/screens/GiveAppreciationScreen/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ const paginationData = {
const schema = yup.object().shape({
receiver: yup.string().required(messages.SELECT_COWORKER_NAME),
core_value_id: yup.string().required(messages.SELECT_CORE_VALUE),
description: yup.string().required(messages.ENTER_DESCIPTION),
description: yup.string().required(messages.ENTER_DESCIPTION)
.min(150, messages.MIN_DESCRIPTION_LENGTH),
});

const AppreciationScreen = () => {
Expand Down Expand Up @@ -159,12 +160,17 @@ const AppreciationScreen = () => {
<Controller
control={control}
render={({field: {onChange, value}}) => (
<TextInput
style={styles.description}
onChangeText={onChange}
value={value}
multiline
/>
<>
<TextInput
style={styles.description}
onChangeText={onChange}
value={value}
multiline
/>
<Typography style={styles.noteText}>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The text field should toggle between helper text and error messages. We should avoid showing both simultaneously, especially when they have same text.

<Text style={styles.noteBold}>{messages.NOTE}</Text> {messages.MIN_DESCRIPTION_LENGTH}
</Typography>
</>
)}
name="description"
/>
Expand Down Expand Up @@ -259,6 +265,14 @@ const styles = StyleSheet.create({
fontSize: 16,
borderRadius: 12,
},
noteText: {
color: 'gray',
fontSize: 10,
marginTop: 4,
},
noteBold: {
fontWeight: 'bold',
},
});

export default AppreciationScreen;