@rpg-engine/long-bow 0.8.50 → 0.8.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpg-engine/long-bow",
-  "version": "0.8.50",
+  "version": "0.8.51",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/DailyTasks/DailyRewardsTooltip.tsx

@@ -57,13 +57,7 @@ export const DailyRewardsTooltip: React.FC<IDailyRewardsTooltipProps> = ({
                 <SpriteFromAtlas
                   atlasJSON={itemsAtlasJSON}
                   atlasIMG={itemsAtlasIMG}
-                  spriteKey={
-                    reward.type === RewardType.Gold
-                      ? 'others/gold-coin-qty-6.png'
-                      : reward.type === RewardType.Experience
-                      ? 'others/royal-chalice.png'
-                      : reward.texturePath || 'others/no-image.png'
-                  }
+                  spriteKey={reward.texturePath ?? 'check.png'}
                   width={24}
                   height={24}
                   imgScale={1.75}
@@ -142,6 +136,7 @@ const RewardLabel = styled.span`
   color: ${uiColors.yellow};
   font-size: 0.9rem;
   line-height: 1.2;
+  padding-top: 15px;
   display: inline-flex;
   align-items: center;
 `;

package/src/components/DailyTasks/DailyTasks.tsx

@@ -2,7 +2,6 @@ import {
   ICharacterDailyTask,
   ICollectGlobalRewardRequest,
   ITaskIdentifier,
-  TaskStatus,
   TaskType,
 } from '@rpg-engine/shared';
 import React from 'react';
@@ -38,27 +37,18 @@ export const DailyTasks: React.FC<IDailyTasksProps> = ({
   iconAtlasJSON,
   iconAtlasIMG,
 }): JSX.Element | null => {
-  const [localTasks, setLocalTasks] = React.useState(tasks);
+  const [localTasks] = React.useState(tasks);
   const size = useResponsiveSize(scale);
 
   const handleClaimReward = (taskKey: string, type: TaskType) => {
-    setLocalTasks(prevTasks =>
-      prevTasks.map(task =>
-        task.key === taskKey ? { ...task, claimed: true } : task
-      )
-    );
-    onClaimReward({ type, taskKey });
+    onClaimReward({
+      type,
+      taskKey,
+    });
   };
 
-  const handleClaimAllRewards = () => {
-    const tasksToReward = localTasks
-      .filter(task => task.status === TaskStatus.Completed && !task.claimed)
-      .map(task => ({
-        type: task.type,
-        taskKey: task.key,
-      }));
-
-    onClaimGlobalReward({ tasks: tasksToReward });
+  const handleClaimGlobalRewards = (tasks: ICollectGlobalRewardRequest) => {
+    onClaimGlobalReward(tasks);
   };
 
   if (!size) return null;
@@ -77,7 +67,7 @@ export const DailyTasks: React.FC<IDailyTasksProps> = ({
         <TasksList className="tasks-container">
           <GlobalDailyProgress
             tasks={localTasks}
-            onClaimAllRewards={handleClaimAllRewards}
+            onClaimAllRewards={handleClaimGlobalRewards}
           />
           {localTasks.map(task => (
             <DailyTaskItem

package/src/components/DailyTasks/GlobalDailyProgress.tsx

@@ -44,9 +44,9 @@ export const GlobalDailyProgress: React.FC<IGlobalTaskProgressProps> = ({
       <ProgressBar>
         <ProgressFill percentage={(completedTasks / totalTasks) * 100} />
       </ProgressBar>
-      {totalTasks > 0 && allCompleted && allClaimed && (
+      {totalTasks > 0 && allCompleted && (
         <>
-          {isClaimed ? (
+          {allClaimed || isClaimed ? (
             <ClaimedText>Global Rewards Claimed</ClaimedText>
           ) : (
             <CollectWrapper>

package/src/mocks/dailyTasks.mocks.ts

@@ -36,6 +36,7 @@ export const mockTasks: ICharacterDailyTask[] = [
             },
             {
                 type: RewardType.Experience,
+                texturePath: 'others/royal-chalice.png',
                 quantity: 100
             }
         ]
@@ -62,6 +63,7 @@ export const mockTasks: ICharacterDailyTask[] = [
             {
                 type: RewardType.Gold,
                 key: 'gold-coin',
+                texturePath: 'others/gold-coin-qty-6.png',
                 quantity: 100
             },
             {
@@ -72,6 +74,7 @@ export const mockTasks: ICharacterDailyTask[] = [
             },
             {
                 type: RewardType.Experience,
+                texturePath: 'others/royal-chalice.png',
                 quantity: 250
             }
         ],
@@ -100,6 +103,7 @@ export const mockTasks: ICharacterDailyTask[] = [
             {
                 type: RewardType.Gold,
                 key: 'gold-coin',
+                texturePath: 'others/gold-coin-qty-6.png',
                 quantity: 1000
             },
             {
@@ -110,6 +114,7 @@ export const mockTasks: ICharacterDailyTask[] = [
             },
             {
                 type: RewardType.Experience,
+                texturePath: 'others/royal-chalice.png',
                 quantity: 1000
             }
         ],
@@ -129,11 +134,13 @@ export const mockTasks: ICharacterDailyTask[] = [
         rewards: [
             {
                 type: RewardType.Experience,
+                texturePath: 'others/royal-chalice.png',
                 quantity: 10000
             },
             {
                 type: RewardType.Gold,
                 key: 'gold-coin',
+                texturePath: 'others/gold-coin-qty-6.png',
                 quantity: 1000
             },
             {
@@ -181,7 +188,7 @@ export const mockTasks: ICharacterDailyTask[] = [
             ]
         },
         progress: {
-            crafted: { 'life-potion': 2 },
+            crafted: { 'life-potion': 5 },
         },
         rewards: [
             {
@@ -193,14 +200,16 @@ export const mockTasks: ICharacterDailyTask[] = [
             {
                 type: RewardType.Gold,
                 key: 'gold-coin',
+                texturePath: 'others/gold-coin-qty-6.png',
                 quantity: 150
             },
             {
                 type: RewardType.Experience,
+                texturePath: 'others/royal-chalice.png',
                 quantity: 200
             }
         ],
-        status: TaskStatus.InProgress,
-        claimed: false
+        status: TaskStatus.Completed,
+        claimed: true
     },
 ];