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

Uni merge 1.0.6 #441

Merged
merged 209 commits into from
Jun 1, 2022
Merged

Uni merge 1.0.6 #441

merged 209 commits into from
Jun 1, 2022

Conversation

W3stside
Copy link
Contributor

@W3stside W3stside commented Apr 22, 2022

NORMAL MERGE! DO NO SQUASH!

Summary

Latest update from uni to 1.0.6 -

Notes:
Uni merge 1.0.6

  1. React-ga >> react-ga4: https://support.google.com/analytics/answer/10089681?hl=en
    1. Uses Google Analytics 4 formerly known as “App + web”
  2. Stopped supporting portis, adds matic
  3. Re-enabled fortmatic (walletmodalmod line 247)
  4. Matic wallet (tokensMod) > isMatic fn
  5. ErrorBoundary - updates service worker on errors - errors not truncated
    1. Widget has own ErrorBoundary (more generic - doesn’t point to the uni repo for example)
  6. Removed @src/abis/types ?
  7. On supported network hook (useOnSupportedNetwork)
  8. Adds donation link to user state (Ukraine)
  9. Switch to CJS type: module in package.json (reverted this in post merge, required for getting app to build (removes package.json "type": "module" which is cjs)
    1. Doesn’t work with our .js craco as it expects craco.config.js
  10. Rule of hooks broken from useActiveWeb3React (if block return for widget) - mitigated by them via "ts ignore"
  11. a lot of packages moved in/out of dependencies into devDepedencies, packages removed
  12. lib (widget folder) changed a lot, updated our mod as well <---- important reason for this merge

zzmp and others added 30 commits February 28, 2022 10:47
* fix: cjs in cra

* chore: wrap cjs for mjs

* chore: export cjs and esm

* chore: export chunks

* fix: correctly export locales

* chore: note exports compat

* fix: use cjs for common deps

* chore: bump to v0.0.20-beta

* chore: rm outdated comment
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.28 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](ai/nanoid@3.1.28...3.2.0)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](unshiftio/url-parse@1.5.3...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix: make dialog provider an isolate

* fix: use button for connect wallet

* chore: document esoteric changes
* feat(widgets): support wrapping native assets

* integrate wrap with swapInfo, start a useWrapCallback hook

* add loading state

* add pending state to (un)wrap transactions

* final cleanup

* janky merge conflict fix--disregard! this will change

* fixed

* 💢

* pr feedback

* z's pr feedback

* pr feedback

* zzmp pr feedback

* zzmp pr feedback
…nsupported networks (#3376)

* disable interactions and don't show summary screen on unsupported networks

* clear input values on unsupported network

* pr feedback

* pr feedback

* simpler active trade clearing

* rename some things
* fix: layout token balance on token select

* fix: do not clear block on window re-focus
* create donation banner

* update styling and copy

* only show banner on swap page

* dont use hard coded z index

* style updates
* use permit when valid on approvals

* fix broken check for permit sig

* update conditionals

* update text

* remove unneeded else

* move permit and approve logic to combined hook

* update comment

* split txn and approval state, code clean

* organize disable conditions

* small changes

* update conditional check
* feat: make data user-selectable

* fix: consider the whole node for focus

* fix: back out lineheight typing

* fix: straggling occurences

* chore: comment on root user-select
* introduce useQuorum

introduce LATEST_GOVERNOR_INDEX

* use CurrencyAmounts and fix % logic

* gate useQuorum to mainnet, just to be safe

* comment
* feat: export used types

* fix: clean defaulting names

* chore: rename to useSyncTokenDefaults
* update loading icon

* color update, update file for spinner

* update loader styling size

* update file naming for spinner
@github-actions
Copy link
Contributor

  • 🔭 GP Swap: CoW Protocol v2 Swap UI

@qbzzt
Copy link
Contributor

qbzzt commented Apr 25, 2022

I'm not sure what I contributed, but you're welcome to it.

src/components/ErrorBoundary/index.tsx Show resolved Hide resolved
src/components/FeeSelector/index.tsx Show resolved Hide resolved
src/components/FeeSelector/shared.tsx Show resolved Hide resolved
src/custom/abis/types/GPv2Settlement.d.ts Outdated Show resolved Hide resolved
src/custom/abis/types/VCow.d.ts Outdated Show resolved Hide resolved
src/custom/hooks/useContract/index.ts Show resolved Hide resolved
src/custom/hooks/useTokenLazy.ts Show resolved Hide resolved
src/custom/hooks/useWalletInfo.ts Outdated Show resolved Hide resolved
@qbzzt
Copy link
Contributor

qbzzt commented May 26, 2022

I have read the CLA Document and I hereby sign the CLA

@qbzzt
Copy link
Contributor

qbzzt commented May 26, 2022

recheckcla

@JFrankfurt
Copy link
Contributor

I'm not sure what I contributed

Is anyone ever sure?

@qbzzt
Copy link
Contributor

qbzzt commented May 26, 2022

I'm not sure what I contributed

Is anyone ever sure?

Actually yes. Now I am (I looked at the commit list) - I updated the Optimism image. Tiny change, and you're welcome to it.

@alfetopito
Copy link
Collaborator

Thank you all, and sorry again (for the nth-time) for the ping.
Every time we enable the CLA bot you all get notified, over and over 🤦

@anxolin
Copy link
Contributor

anxolin commented May 29, 2022

@W3stside could you rebase this branch and get it merged once all checks are passing?

Also, maybe not for this PR, but can you modify the cla.yml so it doesn't run for the branches where we incorporate changes from upstream? Let's hope we don't bother again with notifications Uniswap folks.
Sorry for the troubles 🙏

One simple solution is that we just use a naming convention for these merge's branch

name: 'CLA Assistant'

@W3stside W3stside mentioned this pull request Jun 1, 2022
@W3stside W3stside merged commit 46bb8af into develop Jun 1, 2022
@alfetopito alfetopito deleted the uni-merge-1.0.6 branch July 18, 2022 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.