Add all base components and pages #19
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mul53
pushed a commit
to mul53/uniswap-interface
that referenced
this pull request
Jan 16, 2021
Enhancement: Bridge Input Errors
NameX44
pushed a commit
to NameX44/uniswap-interface-skynet
that referenced
this pull request
Aug 29, 2021
chore: Add CafeSwap token
NameX44
pushed a commit
to NameX44/uniswap-interface-skynet
that referenced
this pull request
Aug 30, 2021
* disable light mode * Fix code style issues with ESLint Co-authored-by: Daniel Vega <dvega@tangocode.com>
JFrankfurt
pushed a commit
that referenced
this pull request
Dec 9, 2022
* feat: add custom wallet connect class * feat: utilize custom wallet connect in components * refactor: reorganized wallet options / removed redundancies (#17) * reorganized * fixed merge conflict * removed duplicate case label * fix: re-added deleted comment
tinaszheng
added a commit
that referenced
this pull request
Jul 14, 2023
Co-authored-by: Mike Grabowski <grabbou@gmail.com> Co-authored-by: Zach Pomerantz <zzmp@uniswap.org> Co-authored-by: Tina <59578595+tinaszheng@users.noreply.github.com> Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com> Co-authored-by: Vignesh Mohankumar <me@vig.xyz> Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com> Co-authored-by: Jack Short <john.short.tj@gmail.com> Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt> Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Nate Wienert <natewienert@gmail.com> Co-authored-by: Charles Bachmeier <charles@bachmeier.io> Co-authored-by: Charles Bachmeier <charlie@genie.xyz>
zzmp
added a commit
that referenced
this pull request
Jul 14, 2023
* add npm secret and modify github actions * inject npm secret for tests as well * revert changes to staging and prod actions because we arent going to use themmm * remove unused github actions * minor copy change for convenience lol * feat: add DutchOrderTrade type to Swap components (#8) * feat: add flag for gouda (#5) * feat: add new signature details type (#4) * feat: local gouda activity (#9) * feat: Unified Routing API classic and dutch limit quote requests (#10) * chore: Rebase 5/26 (#13) Co-authored-by: Mike Grabowski <grabbou@gmail.com> Co-authored-by: Zach Pomerantz <zzmp@uniswap.org> Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com> Co-authored-by: Vignesh Mohankumar <me@vig.xyz> Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com> Co-authored-by: Jack Short <john.short.tj@gmail.com> Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com> Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt> Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Nate Wienert <natewienert@gmail.com> Co-authored-by: Charles Bachmeier <charles@bachmeier.io> Co-authored-by: Charles Bachmeier <charlie@genie.xyz> * feat: add UniswapX to Settings (#7) * feat: merge upstream 5/31 (#16) * feat: Upgrade unified-routing-api URL (#15) * chore: merge upstream 6/2 (#19) Co-authored-by: Mike Grabowski <grabbou@gmail.com> Co-authored-by: Zach Pomerantz <zzmp@uniswap.org> Co-authored-by: Tina <59578595+tinaszheng@users.noreply.github.com> Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com> Co-authored-by: Vignesh Mohankumar <me@vig.xyz> Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com> Co-authored-by: Jack Short <john.short.tj@gmail.com> Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt> Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Nate Wienert <natewienert@gmail.com> Co-authored-by: Charles Bachmeier <charles@bachmeier.io> Co-authored-by: Charles Bachmeier <charlie@genie.xyz> * feat: uniswapx gas tooltip (#12) Co-authored-by: Mike Grabowski <grabbou@gmail.com> Co-authored-by: Zach Pomerantz <zzmp@uniswap.org> Co-authored-by: Tina <59578595+tinaszheng@users.noreply.github.com> Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com> Co-authored-by: Vignesh Mohankumar <me@vig.xyz> Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com> Co-authored-by: Jack Short <john.short.tj@gmail.com> Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt> Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Nate Wienert <natewienert@gmail.com> Co-authored-by: Charles Bachmeier <charles@bachmeier.io> Co-authored-by: Charles Bachmeier <charlie@genie.xyz> * feat: swap callback (#17) * feat: gouda gating (#14) Co-authored-by: Mike Grabowski <grabbou@gmail.com> Co-authored-by: Zach Pomerantz <zzmp@uniswap.org> Co-authored-by: Tina <59578595+tinaszheng@users.noreply.github.com> Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com> Co-authored-by: Vignesh Mohankumar <me@vig.xyz> Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com> Co-authored-by: Jack Short <john.short.tj@gmail.com> Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt> Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Nate Wienert <natewienert@gmail.com> Co-authored-by: Charles Bachmeier <charles@bachmeier.io> Co-authored-by: Charles Bachmeier <charlie@genie.xyz> * fix: settings e2e test (#22) * feat: update swap callback to add orders to redux state (#18) * chore: Fix types for useBestTrade return result (#21) * feat: gql gouda orders (#20) * feat: show $0 for gas fee for now (#25) * chore: Rebase 06/08 (#26) Co-authored-by: Zach Pomerantz <zzmp@uniswap.org> Co-authored-by: Tina <59578595+tinaszheng@users.noreply.github.com> Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com> Co-authored-by: Vignesh Mohankumar <me@vig.xyz> Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com> Co-authored-by: Jack Short <john.short.tj@gmail.com> Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com> Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt> Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Nate Wienert <natewienert@gmail.com> Co-authored-by: Charles Bachmeier <charles@bachmeier.io> Co-authored-by: Charles Bachmeier <charlie@genie.xyz> Co-authored-by: Brendan Wong <35351983+LunrEclipse@users.noreply.github.com> Co-authored-by: cartcrom <cartergcromer@gmail.com> Co-authored-by: clrdo <129212060+clrdo@users.noreply.github.com> Co-authored-by: clrdo <clrdo@github.com> Co-authored-by: Eddie Dugan <eddie.dugan@uniswap.org> * feat: poll on order submit (#23) * feat: update gouda-sdk to 1.0.0-alpha.3 (#31) * feat: rename gasUseEstimateUSD for dutch orders (#30) Co-authored-by: Tina Zheng <tina.s.zheng+github@gmail.com> * chore: Fix response types (#36) * feat: Gouda ETH input flow (#29) Co-authored-by: Eddie Dugan <eddie.dugan@uniswap.org> * fix: use trade to determine what router label to show (#41) * feat: open uniswapx modal on click (#32) * feat: gouda logging new params in swap quote received (#33) * fix: wrap step ui fixes (#40) * feat: use BE deadline padding (#46) * chore: merge 6/23 (#50) Co-authored-by: Mike Grabowski <grabbou@gmail.com> Co-authored-by: Zach Pomerantz <zzmp@uniswap.org> Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com> Co-authored-by: Vignesh Mohankumar <me@vig.xyz> Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com> Co-authored-by: Jack Short <john.short.tj@gmail.com> Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com> Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt> Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Nate Wienert <natewienert@gmail.com> Co-authored-by: Charles Bachmeier <charles@bachmeier.io> Co-authored-by: Charles Bachmeier <charlie@genie.xyz> Co-authored-by: Brendan Wong <35351983+LunrEclipse@users.noreply.github.com> Co-authored-by: cartcrom <cartergcromer@gmail.com> Co-authored-by: clrdo <129212060+clrdo@users.noreply.github.com> Co-authored-by: clrdo <clrdo@github.com> Co-authored-by: Shubham Rasal <95695273+Shubham-Rasal@users.noreply.github.com> Co-authored-by: Saro Vindigni <sarovindigni@bolket.com> Co-authored-by: Jordan Frankfurt <<jordan@CORN-Jordan-949.frankfurt> Co-authored-by: John Short <john.short@CORN-Jack-899.local> * feat: Gouda opt-in flow request logic (#37) Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com> * feat: hide slippage and deadline settings when the current trade is gouda (#44) * feat: use settled order amounts (#45) * feat: fetch receipt before dispatch (#49) * fix: updated order popups to launch modal (#48) * feat: Use slippage value from URA response for UniswapX trades (#51) * fix: Bump gouda-sdk to match backend response for quotes (#58) * feat: Change gouda order status URL param from offerer -> swapper (#59) * feat: disable opt in flow (#57) * feat: Dont show USD value change for uniswapx trades (#55) * fix: Don't use WETH as input currency for Classic ETH-in trades (#54) * feat: Reset to WETH after wrap is complete (#52) * fix: correct descriptor in UniswapX activity row items (#61) * fix: align review modal and gouda activity modal (#60) Co-authored-by: Charles Bachmeier <charles@bachmeier.io> * feat: Get wrap and approve gas info (#53) Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com> * fix: restore summary view when wrap is rejected (#66) * fix: serialize tx receipts before storing (#64) * fix: Insufficient balance check should read from the right currency (#65) * feat: update designs for gas tooltips (#67) * fix: UniswapX gas descriptor boolean (#69) * chore: Bump conedison for better gas price formatting (#70) * chore: Switch from gouda-sdk to uniswapx-sdk (#71) * chore: Rename all variables `gouda` to UniswapX (#72) * chore: Merge 7/8/23 (#73) Co-authored-by: Mike Grabowski <grabbou@gmail.com> Co-authored-by: Zach Pomerantz <zzmp@uniswap.org> Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com> Co-authored-by: Vignesh Mohankumar <me@vig.xyz> Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com> Co-authored-by: Jack Short <john.short.tj@gmail.com> Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com> Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt> Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Nate Wienert <natewienert@gmail.com> Co-authored-by: Charles Bachmeier <charles@bachmeier.io> Co-authored-by: Charles Bachmeier <charlie@genie.xyz> Co-authored-by: Brendan Wong <35351983+LunrEclipse@users.noreply.github.com> Co-authored-by: cartcrom <cartergcromer@gmail.com> Co-authored-by: clrdo <129212060+clrdo@users.noreply.github.com> Co-authored-by: clrdo <clrdo@github.com> Co-authored-by: Shubham Rasal <95695273+Shubham-Rasal@users.noreply.github.com> Co-authored-by: Saro Vindigni <sarovindigni@bolket.com> Co-authored-by: Jordan Frankfurt <<jordan@CORN-Jordan-949.frankfurt> Co-authored-by: John Short <john.short@CORN-Jack-899.local> Co-authored-by: Charlie Bachmeier <charlie.bachmeier@Charlies-MacBook-Pro.local> Co-authored-by: UL Service Account <hello-happy-puppy@users.noreply.github.com> * chore(conedison): update package (#77) * feat: add opt-in UI (#68) * chore: address some todos (#79) * chore: Rename feature flag from gouda_enabled to uniswapx_enabled (#81) * feat: Copy changes (#82) * fix: improve timings on animations for gouda opt-in (#80) * chore: Use updated URLs (#84) * chore: Merge 7/14 (#85) Co-authored-by: Mike Grabowski <grabbou@gmail.com> Co-authored-by: Zach Pomerantz <zzmp@uniswap.org> Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com> Co-authored-by: Vignesh Mohankumar <me@vig.xyz> Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com> Co-authored-by: Jack Short <john.short.tj@gmail.com> Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com> Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt> Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Nate Wienert <natewienert@gmail.com> Co-authored-by: Charles Bachmeier <charles@bachmeier.io> Co-authored-by: Charles Bachmeier <charlie@genie.xyz> Co-authored-by: Brendan Wong <35351983+LunrEclipse@users.noreply.github.com> Co-authored-by: cartcrom <cartergcromer@gmail.com> Co-authored-by: clrdo <129212060+clrdo@users.noreply.github.com> Co-authored-by: clrdo <clrdo@github.com> Co-authored-by: Shubham Rasal <95695273+Shubham-Rasal@users.noreply.github.com> Co-authored-by: Saro Vindigni <sarovindigni@bolket.com> Co-authored-by: Jordan Frankfurt <<jordan@CORN-Jordan-949.frankfurt> Co-authored-by: John Short <john.short@CORN-Jack-899.local> Co-authored-by: Charlie Bachmeier <charlie.bachmeier@Charlies-MacBook-Pro.local> Co-authored-by: UL Service Account <hello-happy-puppy@users.noreply.github.com> * remove changes to github actions files * fix import * actually revert changes to yml * remove method export * feat: Add feature flag for synthetic quotes (#6938) * fix: use Lingui Trans macro (#6943) * fix: use trans macro * add comments * fix: update updater.tsx (#6942) * fix: reformat variable to use ms * move interval definition above getOrderStatus * lint :) * revert * chore: bunch of nits (#6944) bunch of nits * fix: translations etc (#6945) * chore: Remove placeholder signature types (#6937) remove placeholder * chore: merge main into branch (#6948) * fix: Handle Scientific Notation for NFT Collection Activity Prices (#6936) wrap nft activity price in * fix: e2e tests (#6941) * fix: e2e test * fix: set flag for buy-crypto-modal test * fix: fund DAI --------- Co-authored-by: Zach Pomerantz <zzmp@uniswap.org> --------- Co-authored-by: Charles Bachmeier <charles@bachmeier.io> * feat: make inputCurrency optional for swapheader (#6947) * make inputCurrency optional for swapheader * optional pass in * fix: function defined twice (#6950) fix lint * test: add signatureToActivity undefined tests (#6949) * fix: update token lists schema (#6951) fix: update token list schema * chore: some last nits (#6953) * refactor: base type * test: useUserDisabledUniswapX * chore: simplify useAllSignatures usage * chore: standard check order * lint --------- Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com> Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com> Co-authored-by: Mike Grabowski <grabbou@gmail.com> Co-authored-by: Zach Pomerantz <zzmp@uniswap.org> Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com> Co-authored-by: Vignesh Mohankumar <me@vig.xyz> Co-authored-by: Jack Short <john.short.tj@gmail.com> Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt> Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Nate Wienert <natewienert@gmail.com> Co-authored-by: Charles Bachmeier <charles@bachmeier.io> Co-authored-by: Charles Bachmeier <charlie@genie.xyz> Co-authored-by: Brendan Wong <35351983+LunrEclipse@users.noreply.github.com> Co-authored-by: cartcrom <cartergcromer@gmail.com> Co-authored-by: clrdo <129212060+clrdo@users.noreply.github.com> Co-authored-by: clrdo <clrdo@github.com> Co-authored-by: Eddie Dugan <eddie.dugan@uniswap.org> Co-authored-by: marktoda <toda.mark@gmail.com> Co-authored-by: Shubham Rasal <95695273+Shubham-Rasal@users.noreply.github.com> Co-authored-by: Saro Vindigni <sarovindigni@bolket.com> Co-authored-by: Jordan Frankfurt <<jordan@CORN-Jordan-949.frankfurt> Co-authored-by: John Short <john.short@CORN-Jack-899.local> Co-authored-by: Charlie Bachmeier <charlie.bachmeier@Charlies-MacBook-Pro.local> Co-authored-by: UL Service Account <hello-happy-puppy@users.noreply.github.com>
willpote
pushed a commit
that referenced
this pull request
Jul 17, 2023
Co-authored-by: Mike Grabowski <grabbou@gmail.com> Co-authored-by: Zach Pomerantz <zzmp@uniswap.org> Co-authored-by: Tina <59578595+tinaszheng@users.noreply.github.com> Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com> Co-authored-by: Vignesh Mohankumar <me@vig.xyz> Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com> Co-authored-by: Jack Short <john.short.tj@gmail.com> Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt> Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Nate Wienert <natewienert@gmail.com> Co-authored-by: Charles Bachmeier <charles@bachmeier.io> Co-authored-by: Charles Bachmeier <charlie@genie.xyz>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This also includes: