From d666f59c1bc5f8d4a0dda392ff24363b0d5a42b2 Mon Sep 17 00:00:00 2001
From: Mo Tarbin <mhed.t91@gmail.com>
Date: Tue, 3 Feb 2026 17:57:48 -0500
Subject: [PATCH] https://github.com/donetick/donetick/issues/493

---
 src/views/User/UserPoints.jsx | 68 +++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/src/views/User/UserPoints.jsx b/src/views/User/UserPoints.jsx
index ad21edd..04cb6df 100644
--- a/src/views/User/UserPoints.jsx
+++ b/src/views/User/UserPoints.jsx
@@ -786,30 +786,30 @@ const UserPoints = () => {
           )
 
           const pointsCards = [
-            {
-              icon: <AccountBalanceWallet />,
-              title: 'Total',
-              text: `${totalPoints} points`,
-              subtext: 'All time earned',
-            },
             {
               icon: <Toll />,
               title: 'Available',
               text: `${availablePoints} points`,
               subtext: 'Ready to redeem',
             },
-            {
-              icon: <TrendingUp />,
-              title: 'Period Points',
-              text: `${periodPoints} points`,
-              subtext: `${tabValue === 24 * 30 ? 'All time' : tabValue === 6 * 30 ? 'Last 6 months' : `Last ${tabValue} days`}`,
-            },
             {
               icon: <Redeem />,
               title: 'Redeemed',
               text: `${redeemedPoints} points`,
               subtext: 'Previously used',
             },
+            {
+              icon: <AccountBalanceWallet />,
+              title: 'Total',
+              text: `${totalPoints} points`,
+              subtext: 'All time earned',
+            },
+            {
+              icon: <TrendingUp />,
+              title: 'Period Points',
+              text: `${periodPoints} points`,
+              subtext: `${tabValue === 24 * 30 ? 'All time' : tabValue === 6 * 30 ? 'Last 6 months' : `Last ${tabValue} days`}`,
+            },
           ]
 
           return pointsCards.map((card, index) => (
@@ -934,25 +934,31 @@ const UserPoints = () => {
       </Box>
 
       <RedeemPointsModal
-        config={{
-          onClose: () => {
-            setIsRedeemModalOpen(false)
-          },
-          isOpen: isRedeemModalOpen,
-          available: circleUsers.find(user => user.userId === selectedUser)
-            ?.points,
-          user: circleUsers.find(user => user.userId === selectedUser),
-          onSave: ({ userId, points }) => {
-            RedeemPoints(userId, points, userProfile.circleID)
-              .then(() => {
-                setIsRedeemModalOpen(false)
-                handleCircleMembersRefetch()
-              })
-              .catch(err => {
-                console.log(err)
-              })
-          },
-        }}
+        config={(() => {
+          const user = circleUsers.find(u => u.userId === selectedUser)
+          const availablePoints = user
+            ? (user.points || 0) - (user.pointsRedeemed || 0)
+            : 0
+
+          return {
+            onClose: () => {
+              setIsRedeemModalOpen(false)
+            },
+            isOpen: isRedeemModalOpen,
+            available: availablePoints,
+            user: user,
+            onSave: ({ userId, points }) => {
+              RedeemPoints(userId, points, userProfile.circleID)
+                .then(() => {
+                  setIsRedeemModalOpen(false)
+                  handleCircleMembersRefetch()
+                })
+                .catch(err => {
+                  console.log(err)
+                })
+            },
+          }
+        })()}
       />
     </Container>
   )