diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx index 185b9e76c..7e5150cd7 100644 --- a/ts/components/conversation/TimerNotification.tsx +++ b/ts/components/conversation/TimerNotification.tsx @@ -78,7 +78,7 @@ function useFollowSettingsButtonClick( props.timespanSeconds ?? undefined ); }, - showExitIcon: true, + showExitIcon: false, onClickClose: onExit, }) ); diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx index 18cec46c9..3687461ec 100644 --- a/ts/components/dialog/SessionConfirm.tsx +++ b/ts/components/dialog/SessionConfirm.tsx @@ -1,6 +1,7 @@ -import { shell } from 'electron'; import { Dispatch } from '@reduxjs/toolkit'; +import { shell } from 'electron'; import React, { useState } from 'react'; +import styled from 'styled-components'; import { MessageInteraction } from '../../interactions'; import { updateConfirmModal } from '../../state/ducks/modalDialog'; import { SessionWrapperModal } from '../SessionWrapperModal'; @@ -10,6 +11,15 @@ import { SessionSpinner } from '../basic/SessionSpinner'; import { SpacerLG } from '../basic/Text'; import { SessionIcon, SessionIconSize, SessionIconType } from '../icon'; +const StyledSubText = styled(SessionHtmlRenderer)<{ textLength: number }>` + font-size: var(--font-size-md); + line-height: 1.5; + max-width: ${props => + props.textLength > 90 + ? '60ch' + : '33ch'}; // this is ugly, but we want the dialog description to have multiple lines when a short text is displayed +`; + export interface SessionConfirmDialogProps { message?: string; messageSub?: string; @@ -64,8 +74,6 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => { const cancelText = props.cancelText || window.i18n('cancel'); const showHeader = !!props.title; - const messageSubText = messageSub ? 'session-confirm-main-message' : undefined; - const onClickOkHandler = async () => { if (onClickOk) { setIsLoading(true); @@ -101,7 +109,6 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => { window.inboxStore?.dispatch(updateConfirmModal(null)); }; - return ( { )} - + diff --git a/ts/themes/globals.tsx b/ts/themes/globals.tsx index 680fca95f..4ff6d175a 100644 --- a/ts/themes/globals.tsx +++ b/ts/themes/globals.tsx @@ -141,7 +141,7 @@ export const THEME_GLOBALS: ThemeGlobals = { '--button-path-connecting-color': COLORS.PATH.CONNECTING, '--button-path-error-color': COLORS.PATH.ERROR, - '--modal-background-color': `rgba(${hexColorToRGB(COLORS.BLACK)}, 0.3)`, + '--modal-background-color': `rgba(${hexColorToRGB(COLORS.BLACK)}, 0.6)`, '--modal-drop-shadow': `0px 0px 10px rgba(${hexColorToRGB(COLORS.BLACK)}, 0.22)`, '--lightbox-background-color': `rgba(${hexColorToRGB(COLORS.BLACK)}, 0.8)`,