Fix merge conflict v26

[mattupham]

What is the purpose of the change:

• fix merge conflict for v26 release

Linear Task

Brief Changelog

Testing and Verifying

[vercel]

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

Name	Status	Preview	Comments	Updated (UTC)
osmosis-frontend	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Sep 18, 2024 4:06pm

4 Skipped Deployments

Name	Status	Preview	Comments	Updated (UTC)
osmosis-frontend-datadog	⬜️ Ignored (Inspect)	Visit Preview		Sep 18, 2024 4:06pm
osmosis-frontend-dev	⬜️ Ignored (Inspect)	Visit Preview		Sep 18, 2024 4:06pm
osmosis-frontend-edgenet	⬜️ Ignored (Inspect)			Sep 18, 2024 4:06pm
osmosis-testnet	⬜️ Ignored (Inspect)	Visit Preview		Sep 18, 2024 4:06pm

[coderabbitai]

Walkthrough

The changes in this pull request involve a modification to the processing of the placed_at timestamp within the getTickInfoAndTransformOrders function. The adjustment alters the division of the placed_at value from 1,000,000 to 1,000, indicating a shift from nanoseconds to milliseconds. This change impacts how the timestamp is represented in Unix format, affecting any logic or data handling dependent on the placed_at value.

Changes

Files	Change Summary
packages/server/src/queries/complex/orderbooks/active-orders.ts	Modified the placed_at timestamp processing in getTickInfoAndTransformOrders from nanoseconds to milliseconds.

Possibly related PRs

• [Limit Orders]: Fix date display for order history #3833: Modifies the placed_at property calculation in historical-orders.ts, related to timestamp processing.
• [Limit Orders]: Fix date display for active orders from node #3840: Changes the division of the placed_at timestamp in the getTickInfoAndTransformOrders function in active-orders.ts, directly related to the main PR's changes.

Suggested reviewers

• mattupham

---

Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 1d03040 and b6182bc.

Files selected for processing (1)

• packages/server/src/queries/complex/orderbooks/active-orders.ts (1 hunks)

Additional comments not posted (1)

packages/server/src/queries/complex/orderbooks/active-orders.ts (1)

196-196: Verify the intentional change of placed_at timestamp unit and ensure dependent code is updated.

The placed_at timestamp unit seems to have been changed from nanoseconds to milliseconds.

• Confirm if this change is intentional and correct based on the actual unit of the incoming placed_at value.
• Ensure that any logic or display code depending on this timestamp has been updated to handle the new millisecond unit correctly, in order to avoid incorrect behavior or display of order placement times.

To verify the impact of this change:

Verification successful

---

Verify input data for active-orders.ts and add clarifying comment

Based on the codebase analysis, the change from nanoseconds to milliseconds in active-orders.ts appears to be an isolated correction. The rest of the codebase consistently treats placed_at as a Unix timestamp in seconds.

• Verify that the input data for active-orders.ts is now correctly providing timestamps in milliseconds.
• Add a comment in active-orders.ts explaining the timestamp unit (milliseconds) and the reason for the division by 1000, to improve future maintainability.

Example comment:

// Convert timestamp from milliseconds to seconds for consistency with other parts of the codebase
placed_at: dayjs(o.placed_at / 1000).unix(),

This change appears to be a necessary correction rather than a breaking change that affects other parts of the codebase.

Scripts executed

The following scripts were executed for the analysis:

Script:

# Check if `placed_at` is being used in a time-based logic or display
rg --type typescript $'placed_at' -g '!active-orders.ts'

# If matches are found, manually review those files to ensure 
# they are updated to handle the millisecond unit correctly.

Length of output: 90

---

Script:

#!/bin/bash

# Search for 'placed_at' and 'placedAt' in all text files, excluding active-orders.ts
echo "Searching for 'placed_at' and 'placedAt' in all text files:"
rg -i 'placed_at|placedAt' --type-add 'text:*.{ts,js,jsx,tsx}' --type text -g '!active-orders.ts'

# Find TypeScript and JavaScript files, then search for 'placed_at' and 'placedAt'
echo "Searching specifically in TypeScript and JavaScript files:"
fd -e ts -e js -e tsx -e jsx | grep -v 'active-orders.ts' | xargs rg -i 'placed_at|placedAt'

# If any results are found, show a few lines of context
echo "Showing context for any matches found:"
fd -e ts -e js -e tsx -e jsx | grep -v 'active-orders.ts' | xargs rg -i 'placed_at|placedAt' -C 3

Length of output: 11254

---

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 generate interesting stats about this repository and render them as a table.
  -- @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.