Skip to content
Open
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
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
"@emotion/react": "~11.11.3",
"@emotion/styled": "~11.11.0",
"@ewsjs/xhr": "patch:@ewsjs/xhr@npm%3A2.0.2#~/.yarn/patches/@ewsjs-xhr-npm-2.0.2-77506b0a6c.patch",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/css-in-js": "~0.32.0",
"@rocket.chat/desktop-api": "~1.1.0",
"@rocket.chat/fuselage": "0.58.0",
"@rocket.chat/fuselage-hooks": "~0.33.1",
"@rocket.chat/fuselage": "0.78.0",
"@rocket.chat/fuselage-hooks": "~0.41.0",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/icons": "0.37.0",
"archiver": "~7.0.1",
Expand Down
6 changes: 3 additions & 3 deletions src/ui/components/SideBar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import {
Box,
ButtonGroup,
IconButton,
Menu,
MenuItem,
MenuSection,
MenuV2,
OptionContent,
OptionIcon,
} from '@rocket.chat/fuselage';
Expand Down Expand Up @@ -141,7 +141,7 @@ export const SideBar = () => {
)}
</ButtonGroup>

<MenuV2
<Menu
title={t('sidebar.tooltips.settingsMenu')}
placement='right'
onAction={handleMenuClick}
Expand All @@ -156,7 +156,7 @@ export const SideBar = () => {
<OptionContent>{t('sidebar.settings')}</OptionContent>
</MenuItem>
</MenuSection>
</MenuV2>
</Menu>
</Box>
</Box>
);
Expand Down
40 changes: 26 additions & 14 deletions src/ui/components/SupportedVersionDialog/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
import { Box, Button, Modal } from '@rocket.chat/fuselage';
import {
Box,
Button,
Modal,
ModalClose,
ModalContent,
ModalFooter,
ModalFooterControllers,
ModalHeader,
ModalHeaderText,
ModalIcon,
ModalTitle,
} from '@rocket.chat/fuselage';
import { ipcRenderer } from 'electron';
import moment from 'moment';
import { useCallback, useEffect, useState } from 'react';
Expand Down Expand Up @@ -157,27 +169,27 @@ export const SupportedVersionDialog = () => {
<Wrapper isVisible={isVisible}>
<ModalBackdrop>
<Modal>
<Modal.Header>
<Modal.Icon name='warning' color='danger' />
<Modal.HeaderText>
<Modal.Title>{expirationMessage?.title}</Modal.Title>
</Modal.HeaderText>
<Modal.Close onClick={dismissTimeUpdate} />
</Modal.Header>
<Modal.Content>
<ModalHeader>
<ModalIcon name='warning' color='danger' />
<ModalHeaderText>
<ModalTitle>{expirationMessage?.title}</ModalTitle>
</ModalHeaderText>
<ModalClose onClick={dismissTimeUpdate} />
</ModalHeader>
<ModalContent>
<Box fontScale='p2b'>{expirationMessage?.subtitle}</Box>

<Box fontScale='p2' mbs={20}>
{expirationMessage?.description}
</Box>
</Modal.Content>
<Modal.Footer>
<Modal.FooterControllers>
</ModalContent>
<ModalFooter>
<ModalFooterControllers>
<Button secondary onClick={handleMoreInfoButtonClick}>
{t('unsupportedServer.moreInformation')}
</Button>
</Modal.FooterControllers>
</Modal.Footer>
</ModalFooterControllers>
</ModalFooter>
</Modal>
</ModalBackdrop>
</Wrapper>
Expand Down
Loading
Loading