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: resolve merge conflicts #37

Merged
merged 5 commits into from
Jun 1, 2023
Merged

chore: resolve merge conflicts #37

merged 5 commits into from
Jun 1, 2023

Conversation

LucaMilanese90
Copy link

Proposed Changes

  • resolve merge conflicts
  • remove redundant types

bogdanfazakas and others added 4 commits May 29, 2023 13:28
@bogdanfazakas @kremalicious
Feature/wagmi (oceanprotocol#1912)
165a9b0 
* wagmi + ethers + web3modal setup

* refactor wallet components

* fallback providers, more config

* kick out useWeb3

* remove all useWeb3 imports

* more web3.js usage removal

* isAddress utils replacement

* restore add token / add network

* less accountId changes

* web3 legacy tinkering, utils/web3 → utils/wallet

* legacy web3 object for ocean.js

* graph sync fix, remove custom network switching code

* package updates, merge fixes

* downgrade to ethers v5

* fix project id

* switch to ConnectKit

* connectkit theming

* add existing chains to wagmi

* rewrite getPaymentCollector()

* kick out getPaymentCollector completely, use wagmi hooks instead

* Revert "kick out getPaymentCollector completely, use wagmi hooks instead"

This reverts commit 54c7d1e.

* switch getPaymentCollector

* calcBaseInGivenDatatokensOut reorg

* wip integrate ocean lib 3.0.0

* update orbis components to use wagmi instead of web hooks

* more oceanjs integration updates

* more refactors

* fix build

* update ocean lib

* fix publish

* fix order fixed rate

* remove logs

* debug and stop infinite cycle orbis connect

* fix orbis dm connection

* mock use network and fix some more tests

* mock wagmi switch network

* mock wagmi  useProvider createClient and connectKit getDefaultClient

* fix jest tests

* try storybook fix

* cleanups and bump ocean lib

* fix order

* bump lib to next.5 and add more modal style

* bump ocean.js lib to 3.0.0

---------

Co-authored-by: Matthias Kretschmann <[email protected]>
@LucaMilanese90
Merge branch 'ocean/main' of https://github.com/deltaDAO/Ocean-Market …
ac672e6 
…into chore/merge-conflicts
@LucaMilanese90
chore: merge conflicts
d9e75ef
@LucaMilanese90
feat: update types
befa473
@vercel
Copy link

vercel bot commented May 30, 2023 •
edited
Loading

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

Name Status Preview Comments Updated (UTC)
ocean-market ✅ Ready (Inspect) Visit Preview 💬 Add feedback May 30, 2023 3:52pm

@netlify
Copy link

netlify bot commented May 30, 2023 •
edited
Loading

✅ Deploy Preview for ocean-market-deltadao ready!

Name Link
🔨 Latest commit 927c21e
🔍 Latest deploy log https://app.netlify.com/sites/ocean-market-deltadao/deploys/64761b6f1d5e8d0008f8c48e
😎 Deploy Preview https://deploy-preview-37--ocean-market-deltadao.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@LucaMilanese90
Copy link
Author

I tested publishing and it seems to be working correctly, but I’m encountering an error while editing.
Screenshot 2023-05-31 at 10 04 44
It does not appear to be related to our PR though since I’m having the same error in the OPF market with assets published without consumer parameters.

@LucaMilanese90
Copy link
Author

@moritzkirstein I just realized that with the refactoring of the option input component we reverted to the old key/value naming instead of the value/label we decided to use. Was this intentional?
Screenshot 2023-05-31 at 10 09 19

@LucaMilanese90 LucaMilanese90 marked this pull request as ready for review May 31, 2023 12:54
@moritzkirstein
Copy link

@moritzkirstein I just realized that with the refactoring of the option input component we reverted to the old key/value naming instead of the value/label we decided to use. Was this intentional? Screenshot 2023-05-31 at 10 09 19

Also noticed this while reviewing. If possible we should allow to pass optional custom placeholders, agreed. value and label are more accurate to how they are actually used.

@moritzkirstein moritzkirstein merged commit 40d9527 into feat/consumer-parameters Jun 1, 2023
@moritzkirstein moritzkirstein deleted the chore/merge-conflicts branch June 1, 2023 10:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@moritzkirstein moritzkirstein moritzkirstein approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@LucaMilanese90 @moritzkirstein @bogdanfazakas