fix: fixed a bunch of nice to have strings and updated the styling on message request banner icon

pull/3281/head
wafflesvsfrankie 11 months ago
parent 811d334e5a
commit e2ae0e3ab3

@ -363,7 +363,7 @@ export const MessageContextMenu = (props: Props) => {
<RetryItem messageId={messageId} /> <RetryItem messageId={messageId} />
{isDeletable ? ( {isDeletable ? (
<ItemWithDataTestId onClick={onSelect}> <ItemWithDataTestId onClick={onSelect}>
<Localizer token="messageSelect" /> <Localizer token="select" />
</ItemWithDataTestId> </ItemWithDataTestId>
) : null} ) : null}
<DeleteItem messageId={messageId} /> <DeleteItem messageId={messageId} />

@ -76,7 +76,7 @@ export class SessionSetPasswordDialog extends Component<Props, State> {
} }
const confirmButtonText = const confirmButtonText =
passwordAction === 'remove' ? window.i18n('remove') : window.i18n('done'); passwordAction === 'remove' ? window.i18n('remove') : window.i18n('save');
const titleString = () => { const titleString = () => {
switch (passwordAction) { switch (passwordAction) {
@ -186,9 +186,12 @@ export class SessionSetPasswordDialog extends Component<Props, State> {
// if user did not fill the first password field, we can't do anything // if user did not fill the first password field, we can't do anything
const errorFirstInput = validatePassword(enteredPassword); const errorFirstInput = validatePassword(enteredPassword);
if (errorFirstInput !== null) { if (errorFirstInput !== null) {
this.setState({ this.setState(
error: errorFirstInput, {
}); error: errorFirstInput,
},
() => this.showError()
);
this.showError(); this.showError();
return false; return false;
} }

@ -62,10 +62,10 @@ const StyledGridContainer = styled.div`
justify-content: center; justify-content: center;
align-items: center; align-items: center;
border-radius: 50%; border-radius: 50%;
background-color: var(--text-secondary-color); background-color: var(--primary-color);
`; `;
export const CirclularIcon = (props: { export const CircularIcon = (props: {
iconType: SessionIconType; iconType: SessionIconType;
iconSize: SessionIconSize | number; iconSize: SessionIconSize | number;
}) => { }) => {
@ -120,7 +120,7 @@ export const MessageRequestsBanner = (props: { handleOnClick: () => any }) => {
}} }}
data-testid="message-request-banner" data-testid="message-request-banner"
> >
<CirclularIcon iconType="messageRequest" iconSize={22} /> <CircularIcon iconType="messageRequest" iconSize={22} />
<StyledMessageRequestBannerHeader> <StyledMessageRequestBannerHeader>
<Localizer token="sessionMessageRequests" /> <Localizer token="sessionMessageRequests" />
</StyledMessageRequestBannerHeader> </StyledMessageRequestBannerHeader>

@ -193,8 +193,8 @@ export const OverlayMessage = () => {
{!isEmpty(pubkeyOrOns) ? ( {!isEmpty(pubkeyOrOns) ? (
<SessionButton <SessionButton
ariaLabel={window.i18n('theContinue')} ariaLabel={window.i18n('next')}
text={window.i18n('theContinue')} text={window.i18n('next')}
disabled={disableNextButton} disabled={disableNextButton}
onClick={handleMessageButtonClick} onClick={handleMessageButtonClick}
dataTestId="next-new-conversation-button" dataTestId="next-new-conversation-button"

@ -130,6 +130,7 @@ export const SettingsCategoryPrivacy = (props: {
dataTestId="change-password-settings-button" dataTestId="change-password-settings-button"
/> />
<SessionSettingButtonItem <SessionSettingButtonItem
title={window.i18n('passwordRemove')}
description={window.i18n('passwordRemoveDescription')} description={window.i18n('passwordRemoveDescription')}
onClick={() => { onClick={() => {
displayPasswordModal('remove', props.onPasswordUpdated); displayPasswordModal('remove', props.onPasswordUpdated);

Loading…
Cancel
Save