{props.children}
;
+ return (
+
+ {props.children}
+
+
+ {/* 3. When wrapped, this will grow to fill the container */}
+
+ );
+});
diff --git a/ts/background.preload.ts b/ts/background.preload.ts
index cf0a59e7f9..e25394ef92 100644
--- a/ts/background.preload.ts
+++ b/ts/background.preload.ts
@@ -37,6 +37,7 @@ import { isWindowDragElement } from './util/isWindowDragElement.std.js';
import { assertDev, strictAssert } from './util/assert.std.js';
import { filter } from './util/iterables.std.js';
import { isNotNil } from './util/isNotNil.std.js';
+import { isAdminDeleteReceiveEnabled } from './util/isAdminDeleteEnabled.dom.js';
import { areRemoteBackupsTurnedOn } from './util/isBackupEnabled.preload.js';
import { lightSessionResetQueue } from './util/lightSessionResetQueue.std.js';
import { setAppLoadingScreenMessage } from './setAppLoadingScreenMessage.dom.js';
@@ -67,11 +68,7 @@ import { RoutineProfileRefresher } from './routineProfileRefresh.preload.js';
import { isOlderThan } from './util/timestamp.std.js';
import { isValidReactionEmoji } from './reactions/isValidReactionEmoji.std.js';
import { safeParsePartial } from './util/schemas.std.js';
-import {
- PollVoteSchema,
- PollTerminateSchema,
- isPollReceiveEnabled,
-} from './types/Polls.dom.js';
+import { PollVoteSchema, PollTerminateSchema } from './types/Polls.dom.js';
import type { ConversationModel } from './models/conversations.preload.js';
import { isIncoming } from './messages/helpers.std.js';
import { getAuthor } from './messages/sources.preload.js';
@@ -333,6 +330,8 @@ export async function startApp(): Promise
+ {/* 4. And then this will make the scroll container overflow */}
+
+
+ {/* 5. When not wrapped, this item should take priority when growing the items */}
+ {props.children}
+
- {renderLeftPane({
- otherTabsUnreadStats,
- collapsed: navTabsCollapsed,
- hasPendingUpdate,
- hasFailedStorySends,
- onToggleCollapse: onToggleNavTabsCollapse,
- })}
-
+
+ {!selectedConversationId &&
+
+ {renderLeftPane({
+ otherTabsUnreadStats,
+ hasPendingUpdate,
+ hasFailedStorySends,
+ onToggleCollapse: onToggleNavTabsCollapse,
+ })}
+
+ }
+
+ {selectedConversationId &&
- {selectedConversationId ? (
-
+ }
);
}
diff --git a/ts/components/CompositionArea.dom.tsx b/ts/components/CompositionArea.dom.tsx
index 0effc83a72..a077ea0589 100644
--- a/ts/components/CompositionArea.dom.tsx
+++ b/ts/components/CompositionArea.dom.tsx
@@ -87,7 +87,7 @@ import { FunPickerButton } from './fun/FunButton.dom.js';
import { AxoDropdownMenu } from '../axo/AxoDropdownMenu.dom.js';
import { AxoIconButton } from '../axo/AxoIconButton.dom.js';
import { tw } from '../axo/tw.dom.js';
-import { isPollSendEnabled, type PollCreateType } from '../types/Polls.dom.js';
+import type { PollCreateType } from '../types/Polls.dom.js';
import { PollCreateModal } from './PollCreateModal.dom.js';
import { useDocumentKeyDown } from '../hooks/useDocumentKeyDown.dom.js';
@@ -456,6 +456,10 @@ export const CompositionArea = memo(function CompositionArea({
}
}, []);
+ const launchRecorder = useCallback(() => {
+ startRecording(conversationId);
+ }, []);
+
const launchMediaPicker = useCallback(
() => launchAttachmentPicker('media'),
[launchAttachmentPicker]
@@ -785,18 +789,6 @@ export const CompositionArea = memo(function CompositionArea({
);
- const micButtonFragment = shouldShowMicrophone ? (
-
- {renderConversationView({ selectedConversationId })}
-
- ) : (
-
- {renderMiniPlayer({ shouldFlow: false })}
-
-
- )}
+ - {isStaging - ? 'THIS IS A STAGING DESKTOP' - : i18n('icu:welcomeToSignal')} -
-
-
- {i18n('icu:signalNonProfit')}
-
-
+ {renderConversationView({ selectedConversationId })}
+
-
- ) : null;
-
const editMessageFragment = draftEditMessage ? (
<>
{large && }
@@ -823,11 +815,8 @@ export const CompositionArea = memo(function CompositionArea({
'flex size-8 shrink-0 items-center justify-center'
);
- let attButton;
- if (draftEditMessage || linkPreviewResult || isRecording) {
- attButton = undefined;
- } else if (isPollSendEnabled()) {
- attButton = (
+ const composerAddMenuButton =
+ draftEditMessage || linkPreviewResult || isRecording ? null : (
@@ -842,6 +831,9 @@ export const CompositionArea = memo(function CompositionArea({
-
-
- );
- }
const sendButtonFragment = !draftEditMessage ? (
<>
@@ -1302,9 +1282,8 @@ export const CompositionArea = memo(function CompositionArea({
)}
{!isViewOnceActive && !large && (
<>
- {!dirty ? micButtonFragment : null}
{editMessageFragment}
- {attButton}
+ {composerAddMenuButton}
)}
@@ -1316,8 +1295,7 @@ export const CompositionArea = memo(function CompositionArea({
)}
>
{leftHandSideButtonsFragment}
- {attButton}
- {!dirty ? micButtonFragment : null}
+ {composerAddMenuButton}
{editMessageFragment}
{dirty || !shouldShowMicrophone ? sendButtonFragment : null}
diff --git a/ts/components/CompositionInput.dom.tsx b/ts/components/CompositionInput.dom.tsx
index 032cb16c58..66741e893a 100644
--- a/ts/components/CompositionInput.dom.tsx
+++ b/ts/components/CompositionInput.dom.tsx
@@ -1084,6 +1084,7 @@ export function CompositionInput(props: Props): React.ReactElement {
diff --git a/ts/components/MediaEditor.dom.tsx b/ts/components/MediaEditor.dom.tsx
index 9b79bd7557..83c32bb4fb 100644
--- a/ts/components/MediaEditor.dom.tsx
+++ b/ts/components/MediaEditor.dom.tsx
@@ -810,7 +810,7 @@ export function MediaEditor({
});
rect.on('deselected', () => {
- setEditMode(undefined);
+ fabricCanvas.setActiveObject(rect);
});
fabricCanvas.add(rect);
@@ -1380,6 +1380,7 @@ export function MediaEditor({
i18n={i18n}
isHighQuality={localIsHighQuality}
onSelectQuality={handleSelectQuality}
+ theme={pickerTheme}
/>
)}
diff --git a/ts/components/MediaQualitySelector.dom.tsx b/ts/components/MediaQualitySelector.dom.tsx
index adce410c53..60af367242 100644
--- a/ts/components/MediaQualitySelector.dom.tsx
+++ b/ts/components/MediaQualitySelector.dom.tsx
@@ -6,6 +6,7 @@ import React, { useCallback, useRef, useState } from 'react';
import classNames from 'classnames';
import { Popover } from 'radix-ui';
import type { LocalizerType } from '../types/Util.std.js';
+import { ThemeType } from '../types/Util.std.js';
import { AxoIconButton } from '../axo/AxoIconButton.dom.js';
export type PropsType = {
@@ -13,6 +14,7 @@ export type PropsType = {
i18n: LocalizerType;
isHighQuality: boolean;
onSelectQuality: (conversationId: string, isHQ: boolean) => unknown;
+ theme?: ThemeType;
};
export function MediaQualitySelector({
@@ -20,6 +22,7 @@ export function MediaQualitySelector({
i18n,
isHighQuality,
onSelectQuality,
+ theme,
}: PropsType): React.JSX.Element {
const [open, setOpen] = useState(false);
const standardRef = useRef
- {i18n('icu:MediaQualitySelector--title')}
-
-