diff --git a/client/sidebar/Item/Condensed.js b/client/sidebar/Item/Condensed.js index 5a233d889519..bda7eb0155d5 100644 --- a/client/sidebar/Item/Condensed.js +++ b/client/sidebar/Item/Condensed.js @@ -31,14 +31,16 @@ const Condensed = ({ {avatar && {avatar}} - {icon} - - {title} - - {badges} + + {icon} + + {title} + + + {badges && {badges}} {menu && ( {menuVisibility ? ( diff --git a/client/sidebar/Item/Extended.js b/client/sidebar/Item/Extended.js index 42aa7a165b75..d9d93bff2eb0 100644 --- a/client/sidebar/Item/Extended.js +++ b/client/sidebar/Item/Extended.js @@ -45,34 +45,38 @@ const Extended = ({ > {avatar && {avatar}} - - {icon} - - {title} - - {time && {formatDate(time)}} - - - - {subtitle} - - {badges} - {menu && ( - - {menuVisibility ? ( - menu() - ) : ( - - )} - - )} - + + + {icon} + + {title} + + {time && {formatDate(time)}} + + + + + + {subtitle} + + {badges} + {menu && ( + + {menuVisibility ? ( + menu() + ) : ( + + )} + + )} + + {actions && ( diff --git a/client/sidebar/Item/Medium.js b/client/sidebar/Item/Medium.js index 1c019ec24e86..4c7e6c870fb0 100644 --- a/client/sidebar/Item/Medium.js +++ b/client/sidebar/Item/Medium.js @@ -31,14 +31,16 @@ const Medium = ({ {avatar && {avatar}} - {icon} - - {title} - - {badges} + + {icon} + + {title} + + + {badges && {badges}} {menu && ( {menuVisibility ? ( diff --git a/package-lock.json b/package-lock.json index 676ed4f555ba..b16b74d4bbc5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4928,9 +4928,9 @@ } }, "@rocket.chat/fuselage": { - "version": "0.27.0", - "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.27.0.tgz", - "integrity": "sha512-yy0cogqDBRlqs/WyVaFMzL9/GmBMAPr2TC1E+pW/8SRgBbIhI08J9YAKrgqKCCPUFh9q/xT4NM4JJLhtSqzj4A==", + "version": "0.6.3-dev.288", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.3-dev.288.tgz", + "integrity": "sha512-Y/WmOovLHoM20Ka+mZ5HDW0OC/TAsDIbL//GFXNphfD1hMnMjNDMWajOj1mORj+bPGCrnb1gKT1pftoLAnqw8Q==", "requires": { "@rocket.chat/css-in-js": "^0.27.0", "@rocket.chat/fuselage-tokens": "^0.27.0", diff --git a/package.json b/package.json index b6e73c4f94ba..328ed771c749 100644 --- a/package.json +++ b/package.json @@ -157,7 +157,7 @@ "@rocket.chat/apps-engine": "1.27.1", "@rocket.chat/css-in-js": "^0.27.0", "@rocket.chat/emitter": "^0.27.0", - "@rocket.chat/fuselage": "^0.27.0", + "@rocket.chat/fuselage": "^0.6.3-dev.288", "@rocket.chat/fuselage-hooks": "^0.27.0", "@rocket.chat/fuselage-polyfills": "^0.27.0", "@rocket.chat/fuselage-tokens": "^0.27.0",