Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/e2e/client/rocketchat.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import './tabbar';
import { log, logError } from './logger';
import { waitUntilFind } from '../../../client/lib/utils/waitUntilFind';
import { imperativeModal } from '../../../client/lib/imperativeModal';
import SaveE2EPasswordModal from './SaveE2EPasswordModal';
import EnterE2EPasswordModal from './EnterE2EPasswordModal';
import SaveE2EPasswordModal from '../../../client/views/e2e/SaveE2EPasswordModal';
import EnterE2EPasswordModal from '../../../client/views/e2e/EnterE2EPasswordModal';
import { call } from '../../../client/lib/utils/call';

let failedToDecodeKey = false;
Expand Down
43 changes: 0 additions & 43 deletions app/threads/client/components/ThreadSkeleton.tsx

This file was deleted.

93 changes: 0 additions & 93 deletions app/threads/client/components/ThreadView.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion app/ui/client/lib/Tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const openToolTip = (title, anchor) => {
anchor,
};
Dep.changed();
unregister = unregister || createEphemeralPortal(() => import('./TooltipComponent'), props, dom);
unregister = unregister || createEphemeralPortal(() => import('../../../../client/components/TooltipComponent'), props, dom);
};

window.matchMedia('(hover: none)').matches || document.body.addEventListener('mouseover', (() => {
Expand Down
16 changes: 0 additions & 16 deletions app/ui/client/lib/TooltipComponent.js

This file was deleted.

24 changes: 24 additions & 0 deletions client/components/TooltipComponent.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { Tooltip, PositionAnimated, AnimatedVisibility } from '@rocket.chat/fuselage';
import React, { ReactElement, ReactNode, useRef } from 'react';

type TooltipComponentProps = {
title: ReactNode;
anchor: Element;
};

export const TooltipComponent = ({ title, anchor }: TooltipComponentProps): ReactElement => {
const ref = useRef(anchor);

return (
<PositionAnimated
anchor={ref}
placement='top-middle'
margin={8}
visible={AnimatedVisibility.UNHIDING}
>
<Tooltip>{title}</Tooltip>
</PositionAnimated>
);
};

export default TooltipComponent;
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Box, PasswordInput, Field, FieldGroup } from '@rocket.chat/fuselage';
import React, { ReactElement, useState, useCallback } from 'react';
import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
import React, { ReactElement, useState, useCallback } from 'react';

import GenericModal from '../../../client/components/GenericModal';
import { useTranslation } from '../../../client/contexts/TranslationContext';
import GenericModal from '../../components/GenericModal';
import { useTranslation } from '../../contexts/TranslationContext';

const EnterE2EPasswordModal = ({
onConfirm,
Expand All @@ -18,11 +18,13 @@ const EnterE2EPasswordModal = ({
const [password, setPassword] = useState('');
const [passwordError, setPasswordError] = useState<string | undefined>();

const handleChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
e.target.value !== '' && setPasswordError(undefined);
setPassword(e.currentTarget.value);
}, [setPassword]);

const handleChange = useCallback(
(e: React.ChangeEvent<HTMLInputElement>) => {
e.target.value !== '' && setPasswordError(undefined);
setPassword(e.currentTarget.value);
},
[setPassword],
);

const handleConfirm = useMutableCallback((): void => {
if (password === '') {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Box } from '@rocket.chat/fuselage';
import React, { ReactElement } from 'react';

import GenericModal from '../../../client/components/GenericModal';
import { useTranslation } from '../../../client/contexts/TranslationContext';
import GenericModal from '../../components/GenericModal';
import { useTranslation } from '../../contexts/TranslationContext';

const SaveE2EPasswordModal = ({
passwordRevealText,
Expand All @@ -26,7 +26,9 @@ const SaveE2EPasswordModal = ({
confirmText={t('I_Saved_My_Password')}
variant='warning'
title={t('Save_Your_Encryption_Password')}
><Box dangerouslySetInnerHTML={{ __html: passwordRevealText }} /></GenericModal>
>
<Box dangerouslySetInnerHTML={{ __html: passwordRevealText }} />
</GenericModal>
);
};

Expand Down
2 changes: 1 addition & 1 deletion client/views/room/contextualBar/Threads/ThreadList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { useResizeObserver, useMutableCallback, useAutoFocus } from '@rocket.cha
import React, { FC, useMemo } from 'react';
import { Virtuoso } from 'react-virtuoso';

import ThreadComponent from '../../../../../app/threads/client/components/ThreadComponent';
import { IMessage } from '../../../../../definition/IMessage';
import { IRoom } from '../../../../../definition/IRoom';
import { IUser } from '../../../../../definition/IUser';
Expand All @@ -17,6 +16,7 @@ import {
import { useSetting } from '../../../../contexts/SettingsContext';
import { useTranslation } from '../../../../contexts/TranslationContext';
import { useTabContext } from '../../providers/ToolboxProvider';
import ThreadComponent from '../../threads/ThreadComponent';
import Row from './Row';
import { withData } from './withData';

Expand Down
Loading