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.

Sign up for GitHub

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

Jump to bottom

chore(trading): merge main back in develop (markets page and others) #6326

Merged
merged 40 commits into from
Apr 30, 2024
Merged

chore(trading): merge main back in develop (markets page and others) #6326

merged 40 commits into from
Apr 30, 2024

Conversation

MadalinaRaicu
Copy link
Contributor

@MadalinaRaicu MadalinaRaicu commented Apr 29, 2024 •
edited by daniel1302
Loading

No description provided.

asiaznik and others added 27 commits April 18, 2024 11:17
@asiaznik
fix(governance): slow accounts data retrieval (#6230)
f788093
@bglownia
fix(web3): set tx status as error if transacion result is falsy (#6252)
951a7ca
@asiaznik
fix(trading): revert max trades from 10 to 500 (#6255)
ecf6a63
@edd
feat(emblem): add market logo component (#6215)
3e9bd4a
@MadalinaRaicu @bwallacee
feat(trading): add back capRewardFeeMultiple (#6244)
a7c71b2 
Co-authored-by: bwallacee <ben@vega.xyz>
@bwallacee
chore(trading): re-enable tpsl deal ticket test (#6248)
0b834f1
@bwallacee
chore(trading): reduce the number of nextepochs (#6249)
c8a213b
@mattrussell36
chore(trading,governance,explorer): release v0.25.17 (#6259)
e87a5a1
@bglownia
feat(trading): improve close position transaction handling (#6221)
dc33cf3
@bglownia
fix(accounts): show assets breakdown when party has no account for th…
129f233 
…is asset (#6254)
@asiaznik
chore(governance): add link to tx details, add error details (#6266)
d558c2a
@asiaznik @bwallacee
chore(trading): reward cards tooltips and text changes (#6258)
57ba250 
Co-authored-by: bwallacee <ben@vega.xyz>
@asiaznik @bwallacee
chore(trading): team id on team page (#6280)
7249e92 
Co-authored-by: bwallacee <ben@vega.xyz>
@edd
chore(explorer): change column heading for oracles (#6256)
e372f16
@mattrussell36 @bwallacee
feat(trading): add deposit/withdraw/transfer pane to portfolio (#6275)
e452e60 
Co-authored-by: bwallacee <ben@vega.xyz>
@MadalinaRaicu
fix(trading): wallet key alias instead of party alias in transfer form (
b1a9542 
#6286)
@bglownia
feat(utils): round to smallest meaningful number (#6274)
aa166bd
@MadalinaRaicu
feat(trading): market icons in console (#6281)
58cd46b
@edd @daro-maj
chore(explorer,trading): asset view tweak and market view tweak (#6261)
c4331e2 
Co-authored-by: Dariusz Majcherczyk <dariusz.majcherczyk@gmail.com>
@MadalinaRaicu
fix(trading): auction countdown (#6292)
908814a
@bglownia
chore(markets): remove name from Spot (#6288)
2c9bec7
@MadalinaRaicu
fix(trading): remove CAF copy from games page (#6306)
a9cb7f2
@asiaznik
fix(trading): referee tier statistic (#6276)
66ad58c
@MadalinaRaicu
fix(trading): another countdown fix (#6300)
f8b415c
@edd
fix(explorer): block links and minor fixes (#6296)
2ac3fe3
@MadalinaRaicu @edd @bwallacee
feat(trading): markets page list view (#6239)
efd015b 
Co-authored-by: Edd <edd@vega.xyz>
Co-authored-by: bwallacee <ben@vega.xyz>
@MadalinaRaicu
chore(trading): merge main back in develop
5d80b0b
@MadalinaRaicu MadalinaRaicu requested review from a team as code owners April 29, 2024 16:38
@MadalinaRaicu MadalinaRaicu changed the base branch from main to develop April 29, 2024 16:38
edd
edd approved these changes Apr 29, 2024
View reviewed changes
Copy link
Member

@edd edd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI seems to be very slow - but this looks fine and running it locally looks OK

@edd edd marked this pull request as draft April 29, 2024 20:54
@edd edd marked this pull request as ready for review April 29, 2024 20:54
@github-actions GitHub Actions
Copy link

Previews

@bwallacee bwallacee force-pushed the chore/merge-main-back-in-develop-1 branch from f9e715c to 7b435d8 Compare April 30, 2024 12:20
@MadalinaRaicu MadalinaRaicu merged commit 840f609 into develop Apr 30, 2024
16 of 18 checks passed
daro-maj added a commit that referenced this pull request May 1, 2024
@MadalinaRaicu @asiaznik
@bglownia @edd @bwallacee @mattrussell36 @daro-maj
chore(trading): merge main back in develop (markets page and others) (#…
f2d1041 
…6326)

Co-authored-by: Art <artur@vegaprotocol.io>
Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com>
Co-authored-by: Edd <edd@vega.xyz>
Co-authored-by: bwallacee <ben@vega.xyz>
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
Co-authored-by: Dariusz Majcherczyk <dariusz.majcherczyk@gmail.com>
@bwallacee bwallacee deleted the chore/merge-main-back-in-develop-1 branch May 22, 2024 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edd edd edd approved these changes

@asiaznik asiaznik asiaznik approved these changes

Assignees
No one assigned
Labels
explorer-preview governance-preview multisig-signer-preview trading-preview
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@MadalinaRaicu @edd @asiaznik @bglownia @bwallacee @mattrussell36