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

[Trade] History Chart #1456

Merged
merged 58 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
fd0e66f
add history chart
GrandSchtroumpf Aug 28, 2024
5b6a3d6
add setter for disposable & recurring
GrandSchtroumpf Aug 29, 2024
221b0e6
write overlapping
GrandSchtroumpf Aug 29, 2024
869b50a
implement date range
GrandSchtroumpf Aug 29, 2024
3f4e7fd
better bounds
GrandSchtroumpf Aug 29, 2024
c92bafc
adjust bound for market
GrandSchtroumpf Aug 29, 2024
b67046a
fix overlapping price boundary
GrandSchtroumpf Aug 29, 2024
d467842
use local search in disposable
GrandSchtroumpf Aug 30, 2024
516872c
handle only one state in disposable
GrandSchtroumpf Aug 30, 2024
d702c2e
fix build
GrandSchtroumpf Aug 30, 2024
833aa81
Merge remote-tracking branch 'origin/main' into issue-#1448
GrandSchtroumpf Sep 4, 2024
874ca62
improve timeout
GrandSchtroumpf Sep 4, 2024
bb5e86f
fix disposable
GrandSchtroumpf Sep 4, 2024
9c0ea2b
set bounds based on data
GrandSchtroumpf Sep 4, 2024
dfd1910
fix tests
GrandSchtroumpf Sep 4, 2024
e232253
fix disposable create
GrandSchtroumpf Sep 4, 2024
1fb4f51
fix disposable emptyOrder
GrandSchtroumpf Sep 4, 2024
3df6e8a
add label on loading icon
GrandSchtroumpf Sep 5, 2024
1269520
don't use tradeCtx for chart
GrandSchtroumpf Sep 5, 2024
3f10647
move Layout to each page
GrandSchtroumpf Sep 5, 2024
eca4b43
rename TradeChart to StrategyChart
GrandSchtroumpf Sep 5, 2024
77cb315
implement chart in edit
GrandSchtroumpf Sep 5, 2024
b1ff178
Merge remote-tracking branch 'origin/main' into issue-#1448
GrandSchtroumpf Sep 5, 2024
d550e21
fix overlapping edit range chart
GrandSchtroumpf Sep 5, 2024
5d515ad
add icons
GrandSchtroumpf Sep 6, 2024
5c93615
setup edit budget for disposable & recurring
GrandSchtroumpf Sep 6, 2024
2e46691
add legend
GrandSchtroumpf Sep 6, 2024
b1597a1
edit budget overlapping
GrandSchtroumpf Sep 6, 2024
2fd1e78
verify if readonly exists
GrandSchtroumpf Sep 9, 2024
4971192
add activity
GrandSchtroumpf Sep 9, 2024
75e875c
add price range for activity
GrandSchtroumpf Sep 9, 2024
32d652f
readonly chart for overlapping
GrandSchtroumpf Sep 9, 2024
28cdc81
reset settings with default price
GrandSchtroumpf Sep 9, 2024
5bd7d90
Use market Price as ref is on order
GrandSchtroumpf Sep 9, 2024
3c05aa8
disable route type in activity
GrandSchtroumpf Sep 9, 2024
24ee312
improve default values
GrandSchtroumpf Sep 9, 2024
e49f54a
create default orders
GrandSchtroumpf Sep 10, 2024
88d67ee
improve price display
GrandSchtroumpf Sep 10, 2024
62f1206
updat multiplier
GrandSchtroumpf Sep 10, 2024
f03e915
Merge remote-tracking branch 'origin/main' into issue-#1448
GrandSchtroumpf Sep 10, 2024
6bd629a
fix after merge
GrandSchtroumpf Sep 10, 2024
bc8db5c
fix date range filtering in activity
GrandSchtroumpf Sep 10, 2024
af3c66b
[CI] Update Screenshots
GrandSchtroumpf Sep 10, 2024
5ebcd1e
change size of the font
GrandSchtroumpf Sep 11, 2024
790cdf0
[CI] Update Screenshots
GrandSchtroumpf Sep 11, 2024
f88004b
round to 4 decimals
GrandSchtroumpf Sep 11, 2024
392b399
round market price to 4 decimals
GrandSchtroumpf Sep 11, 2024
f8ff4b3
move chart disposable
GrandSchtroumpf Sep 11, 2024
01e108b
Merge remote-tracking branch 'origin/main' into issue-#1448
GrandSchtroumpf Sep 11, 2024
15cee6f
[CI] Update Screenshots
GrandSchtroumpf Sep 11, 2024
4b16ba6
request changes
GrandSchtroumpf Sep 11, 2024
09c89ef
move chart to strategies/common
GrandSchtroumpf Sep 11, 2024
21c6710
max width in edit price
GrandSchtroumpf Sep 11, 2024
5dba97d
fix height of not found
GrandSchtroumpf Sep 11, 2024
4e7818e
Merge remote-tracking branch 'origin/main' into issue-#1448
GrandSchtroumpf Sep 11, 2024
a065a3a
[CI] Update Screenshots
GrandSchtroumpf Sep 11, 2024
2c9b3e3
remove check on data length
GrandSchtroumpf Sep 12, 2024
a5c3995
[CI] Update Screenshots
GrandSchtroumpf Sep 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ The file `common.ts` with type [`AppConfig`](src/config/types.ts) contains impor
- `tokenListOverride`: Token list override to be used in the app when fetching the token list. Tokens in the list will override any other token with the same address.
- `tokenLists`: List of token lists including the uri and the parser name to be used to parse the token list. Please update the tokenParserMap in the `src/config/utils.ts` file to include the parser name and the parser function.
- `sdk`/`cacheTTL`: When the app loads, it will ignore any cached data if it is older than the cacheTTL time in milliseconds. If set to 0, the app will always ignore the cache data and fetch new data on load.
- `ui`
- `priceChart`: use `tradingView` chart or `native` chart for token pair price history. You need to provide a backend with price history endpoint to support `native` view.

