From dce85a86c99c0ca0832442a3cfe2990cd9720753 Mon Sep 17 00:00:00 2001
From: srgooglo <srgooglo@ragestudio.net>
Date: Thu, 10 Nov 2022 13:47:21 +0000
Subject: [PATCH] use model to fetch badges

---
 packages/app/src/pages/account/index.jsx | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/app/src/pages/account/index.jsx b/packages/app/src/pages/account/index.jsx
index c2820199..5cd2a571 100755
--- a/packages/app/src/pages/account/index.jsx
+++ b/packages/app/src/pages/account/index.jsx
@@ -49,16 +49,17 @@ const TabRender = React.memo((props) => {
 const UserBadges = React.memo((props) => {
 	return React.createElement(Loadable({
 		loader: async () => {
-			let { badges } = props
+			let { user_id } = props
+
+			const badgesData = await User.getUserBadges(user_id).catch((err) => {
+				console.error(err)
+
+				app.message.error("Failed to fetch user badges")
 
-			if (!badges || Array.isArray(badges) === false || badges.length === 0) {
 				return null
-			}
+			})
 
-			// fetch badges datam from api
-			const badgesData = await app.api.request("main", "get", "badges", {
-				_id: badges
-			}).catch(() => false)
+			console.log(badgesData)
 
 			if (!badgesData) {
 				return null
@@ -286,7 +287,7 @@ export default class Account extends React.Component {
 
 				<div className="badgesTab">
 					<React.Suspense fallback={<antd.Skeleton />}>
-						<UserBadges badges={user.badges} />
+						<UserBadges user_id={user._id} />
 					</React.Suspense>
 				</div>
 			</div>