Merge remote-tracking branch 'origin/develop' into develop

MafiaTelegramBot/DataBase/EntityDao/AchievementsDao.cs

@@ -20,7 +20,7 @@ namespace MafiaTelegramBot.DataBase.EntityDao
 
         private static async Task<bool> UserDataExists(long id)
         {
-            return await DataBase.OpenedRoles.AnyAsync(entity => entity.Id == id);
+            return await DataBase.Achievements.AnyAsync(entity => entity.PlayerId == id);
         }
     }
 }

MafiaTelegramBot/Resources/Keyboard.cs

@@ -87,9 +87,10 @@ namespace MafiaTelegramBot.Resources
             {
                 new[] {
                     InlineKeyboardButton.WithCallbackData(strings.shop, $"{Callback.ShopMenu}|{userId}"),
-                    InlineKeyboardButton.WithCallbackData(strings.my_roles, $"{Callback.ShowMyRoles}|{userId}")
+                    InlineKeyboardButton.WithCallbackData(strings.settings, $"{Callback.SettingsProfile}|{userId}")
                 },
-                new[] {InlineKeyboardButton.WithCallbackData(strings.settings, $"{Callback.SettingsProfile}|{userId}")}
+                new[] {InlineKeyboardButton.WithCallbackData(strings.my_roles, $"{Callback.ShowMyRoles}|{userId}")}
+                
             });
         }
 

MafiaTelegramBot/Resources/strings.resx

@@ -37,7 +37,7 @@
         <value>Магазин</value>
     </data>
     <data name="my_roles" xml:space="preserve">
-        <value>Мои роли</value>
+        <value>Статистика по ролям</value>
     </data>
     <data name="settings" xml:space="preserve">
         <value>Настройки</value>