diff --git a/ts/components/SessionPasswordPrompt.tsx b/ts/components/SessionPasswordPrompt.tsx index 79bfe4fcc..3194a16d3 100644 --- a/ts/components/SessionPasswordPrompt.tsx +++ b/ts/components/SessionPasswordPrompt.tsx @@ -77,7 +77,7 @@ class SessionPasswordPromptInner extends PureComponent { type="password" id="password-prompt-input" defaultValue="" - placeholder={window.i18n('passwordCreate')} + placeholder={window.i18n('passwordEnter')} onKeyUp={this.onKeyUp} ref={input => { this.inputRef = input; diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index b15a014a8..91366a888 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -358,7 +358,7 @@ export class SessionConversation extends Component { } } - private async maybeAddAttachment(file: any) { + private async maybeAddAttachment(file: File) { if (!file) { return; } diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index ff3beb89d..6682a5265 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -30,6 +30,7 @@ import { StyledLeftPaneOverlay } from './OverlayMessage'; const StyledMemberListNoContacts = styled.div` text-align: center; + align-self: center; padding: 20px; `; @@ -53,9 +54,7 @@ const StyledGroupMemberListContainer = styled.div` `; const NoContacts = () => { - return ( - {window.i18n('conversationsNone')} - ); + return {window.i18n('contactNone')}; }; /** diff --git a/ts/components/settings/section/CategoryRecoveryPassword.tsx b/ts/components/settings/section/CategoryRecoveryPassword.tsx index b6c35f0ec..f82062ce8 100644 --- a/ts/components/settings/section/CategoryRecoveryPassword.tsx +++ b/ts/components/settings/section/CategoryRecoveryPassword.tsx @@ -180,7 +180,7 @@ export const SettingsCategoryRecoveryPassword = () => { {!hideRecoveryPassword ? ( { dispatch(updateHideRecoveryPasswordModal({ state: 'firstWarning' })); diff --git a/ts/interactions/messageInteractions.ts b/ts/interactions/messageInteractions.ts index 48303262d..a996977a5 100644 --- a/ts/interactions/messageInteractions.ts +++ b/ts/interactions/messageInteractions.ts @@ -130,6 +130,7 @@ const acceptOpenGroupInvitationV2 = (completeUrl: string, roomName?: string) => }, onClickClose, + okText: window.i18n('join'), }) ); // this function does not throw, and will showToasts if anything happens