diff --git a/client/src/components/Memberships/AddPopup/AddPopup.jsx b/client/src/components/Memberships/AddPopup/AddPopup.jsx
index b01bff13..4c460979 100755
--- a/client/src/components/Memberships/AddPopup/AddPopup.jsx
+++ b/client/src/components/Memberships/AddPopup/AddPopup.jsx
@@ -17,18 +17,18 @@ const AddStep = React.memo(
({ users, currentUserIds, permissionsSelectStep, title, onCreate, onClose }) => {
const [t] = useTranslation();
const [step, openStep, handleBack] = useSteps();
- const [searchValue, handleSearchFieldChange] = useField('');
- const search = useMemo(() => searchValue.trim().toLowerCase(), [searchValue]);
+ const [search, handleSearchChange] = useField('');
+ const cleanSearch = useMemo(() => search.trim().toLowerCase(), [search]);
const filteredUsers = useMemo(
() =>
users.filter(
(user) =>
- user.email.includes(search) ||
- user.name.toLowerCase().includes(search) ||
- (user.username && user.username.includes(search)),
+ user.email.includes(cleanSearch) ||
+ user.name.toLowerCase().includes(cleanSearch) ||
+ (user.username && user.username.includes(cleanSearch)),
),
- [users, search],
+ [users, cleanSearch],
);
const searchField = useRef(null);
@@ -102,10 +102,10 @@ const AddStep = React.memo(
{filteredUsers.length > 0 && (
diff --git a/client/src/locales/ru/core.js b/client/src/locales/ru/core.js
index e9e88d30..251da210 100644
--- a/client/src/locales/ru/core.js
+++ b/client/src/locales/ru/core.js
@@ -137,7 +137,7 @@ export default {
time: 'Время',
timer: 'Таймер',
title: 'Название',
- userActions_title: 'Действия с пользователем',
+ userActions: 'Действия с пользователем',
userAddedThisCardToList: '<0>{{user}}0><1> добавил(а) эту карточку в {{list}}1>',
userLeftNewCommentToCard: '{{user}} оставил(а) комментарий «{{comment}}» к <2>{{card}}2>',
userMovedCardFromListToList:
diff --git a/server/db/migrations/20220725150723_add_language_to_user_account_table.js b/server/db/migrations/20220725150723_add_language_to_user_account_table.js
index b048a3ab..21db79ba 100644
--- a/server/db/migrations/20220725150723_add_language_to_user_account_table.js
+++ b/server/db/migrations/20220725150723_add_language_to_user_account_table.js
@@ -1,11 +1,11 @@
-module.exports.up = async (knex) =>
+module.exports.up = (knex) =>
knex.schema.table('user_account', (table) => {
/* Columns */
table.text('language');
});
-module.exports.down = async (knex) =>
+module.exports.down = (knex) =>
knex.schema.table('user_account', (table) => {
table.dropColumn('language');
});
diff --git a/server/db/migrations/20220803221221_add_password_changed_at_to_user_account_table.js b/server/db/migrations/20220803221221_add_password_changed_at_to_user_account_table.js
index 5d636967..5cf937c1 100644
--- a/server/db/migrations/20220803221221_add_password_changed_at_to_user_account_table.js
+++ b/server/db/migrations/20220803221221_add_password_changed_at_to_user_account_table.js
@@ -1,11 +1,11 @@
-module.exports.up = async (knex) =>
+module.exports.up = (knex) =>
knex.schema.table('user_account', (table) => {
/* Columns */
table.timestamp('password_changed_at', true);
});
-module.exports.down = async (knex) =>
+module.exports.down = (knex) =>
knex.schema.table('user_account', (table) => {
table.dropColumn('password_changed_at');
});