diff options
author | Vijay A <vraravam@users.noreply.github.com> | 2023-07-21 10:52:49 +0530 |
---|---|---|
committer | Vijay A <vraravam@users.noreply.github.com> | 2023-07-21 10:52:49 +0530 |
commit | d348bc10ea600d70ee006316fdcb56eb1dba457b (patch) | |
tree | 4d72b183c92d70b442b23e4d98cde2c4242002e2 /src/components/settings | |
parent | 6.4.1-nightly.8 [skip ci] (diff) | |
download | ferdium-app-d348bc10ea600d70ee006316fdcb56eb1dba457b.tar.gz ferdium-app-d348bc10ea600d70ee006316fdcb56eb1dba457b.tar.zst ferdium-app-d348bc10ea600d70ee006316fdcb56eb1dba457b.zip |
Revert "update react-router-dom to version 6.14.1"
and "update react-router-dom,react-tooltip& react-transition-group"
This reverts commit 0a4a0497bb630dc85cfa0145d57f954feb9c052a and 345fd98dc52a3b7f0d69022b6a19818e559e4557.
Diffstat (limited to 'src/components/settings')
-rw-r--r-- | src/components/settings/account/AccountDashboard.tsx | 9 | ||||
-rw-r--r-- | src/components/settings/services/ServiceItem.tsx | 20 | ||||
-rw-r--r-- | src/components/settings/team/TeamDashboard.tsx | 9 |
3 files changed, 9 insertions, 29 deletions
diff --git a/src/components/settings/account/AccountDashboard.tsx b/src/components/settings/account/AccountDashboard.tsx index de323c06e..163b0a160 100644 --- a/src/components/settings/account/AccountDashboard.tsx +++ b/src/components/settings/account/AccountDashboard.tsx | |||
@@ -1,7 +1,7 @@ | |||
1 | import { Component } from 'react'; | 1 | import { Component } from 'react'; |
2 | import { observer } from 'mobx-react'; | 2 | import { observer } from 'mobx-react'; |
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; |
4 | import { Tooltip as ReactTooltip } from 'react-tooltip'; | 4 | import ReactTooltip from 'react-tooltip'; |
5 | import { H1, H2 } from '../../ui/headline'; | 5 | import { H1, H2 } from '../../ui/headline'; |
6 | 6 | ||
7 | import Loader from '../../ui/Loader'; | 7 | import Loader from '../../ui/Loader'; |
@@ -215,12 +215,7 @@ class AccountDashboard extends Component<IProp> { | |||
215 | </> | 215 | </> |
216 | )} | 216 | )} |
217 | </div> | 217 | </div> |
218 | <ReactTooltip | 218 | <ReactTooltip place="right" type="dark" effect="solid" /> |
219 | place="right" | ||
220 | variant="dark" | ||
221 | float | ||
222 | style={{ height: 'auto' }} | ||
223 | /> | ||
224 | </div> | 219 | </div> |
225 | ); | 220 | ); |
226 | } | 221 | } |
diff --git a/src/components/settings/services/ServiceItem.tsx b/src/components/settings/services/ServiceItem.tsx index babe06b5a..bf2dfa9da 100644 --- a/src/components/settings/services/ServiceItem.tsx +++ b/src/components/settings/services/ServiceItem.tsx | |||
@@ -1,6 +1,6 @@ | |||
1 | import { Component, ReactElement } from 'react'; | 1 | import { Component, ReactElement } from 'react'; |
2 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 2 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; |
3 | import { Tooltip as ReactTooltip } from 'react-tooltip'; | 3 | import ReactTooltip from 'react-tooltip'; |
4 | import { observer } from 'mobx-react'; | 4 | import { observer } from 'mobx-react'; |
5 | import classnames from 'classnames'; | 5 | import classnames from 'classnames'; |
6 | import { mdiBellOff, mdiMessageBulletedOff, mdiPower } from '@mdi/js'; | 6 | import { mdiBellOff, mdiMessageBulletedOff, mdiPower } from '@mdi/js'; |
@@ -73,8 +73,7 @@ class ServiceItem extends Component<IProps> { | |||
73 | {service.isMuted && ( | 73 | {service.isMuted && ( |
74 | <Icon | 74 | <Icon |
75 | icon={mdiBellOff} | 75 | icon={mdiBellOff} |
76 | data-tooltip-id="tooltip-service-item" | 76 | data-tip={intl.formatMessage(messages.tooltipIsMuted)} |
77 | data-tooltip-content={intl.formatMessage(messages.tooltipIsMuted)} | ||
78 | /> | 77 | /> |
79 | )} | 78 | )} |
80 | </td> | 79 | </td> |
@@ -86,10 +85,7 @@ class ServiceItem extends Component<IProps> { | |||
86 | {!service.isEnabled && ( | 85 | {!service.isEnabled && ( |
87 | <Icon | 86 | <Icon |
88 | icon={mdiPower} | 87 | icon={mdiPower} |
89 | data-tooltip-id="tooltip-service-item" | 88 | data-tip={intl.formatMessage(messages.tooltipIsDisabled)} |
90 | data-tooltip-content={intl.formatMessage( | ||
91 | messages.tooltipIsDisabled, | ||
92 | )} | ||
93 | /> | 89 | /> |
94 | )} | 90 | )} |
95 | </td> | 91 | </td> |
@@ -101,18 +97,12 @@ class ServiceItem extends Component<IProps> { | |||
101 | {!service.isNotificationEnabled && ( | 97 | {!service.isNotificationEnabled && ( |
102 | <Icon | 98 | <Icon |
103 | icon={mdiMessageBulletedOff} | 99 | icon={mdiMessageBulletedOff} |
104 | data-tooltip-id="tooltip-service-item" | 100 | data-tip={intl.formatMessage( |
105 | data-tooltip-content={intl.formatMessage( | ||
106 | messages.tooltipNotificationsDisabled, | 101 | messages.tooltipNotificationsDisabled, |
107 | )} | 102 | )} |
108 | /> | 103 | /> |
109 | )} | 104 | )} |
110 | <ReactTooltip | 105 | <ReactTooltip place="top" type="dark" effect="solid" /> |
111 | id="tooltip-service-item" | ||
112 | place="right" | ||
113 | variant="dark" | ||
114 | style={{ height: 'auto' }} | ||
115 | /> | ||
116 | </td> | 106 | </td> |
117 | </tr> | 107 | </tr> |
118 | ); | 108 | ); |
diff --git a/src/components/settings/team/TeamDashboard.tsx b/src/components/settings/team/TeamDashboard.tsx index 77bccb8c3..6fd2d4426 100644 --- a/src/components/settings/team/TeamDashboard.tsx +++ b/src/components/settings/team/TeamDashboard.tsx | |||
@@ -3,7 +3,7 @@ | |||
3 | import { Component, ReactElement } from 'react'; | 3 | import { Component, ReactElement } from 'react'; |
4 | import { observer } from 'mobx-react'; | 4 | import { observer } from 'mobx-react'; |
5 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 5 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; |
6 | import { Tooltip as ReactTooltip } from 'react-tooltip'; | 6 | import ReactTooltip from 'react-tooltip'; |
7 | import withStyles, { WithStylesProps } from 'react-jss'; | 7 | import withStyles, { WithStylesProps } from 'react-jss'; |
8 | import classnames from 'classnames'; | 8 | import classnames from 'classnames'; |
9 | import Loader from '../../ui/Loader'; | 9 | import Loader from '../../ui/Loader'; |
@@ -173,12 +173,7 @@ class TeamDashboard extends Component<IProps> { | |||
173 | </> | 173 | </> |
174 | )} | 174 | )} |
175 | </div> | 175 | </div> |
176 | <ReactTooltip | 176 | <ReactTooltip place="right" type="dark" effect="solid" /> |
177 | place="right" | ||
178 | variant="dark" | ||
179 | float | ||
180 | style={{ height: 'auto' }} | ||
181 | /> | ||
182 | </div> | 177 | </div> |
183 | ) : ( | 178 | ) : ( |
184 | <div className="settings__main"> | 179 | <div className="settings__main"> |