fix: correct alignment of isDeleted message svg

pull/3281/head
Audric Ackermann 9 months ago
parent 099c9d2b0e
commit 6cbbaa361a
No known key found for this signature in database

@ -339,11 +339,3 @@ input {
margin: auto auto; margin: auto auto;
} }
} }
.module-message__text {
white-space: pre-wrap;
svg {
margin-inline-end: var(--margins-xs);
}
}

@ -1,6 +1,7 @@
import classNames from 'classnames'; import classNames from 'classnames';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import styled from 'styled-components';
import { isOpenOrClosedGroup } from '../../../../models/conversationAttributes'; import { isOpenOrClosedGroup } from '../../../../models/conversationAttributes';
import { MessageRenderingProps } from '../../../../models/messageType'; import { MessageRenderingProps } from '../../../../models/messageType';
import { StateType } from '../../../../state/reducer'; import { StateType } from '../../../../state/reducer';
@ -21,6 +22,21 @@ export type MessageTextSelectorProps = Pick<
'text' | 'direction' | 'status' | 'isDeleted' | 'conversationType' 'text' | 'direction' | 'status' | 'isDeleted' | 'conversationType'
>; >;
const StyledMessageText = styled.div<{ isDeleted?: boolean }>`
white-space: pre-wrap;
svg {
margin-inline-end: var(--margins-xs);
}
${({ isDeleted }) =>
isDeleted &&
`
display: flex;
align-items: center;
`}
`;
export const MessageText = (props: Props) => { export const MessageText = (props: Props) => {
const selected = useSelector((state: StateType) => getMessageTextProps(state, props.messageId)); const selected = useSelector((state: StateType) => getMessageTextProps(state, props.messageId));
const multiSelectMode = useSelector(isMessageSelectionMode); const multiSelectMode = useSelector(isMessageSelectionMode);
@ -43,7 +59,11 @@ export const MessageText = (props: Props) => {
: 'var(--message-bubbles-sent-text-color)'; : 'var(--message-bubbles-sent-text-color)';
return ( return (
<div dir="auto" className={classNames('module-message__text')}> <StyledMessageText
dir="auto"
className={classNames('module-message__text')}
isDeleted={isDeleted}
>
{isDeleted && <SessionIcon iconType="delete" iconSize="small" iconColor={iconColor} />} {isDeleted && <SessionIcon iconType="delete" iconSize="small" iconColor={iconColor} />}
<MessageBody <MessageBody
text={contents || ''} text={contents || ''}
@ -51,6 +71,6 @@ export const MessageText = (props: Props) => {
disableJumbomoji={false} disableJumbomoji={false}
isGroup={isOpenOrClosedGroup(conversationType)} isGroup={isOpenOrClosedGroup(conversationType)}
/> />
</div> </StyledMessageText>
); );
}; };

@ -304,10 +304,6 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
// if the time is 101, and that task is to be run at t=101, we need to start it right away. // if the time is 101, and that task is to be run at t=101, we need to start it right away.
if (nextJob.persistedData.nextAttemptTimestamp > Date.now()) { if (nextJob.persistedData.nextAttemptTimestamp > Date.now()) {
window.log.info(
'next job is not due to be run just yet...',
nextJob.persistedData.nextAttemptTimestamp - Date.now()
);
return; return;
} }
let jobResult: RunJobResult | null = null; let jobResult: RunJobResult | null = null;

@ -78,10 +78,10 @@ async function addJob({ groupPk, member, inviteAsAdmin, forceUnrevoke }: JobExtr
await MetaGroupWrapperActions.memberSetInviteNotSent(groupPk, member); await MetaGroupWrapperActions.memberSetInviteNotSent(groupPk, member);
} }
await LibSessionUtil.saveDumpsToDb(groupPk);
window?.inboxStore?.dispatch( window?.inboxStore?.dispatch(
groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk }) as any groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk }) as any
); );
await LibSessionUtil.saveDumpsToDb(groupPk);
await runners.groupInviteJobRunner.addJob(groupInviteJob); await runners.groupInviteJobRunner.addJob(groupInviteJob);
} }
@ -186,6 +186,8 @@ class GroupInviteJob extends PersistedJob<GroupInvitePersistedData> {
} }
let failed = true; let failed = true;
try { try {
let start = Date.now();
if (this.persistedData.forceUnrevoke) { if (this.persistedData.forceUnrevoke) {
const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, member); const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, member);
const unrevokeSubRequest = new SubaccountUnrevokeSubRequest({ const unrevokeSubRequest = new SubaccountUnrevokeSubRequest({
@ -201,7 +203,14 @@ class GroupInviteJob extends PersistedJob<GroupInvitePersistedData> {
allow401s: false, allow401s: false,
timeoutMs: 10 * DURATION.SECONDS, timeoutMs: 10 * DURATION.SECONDS,
}); });
window?.inboxStore?.dispatch(
groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk }) as any
);
if (sequenceResult !== RunJobResult.Success) { if (sequenceResult !== RunJobResult.Success) {
window.log.warn(
`GroupInvite: GroupSync.pushChangesToGroupSwarmIfNeeded failed after ${Date.now() - start}ms`
);
await LibSessionUtil.saveDumpsToDb(groupPk); await LibSessionUtil.saveDumpsToDb(groupPk);
throw new Error( throw new Error(
@ -231,7 +240,7 @@ class GroupInviteJob extends PersistedJob<GroupInvitePersistedData> {
inviteDetails, inviteDetails,
SnodeNamespaces.Default SnodeNamespaces.Default
); );
start = Date.now();
const { effectiveTimestamp } = await timeoutWithAbort( const { effectiveTimestamp } = await timeoutWithAbort(
MessageSender.sendSingleMessage({ MessageSender.sendSingleMessage({
message: rawMessage, message: rawMessage,
@ -240,6 +249,9 @@ class GroupInviteJob extends PersistedJob<GroupInvitePersistedData> {
10 * DURATION.SECONDS, 10 * DURATION.SECONDS,
controller controller
); );
window.log.debug(
`GroupInvite: sendSingleMessage took ${Date.now() - start}ms. effectiveTimestamp: ${effectiveTimestamp}`
);
if (effectiveTimestamp !== null) { if (effectiveTimestamp !== null) {
failed = false; failed = false;

@ -92,10 +92,11 @@ async function pushChangesToGroupSwarmIfNeeded({
deleteAllMessagesSubRequest, deleteAllMessagesSubRequest,
extraStoreRequests, extraStoreRequests,
allow401s, allow401s,
timeoutMs timeoutMs,
}: WithGroupPubkey & }: WithGroupPubkey &
WithAllow401s & WithAllow401s &
WithRevokeSubRequest & Partial<WithTimeoutMs> & { WithRevokeSubRequest &
Partial<WithTimeoutMs> & {
supplementalKeysSubRequest?: StoreGroupKeysSubRequest; supplementalKeysSubRequest?: StoreGroupKeysSubRequest;
deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest; deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest;
extraStoreRequests: Array<StoreGroupMessageSubRequest>; extraStoreRequests: Array<StoreGroupMessageSubRequest>;

Loading…
Cancel
Save