Commit Graph

  • 6d43911870 Merge branch 'main' into WEB-2043-add-infinite-scroll-to-collection-filter-panel Lynn Yu 2022-11-16 20:47:24 -05:00
  • ed858cbebd Merge branch 'main' into jack/sudoSwap Jack Short 2022-11-16 20:46:20 -05:00
  • 9f5fe362f3 Merge branch 'main' into jack/sudoSweep Jack Short 2022-11-16 20:45:58 -05:00
  • 5b3b22e0ca simplification Jack Short 2022-11-16 20:43:54 -05:00
  • 213cee16bd merge main Lynn Yu 2022-11-16 20:42:43 -05:00
  • 9cca3a806c Merge branch 'jack/sudoswap' into jack/sudoSweep Jack Short 2022-11-16 20:37:48 -05:00
  • d1c8915d1c reformatting Jack Short 2022-11-16 20:34:18 -05:00
  • 9eccde1b20 adding back recalculating bag Jack Short 2022-11-16 20:33:24 -05:00
  • 82c3193d21
    refactor: better theming (#5259) Mike Grabowski 2022-11-17 02:26:26 +01:00
  • 9a66ab25e5 typo Jack Short 2022-11-16 20:24:46 -05:00
  • 9630152f54 refactor: remove deprecated colors Mike 2022-11-17 02:24:18 +01:00
  • 08d6913551 revisions Jack Short 2022-11-16 20:12:25 -05:00
  • e630185a6d chore: update to latest and use proper method Mike 2022-11-17 01:57:10 +01:00
  • bb429ff555 ensure no pointer events on tooltip Lynn Yu 2022-11-16 19:55:03 -05:00
  • cef38bd552 chore: clean up post merge Mike 2022-11-17 01:38:09 +01:00
  • 269ed86038 Merge branch 'main' into feat/color-improvements Mike 2022-11-17 01:33:42 +01:00
  • 09db3a50ad chore: handle 0 Mike 2022-11-17 01:10:18 +01:00
  • a3e0cd5b5d chore: tweaks Mike 2022-11-17 01:02:34 +01:00
  • d23ab7a694 chore: fix Mike 2022-11-17 00:53:18 +01:00
  • 3ac6919dbf add new file Charlie 2022-11-16 15:47:56 -08:00
  • 503fc37a4b
    fix: Can list and relist to all marketplaces (#5250) Charles Bachmeier 2022-11-16 15:42:19 -08:00
  • 446c55f9af simplified sort dropdown Charlie 2022-11-16 15:41:55 -08:00
  • 721fd60fdd Merge branch 'main' into WEB-2233-erc-1155-card Lynn Yu 2022-11-16 18:31:21 -05:00
  • 1788c9f3c0
    fix: max depth error (#5258) aballerr 2022-11-16 18:21:50 -05:00
  • 6f0d8c8739 Merge branch 'main' into WEB-2233-erc-1155-card Lynn Yu 2022-11-16 18:16:01 -05:00
  • 4fab9bbd23 remove extra Lynn Yu 2022-11-16 18:05:37 -05:00
  • cc338dff88 slightly reduce row padding Callil Capuozzo 2022-11-16 17:56:14 -05:00
  • e1d489a6bc
    chore: update deploy action (#5254) v4.154.0 Connor McEwen 2022-11-16 14:50:14 -08:00
  • 68242bf148 fix: formatting of nft token pricing Jordan Frankfurt 2022-11-16 16:32:45 -06:00
  • 21918a3b95 use ms 60s Charlie 2022-11-16 14:24:31 -08:00
  • aabde6df5b fix: size down new position button Zach Pomerantz 2022-11-16 13:51:20 -08:00
  • 1968f38a7f remove unnecessary style changes Lynn Yu 2022-11-16 16:41:16 -05:00
  • b90fef5a3f Merge branch 'main' into explore-table-polish Callil Capuozzo 2022-11-16 16:34:02 -05:00
  • 9d9952373b Normalize explore styles Callil Capuozzo 2022-11-16 16:31:35 -05:00
  • 0abcc6767c initial commit cartcrom 2022-11-16 16:31:22 -05:00
  • 9b31e7b66d
    feat: render background below navbar + remove overflow (#5247) Mike Grabowski 2022-11-16 22:19:05 +01:00
  • 5696c61354
    feat: add glow to trending table (#5248) Mike Grabowski 2022-11-16 22:18:53 +01:00
  • 61215c13ba Merge branch 'main' into WEB-2043-add-infinite-scroll-to-collection-filter-panel Lynn Yu 2022-11-16 16:11:59 -05:00
  • 3309134e48 chore: add root back Mike 2022-11-16 22:11:21 +01:00
  • b30679c9f9
    style: adjust grid behavior and update collection page styles (#5226) Callil Capuozzo 2022-11-16 16:11:17 -05:00
  • 1572410c47
    ci: GitHub CODEOWNERS (#5244) vignesh mohankumar 2022-11-16 16:08:29 -05:00
  • 41662a262a chore: move widget to its proper place Mike 2022-11-16 22:06:56 +01:00
  • 0223781075 chore: document ts workaround Mike 2022-11-16 22:06:49 +01:00
  • b4b33aa1ba chore: remove color type, its a string Mike 2022-11-16 22:03:02 +01:00
  • 214de1d4f8 wip: just get it out Mike 2022-11-16 21:55:48 +01:00
  • 6ff3c78907 fixing max depth error Alex Ball 2022-11-16 15:52:09 -05:00
  • 5eeb44b703 Clean up card styles Callil Capuozzo 2022-11-16 15:50:18 -05:00
  • bfd6804bad Address comments Callil Capuozzo 2022-11-16 15:46:43 -05:00
  • 51b9685126 feat: adding sudoswap to sweep Jack Short 2022-11-16 15:43:36 -05:00
  • f3d5fe08b6
    fix: setting up a single buy state (#5206) aballerr 2022-11-16 15:37:43 -05:00
  • 44634e4b46 chore: upgrade conedison Zach Pomerantz 2022-11-16 12:37:33 -08:00
  • 247fbfdf01
    fix: retain permit sig if amount decreases (#5253) Zach Pomerantz 2022-11-16 12:18:31 -08:00
  • 8b3b27c96c Address comments Callil Capuozzo 2022-11-16 14:57:36 -05:00
  • 6d4de96ce5 Add shared variable Callil Capuozzo 2022-11-16 14:49:44 -05:00
  • f3ac0d603b chore: update deploy action Connor McEwen 2022-11-16 11:37:33 -08:00
  • 08595192e1 merge Lynn Yu 2022-11-16 14:33:46 -05:00
  • bf755acc0c merge main Lynn Yu 2022-11-16 14:31:15 -05:00
  • 14a9edec47 Update Card.css.ts Callil Capuozzo 2022-11-16 14:30:46 -05:00
  • c1781d7aed Merge branch 'main' into adjust-grid-behavior Callil Capuozzo 2022-11-16 14:30:30 -05:00
  • 5ac7413aa5 fix: retain permit sig if amount decreases Zach Pomerantz 2022-11-16 11:27:51 -08:00
  • 5623321529 resolving merge conflicts Alex Ball 2022-11-16 14:26:00 -05:00
  • 1511ddf23a addressing linting errors Alex Ball 2022-11-16 14:23:49 -05:00
  • f391f1c719
    feat: add tooltips when adding and removing from nft bag (#5222) lynn 2022-11-16 14:18:37 -05:00
  • d72488c450 updated snapshot cartcrom 2022-11-16 14:17:09 -05:00
  • fe2e339e0d merge main Lynn Yu 2022-11-16 14:05:57 -05:00
  • cdfdeffa03 removing bag recalculation Jack Short 2022-11-16 14:05:42 -05:00
  • f037297779 Add breakpoint sprinkles Callil Capuozzo 2022-11-16 14:00:46 -05:00
  • d589a86d5d resolving merge conflicts Alex Ball 2022-11-16 14:00:28 -05:00
  • 2c446282fe Merge branch 'WEB-2073-add-tool-tips-to-cards-for-adding-and-removing-from-bag' of https://github.com/Uniswap/interface into WEB-2073-add-tool-tips-to-cards-for-adding-and-removing-from-bag Lynn Yu 2022-11-16 13:59:55 -05:00
  • 6d1dd12db7
    style: example tooltip (#5238) Jack Short 2022-11-16 13:59:27 -05:00
  • 3892bc1b71 removed previous blocked Icon cartcrom 2022-11-16 13:56:29 -05:00
  • 68e9bc418f add comment about LR strategy Charlie 2022-11-16 10:51:42 -08:00
  • 496648d46e fixed blocked tokens not appearing or having icons cartcrom 2022-11-16 13:49:58 -05:00
  • d38854749b
    feat: view my nft cards redesign (#5246) lynn 2022-11-16 13:49:45 -05:00
  • 828c0a7954 merge Lynn Yu 2022-11-16 13:47:57 -05:00
  • d9e2fe9485 update LR and cleanup Charlie 2022-11-16 10:46:43 -08:00
  • ff7e788fa9 integrated amm pricing on collection Jack Short 2022-11-16 13:42:03 -05:00
  • 3587b157fe Merge branch 'main' into WEB-2073-add-tool-tips-to-cards-for-adding-and-removing-from-bag Lynn Yu 2022-11-16 13:40:17 -05:00
  • 61fcf084ab link Lynn Yu 2022-11-16 13:28:57 -05:00
  • 834307bcfa Simplify layout for filter chips and buttons Callil Capuozzo 2022-11-16 13:25:46 -05:00
  • c6bf9c84cc Merge branch 'main' into adjust-grid-behavior Callil Capuozzo 2022-11-16 13:16:04 -05:00
  • 3f41a5ac90 Add requested changes Callil Capuozzo 2022-11-16 13:15:46 -05:00
  • eefa8deb2c init Lynn Yu 2022-11-16 13:06:28 -05:00
  • dfcfe67c58 chore: move component to theme Mike 2022-11-16 19:05:04 +01:00
  • 54a602ced8 working when connected locally Charlie 2022-11-16 10:02:48 -08:00
  • 9948692832 finished feature cartcrom 2022-11-16 12:56:17 -05:00
  • fef9a14d15 Merge branch 'main' into WEB-2231-unlisted-erc-721-nft-card Lynn Yu 2022-11-16 12:50:03 -05:00
  • 10a1963801
    fix: reverting navbar change (#5237) aballerr 2022-11-16 12:46:30 -05:00
  • f9330aa730 fixing linting error Alex Ball 2022-11-16 12:36:01 -05:00
  • d4c1eeb3bf chore: simplify Mike 2022-11-16 18:33:47 +01:00
  • 7c38f37761 Merge branch 'main' into adjust-grid-behavior Callil Capuozzo 2022-11-16 12:32:07 -05:00
  • b4280e20a9 feat: add glow Mike 2022-11-16 18:20:52 +01:00
  • 975a80b9c3 removing unused variable Alex Ball 2022-11-16 12:11:21 -05:00
  • 0995a0ca5e feat: adding sudoswap amm pricing Jack Short 2022-11-16 12:09:48 -05:00
  • 794ff047b1 removing new line Alex Ball 2022-11-16 12:03:15 -05:00
  • 7a3cbd0729 removing uneeded top variables Alex Ball 2022-11-16 12:02:27 -05:00
  • be7e808fff
    refactor: remove unused isSellMode, setIsSellMode in useSellAsset (#5236) vignesh mohankumar 2022-11-16 11:42:56 -05:00
  • e2bc426eed rm Vignesh Mohankumar 2022-11-16 11:36:44 -05:00
  • 491c4f30fb Merge branch 'main' into rm-sell-mode-hook Vignesh Mohankumar 2022-11-16 11:34:26 -05:00
  • 380c6f05b6 chore: remove unused prop Mike 2022-11-16 17:32:25 +01:00