Skip to content

Commit

Permalink
Regression: Revert replace contact center icon (#26238)
Browse files Browse the repository at this point in the history
  • Loading branch information
Filipe Marins authored Jul 13, 2022
1 parent 5288180 commit 48a71c8
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 23 deletions.
2 changes: 1 addition & 1 deletion apps/meteor/client/sidebar/sections/OmnichannelSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const OmnichannelSection = (props: typeof Box): ReactElement => {
{isCallEnabled && <OmnichannelCallToggle />}
<Sidebar.TopBar.Action {...omnichannelIcon} onClick={handleAvailableStatusChange} />
{hasPermissionToSeeContactCenter && (
<Sidebar.TopBar.Action title={t('Contact_Center')} icon='notebook-hashtag' onClick={(): void => handleRoute('directory')} />
<Sidebar.TopBar.Action title={t('Contact_Center')} icon='address-book' onClick={(): void => handleRoute('directory')} />
)}
{isCallReady && <OmniChannelCallDialPad />}
</Sidebar.TopBar.Actions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,7 @@ const MessageHeader: FC<{ message: IMessage }> = ({ message }) => {

{shouldShowRolesList && <RolesList roles={roles} isBot={message.bot} />}
<MessageTimestamp title={formatters.dateAndTime(message.ts)}>{formatters.time(message.ts)}</MessageTimestamp>
{message.private && (
// The MessageStatusPrivateIndicator component should not have name prop, it should be fixed on fuselage
<MessageStatusPrivateIndicator name='message'>{t('Only_you_can_see_this_message')}</MessageStatusPrivateIndicator>
)}
{message.private && <MessageStatusPrivateIndicator>{t('Only_you_can_see_this_message')}</MessageStatusPrivateIndicator>}
<MessageIndicators message={message} />
</MessageHeaderTemplate>
);
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,14 +200,14 @@
"@rocket.chat/favicon": "workspace:^",
"@rocket.chat/forked-matrix-appservice-bridge": "^4.0.1",
"@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.2",
"@rocket.chat/fuselage": "^0.32.0-dev.73",
"@rocket.chat/fuselage": "^0.32.0-dev.80",
"@rocket.chat/fuselage-hooks": "~0.31.15-dev.6",
"@rocket.chat/fuselage-polyfills": "~0.31.15-dev.6",
"@rocket.chat/fuselage-toastbar": "^0.32.0-dev.47",
"@rocket.chat/fuselage-tokens": "^0.32.0-dev.23",
"@rocket.chat/fuselage-ui-kit": "~0.32.0-dev.23",
"@rocket.chat/gazzodown": "workspace:^",
"@rocket.chat/icons": "~0.32.0-dev.55",
"@rocket.chat/icons": "~0.32.0-dev.60",
"@rocket.chat/logo": "~0.32.0-dev.23",
"@rocket.chat/memo": "~0.31.15-dev.6",
"@rocket.chat/message-parser": "~0.32.0-dev.21",
Expand Down
90 changes: 74 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3373,6 +3373,19 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-in-js@npm:~0.31.15-dev.13":
version: 0.31.15-dev.13
resolution: "@rocket.chat/css-in-js@npm:0.31.15-dev.13"
dependencies:
"@emotion/hash": ^0.8.0
"@rocket.chat/css-supports": ~0.31.15-dev.13
"@rocket.chat/memo": ~0.31.15-dev.13
"@rocket.chat/stylis-logical-props-middleware": ~0.31.15-dev.13
stylis: ~4.0.13
checksum: fd184810341c93d638339511b966a3f31a5c047db9d45f288b17fbc0fca16ef40dc17c0255ceab860989a181ea8460641c18ef584138423470dfc38521d72a9e
languageName: node
linkType: hard

"@rocket.chat/css-in-js@npm:~0.31.15-dev.2":
version: 0.31.15-dev.2
resolution: "@rocket.chat/css-in-js@npm:0.31.15-dev.2"
Expand Down Expand Up @@ -3408,6 +3421,15 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-supports@npm:~0.31.15-dev.13":
version: 0.31.15-dev.13
resolution: "@rocket.chat/css-supports@npm:0.31.15-dev.13"
dependencies:
"@rocket.chat/memo": ~0.31.15-dev.13
checksum: 66acbc25e38c5f658a7dae49ca8b901dd73b6bcf456bf5081aab1bf6bf6f3a2015d0a58f2e2e37ca447d12d4ebd9b79aae47d12f7bac12a69078e45e4ba35345
languageName: node
linkType: hard

"@rocket.chat/css-supports@npm:~0.31.15-dev.2":
version: 0.31.15-dev.2
resolution: "@rocket.chat/css-supports@npm:0.31.15-dev.2"
Expand Down Expand Up @@ -3635,7 +3657,7 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage-tokens@npm:^0.32.0-dev.23, @rocket.chat/fuselage-tokens@npm:~0.32.0-dev.23":
"@rocket.chat/fuselage-tokens@npm:^0.32.0-dev.23":
version: 0.32.0-dev.23
resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0-dev.23"
checksum: 28bbee7c70c162db7af5ebfe796951260ae1ab16ffecfe3e7f58880da2ce7d4eee6facb4da54fde7b7572822b3a04adfbbdde6f5ca723a5c8578796c8eb55a6a
Expand All @@ -3649,6 +3671,13 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage-tokens@npm:~0.32.0-dev.30":
version: 0.32.0-dev.30
resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0-dev.30"
checksum: bc1852f705a8a33077f218094f39b378928a86f95b6f22161e0832448175671134c03867efc160a9882d0f9e10ba7c2501928e35edee64bb5d570001212d0e0d
languageName: node
linkType: hard

"@rocket.chat/fuselage-ui-kit@npm:~0.32.0-dev.23":
version: 0.32.0-dev.23
resolution: "@rocket.chat/fuselage-ui-kit@npm:0.32.0-dev.23"
Expand Down Expand Up @@ -3689,15 +3718,15 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage@npm:^0.32.0-dev.73":
version: 0.32.0-dev.73
resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.73"
"@rocket.chat/fuselage@npm:^0.32.0-dev.80":
version: 0.32.0-dev.80
resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.80"
dependencies:
"@rocket.chat/css-in-js": ~0.31.15-dev.6
"@rocket.chat/css-supports": ~0.31.15-dev.6
"@rocket.chat/fuselage-tokens": ~0.32.0-dev.23
"@rocket.chat/memo": ~0.31.15-dev.6
"@rocket.chat/styled": ~0.31.15-dev.6
"@rocket.chat/css-in-js": ~0.31.15-dev.13
"@rocket.chat/css-supports": ~0.31.15-dev.13
"@rocket.chat/fuselage-tokens": ~0.32.0-dev.30
"@rocket.chat/memo": ~0.31.15-dev.13
"@rocket.chat/styled": ~0.31.15-dev.13
invariant: ^2.2.4
react-keyed-flatten-children: ^1.3.0
peerDependencies:
Expand All @@ -3707,7 +3736,7 @@ __metadata:
react: ^17.0.2
react-dom: ^17.0.2
react-virtuoso: 1.2.4
checksum: 37654307dedbd616edf5eefd92466be07c54b9f4e383194002947fee8e92bdd7853135f4ae87ef692cfbb13490a4522eb06dbc2c1ac06898b1d4e83528dada52
checksum: 4d5faff19704b3665cd7d4c5c621fdbe3b021e2d17de695ce5ba92b76a1f1c205025560249ad018bdfadfaf26663e29b571603a782467138c7af8b19fbecb4f2
languageName: node
linkType: hard

Expand Down Expand Up @@ -3800,10 +3829,10 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/icons@npm:~0.32.0-dev.55":
version: 0.32.0-dev.55
resolution: "@rocket.chat/icons@npm:0.32.0-dev.55"
checksum: babbf697e7b9853736d1d82e9142f69be5456a68ec3b20bce3780ed1dd4e34a246b7645ac488a478baa8dfc2f048f0906ef843db59fc4a6c718153859e45ef32
"@rocket.chat/icons@npm:~0.32.0-dev.60":
version: 0.32.0-dev.60
resolution: "@rocket.chat/icons@npm:0.32.0-dev.60"
checksum: d6c4358360c963a37b7cc9cd8e48be984d52a9585344c37a184bcf7911b0c3f5bb59e86c6e8faa5c24d3fbbfb18349e78f4a7dfaa9a59fea74dd200b0a409d65
languageName: node
linkType: hard

Expand Down Expand Up @@ -3924,6 +3953,13 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/memo@npm:~0.31.15-dev.13":
version: 0.31.15-dev.13
resolution: "@rocket.chat/memo@npm:0.31.15-dev.13"
checksum: 41a5a8006ea9356e1a3cf83d73649d797c6d48f3373be31a1dd1c9e3a0ba05a6101d8462e0e22cc47c0d116b439c7ba3d2f03a3d4b12d9bbd7fd0cc9879f77da
languageName: node
linkType: hard

"@rocket.chat/memo@npm:~0.31.15-dev.2":
version: 0.31.15-dev.2
resolution: "@rocket.chat/memo@npm:0.31.15-dev.2"
Expand Down Expand Up @@ -3983,14 +4019,14 @@ __metadata:
"@rocket.chat/favicon": "workspace:^"
"@rocket.chat/forked-matrix-appservice-bridge": ^4.0.1
"@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.2
"@rocket.chat/fuselage": ^0.32.0-dev.73
"@rocket.chat/fuselage": ^0.32.0-dev.80
"@rocket.chat/fuselage-hooks": ~0.31.15-dev.6
"@rocket.chat/fuselage-polyfills": ~0.31.15-dev.6
"@rocket.chat/fuselage-toastbar": ^0.32.0-dev.47
"@rocket.chat/fuselage-tokens": ^0.32.0-dev.23
"@rocket.chat/fuselage-ui-kit": ~0.32.0-dev.23
"@rocket.chat/gazzodown": "workspace:^"
"@rocket.chat/icons": ~0.32.0-dev.55
"@rocket.chat/icons": ~0.32.0-dev.60
"@rocket.chat/livechat": "workspace:^"
"@rocket.chat/logo": ~0.32.0-dev.23
"@rocket.chat/memo": ~0.31.15-dev.6
Expand Down Expand Up @@ -4399,6 +4435,16 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/styled@npm:~0.31.15-dev.13":
version: 0.31.15-dev.13
resolution: "@rocket.chat/styled@npm:0.31.15-dev.13"
dependencies:
"@rocket.chat/css-in-js": ~0.31.15-dev.13
tslib: ^2.3.1
checksum: 08ed3e23a24a4d88da403bfd7ee2eb1f0f749300ffde972410676b2eff6eebd39a77a786b6394d51b0461aae40a1990779cf6b682b47bc3899319d12afbe46e4
languageName: node
linkType: hard

"@rocket.chat/styled@npm:~0.31.15-dev.2":
version: 0.31.15-dev.2
resolution: "@rocket.chat/styled@npm:0.31.15-dev.2"
Expand Down Expand Up @@ -4431,6 +4477,18 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.15-dev.13":
version: 0.31.15-dev.13
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.15-dev.13"
dependencies:
"@rocket.chat/css-supports": ~0.31.15-dev.13
tslib: ^2.3.1
peerDependencies:
stylis: 4.0.10
checksum: 8991b675eb18c18e46926deab8b1a684bb8b5f6a4bfc3e71222815fc2842c24182c4cdc970850b6213d79daa1816026d09703c3c14365762de40c0ef179cab1e
languageName: node
linkType: hard

"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.15-dev.2":
version: 0.31.15-dev.2
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.15-dev.2"
Expand Down

0 comments on commit 48a71c8

Please sign in to comment.