#### Gas token different than native token

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png
5 changes: 5 additions & 0 deletions src/assets/icons/lock.svg
3 changes: 3 additions & 0 deletions src/components/activity/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ export interface ActivitySearchParams extends Partial<PaginationParams> {
actions?: ActivityAction[];
start?: Date;
end?: Date;
// This is only for StrategyPageParams, but if I don't implement it here the build breaks
priceStart?: string;
priceEnd?: string;
}
export const activityActionName: Record<ActivityAction, string> = {
create: 'Create',
Expand Down
1 change: 1 addition & 0 deletions src/components/common/CarbonLogoLoading.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const CarbonLogoLoading = ({
fill="none"
xmlns="http://www.w3.org/2000/svg"
className={className}
aria-label="Loading"
>
<path
style={{
Expand Down
15 changes: 6 additions & 9 deletions src/components/common/NotFound.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ export const NotFound: FC<Props> = ({
<section
className={cn(
'gap-30 py-50 relative flex min-h-[500px] flex-col items-center justify-center px-20 text-center',
bordered && 'border-background-800 rounded border-2'
bordered && 'border-background-800 rounded border-2',
className
)}
>
{showBackButton && (
Expand All @@ -38,14 +39,10 @@ export const NotFound: FC<Props> = ({
</button>
)}
<div
className={cn(
'rounded-full p-20',
{
'bg-primary/20': variant === 'info',
'bg-error/20': variant === 'error',
},
className
)}
className={cn('rounded-full p-20', {
'bg-primary/20': variant === 'info',
'bg-error/20': variant === 'error',
})}
>
<IconSearch
className={cn('size-32', {
Expand Down
2 changes: 1 addition & 1 deletion src/components/simulator/input/SimInputChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
ChartPrices,
D3ChartCandlesticks,
OnPriceUpdates,
} from 'components/simulator/input/d3Chart';
} from 'components/strategies/common/d3Chart';
import { useCompareTokenPrice } from 'libs/queries/extApi/tokenPrice';
import { SimulatorType } from 'libs/routing/routes/sim';
import { useCallback } from 'react';
Expand Down

This file was deleted.

60 changes: 0 additions & 60 deletions src/components/simulator/input/d3Chart/recurring/D3ChartHandle.tsx

This file was deleted.

This file was deleted.

Loading