@rpg-engine/long-bow 0.8.51 → 0.8.53

package/dist/components/DailyTasks/DailyTaskItem.d.ts

@@ -8,6 +8,7 @@ interface IDailyTaskItemProps {
     itemsAtlasIMG: string;
     iconAtlasJSON?: Record<string, any>;
     iconAtlasIMG?: string;
+    isRewardClaimed: boolean;
 }
 export declare const DailyTaskItem: React.FC<IDailyTaskItemProps>;
 export {};

package/dist/components/DailyTasks/DailyTasks.d.ts

@@ -1,8 +1,8 @@
-import { ICharacterDailyTask, ICollectGlobalRewardRequest, ITaskIdentifier } from '@rpg-engine/shared';
+import { ICharacterDailyTask, ICollectGlobalRewardRequest, ICollectRewardRequest } from '@rpg-engine/shared';
 import React from 'react';
 export interface IDailyTasksProps {
     tasks: ICharacterDailyTask[];
-    onClaimReward: (task: ITaskIdentifier) => void;
+    onClaimReward: (task: ICollectRewardRequest) => void;
     onClaimGlobalReward: (tasks: ICollectGlobalRewardRequest) => void;
     onClose: () => void;
     scale?: number;
@@ -10,5 +10,6 @@ export interface IDailyTasksProps {
     itemsAtlasIMG: string;
     iconAtlasJSON?: Record<string, any>;
     iconAtlasIMG?: string;
+    globalRewardClaimed?: boolean;
 }
 export declare const DailyTasks: React.FC<IDailyTasksProps>;

package/dist/components/DailyTasks/GlobalDailyProgress.d.ts

@@ -3,6 +3,7 @@ import React from 'react';
 interface IGlobalTaskProgressProps {
     tasks: ICharacterDailyTask[];
     onClaimAllRewards: (tasks: ICollectGlobalRewardRequest) => void;
+    globalRewardClaimed: boolean;
 }
 export declare const GlobalDailyProgress: React.FC<IGlobalTaskProgressProps>;
 export {};

package/dist/long-bow.cjs.development.js

@@ -29632,10 +29632,11 @@ var DailyTaskItem = function DailyTaskItem(_ref) {
     itemsAtlasJSON = _ref.itemsAtlasJSON,
     itemsAtlasIMG = _ref.itemsAtlasIMG,
     iconAtlasJSON = _ref.iconAtlasJSON,
-    iconAtlasIMG = _ref.iconAtlasIMG;
+    iconAtlasIMG = _ref.iconAtlasIMG,
+    isRewardClaimed = _ref.isRewardClaimed;
   var isMobile = shared.isMobileOrTablet();
   var isCompleted = task.status === shared.TaskStatus.Completed;
-  var isClaimed = task.claimed;
+  var isClaimed = task.claimed || isRewardClaimed;
   var handleClaimReward = function handleClaimReward() {
     onClaimReward(task.key, task.type);
   };
@@ -29696,29 +29697,37 @@ var CollectWrapper = /*#__PURE__*/styled__default.div.withConfig({
 
 var GlobalDailyProgress = function GlobalDailyProgress(_ref) {
   var tasks = _ref.tasks,
-    onClaimAllRewards = _ref.onClaimAllRewards;
+    onClaimAllRewards = _ref.onClaimAllRewards,
+    globalRewardClaimed = _ref.globalRewardClaimed;
   var totalTasks = tasks.length;
   var completedTasks = tasks.filter(function (task) {
     return task.status === shared.TaskStatus.Completed;
   }).length;
-  var claimedTasks = tasks.filter(function (task) {
+  var allCompleted = tasks.length > 0 && tasks.every(function (task) {
+    return task.status === shared.TaskStatus.Completed;
+  });
+  var allClaimed = tasks.length > 0 && tasks.every(function (task) {
     return task.claimed === true;
-  }).length;
-  var allCompleted = completedTasks === totalTasks;
-  var allClaimed = claimedTasks === totalTasks;
-  var _React$useState = React__default.useState(false),
-    isClaimed = _React$useState[0],
-    setIsClaimed = _React$useState[1];
-  var handleClaimAll = function handleClaimAll(tasks) {
-    onClaimAllRewards(tasks);
-    setIsClaimed(true);
+  });
+  var shouldShowGlobalButton = allCompleted && allClaimed && !globalRewardClaimed;
+  var shouldShowClaimedMessage = globalRewardClaimed;
+  var handleClaimAll = function handleClaimAll() {
+    var taskIdentifiers = tasks.map(function (task) {
+      return {
+        taskKey: task.key,
+        type: task.type
+      };
+    });
+    onClaimAllRewards({
+      tasks: taskIdentifiers
+    });
   };
   return React__default.createElement(GlobalProgressContainer, null, React__default.createElement(HeaderContainer$1, null, React__default.createElement(GlobeIcon, null, "\uD83C\uDF0D"), React__default.createElement(ProgressText, null, "Global Tasks Completed: ", completedTasks, "/", totalTasks)), React__default.createElement(ProgressBar, null, React__default.createElement(ProgressFill, {
     percentage: completedTasks / totalTasks * 100
-  })), totalTasks > 0 && allCompleted && React__default.createElement(React__default.Fragment, null, allClaimed || isClaimed ? React__default.createElement(ClaimedText$1, null, "Global Rewards Claimed") : React__default.createElement(CollectWrapper$1, null, React__default.createElement(Button, {
+  })), allCompleted && React__default.createElement(React__default.Fragment, null, shouldShowGlobalButton && React__default.createElement(CollectWrapper$1, null, React__default.createElement(Button, {
     buttonType: exports.ButtonTypes.RPGUIButton,
     onPointerDown: handleClaimAll
-  }, "Collect Global Rewards"))));
+  }, "Collect Global Rewards")), shouldShowClaimedMessage && React__default.createElement(ClaimedText$1, null, "Global Rewards Claimed")));
 };
 var GlobalProgressContainer = /*#__PURE__*/styled__default.div.withConfig({
   displayName: "GlobalDailyProgress__GlobalProgressContainer",
@@ -29765,18 +29774,33 @@ var DailyTasks = function DailyTasks(_ref) {
     itemsAtlasJSON = _ref.itemsAtlasJSON,
     itemsAtlasIMG = _ref.itemsAtlasIMG,
     iconAtlasJSON = _ref.iconAtlasJSON,
-    iconAtlasIMG = _ref.iconAtlasIMG;
+    iconAtlasIMG = _ref.iconAtlasIMG,
+    _ref$globalRewardClai = _ref.globalRewardClaimed,
+    globalRewardClaimed = _ref$globalRewardClai === void 0 ? false : _ref$globalRewardClai;
   var _React$useState = React__default.useState(tasks),
     localTasks = _React$useState[0];
   var size = useResponsiveSize(scale);
-  var handleClaimReward = function handleClaimReward(taskKey, type) {
+  var _useState = React.useState([]),
+    claimedTasks = _useState[0],
+    setClaimedTasks = _useState[1];
+  var _useState2 = React.useState(false),
+    globalRewardClaimedLocal = _useState2[0],
+    setGlobalRewardClaimedLocal = _useState2[1];
+  var handleClaimReward = function handleClaimReward(taskKey, taskType) {
     onClaimReward({
-      type: type,
-      taskKey: taskKey
+      taskKey: taskKey,
+      type: taskType
+    });
+    setClaimedTasks(function (prev) {
+      return [].concat(prev, [taskKey]);
     });
   };
   var handleClaimGlobalRewards = function handleClaimGlobalRewards(tasks) {
     onClaimGlobalReward(tasks);
+    setGlobalRewardClaimedLocal(true);
+  };
+  var isTaskRewardClaimed = function isTaskRewardClaimed(taskKey) {
+    return claimedTasks.includes(taskKey);
   };
   if (!size) return null;
   return React__default.createElement(TasksContainer, {
@@ -29790,7 +29814,8 @@ var DailyTasks = function DailyTasks(_ref) {
     className: "tasks-container"
   }, React__default.createElement(GlobalDailyProgress, {
     tasks: localTasks,
-    onClaimAllRewards: handleClaimGlobalRewards
+    onClaimAllRewards: handleClaimGlobalRewards,
+    globalRewardClaimed: globalRewardClaimed || globalRewardClaimedLocal
   }), localTasks.map(function (task) {
     return React__default.createElement(DailyTaskItem, {
       key: task.key,
@@ -29800,7 +29825,8 @@ var DailyTasks = function DailyTasks(_ref) {
       itemsAtlasJSON: itemsAtlasJSON,
       itemsAtlasIMG: itemsAtlasIMG,
       iconAtlasJSON: iconAtlasJSON,
-      iconAtlasIMG: iconAtlasIMG
+      iconAtlasIMG: iconAtlasIMG,
+      isRewardClaimed: task.claimed || isTaskRewardClaimed(task.key)
     });
   }))));
 };