-
Notifications
You must be signed in to change notification settings - Fork 49
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove quest UI while syncing #2449
Conversation
The latest updates on your projects. Learn more about Vercel for Git ↗︎
1 Skipped Deployment
|
WalkthroughThe changes in this pull request involve the integration of a new hook, Changes
Possibly related PRs
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
You are out of MentatBot reviews. Your usage will refresh December 16 at 08:00 AM. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 0
🧹 Outside diff range and nitpick comments (1)
client/src/ui/modules/navigation/TopLeftNavigation.tsx (1)
Line range hint
327-331
: Consider extracting the visibility logic for better readabilityWhile the current implementation works correctly, the conditional logic could be more expressive.
Consider this refactor to improve readability:
- {unclaimedQuestsCount > 0 && !worldLoading && ( + {shouldShowQuestsMenu && ( <div className="absolute right-0 px-4 top-full mt-2"> <QuestsMenu unclaimedQuestsCount={unclaimedQuestsCount} /> </div> )} + // Add this near other state declarations + const shouldShowQuestsMenu = unclaimedQuestsCount > 0 && !worldLoading;This change:
- Makes the rendering logic more self-documenting
- Separates the business logic from the presentation
- Improves maintainability for future condition changes
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
client/src/ui/modules/navigation/TopLeftNavigation.tsx
(3 hunks)
🔇 Additional comments (2)
client/src/ui/modules/navigation/TopLeftNavigation.tsx (2)
26-26
: LGTM: Clean import statement
The import follows the project's conventions and is appropriately placed with other store-related imports.
100-101
: LGTM: Clear and concise state management
The worldLoading
state is well-named and follows React's best practices for store selectors.
Failed to generate code suggestions for PR |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 1
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
client/src/ui/modules/navigation/TopLeftNavigation.tsx
(3 hunks)
🔇 Additional comments (3)
client/src/ui/modules/navigation/TopLeftNavigation.tsx (3)
7-7
: LGTM!
The import statement follows the project's conventions and is appropriately placed with other store-related imports.
100-101
: LGTM!
The state variable is well-named and follows the selector pattern correctly. The empty line after the declaration improves code readability.
327-337
: Verify loading state management
Let's ensure the loading state is properly integrated with the world store and quest updates.
✅ Verification successful
Loading state implementation is properly integrated
The loading state is well-managed with proper synchronization:
- World loading state is centrally managed through
useWorldStore
- Loading state transitions are properly handled in
World.tsx
during data fetching - Quest count updates are safely memoized based on
questClaimStatus
, preventing race conditions - The loading UI in
TopLeftNavigation.tsx
correctly responds to the world loading state
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Check for proper loading state management and potential race conditions
# Check world store implementation
echo "Checking world store implementation..."
ast-grep --pattern 'export const useWorldStore = create<$_>($_)'
# Check for race condition prevention
echo "Checking quest count updates during loading..."
ast-grep --pattern 'useUnclaimedQuestsCount'
Length of output: 1090
Script:
#!/bin/bash
# Let's check the implementation of useUnclaimedQuestsCount and its loading state handling
echo "Checking useUnclaimedQuestsCount implementation..."
rg -A 10 "export const useUnclaimedQuestsCount" client/src/hooks/helpers/useQuests.tsx
# Check how worldLoading is used in TopLeftNavigation
echo "Checking worldLoading usage..."
rg -A 5 "worldLoading" client/src/ui/modules/navigation/TopLeftNavigation.tsx
# Check if there are any other components using worldLoading state
echo "Checking other worldLoading usages..."
rg "useWorldStore" --type ts --type tsx
Length of output: 1405
Script:
#!/bin/bash
# Let's check for any race conditions in quest claim status updates
echo "Checking quest claim status implementation..."
rg -A 10 "useQuestClaimStatus" client/src/hooks/helpers/useQuests.tsx
# Check world store usage across the codebase
echo "Checking world store usage..."
rg "useWorldStore"
# Check for loading state transitions
echo "Checking where world loading state is set..."
rg "setWorldLoading" -A 5
Length of output: 5419
{worldLoading ? ( | ||
<div className="absolute right-2 p-4 mt-2 top-full flex flex-row items-center justify-center bg-black/80 rounded-lg"> | ||
<img src="/images/eternumloader.png" className="w-10" /> | ||
<div className="ml-4">Quests are loading...</div> | ||
</div> | ||
) : ( | ||
unclaimedQuestsCount > 0 && ( | ||
<div className="absolute right-0 px-4 top-full mt-2"> | ||
<QuestsMenu unclaimedQuestsCount={unclaimedQuestsCount} /> | ||
</div> | ||
) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Enhance loading state accessibility and maintainability
While the loading state logic is correct, consider these improvements:
- Add proper accessibility attributes
- Use consistent styling approach
- Make the loading message more informative
Consider applying these changes:
{worldLoading ? (
- <div className="absolute right-2 p-4 mt-2 top-full flex flex-row items-center justify-center bg-black/80 rounded-lg">
- <img src="/images/eternumloader.png" className="w-10" />
- <div className="ml-4">Quests are loading...</div>
+ <div
+ className="absolute right-2 px-4 mt-2 top-full flex flex-row items-center justify-center bg-black/80 rounded-lg"
+ role="status"
+ aria-live="polite"
+ >
+ <img
+ src="/images/eternumloader.png"
+ className="w-10"
+ alt="Loading indicator"
+ />
+ <div className="ml-4">Synchronizing quest data with the realm...</div>
</div>
) : (
unclaimedQuestsCount > 0 && (
<div className="absolute right-0 px-4 top-full mt-2">
<QuestsMenu unclaimedQuestsCount={unclaimedQuestsCount} />
</div>
)
)}
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
{worldLoading ? ( | |
<div className="absolute right-2 p-4 mt-2 top-full flex flex-row items-center justify-center bg-black/80 rounded-lg"> | |
<img src="/images/eternumloader.png" className="w-10" /> | |
<div className="ml-4">Quests are loading...</div> | |
</div> | |
) : ( | |
unclaimedQuestsCount > 0 && ( | |
<div className="absolute right-0 px-4 top-full mt-2"> | |
<QuestsMenu unclaimedQuestsCount={unclaimedQuestsCount} /> | |
</div> | |
) | |
{worldLoading ? ( | |
<div | |
className="absolute right-2 px-4 mt-2 top-full flex flex-row items-center justify-center bg-black/80 rounded-lg" | |
role="status" | |
aria-live="polite" | |
> | |
<img | |
src="/images/eternumloader.png" | |
className="w-10" | |
alt="Loading indicator" | |
/> | |
<div className="ml-4">Synchronizing quest data with the realm...</div> | |
</div> | |
) : ( | |
unclaimedQuestsCount > 0 && ( | |
<div className="absolute right-0 px-4 top-full mt-2"> | |
<QuestsMenu unclaimedQuestsCount={unclaimedQuestsCount} /> | |
</div> | |
) |
* Add confirmation step to destroy building * raise limits and remove chat (#2435) * loading page loading itmes (#2436) * loaf-opti * buildings * load * push config * loading * fix for 0 donkey bridge, base manifest on chain env * tiles * merge * do sync * bank * market * bump * queries * reintroduce syncing and fetching * sync and get happening again * working multi bridge out step 2, fix transaction success states * tiles * remove logging * memo * world * set loading state * chunk * coords * as * bunk * bridge styling * update * update dojo version * update dojo sync * Fix hyperstructures * fix * add back chat * a * llint * ✨ Add sub to all player structures * fix(social): get name from address directly * chore: add has not settled realm yet * undefined if no realm found * pretty * fix: trade history crash * 🐛 Fix * config * add realm select border animation * hovered frag mine * hs cost (#2443) * hs cost * fix deposit arrival * update lock * load * Fix/army stamina (#2448) * Fix current tick values in nextBlockTimestamp * lint * Remove quest UI while syncing (#2449) * Remove quest UI while syncing * Add quest load animation * Raschel-dev (#2447) * hs cost * fix deposit arrival * update lock * fix hs crash * building cost config * fix namespace * remove resource cost syncing * added production * fix costs * add upgrade * trigger * remove events * fix tile * fixes * remove loading * fix: transfer view styling bug (#2451) * Fix social tribe crash (#2450) * fix build * fix market --------- Co-authored-by: Bob <[email protected]> Co-authored-by: tedison <[email protected]> Co-authored-by: ponderingdemocritus <[email protected]> Co-authored-by: tedison <[email protected]> Co-authored-by: RedBeardEth <[email protected]> Co-authored-by: Loaf <[email protected]> Co-authored-by: bal7hazar <[email protected]> Co-authored-by: Nasr <[email protected]> Co-authored-by: Larko <[email protected]> Co-authored-by: 0x1337 <[email protected]> Co-authored-by: Bob <[email protected]> Co-authored-by: zabanyat.eth <[email protected]>
* Add confirmation step to destroy building * raise limits and remove chat (#2435) * loading page loading itmes (#2436) * loaf-opti * buildings * load * push config * loading * fix for 0 donkey bridge, base manifest on chain env * tiles * merge * do sync * bank * market * bump * queries * reintroduce syncing and fetching * sync and get happening again * working multi bridge out step 2, fix transaction success states * tiles * remove logging * memo * world * set loading state * chunk * coords * as * bunk * bridge styling * update * update dojo version * update dojo sync * Fix hyperstructures * fix * add back chat * a * llint * ✨ Add sub to all player structures * fix(social): get name from address directly * chore: add has not settled realm yet * undefined if no realm found * pretty * fix: trade history crash * 🐛 Fix * config * add realm select border animation * hovered frag mine * hs cost (#2443) * hs cost * fix deposit arrival * update lock * load * Fix/army stamina (#2448) * Fix current tick values in nextBlockTimestamp * lint * Remove quest UI while syncing (#2449) * Remove quest UI while syncing * Add quest load animation * Raschel-dev (#2447) * hs cost * fix deposit arrival * update lock * fix hs crash * building cost config * fix namespace * remove resource cost syncing * added production * fix costs * add upgrade * trigger * remove events * fix tile * fixes * remove loading * fix: transfer view styling bug (#2451) * Fix social tribe crash (#2450) * fix build * fix market * feat: optimise event messages (#2455) * optimize events * fix getSyncEvents composite * small fixes --------- Co-authored-by: Bob <[email protected]> Co-authored-by: ponderingdemocritus <[email protected]> Co-authored-by: RedBeardEth <[email protected]> Co-authored-by: Loaf <[email protected]> Co-authored-by: aymericdelab <[email protected]> Co-authored-by: bal7hazar <[email protected]> Co-authored-by: Nasr <[email protected]> Co-authored-by: Larko <[email protected]> Co-authored-by: 0x1337 <[email protected]> Co-authored-by: raschel <[email protected]> Co-authored-by: Bob <[email protected]> Co-authored-by: zabanyat.eth <[email protected]>
* Add confirmation step to destroy building * raise limits and remove chat (#2435) * loading page loading itmes (#2436) * loaf-opti * buildings * load * push config * loading * fix for 0 donkey bridge, base manifest on chain env * tiles * merge * do sync * bank * market * bump * queries * reintroduce syncing and fetching * sync and get happening again * working multi bridge out step 2, fix transaction success states * tiles * remove logging * memo * world * set loading state * chunk * coords * as * bunk * bridge styling * update * update dojo version * update dojo sync * Fix hyperstructures * fix * add back chat * a * llint * ✨ Add sub to all player structures * fix(social): get name from address directly * chore: add has not settled realm yet * undefined if no realm found * pretty * fix: trade history crash * 🐛 Fix * config * add realm select border animation * hovered frag mine * hs cost (#2443) * hs cost * fix deposit arrival * update lock * load * Fix/army stamina (#2448) * Fix current tick values in nextBlockTimestamp * lint * Remove quest UI while syncing (#2449) * Remove quest UI while syncing * Add quest load animation * Raschel-dev (#2447) * hs cost * fix deposit arrival * update lock * fix hs crash * building cost config * fix namespace * remove resource cost syncing * added production * fix costs * add upgrade * trigger * remove events * fix tile * fixes * remove loading * fix: transfer view styling bug (#2451) * Fix social tribe crash (#2450) * fix build * fix market * add lords to controller on landing * feat: optimise event messages (#2455) * optimize events * fix getSyncEvents composite * small fixes * 🐛 Fix mainnet torii cfg * Fix laggy social search * landing page + quest + inventory (#2461) * update inventory * more discrete quest loading * fix landing page sync --------- Co-authored-by: Bob <[email protected]> Co-authored-by: tedison <[email protected]> Co-authored-by: ponderingdemocritus <[email protected]> Co-authored-by: tedison <[email protected]> Co-authored-by: RedBeardEth <[email protected]> Co-authored-by: Loaf <[email protected]> Co-authored-by: bal7hazar <[email protected]> Co-authored-by: Nasr <[email protected]> Co-authored-by: Larko <[email protected]> Co-authored-by: 0x1337 <[email protected]> Co-authored-by: Bob <[email protected]> Co-authored-by: zabanyat.eth <[email protected]>
Summary by CodeRabbit