Skip to content
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

Fix merge conflict v26 #3846

Merged
merged 3 commits into from
Sep 18, 2024
Merged

Fix merge conflict v26 #3846

merged 3 commits into from
Sep 18, 2024

Commits on Sep 4, 2024

  1. Merge pull request #3819 from osmosis-labs/stage

    Publish Stage
    jonator committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    5eafe10 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Publish Stage (#3831)

    * Mattupham/fe 1067 portfolio v3 update 0 change values to be green and up (#3823)
    
    * add threshold updates
    
    * Clean up logs
    
    * [Limit Orders]: SQS Active Order Query (#3828)
    
    * fix: increased cache time and refetch interval for active orders
    
    * fix: even longer cache
    
    * fix: WIP batch query implementation
    
    * fix: longer delay between batches
    
    * fix: batch size/timing
    
    * fix: vercel max duration
    
    * fix: wired in sqs query for active orders
    
    * fix: build
    
    * fix: filled orders styling
    
    * fix: remove claimable orders test data
    
    * fix: further reduced queries
    
    * feat: moved orders query to passthrough
    
    * fix: moved active orders to local router
    
    * fix: altered orders cache to be more responsive
    
    * chore: post typing fixes for active orders sqs query
    
    * fix: reverted unnecessary changes
    
    * feat: removed pool restriction on orderbooks
    
    * Clean up formatter (#3829)
    
    * Clean up formatter
    
    * Remove log
    
    * update no price data
    
    * add pr notification yaml (#3830)
    
    Co-authored-by: Michael Millington <>
    
    * fix lint issue (#3832)
    
    * Handle PricePretty and Lint issue
    
    * add search from query param for earn (#3836)
    
    * Update search from query param
    
    * Do not log subsequent chart interaction events / Handle last event tracking (#3834)
    
    * Handle last event tracking
    
    * Clean up
    
    * Clean up types
    
    * Update event properties
    
    * Add types for event options
    
    * Fix lint
    
    * Update MATIC -> POL (#3835)
    
    * Update MATIC -> POL
    
    * Update tests
    
    * feat: feature flag for sqs active orders (#3837)
    
    * [Limit Orders]: Fix date display for order history (#3833)
    
    * fix: date display for order history
    
    * fix: undid feature flag changes
    
    * fix: typing issue
    
    * [Limit Orders]: Price to Tick Crash Handler (#3838)
    
    * fix: price to tick error handling
    
    * feat: added swap source to swap amplitude events
    
    ---------
    
    Co-authored-by: Matt Upham <[email protected]>
    
    * Update IBC overrides to use POL (#3839)
    
    ---------
    
    Co-authored-by: Matt Upham <[email protected]>
    Co-authored-by: Connor Barr <[email protected]>
    Co-authored-by: Max Millington <[email protected]>
    4 people committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    bd1936c View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Fix merge conflict

    mattupham committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    b6182bc View commit details
    Browse the repository at this point in the history