[client] bank showing both siege and combat

[aymericdelab]

Fixes #2047

Summary by CodeRabbit

• New Features

  • Improved message display logic in the MarketModal, ensuring users see relevant battle status without confusion during sieges.

• Style

  • Minor formatting adjustments and added comments for better clarity.

[vercel]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
eternum	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Nov 7, 2024 3:54pm

1 Skipped Deployment

Name	Status	Preview	Comments	Updated (UTC)
eternum-landing	⬜️ Ignored (Inspect)	Visit Preview		Nov 7, 2024 3:54pm

[mentatbot]

You are out of MentatBot reviews. Your usage will refresh November 11 at 08:00 AM.

[coderabbitai]

Walkthrough

The changes in this pull request modify the conditional rendering logic within the MarketModal component. Specifically, the display of the message indicating "Bank combat has started" is now contingent on two conditions: isBattleOngoing must be true, and isSiegeOngoing must be false. This adjustment ensures that the combat message is not shown during a siege. Minor formatting adjustments and comments were also added for clarity, but they do not alter the component's functionality.

Changes

File Path	Change Summary
client/src/ui/components/trading/MarketModal.tsx	Modified conditional rendering logic for AMM status message; added comments and formatting adjustments.

Assessment against linked issues

Objective	Addressed	Explanation
Prevent showing both siege and combat messages (#2047)	✅

Possibly related PRs

• [client] fixes for resource transfer  #1824: Changes in the Entity component regarding battle status checks relate to the modifications in the MarketModal component's conditional rendering logic.
• locked resources bank #1831: Introduction of the isResourcesLocked method in the BattleManager class enhances logic for determining battle states, connected to ongoing battle checks in the MarketModal.
• Fix combat time #2043: Updates to the isBattleOngoing method in the BattleManager class relate directly to the changes made in the MarketModal component regarding battle status.

Suggested reviewers

• edisontim
• bob0005

🐰 In the market where battles unfold,
A message now clearer, a story retold.
When sieges are quiet, and combat is near,
The truth of the battle is now crystal clear!
With comments for guidance, and logic refined,
A smoother experience for all of mankind! 🌟

---

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?

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>, please review it.
  • Generate unit testing code for this file.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

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)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[github-actions]

Failed to generate code suggestions for PR

[coderabbitai]

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)

client/src/ui/components/trading/MarketModal.tsx (1)

Line range hint 311-316: LGTM! The fix correctly prevents showing both siege and combat messages.

The change ensures that the combat message is only shown when there's an ongoing battle and no siege, which addresses the original issue. However, since these states are mutually exclusive, we could improve readability with an else-if structure.

Consider this minor refactor for better readability:

-                {!isSiegeOngoing && isBattleOngoing && (
+                } else if (isBattleOngoing) {
                  <div className="flex items-center text-red">
                    <span className="mr-2">⚠</span> Bank combat has started, AMM blocked for{" "}
                    {formatTimeDifference(battleManager.getTimeLeft(currentBlockTimestamp) || new Date(0))} remaining
                  </div>
-                )}
+                }

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 93c3146 and be65943.

📒 Files selected for processing (1)

• client/src/ui/components/trading/MarketModal.tsx (1 hunks)