diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e553126ee..443ba9fc8 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1032,4 +1032,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 45955b00d9fe695cf6b62c8d0070f63a38904a50 -COCOAPODS: 1.11.3 +COCOAPODS: 1.13.0 diff --git a/src/assets/images/eye.png b/src/assets/images/eye.png new file mode 100644 index 000000000..c5b58c00a Binary files /dev/null and b/src/assets/images/eye.png differ diff --git a/src/assets/images/eyeOff.png b/src/assets/images/eyeOff.png new file mode 100644 index 000000000..62dc80a99 Binary files /dev/null and b/src/assets/images/eyeOff.png differ diff --git a/src/components/BottomSheet/BottomSheetHeader.js b/src/components/BottomSheet/BottomSheetHeader.js index 5ef05c2f0..4f67d60c5 100644 --- a/src/components/BottomSheet/BottomSheetHeader.js +++ b/src/components/BottomSheet/BottomSheetHeader.js @@ -47,7 +47,7 @@ const BottomSheetModalHeader = ({ title, closeModal, colors }) => { return ( - + {title} diff --git a/src/components/ConversationActionItem.js b/src/components/ConversationActionItem.js index 3bc353b2a..d60e66c3d 100644 --- a/src/components/ConversationActionItem.js +++ b/src/components/ConversationActionItem.js @@ -81,7 +81,7 @@ const ConversationActionItem = ({ }}> - + {text} @@ -89,7 +89,12 @@ const ConversationActionItem = ({ {shouldShowUserAvatar && ( )} - + {name} {(itemType === 'assignee' || itemType === 'team' || itemType === 'snooze') && ( diff --git a/src/components/ConversationAgentItem.js b/src/components/ConversationAgentItem.js index c3ce831ed..28a40a9cd 100644 --- a/src/components/ConversationAgentItem.js +++ b/src/components/ConversationAgentItem.js @@ -131,7 +131,7 @@ const ConversationAgentItem = ({ colors, title, agentsList, activeValue, onClick {filteredAgentsOnSearch.length !== 0 && ( - + {title} )} @@ -151,7 +151,7 @@ const ConversationAgentItem = ({ colors, title, agentsList, activeValue, onClick fontSize={12} availabilityStatus={item.availability_status} /> - + {`${item.name}`} @@ -164,7 +164,7 @@ const ConversationAgentItem = ({ colors, title, agentsList, activeValue, onClick ))} {filteredAgentsOnSearch && filteredAgentsOnSearch.length === 0 && ( - + {i18n.t('CONVERSATION_AGENTS.NO_RESULT')} diff --git a/src/components/ConversationDetailsItem.js b/src/components/ConversationDetailsItem.js index 37537c831..8d8b1a1e0 100644 --- a/src/components/ConversationDetailsItem.js +++ b/src/components/ConversationDetailsItem.js @@ -34,17 +34,21 @@ const ConversationDetailsItem = ({ value, title, type }) => { - + {title} {link ? ( - openURL({ URL: value })}> + openURL({ URL: value })}> {value} ) : ( - + {value} )} diff --git a/src/components/Empty/Empty.js b/src/components/Empty/Empty.js index 41da73270..c82f5e119 100644 --- a/src/components/Empty/Empty.js +++ b/src/components/Empty/Empty.js @@ -55,14 +55,19 @@ const Empty = ({ image, title, subTitle }) => { {title && ( - + {title} )} {subTitle && ( - + {subTitle} diff --git a/src/components/FilterButton/ClearFilterButton.js b/src/components/FilterButton/ClearFilterButton.js index c211e4fcb..a080dd6c7 100644 --- a/src/components/FilterButton/ClearFilterButton.js +++ b/src/components/FilterButton/ClearFilterButton.js @@ -52,7 +52,7 @@ const Dropdown = ({ onSelectItem, count }) => { - + {getTextSubstringWithEllipsis(count, 20)} diff --git a/src/components/FilterButton/FilterButton.js b/src/components/FilterButton/FilterButton.js index 82d80e7d1..16e19d039 100644 --- a/src/components/FilterButton/FilterButton.js +++ b/src/components/FilterButton/FilterButton.js @@ -57,7 +57,7 @@ const FilterButton = ({ label, onPress, isActive, hasLeftIcon, leftIconName }) = )} - + {getTextSubstringWithEllipsis(label, 20)} diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js index 940d6f9f6..f5ddff4a4 100644 --- a/src/components/Header/Header.js +++ b/src/components/Header/Header.js @@ -116,12 +116,12 @@ const Header = ({ style={styles.headerLoader} /> ) : null} - + {headerText} {showCount && !loading && count !== 0 && ( - + {`(${count})`} diff --git a/src/components/InboxName/InboxName.js b/src/components/InboxName/InboxName.js index 3c6647b57..a20ee5030 100644 --- a/src/components/InboxName/InboxName.js +++ b/src/components/InboxName/InboxName.js @@ -37,7 +37,7 @@ const InboxName = ({ inboxName, phoneNumber, channelType }) => { {iconName ? : null} {inboxName ? ( - + {getTextSubstringWithEllipsis(inboxName, 26)} ) : null} diff --git a/src/components/LabelBox.js b/src/components/LabelBox.js index e93643aa7..1ce862fe7 100644 --- a/src/components/LabelBox.js +++ b/src/components/LabelBox.js @@ -54,7 +54,7 @@ const LabelBox = ({ id, title, color, onClickRemoveLabel }) => { - + {title} onClickRemoveLabel()}> diff --git a/src/components/Modal/ModalView.js b/src/components/Modal/ModalView.js index 24d50e724..77bffc456 100644 --- a/src/components/Modal/ModalView.js +++ b/src/components/Modal/ModalView.js @@ -69,15 +69,15 @@ const ModalView = ({ showModal, headerText, contentText, buttonText, onPressClos - + {headerText} - + {contentText} - + {buttonText} diff --git a/src/components/NotificationActionItem.js b/src/components/NotificationActionItem.js index 187df08d8..5474eeae1 100644 --- a/src/components/NotificationActionItem.js +++ b/src/components/NotificationActionItem.js @@ -44,7 +44,7 @@ const NotificationActionItem = ({ text, iconName, itemType, onPressItem }) => { onPressItem({ itemType })}> - + {text} diff --git a/src/components/NotificationItem.js b/src/components/NotificationItem.js index 16a7f09d1..71505682c 100644 --- a/src/components/NotificationItem.js +++ b/src/components/NotificationItem.js @@ -48,15 +48,15 @@ const NotificationItemComponent = ({ item, onSelectNotification }) => { )} {!read_at ? ( - + {push_message_title} ) : ( - + {push_message_title} )} - + {`${timeAgo({ time: created_at })}`} diff --git a/src/components/Text/Text.spec.js b/src/components/Text/Text.spec.js index 41faea75e..8efa33b72 100644 --- a/src/components/Text/Text.spec.js +++ b/src/components/Text/Text.spec.js @@ -9,23 +9,43 @@ describe('Text', () => { expect(screen.getByText('Test')).toBeTruthy(); }); it('should render the text with bold', () => { - render(Test); + render( + + Test + , + ); expect(screen.getByText('Test')).toHaveStyle({ fontWeight: 'bold' }); }); it('should render the text with color', () => { - render(Test); + render( + + Test + , + ); expect(screen.getByText('Test')).toHaveStyle({ color: 'red' }); }); it('should render the text with xxs', () => { - render(Test); + render( + + Test + , + ); expect(screen.getByText('Test')).toHaveStyle({ fontSize: 10 }); }); it('should render the capitalize text', () => { - render(Test); + render( + + Test + , + ); expect(screen.getByText('Test')).toHaveStyle({ textTransform: 'capitalize' }); }); it('should render the text if custom style is passed', () => { - render(Test); + render( + + Test + , + ); expect(screen.getByText('Test')).toHaveStyle({ lineHeight: 20 }); }); }); diff --git a/src/components/Text/Text.stories.js b/src/components/Text/Text.stories.js index ff026ebc1..312196d84 100644 --- a/src/components/Text/Text.stories.js +++ b/src/components/Text/Text.stories.js @@ -8,26 +8,60 @@ storiesOf('Text', module) .addDecorator(getStory => {getStory()}) .add('with font size', () => ( - xxs - xs - sm - md - lg - xl - xxl - xxxl + + xxs + + + xs + + + sm + + + md + + + lg + + + xl + + + xxl + + + xxxl + )) .add('with font weight', () => ( - thin - ultraLight - light - regular - medium - semiBold - bold - heavy - normal + + thin + + + ultraLight + + + light + + + regular + + + medium + + + semiBold + + + bold + + + heavy + + + normal + )); diff --git a/src/components/TextInput.js b/src/components/TextInput.js index 9fa36a1fb..77d865a83 100644 --- a/src/components/TextInput.js +++ b/src/components/TextInput.js @@ -59,7 +59,7 @@ const TextInputField = ({ onChangeText, error, keyboardType, secureTextEntry, la return ( - + {label} {error && ( - + {error.message} )} diff --git a/src/components/UserAvatar/UserAvatar.js b/src/components/UserAvatar/UserAvatar.js index 1cedf1c9a..b32b199f4 100644 --- a/src/components/UserAvatar/UserAvatar.js +++ b/src/components/UserAvatar/UserAvatar.js @@ -165,7 +165,11 @@ const UserAvatar = ({ borderRadius: size, }, ]}> - + {getUserInitial({ userName })} diff --git a/src/components/UserAvatar/UserAvatarGroup.js b/src/components/UserAvatar/UserAvatarGroup.js index 2ce0b3d5a..bd7a00905 100644 --- a/src/components/UserAvatar/UserAvatarGroup.js +++ b/src/components/UserAvatar/UserAvatarGroup.js @@ -32,7 +32,9 @@ const UserAvatarGroup = ({ users, size, showMoreText, moreText, length, fontSize const count = users.length - length; return ( - {`+${count} ${moreText || ''}`} + {`+${count} ${ + moreText || '' + }`} ); }; diff --git a/src/constants/images.js b/src/constants/images.js index 09619ca53..d87e290f7 100644 --- a/src/constants/images.js +++ b/src/constants/images.js @@ -14,6 +14,8 @@ const forgotPassword = require('../assets/images/forgotPassword.png'); const emptyConversations = require('../assets/images/emptyConversations.png'); const URL = require('../assets/images/url.png'); const login = require('../assets/images/login.png'); +const eye = require('../assets/images/eye.png'); +const eyeOff = require('../assets/images/eyeOff.png'); export default { appLogo, @@ -32,4 +34,6 @@ export default { emptyConversations, URL, login, + eye, + eyeOff, }; diff --git a/src/screens/ChatScreen/components/AttachmentActionItem.js b/src/screens/ChatScreen/components/AttachmentActionItem.js index 7660708ee..8813bfb25 100644 --- a/src/screens/ChatScreen/components/AttachmentActionItem.js +++ b/src/screens/ChatScreen/components/AttachmentActionItem.js @@ -40,7 +40,7 @@ const AttachmentActionItem = ({ text, itemType, iconName, onPressItem }) => { onPressItem({ itemType })}> - + {text} diff --git a/src/screens/ChatScreen/components/AttachmentPreview.js b/src/screens/ChatScreen/components/AttachmentPreview.js index e6fbd7bb0..3ac9afc6f 100644 --- a/src/screens/ChatScreen/components/AttachmentPreview.js +++ b/src/screens/ChatScreen/components/AttachmentPreview.js @@ -56,10 +56,10 @@ const AttachmentPreview = ({ attachmentDetails, onRemoveAttachment }) => { ) : ( )} - + {fileName.length < 36 ? `${fileName}` : `...${fileName.substr(fileName.length - 15)}`} - + {formattedFileSize} diff --git a/src/screens/ChatScreen/components/Banner.js b/src/screens/ChatScreen/components/Banner.js index c6aed8141..00a56b318 100644 --- a/src/screens/ChatScreen/components/Banner.js +++ b/src/screens/ChatScreen/components/Banner.js @@ -96,7 +96,7 @@ const BannerComponent = ({ - + {text} {hrefText && hrefLink ? ( { onClick(content)}> - + {`${shortCode} - `} - + {content} diff --git a/src/screens/ChatScreen/components/ChatAttachmentItem.js b/src/screens/ChatScreen/components/ChatAttachmentItem.js index c9a2881c1..7579f6424 100644 --- a/src/screens/ChatScreen/components/ChatAttachmentItem.js +++ b/src/screens/ChatScreen/components/ChatAttachmentItem.js @@ -214,7 +214,11 @@ const ChatAttachmentItemComponent = ({ type, attachments, showAttachment, messag {fileNameToDisplay} showAttachment({ type: 'file', dataUrl })}> - + {i18n.t('CONVERSATION.DOWNLOAD')} diff --git a/src/screens/ChatScreen/components/ChatHeader.js b/src/screens/ChatScreen/components/ChatHeader.js index 856f5b061..4de0176f2 100644 --- a/src/screens/ChatScreen/components/ChatHeader.js +++ b/src/screens/ChatScreen/components/ChatHeader.js @@ -381,7 +381,7 @@ const ChatHeader = ({ {customerDetails.name && ( - + {getTextSubstringWithEllipsis(customerDetails.name, 13)} )} diff --git a/src/screens/ChatScreen/components/ChatMessage.js b/src/screens/ChatScreen/components/ChatMessage.js index ee7cc7330..d92252a15 100644 --- a/src/screens/ChatScreen/components/ChatMessage.js +++ b/src/screens/ChatScreen/components/ChatMessage.js @@ -73,12 +73,12 @@ const ActivityMessageComponent = ({ message, created_at }) => { return ( - + {message.content} - + {messageStamp({ time: created_at })} diff --git a/src/screens/ChatScreen/components/ChatMessageActionItem.js b/src/screens/ChatScreen/components/ChatMessageActionItem.js index 585c6ae07..2e00f0644 100644 --- a/src/screens/ChatScreen/components/ChatMessageActionItem.js +++ b/src/screens/ChatScreen/components/ChatMessageActionItem.js @@ -46,7 +46,7 @@ const ChatMessageActionItem = ({ text, itemType, onPressItem }) => { )} - + {text} diff --git a/src/screens/ChatScreen/components/ChatMessageDate.js b/src/screens/ChatScreen/components/ChatMessageDate.js index 9f49826ff..0dab91dd6 100644 --- a/src/screens/ChatScreen/components/ChatMessageDate.js +++ b/src/screens/ChatScreen/components/ChatMessageDate.js @@ -31,7 +31,7 @@ const ChatMessageDateComponent = ({ date }) => { return ( - + {date} diff --git a/src/screens/ChatScreen/components/ChatMessageItem.js b/src/screens/ChatScreen/components/ChatMessageItem.js index f276ffc01..d20df17dd 100644 --- a/src/screens/ChatScreen/components/ChatMessageItem.js +++ b/src/screens/ChatScreen/components/ChatMessageItem.js @@ -234,7 +234,7 @@ const ChatMessageItemComponent = ({ conversation, type, message, created_at, sho defaultBGColor={colors.primaryColor} size={14} /> - + {senderName} @@ -368,9 +368,9 @@ const ChatMessageItemComponent = ({ conversation, type, message, created_at, sho .map(({ key, value, title }) => value ? ( - + {title} - + {value} @@ -459,7 +459,7 @@ const ChatMessageItemComponent = ({ conversation, type, message, created_at, sho /> - + {readableTime} {isPrivate && ( diff --git a/src/screens/ChatScreen/components/ConversationLabels.js b/src/screens/ChatScreen/components/ConversationLabels.js index 38911d635..609929f24 100644 --- a/src/screens/ChatScreen/components/ConversationLabels.js +++ b/src/screens/ChatScreen/components/ConversationLabels.js @@ -203,7 +203,7 @@ const ConversationLabels = ({ colors, conversationDetails }) => { {conversationSavedLabels && activeLabels && ( - + {i18n.t('CONVERSATION_LABELS.SELECTED')} {activeLabels.map(item => ( @@ -220,7 +220,7 @@ const ConversationLabels = ({ colors, conversationDetails }) => { styles.labelColorDisplay, ]} /> - + {`${item.title}`} @@ -233,7 +233,7 @@ const ConversationLabels = ({ colors, conversationDetails }) => { {activeLabels.length === 0 && ( - + {i18n.t('CONVERSATION_LABELS.NOT_SELECTED')} @@ -256,7 +256,7 @@ const ConversationLabels = ({ colors, conversationDetails }) => { styles.labelColorDisplay, ]} /> - + {`${item.title}`} @@ -267,7 +267,7 @@ const ConversationLabels = ({ colors, conversationDetails }) => { ))} {filteredLabelsOnSearch && filteredLabelsOnSearch.length === 0 && ( - + {i18n.t('CONVERSATION_LABELS.NO_RESULT')} diff --git a/src/screens/ChatScreen/components/ConversationPriority.js b/src/screens/ChatScreen/components/ConversationPriority.js index 063e91961..1c1b3fe16 100644 --- a/src/screens/ChatScreen/components/ConversationPriority.js +++ b/src/screens/ChatScreen/components/ConversationPriority.js @@ -117,7 +117,7 @@ const SnoozeConversation = ({ colors, conversationId, activePriority, closeModal onPress={() => changePriority(item.id)}> - + {item.name} diff --git a/src/screens/ChatScreen/components/ConversationTeams.js b/src/screens/ChatScreen/components/ConversationTeams.js index fa29eacfc..b9b4c325b 100644 --- a/src/screens/ChatScreen/components/ConversationTeams.js +++ b/src/screens/ChatScreen/components/ConversationTeams.js @@ -170,7 +170,7 @@ const ConversationTeams = ({ colors, conversationDetails, closeModal }) => { {filteredTeamsOnSearch.length !== 0 && ( - + {i18n.t('CONVERSATION_TEAMS.SELECT_TEAM')} )} @@ -184,7 +184,7 @@ const ConversationTeams = ({ colors, conversationDetails, closeModal }) => { onPress={() => onClickAssignTeam(item.id)}> - + {`${item.name}`} @@ -197,7 +197,7 @@ const ConversationTeams = ({ colors, conversationDetails, closeModal }) => { ))} {filteredTeamsOnSearch && filteredTeamsOnSearch.length === 0 && ( - + {i18n.t('CONVERSATION_TEAMS.NO_RESULT')} diff --git a/src/screens/ChatScreen/components/MentionUser.js b/src/screens/ChatScreen/components/MentionUser.js index ccd22cb13..d9e5deee6 100644 --- a/src/screens/ChatScreen/components/MentionUser.js +++ b/src/screens/ChatScreen/components/MentionUser.js @@ -43,10 +43,10 @@ const MentionUserComponent = ({ fontSize={12} availabilityStatus={availabilityStatus} /> - + {`${name} - `} - + {email} diff --git a/src/screens/ChatScreen/components/ReplyBox.js b/src/screens/ChatScreen/components/ReplyBox.js index 7750c2b45..2d49632ae 100644 --- a/src/screens/ChatScreen/components/ReplyBox.js +++ b/src/screens/ChatScreen/components/ReplyBox.js @@ -283,7 +283,7 @@ const ReplyBox = ({ conversationId, inboxId, conversationDetails, enableReplyBut {isAnEmailChannelAndNotInPrivateNote() && emailFields && ( - + {'Cc'} - + {'Bcc'} toggleStatusForConversations(item.key)}> - + {`${i18n.t('CONVERSATION.SNOOZE_UNTIL')} ${item.title}`} diff --git a/src/screens/ChatScreen/components/UserTypingStatus.js b/src/screens/ChatScreen/components/UserTypingStatus.js index 22e83718e..876c33401 100644 --- a/src/screens/ChatScreen/components/UserTypingStatus.js +++ b/src/screens/ChatScreen/components/UserTypingStatus.js @@ -26,7 +26,12 @@ const TypingStatusComponent = ({ typingUser }) => { - + {typingUser ? `${typingUser}` : ''} diff --git a/src/screens/ConfigureURLScreen/ConfigureURLScreen.js b/src/screens/ConfigureURLScreen/ConfigureURLScreen.js index f6410392e..456bde6cb 100644 --- a/src/screens/ConfigureURLScreen/ConfigureURLScreen.js +++ b/src/screens/ConfigureURLScreen/ConfigureURLScreen.js @@ -83,10 +83,10 @@ const ConfigureURLScreenComponent = ({ navigation }) => { - + {i18n.t('CONFIGURE_URL.ENTER_URL')} - + {i18n.t('CONFIGURE_URL.DESCRIPTION')} diff --git a/src/screens/Conversation/components/ConversationFilter/ConversationFilter.js b/src/screens/Conversation/components/ConversationFilter/ConversationFilter.js index 8978bb52b..d093238bf 100644 --- a/src/screens/Conversation/components/ConversationFilter/ConversationFilter.js +++ b/src/screens/Conversation/components/ConversationFilter/ConversationFilter.js @@ -70,7 +70,7 @@ const ConversationFilter = ({ colors, activeValue, leftIcon, items, onChangeFilt )} - + {item.name} diff --git a/src/screens/Conversation/components/ConversationFilter/ConversationInboxFilter.js b/src/screens/Conversation/components/ConversationFilter/ConversationInboxFilter.js index 567be6ae8..ed1a6592d 100644 --- a/src/screens/Conversation/components/ConversationFilter/ConversationInboxFilter.js +++ b/src/screens/Conversation/components/ConversationFilter/ConversationInboxFilter.js @@ -86,7 +86,7 @@ const ConversationInboxFilter = ({ colors, activeValue, hasLeftIcon, items, onCh )} - + {item.name === 'All' ? 'All Inboxes' : item.name} diff --git a/src/screens/Conversation/components/ConversationItem/CardLabels.js b/src/screens/Conversation/components/ConversationItem/CardLabels.js index 0ed1586a9..f77c93546 100644 --- a/src/screens/Conversation/components/ConversationItem/CardLabels.js +++ b/src/screens/Conversation/components/ConversationItem/CardLabels.js @@ -64,7 +64,7 @@ const CardLabel = ({ conversationDetails, conversationId }) => { {activeLabels.map(({ id, title, color }) => ( - + {title} diff --git a/src/screens/Conversation/components/ConversationItem/ConversationAttachment.js b/src/screens/Conversation/components/ConversationItem/ConversationAttachment.js index 2a37a8672..e6dae158a 100644 --- a/src/screens/Conversation/components/ConversationItem/ConversationAttachment.js +++ b/src/screens/Conversation/components/ConversationItem/ConversationAttachment.js @@ -23,7 +23,7 @@ const ConversationAttachmentItem = ({ attachment }) => { - + {i18n.t('CONVERSATION.PICTURE_CONTENT')} @@ -32,7 +32,7 @@ const ConversationAttachmentItem = ({ attachment }) => { - + {i18n.t('CONVERSATION.ATTACHMENT_CONTENT')} diff --git a/src/screens/Conversation/components/ConversationItem/ConversationContent.js b/src/screens/Conversation/components/ConversationItem/ConversationContent.js index b96dc843e..b55aa3a53 100644 --- a/src/screens/Conversation/components/ConversationItem/ConversationContent.js +++ b/src/screens/Conversation/components/ConversationItem/ConversationContent.js @@ -55,11 +55,17 @@ const ConversationContent = ({ content, messageType, isPrivate, unReadCount }) = )} {unReadCount ? ( - + {findLastMessage(message)} ) : ( - + {findLastMessage(message)} )} @@ -71,11 +77,17 @@ const ConversationContent = ({ content, messageType, isPrivate, unReadCount }) = {unReadCount ? ( - + {getTextSubstringWithEllipsis(message, 32)} ) : ( - + {getTextSubstringWithEllipsis(message, 32)} )} @@ -85,11 +97,11 @@ const ConversationContent = ({ content, messageType, isPrivate, unReadCount }) = ) : ( {unReadCount ? ( - + {findLastMessage(message)} ) : ( - + {findLastMessage(message)} )} diff --git a/src/screens/Conversation/components/ConversationItem/ConversationItem.js b/src/screens/Conversation/components/ConversationItem/ConversationItem.js index e0098d095..1c68ec497 100644 --- a/src/screens/Conversation/components/ConversationItem/ConversationItem.js +++ b/src/screens/Conversation/components/ConversationItem/ConversationItem.js @@ -141,7 +141,12 @@ const ConversationItem = ({ item, conversationTypingUsers, onPress, showAssignee ]}> - + Unread @@ -157,7 +162,12 @@ const ConversationItem = ({ item, conversationTypingUsers, onPress, showAssignee ]}> - + Read @@ -197,7 +207,7 @@ const ConversationItem = ({ item, conversationTypingUsers, onPress, showAssignee - + #{id} @@ -213,7 +223,7 @@ const ConversationItem = ({ item, conversationTypingUsers, onPress, showAssignee {showAssigneeLabel && assigneeName && ( - + {getTextSubstringWithEllipsis(assigneeName, 14)} @@ -230,11 +240,11 @@ const ConversationItem = ({ item, conversationTypingUsers, onPress, showAssignee {!!name && (unreadCount ? ( - + {getTextSubstringWithEllipsis(name, 22)} ) : ( - + {getTextSubstringWithEllipsis(name, 22)} ))} @@ -251,7 +261,7 @@ const ConversationItem = ({ item, conversationTypingUsers, onPress, showAssignee /> ) ) : ( - + {getTextSubstringWithEllipsis(typingUser, 25)} )} @@ -260,14 +270,14 @@ const ConversationItem = ({ item, conversationTypingUsers, onPress, showAssignee - + {dynamicTime({ time: created_at })} {unreadCount ? ( - + {unreadCount > 9 ? '9+' : unreadCount.toString()} diff --git a/src/screens/Conversation/components/ConversationItem/ConversationLabels.js b/src/screens/Conversation/components/ConversationItem/ConversationLabels.js index d6138409d..9e5159dac 100644 --- a/src/screens/Conversation/components/ConversationItem/ConversationLabels.js +++ b/src/screens/Conversation/components/ConversationItem/ConversationLabels.js @@ -64,7 +64,7 @@ const ConversationLabel = ({ conversationDetails, conversationId }) => { {activeLabels.map(({ id, title, color }) => ( - + {title} diff --git a/src/screens/Conversation/components/ConversationList/ConversationList.js b/src/screens/Conversation/components/ConversationList/ConversationList.js index 11e75d0e0..6a7f3db02 100644 --- a/src/screens/Conversation/components/ConversationList/ConversationList.js +++ b/src/screens/Conversation/components/ConversationList/ConversationList.js @@ -76,7 +76,7 @@ const ConversationList = ({ return ( {isAllConversationsAreFetched ? ( - + {i18n.t('CONVERSATION.ALL_CONVERSATION_LOADED')} 🎉 ) : ( diff --git a/src/screens/ConversationDetails/ConversationDetailsScreen.js b/src/screens/ConversationDetails/ConversationDetailsScreen.js index 4a274b64a..160150c60 100644 --- a/src/screens/ConversationDetails/ConversationDetailsScreen.js +++ b/src/screens/ConversationDetails/ConversationDetailsScreen.js @@ -154,13 +154,18 @@ const ConversationDetailsScreen = ({ navigation, route }) => { /> - + {name} {senderAdditionalInfo.description ? ( - + {senderAdditionalInfo.description} @@ -170,7 +175,7 @@ const ConversationDetailsScreen = ({ navigation, route }) => { - + {i18n.t('CONVERSATION_LABELS.TITLE')} diff --git a/src/screens/ConversationDetails/components/AddButton.js b/src/screens/ConversationDetails/components/AddButton.js index f0b0d84db..8d1fa64ad 100644 --- a/src/screens/ConversationDetails/components/AddButton.js +++ b/src/screens/ConversationDetails/components/AddButton.js @@ -40,7 +40,12 @@ const AddButton = ({ buttonLabel, iconName, onClickOpen }) => { return ( - + {buttonLabel} diff --git a/src/screens/ConversationDetails/components/ContactAttributes.js b/src/screens/ConversationDetails/components/ContactAttributes.js index 344f65d5d..0f722f7b3 100644 --- a/src/screens/ConversationDetails/components/ContactAttributes.js +++ b/src/screens/ConversationDetails/components/ContactAttributes.js @@ -53,7 +53,7 @@ const ContactAttributes = ({ conversationDetails }) => { - + {i18n.t('CONTACT_ATTRIBUTES.TITLE')} diff --git a/src/screens/ConversationDetails/components/ContactDetails.js b/src/screens/ConversationDetails/components/ContactDetails.js index c1ccc7c16..19eb98e0f 100644 --- a/src/screens/ConversationDetails/components/ContactDetails.js +++ b/src/screens/ConversationDetails/components/ContactDetails.js @@ -43,7 +43,7 @@ const ContactDetails = ({ type, value, iconName }) => { return ( onClickOpen()}> - + {value} diff --git a/src/screens/ConversationDetails/components/ConversationAttributes.js b/src/screens/ConversationDetails/components/ConversationAttributes.js index de3956829..7e6d2dd73 100644 --- a/src/screens/ConversationDetails/components/ConversationAttributes.js +++ b/src/screens/ConversationDetails/components/ConversationAttributes.js @@ -125,7 +125,7 @@ const ConversationAttributes = ({ conversationDetails }) => { - + {i18n.t('CONVERSATION_DETAILS.TITLE')} diff --git a/src/screens/ConversationDetails/components/ConversationParticipants.js b/src/screens/ConversationDetails/components/ConversationParticipants.js index 01fda1ad8..7a3026f20 100644 --- a/src/screens/ConversationDetails/components/ConversationParticipants.js +++ b/src/screens/ConversationDetails/components/ConversationParticipants.js @@ -156,18 +156,18 @@ const ConversationParticipants = ({ conversationId }) => { - + {i18n.t('CONVERSATION_PARTICIPANTS.TITLE')} {!isConversationWatchersExist ? ( - + {i18n.t('CONVERSATION_PARTICIPANTS.NO_PARTICIPANTS_TEXT')} ) : ( - + {watchersText} )} @@ -191,7 +191,7 @@ const ConversationParticipants = ({ conversationId }) => { )} {isCurrentUserWatching ? ( - + {i18n.t('CONVERSATION_PARTICIPANTS.YOU_ARE_WATCHING')} ) : ( @@ -199,7 +199,11 @@ const ConversationParticipants = ({ conversationId }) => { style={styles.watchConversationButton} onPress={() => updateConversationWatchers(currentAgent)}> - + {i18n.t('CONVERSATION_PARTICIPANTS.WATCH_CONVERSATION')} diff --git a/src/screens/ConversationDetails/components/LabelView.js b/src/screens/ConversationDetails/components/LabelView.js index 497708efd..5d90e81a8 100644 --- a/src/screens/ConversationDetails/components/LabelView.js +++ b/src/screens/ConversationDetails/components/LabelView.js @@ -116,7 +116,7 @@ const LabelView = ({ conversationDetails, conversationId, openLabelsBottomSheet )} {shouldShowEmptyMessage && ( - + {i18n.t('CONVERSATION_LABELS.NO_LABEL')} )} diff --git a/src/screens/ForgotPassword/ForgotPassword.js b/src/screens/ForgotPassword/ForgotPassword.js index cd3a1fd81..912bb1969 100644 --- a/src/screens/ForgotPassword/ForgotPassword.js +++ b/src/screens/ForgotPassword/ForgotPassword.js @@ -76,12 +76,12 @@ const ForgotPasswordComponent = ({ navigation }) => { - + {i18n.t('FORGOT_PASSWORD.TITLE')} - + {i18n.t('FORGOT_PASSWORD.SUB_TITLE')} diff --git a/src/screens/LoginScreen/LoginScreen.js b/src/screens/LoginScreen/LoginScreen.js index 171591530..bcbd46346 100644 --- a/src/screens/LoginScreen/LoginScreen.js +++ b/src/screens/LoginScreen/LoginScreen.js @@ -65,6 +65,8 @@ const LoginScreenComponent = ({ navigation }) => { const baseUrl = useSelector(selectBaseUrl); const activeLocale = useSelector(selectLocale); + const [hiddenPassword, setHiddenPassword] = React.useState(true); + useEffect(() => { dispatch(resetAuth()); if (!installationUrl) { @@ -127,11 +129,11 @@ const LoginScreenComponent = ({ navigation }) => { - + {i18n.t('LOGIN.TITLE')} {baseUrl ? ( - + {i18n.t('LOGIN.DESCRIPTION', { baseUrl })} ) : null} @@ -142,6 +144,7 @@ const LoginScreenComponent = ({ navigation }) => { { /> - ( - + ( + + )} + name="password" + /> + setHiddenPassword(!hiddenPassword)}> + - )} - name="password" - /> + + navigate('ResetPassword')}> - + {i18n.t('LOGIN.FORGOT_PASSWORD')} @@ -211,23 +228,25 @@ const LoginScreenComponent = ({ navigation }) => { {appName === 'Chatwoot' && ( <> - + {i18n.t('LOGIN.CREATE_ACCOUNT')} - {' | '} + + {' | '} + )} navigate('ConfigureURL')}> - + {i18n.t('LOGIN.CHANGE_URL')} - + {i18n.t('LOGIN.CHANGE_LANGUAGE')} diff --git a/src/screens/Notification/NotificationScreen.js b/src/screens/Notification/NotificationScreen.js index 9aa9f950a..90c1667e2 100644 --- a/src/screens/Notification/NotificationScreen.js +++ b/src/screens/Notification/NotificationScreen.js @@ -107,7 +107,7 @@ const NotificationScreen = ({ navigation }) => { animating={!isAllNotificationsLoaded} /> ) : ( - + {`${i18n.t('NOTIFICATION.ALL_NOTIFICATION_LOADED')} 🎉`} )} diff --git a/src/screens/Settings/SettingsScreen.js b/src/screens/Settings/SettingsScreen.js index 5c015ddcc..ab30e10e9 100644 --- a/src/screens/Settings/SettingsScreen.js +++ b/src/screens/Settings/SettingsScreen.js @@ -192,7 +192,7 @@ const SettingsScreen = () => { /> - + {i18n.t('SETTINGS.SET_AVAILABILITY')} @@ -200,7 +200,7 @@ const SettingsScreen = () => { - + {i18n.t('SETTINGS.PREFERENCES')} @@ -267,7 +267,7 @@ const SettingsScreen = () => { - + {i18n.t('SETTINGS.SUPPORT')} @@ -297,7 +297,12 @@ const SettingsScreen = () => { - + {`Version ${packageFile.version}`} @@ -305,7 +310,7 @@ const SettingsScreen = () => { - + {i18n.t('SETTINGS.LOGOUT')} diff --git a/src/screens/Settings/components/AccordionItem.js b/src/screens/Settings/components/AccordionItem.js index 0dc29ab10..24b082b69 100644 --- a/src/screens/Settings/components/AccordionItem.js +++ b/src/screens/Settings/components/AccordionItem.js @@ -54,13 +54,18 @@ const AccordionItem = ({ title, activeValue, rightIcon, leftIcon, routeName, onP onPress({ routeName })}> - + {title} {activeValue && ( - + {getTextSubstringWithEllipsis(activeValue, 12)} )} diff --git a/src/screens/Settings/components/AccountsSelector.js b/src/screens/Settings/components/AccountsSelector.js index 5114fc0c5..d88363b5e 100644 --- a/src/screens/Settings/components/AccountsSelector.js +++ b/src/screens/Settings/components/AccountsSelector.js @@ -81,17 +81,17 @@ const AccountsSelector = ({ accounts, activeValue, onPress, colors }) => { }}> - + {account.name} - + {`#${account.id}`} - + {account.role} diff --git a/src/screens/Settings/components/AvailabilityStatus.js b/src/screens/Settings/components/AvailabilityStatus.js index 50706951d..c96672c98 100644 --- a/src/screens/Settings/components/AvailabilityStatus.js +++ b/src/screens/Settings/components/AvailabilityStatus.js @@ -97,7 +97,7 @@ const AvailabilityStatus = ({ status }) => { - + {item.status} diff --git a/src/screens/Settings/components/LanguageSelector.js b/src/screens/Settings/components/LanguageSelector.js index a442884c4..ccfa76044 100644 --- a/src/screens/Settings/components/LanguageSelector.js +++ b/src/screens/Settings/components/LanguageSelector.js @@ -63,7 +63,7 @@ const LanguageSelector = ({ activeValue, onPress, colors }) => { onPress(language); }}> - + {LANGUAGES[language]} diff --git a/src/screens/Settings/components/NotificationPreferenceItem.js b/src/screens/Settings/components/NotificationPreferenceItem.js index 200cf7569..57fa0cd9c 100644 --- a/src/screens/Settings/components/NotificationPreferenceItem.js +++ b/src/screens/Settings/components/NotificationPreferenceItem.js @@ -45,7 +45,7 @@ const NotificationPreferenceItemComponent = ({ title, item, onCheckedChange, isC return ( onCheckedChange({ item })}> - + {title} diff --git a/src/screens/Settings/components/NotificationPreferenceSelector.js b/src/screens/Settings/components/NotificationPreferenceSelector.js index d4db5b849..57bfc8ebd 100644 --- a/src/screens/Settings/components/NotificationPreferenceSelector.js +++ b/src/screens/Settings/components/NotificationPreferenceSelector.js @@ -88,7 +88,7 @@ const NotificationPreferenceSelector = ({ activeValue, onPress, colors }) => { return ( - + {i18n.t('NOTIFICATION_PREFERENCE.EMAIL')} {allEmailFlags.map( @@ -105,7 +105,7 @@ const NotificationPreferenceSelector = ({ activeValue, onPress, colors }) => { )} - + {i18n.t('NOTIFICATION_PREFERENCE.PUSH')} {allPushFlags.map( diff --git a/src/screens/Settings/components/UserInformation.js b/src/screens/Settings/components/UserInformation.js index 31037d064..0131a83bb 100644 --- a/src/screens/Settings/components/UserInformation.js +++ b/src/screens/Settings/components/UserInformation.js @@ -61,10 +61,10 @@ const UserInformation = ({ status, thumbnail, name, email }) => { - + {name} - + {email}