Fix some review requests

client/routes/router.js

@@ -68,14 +68,6 @@ FlowRouter.route('/home', {
 	}
 });
 
-// FlowRouter.route('/changeavatar', {
-// 	name: 'changeAvatar',
-//
-// 	action() {
-// 		BlazeLayout.render('main', {center: 'avatarPrompt'});
-// 	}
-// });
-
 FlowRouter.route('/account/:group?', {
 	name: 'account',
 

packages/rocketchat-emoji/client/emojiPicker.css

@@ -102,8 +102,32 @@
 	align-items: center;
 
 	& .emoji-filter {
+		position: relative;
+
 		width: 90%;
 		margin-bottom: 0;
+
+		& .search {
+			position: relative;
+
+			width: 100%;
+			height: 35px;
+			padding: 2px 8px;
+
+			border-width: 1px;
+			border-style: solid;
+			border-radius: 5px;
+			outline: none;
+
+			line-height: normal;
+			appearance: none;
+		}
+
+		& .icon-search {
+			position: absolute;
+			top: 10px;
+			left: 7px;
+		}
 	}
 
 	& .change-tone {

packages/rocketchat-i18n/i18n/en.i18n.json

@@ -256,6 +256,7 @@
   "Away_male": "Away",
   "Back": "Back",
   "Back_to_applications": "Back to applications",
+  "Back_to_chat": "Back to chat",
   "Back_to_integrations": "Back to integrations",
   "Back_to_integration_detail": "Back to the integration detail",
   "Back_to_login": "Back to login",
@@ -1380,6 +1381,8 @@
   "Private_Groups": "Private Groups",
   "Private_Groups_list": "List of Private Groups",
   "Profile": "Profile",
+  "Profile_details": "Profile details",
+  "Profile_picture": "Profile picture",
   "Profile_saved_successfully": "Profile saved successfully",
   "Public": "Public",
   "Public_Channel": "Public Channel",

packages/rocketchat-lib/client/MessageAction.js

@@ -138,11 +138,6 @@ Meteor.startup(function() {
 			const message = $(e.currentTarget).closest('.message')[0];
 			chatMessages[Session.get('openedRoom')].edit(message);
 			RocketChat.MessageAction.hideDropDown();
-			// const input = instance.find('.input-message');
-			// Meteor.setTimeout(() => {
-			// 	input.focus();
-			// 	input.change();
-			// }, 200);
 		},
 		validation(message) {
 			if (RocketChat.models.Subscriptions.findOne({

packages/rocketchat-lib/client/views/customFieldsForm.html

@@ -1,53 +1,55 @@
 <template name="customFieldsForm">
+{{#if customFields}}
 	<div class="rc-form-group rc-grid">
-	{{#each customFields}}
+		{{#each customFields}}
-	<div class="rc-input rc-w50 padded">
+			<div class="rc-input rc-w50 padded">
-		{{#if $eq field.type 'select'}}
+				{{#if $eq field.type 'select'}}
-			{{# unless ../new}}
+					{{# unless ../new}}
-			<div class="input-line">
+						<div class="input-line">
-			 <label for="{{fieldName}}">{{_ fieldName}}</label>
+							<label for="{{fieldName}}">{{_ fieldName}}</label>
-			 <div>
+							<div>
-				 <select name="{{fieldName}}" data-customfield="true">
+								<select name="{{fieldName}}" data-customfield="true">
-					 {{#each field.options}}
+									{{#each field.options}}
-              <option value="{{.}}" selected="{{selectedField . ..}}">{{_ .}}</option>
+										<option value="{{.}}" selected="{{selectedField . ..}}">{{_ .}}</option>
-            {{/each}}
+									{{/each}}
-					</select>
+								</select>
-				 <div class="input-error"></div>
+								<div class="input-error"></div>
-         </div>
+							</div>
-       </div>
+						</div>
-			{{else}}
+					{{else}}
-			<label class="rc-input__label">
+						<label class="rc-input__label">
-				<div class="rc-input__title">{{_ fieldName}}</div>
+							<div class="rc-input__title">{{_ fieldName}}</div>
-				<div class="rc-input__wrapper">
+							<div class="rc-input__wrapper">
-					<select name="{{fieldName}}" data-customfield="true" class="rc-input__element">
+								<select name="{{fieldName}}" data-customfield="true" class="rc-input__element">
-						<option></option>
+									<option></option>
-						{{#each field.options}}
+									{{#each field.options}}
-							<option value="{{.}}" selected="{{selectedField . ..}}">{{_ .}}</option>
+										<option value="{{.}}" selected="{{selectedField . ..}}">{{_ .}}</option>
-						{{/each}}
+									{{/each}}
-					</select>
+								</select>
-				</div>
+							</div>
-			</label>
+						</label>
-			{{/unless}}
+					{{/unless}}
-		{{/if}}
+				{{/if}}
-		{{#if $eq field.type 'text'}}
+				{{#if $eq field.type 'text'}}
-			{{# unless ../new}}
+					{{# unless ../new}}
-			<div class="input-line">
+						<div class="input-line">
-				<label for="{{fieldName}}">{{_ fieldName}}</label>
+							<label for="{{fieldName}}">{{_ fieldName}}</label>
-				<div>
+							<div>
-					<input type="text" name="{{fieldName}}" id="{{fieldName}}" data-customfield="true" value="{{fieldValue}}" maxlength="{{field.maxLength}}" />
+								<input type="text" name="{{fieldName}}" id="{{fieldName}}" data-customfield="true" value="{{fieldValue}}" maxlength="{{field.maxLength}}" />
-					<div class="input-error"></div>
+								<div class="input-error"></div>
-				</div>
+							</div>
-			</div>
+						</div>
-			{{else}}
+					{{else}}
 						<label class="rc-input__label">
 							<div class="rc-input__title">{{_ fieldName}}</div>
 							<div class="rc-input__wrapper">
 								<input type="text" class="rc-input__element"  name="{{fieldName}}" id="{{fieldName}}" data-customfield="true" value="{{fieldValue}}" maxlength="{{field.maxLength}}">
 							</div>
 						</label>
-			{{/unless}}
+					{{/unless}}
-		{{/if}}
+				{{/if}}
+			</div>
+		{{/each}}
 	</div>
-	{{/each}}
+{{/if}}
-</div>
 </template>

packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html

@@ -6,7 +6,7 @@
 				<svg class="sidebar-flex__back-icon">
 					<use xlink:href="#icon-arrow-back"></use>
 				</svg>
-				<span>Back to chat</span>
+				<span>{{_ "Back_to_chat"}}</span>
 			</button>
 		</header>
 		<div class="rooms-list">

packages/rocketchat-theme/client/imports/components/message-box.css

@@ -107,7 +107,7 @@
 		border-width: var(--message-box-container-border-width);
 		border-color: var(--message-box-container-border-color);
 		border-radius: var(--message-box-container-border-radius);
-		align-items: flex-end;
+		align-items: center;
 
 		&.editing {
 			background-color: var(--message-box-editing-color);

packages/rocketchat-ui-account/client/accountFlex.html

@@ -6,7 +6,7 @@
 				<svg class="sidebar-flex__back-icon">
 					<use xlink:href="#icon-arrow-back"></use>
 				</svg>
-				<span>Back to chat</span>
+				<span>{{_ "Back_to_chat"}}</span>
 			</button>
 		</header>
 		<div class="rooms-list">

packages/rocketchat-ui-account/client/accountProfile.html

@@ -18,17 +18,17 @@
 			{{> burger}}
 			<h2 style="flex: 1 1; white-space: nowrap;">{{_ "My Profile"}}</h2>
 			<div class="content" style="text-align: end; max-width: 649px;  flex: 1 1 100%">
-				<button class="rc-button rc-button--primary" name="send" type="submit" data-button="create" form="profile" {{canSave 'disabled'}}>Save Changes</button>
+				<button class="rc-button rc-button--primary" name="send" type="submit" data-button="create" form="profile" {{canSave 'disabled'}}>{{_ "Save_changes"}}</button>
 			</div>
 			<div style="flex: 1 1;"></div>
 		</header>
 		<div class="preferences-page__content">
 			<form id="profile" autocomplete="off" class="container">
 				<fieldset class="rc-form-legend">
-					<legend style="margin-bottom: 2.5rem;">Profile Details</legend>
+					<legend style="margin-bottom: 2.5rem;">{{_ "Profile_details"}}</legend>
 					<div>
 						<div class="rc-form-group">
-							<label class="rc-form-label">{{_ "Profile Picture"}}</label>
+							<label class="rc-form-label">{{_ "Profile_picture"}}</label>
 							<div class="rc-select-avatar">
 									<div class="rc-select-avatar__preview">
 									{{# unless avatarPreview}}

packages/rocketchat-ui-admin/client/adminFlex.html

@@ -6,7 +6,7 @@
 				<svg class="sidebar-flex__back-icon">
 					<use xlink:href="#icon-arrow-back"></use>
 				</svg>
-				<span>Back to chat</span>
+				<span>{{_ "Back_to_chat"}}</span>
 			</button>
 		</header>
 		<div class="rooms-list" aria-label="{{_ "Administration"}}">

packages/rocketchat-ui-sidenav/client/roomList.html

@@ -19,14 +19,6 @@
 							<p class="rooms-list__empty-room">{{_ "No_channels_yet" }}</p>
 						{{/each}}
 					</ul>
-
-					{{#if hasMoreChannelsButton ..}}
-						{{!--<button class="rooms-list__more">{{_ "More_channels"}}...</button>--}}
-					{{/if}}
-
-					{{#if hasMoreGroupsButton ..}}
-						{{!--<button class="rooms-list__more">{{_ "More_groups"}}...</button>--}}
-					{{/if}}
 				{{/if}}
 		{{/with}}
 	{{/if}}

packages/rocketchat-ui-sidenav/client/roomList.js

@@ -61,14 +61,6 @@ Template.roomList.helpers({
 		return !['unread', 'f'].includes(group.identifier) || rooms.count();
 	},
 
-	hasMoreChannelsButton(room) {
-		return room.identifier === 'c' || room.anonymous;
-	},
-
-	hasMoreGroupsButton(room) {
-		return room.identifier === 'p';
-	},
-
 	roomType(room) {
 		if (room.header || room.identifier) {
 			return `type-${ room.header || room.identifier }`;

packages/rocketchat-ui/client/views/app/createChannel.html

@@ -28,7 +28,6 @@
 							{{_ "Read_only_channel"}}
 						</span>
 					</label>
-					{{!--<span class="rc-switch__description">Only admin can write new messages</span>--}}
 				</div>
 			</div>
 			<div class="create-channel__inputs">

packages/rocketchat-ui/client/views/app/createChannel.js

@@ -109,7 +109,6 @@ Template.createChannel.events({
 		t.type.set(e.target.checked ? e.target.value : 'p');
 	},
 	'input [name=users]'(e, t) {
-		console.log(this);
 		const input = e.target;
 		const position = input.selectionEnd || input.selectionStart;
 		const length = input.value.length;