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

EGN-417 - Reconcile UI package #932

Merged
merged 69 commits into from
Jun 28, 2023
Merged

EGN-417 - Reconcile UI package #932

merged 69 commits into from
Jun 28, 2023

Commits on Jun 15, 2023

  1. Merge remote-tracking branch 'origin/feature/egn-326' into feature/eg… 

    …n-326
    @chillichelli
    chillichelli committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    a95d32c View commit details
    Browse the repository at this point in the history

  2. fix(packages/ui): remove old components

    @chillichelli
    chillichelli committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    41886c0 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. fix(packages/ui): remove old components

    @chillichelli
    chillichelli committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    e57f301 View commit details
    Browse the repository at this point in the history

  2. fix(packages/ui): remove old components

    @chillichelli
    chillichelli committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    e6279fc View commit details
    Browse the repository at this point in the history

  3. fix(packages/ui): build errors

    @chillichelli
    chillichelli committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    73c09b2 View commit details
    Browse the repository at this point in the history

  4. fix(packages/ui): build errors

    @chillichelli
    chillichelli committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    5749065 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. fix(packages/ui): add more components

    @chillichelli
    chillichelli committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    82e82ec View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/egn-326' into feature/egn-417 

    # Conflicts:
#	packages/ui/package.json
#	packages/ui/src/future/components/form.tsx
#	pnpm-lock.yaml
    @chillichelli
    chillichelli committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    4337a35 View commit details
    Browse the repository at this point in the history

  3. fix(packages/ui): lock file

    @chillichelli
    chillichelli committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    1dbb8b6 View commit details
    Browse the repository at this point in the history

  4. fix(packages/ui): refactor iconbutton and skeletons

    @chillichelli
    chillichelli committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    6455a63 View commit details
    Browse the repository at this point in the history

  5. fix(packages/ui): refactor iconbutton and skeletons

    @chillichelli
    chillichelli committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    081440d View commit details
    Browse the repository at this point in the history

  6. fix(packages/ui): force rename

    @chillichelli
    chillichelli committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    232a7c6 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. fix(packages/ui): remove duplicate chip and dots

    @chillichelli
    chillichelli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    1118884 View commit details
    Browse the repository at this point in the history

  2. fix(packages/ui): remove iconbutton animation dialog and overlay

    @chillichelli
    chillichelli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    46e3ad5 View commit details
    Browse the repository at this point in the history

  3. fix(packages/ui): remove Currency and fix errors

    @chillichelli
    chillichelli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    6726931 View commit details
    Browse the repository at this point in the history

  4. fix(packages/ui): remove icons and loader

    @chillichelli
    chillichelli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    ee870e9 View commit details
    Browse the repository at this point in the history

  5. fix(packages/ui): progressbar

    @chillichelli
    chillichelli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    317fdb2 View commit details
    Browse the repository at this point in the history

  6. fix(packages/ui): switch out old switch with shadcn

    @chillichelli
    chillichelli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    040e8b0 View commit details
    Browse the repository at this point in the history

  7. fix(packages/ui): force file name change

    @chillichelli
    chillichelli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    a2d364e View commit details
    Browse the repository at this point in the history

  8. fix(packages/ui): update explainer component

    @chillichelli
    chillichelli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    53eb365 View commit details
    Browse the repository at this point in the history

  9. fix(packages/ui): housekeeping

    @chillichelli
    chillichelli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    ddba6bb View commit details
    Browse the repository at this point in the history

  10. fix(packages/ui): use slot instead

    @chillichelli
    chillichelli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    3170e72 View commit details
    Browse the repository at this point in the history

  11. refactor(packages/ui): timeAgo component

    @chillichelli
    chillichelli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    9607472 View commit details
    Browse the repository at this point in the history

  12. refactor(packages/ui): remove ExternalLink

    @chillichelli
    chillichelli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    f26c4c1 View commit details
    Browse the repository at this point in the history

  13. refactor(packages/ui): refactor widget

    @chillichelli
    chillichelli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    e038319 View commit details
    Browse the repository at this point in the history

  14. fix(packages/ui): change loader location

    @chillichelli
    chillichelli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    ce04a4b View commit details
    Browse the repository at this point in the history

  15. fix(packages/ui): remove rc-tooltip

    @chillichelli
    chillichelli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    9d74b3d View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. refactor(packages/ui): button styles and uses

    @chillichelli
    chillichelli committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    9e757a6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/egn-326' into feature/egn-417 

    # Conflicts:
#	config/tailwindcss/src/index.ts
#	packages/ui/src/globals.css
    @chillichelli
    chillichelli committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    68b04c3 View commit details
    Browse the repository at this point in the history

  3. refactor(packages/ui): add size xl

    @chillichelli
    chillichelli committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    9cf6e0e View commit details
    Browse the repository at this point in the history

  4. refactor(packages/ui): sort out background colors

    @chillichelli
    chillichelli committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    456c15b View commit details
    Browse the repository at this point in the history

  5. refactor(packages/ui): search component

    @chillichelli
    chillichelli committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    7bad9c1 View commit details
    Browse the repository at this point in the history

  6. fix(apps/earn): last listbox component

    @chillichelli
    chillichelli committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    08c88fd View commit details
    Browse the repository at this point in the history

  7. fix(packages/ui): add index file

    @chillichelli
    chillichelli committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    86c13ce View commit details
    Browse the repository at this point in the history

  8. fix(packages/ui): add self center

    @chillichelli
    chillichelli committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    5fe730a View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. fix(packages/ui): deprecataed chip

    @chillichelli
    chillichelli committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    24e2924 View commit details
    Browse the repository at this point in the history

  2. fix(packages/ui): search input

    @chillichelli
    chillichelli committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    666303f View commit details
    Browse the repository at this point in the history

  3. fix(packages/ui): explainer muted text color

    @chillichelli
    chillichelli committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    9332571 View commit details
    Browse the repository at this point in the history

  4. fix(apps/earn): broken link

    @chillichelli
    chillichelli committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    f0bdbbd View commit details
    Browse the repository at this point in the history

  5. fix(apps/earn): align

    @chillichelli
    chillichelli committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    f31a6e2 View commit details
    Browse the repository at this point in the history

  6. fix(apps/earn): paper color on dark mode

    @chillichelli
    chillichelli committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    72af1f3 View commit details
    Browse the repository at this point in the history

  7. fix(apps/earn): make sure you can still run app on undefined network

    @chillichelli
    chillichelli committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    c0b5452 View commit details
    Browse the repository at this point in the history

  8. fix(apps/earn): css variables

    @chillichelli
    chillichelli committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    89e1f63 View commit details
    Browse the repository at this point in the history

  9. fix(packages/ui): remove typography and input

    @chillichelli
    chillichelli committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    180b0bf View commit details
    Browse the repository at this point in the history

  10. fix(packages/ui): remove future folder in ui library

    @chillichelli
    chillichelli committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    ae72351 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. Merge remote-tracking branch 'origin/feature/egn-326' into feature/eg… 

    …n-326
    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    7ca258e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/egn-326' into feature/egn-417 

    # Conflicts:
#	apps/_root/app/(landing)/stats/route.ts
#	apps/_root/app/partner/layout.tsx
#	apps/_root/app/partner/page.tsx
#	apps/_root/lib/swap/queryParamsSchema.ts
#	apps/_root/lib/swap/useClientTrade.ts
#	apps/_root/lib/swap/useCrossChainTrade/useCrossChainTrade.ts
#	apps/academy/pages/articles/index.tsx
#	apps/earn/components/AddPage/AddSectionConfirmModalConcentrated.tsx
#	apps/earn/components/AddPage/AddSectionReviewModalLegacy.tsx
#	apps/earn/components/AddSection/AddSectionReviewModalLegacy.tsx
#	apps/earn/components/AddSection/AddSectionTrident.tsx
#	apps/earn/components/ConcentratedLiquidityCollectButton.tsx
#	apps/earn/components/ConcentratedLiquidityRemoveWidget.tsx
#	apps/earn/components/ConcentratedLiquidityWidget.tsx
#	apps/earn/components/CreateSection/CreateSectionReviewModalTrident.tsx
#	apps/earn/components/LiquidityChartRangeInput/index.tsx
#	apps/earn/components/NewPositionSection/SelectNetworkWidget.tsx
#	apps/earn/components/NewPositionSection/SelectPricesWidget.tsx
#	apps/earn/components/PoolPage/MigrateTab.tsx
#	apps/earn/components/PoolSection/V3/PoolTransactionsV3/useTransactionsV3.ts
#	apps/earn/components/Pools.tsx
#	apps/earn/components/PoolsSection/Tables/PositionsTable/ConcentratedPositionsTable.tsx
#	apps/earn/components/RemoveSection/RemoveSectionLegacy.tsx
#	apps/earn/components/RemoveSection/RemoveSectionTrident.tsx
#	apps/earn/components/RemoveSection/RemoveSectionUnstake.tsx
#	apps/earn/lib/hooks/useTicks.ts
#	apps/earn/pages/add/index.tsx
#	apps/earn/pages/add/v2/[chainId]/index.tsx
#	apps/furo/components/stream/CreateForm/ExecuteSection.tsx
#	apps/furo/components/stream/CreateMultipleForm/ExecuteMultipleSection.tsx
#	apps/furo/components/stream/UpdateModal.tsx
#	apps/furo/components/vesting/CreateForm/CreateFormReviewModal.tsx
#	apps/furo/components/vesting/CreateMultipleForm/ExecuteMultipleSection.tsx
#	packages/ui/src/components/dialog/ConfirmationDialog.tsx
#	packages/wagmi/src/future/components/ConnectButton.tsx
#	packages/wagmi/src/future/systems/Checker/ApproveBentobox.tsx
#	packages/wagmi/src/future/systems/Checker/ApproveERC20.tsx
    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    40321a3 View commit details
    Browse the repository at this point in the history

  3. fix: import errors

    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    d41e41a View commit details
    Browse the repository at this point in the history

  4. fix(apps/swap): swap e2e tests

    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    dfc438a View commit details
    Browse the repository at this point in the history

  5. fix(apps/earn): earn e2e tests

    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    0b42171 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into feature/egn-417

    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    fb3dec7 View commit details
    Browse the repository at this point in the history

  7. fix(apps/furo): card overflow

    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    639581a View commit details
    Browse the repository at this point in the history

  8. fix(apps/furo): header overlap

    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    032570f View commit details
    Browse the repository at this point in the history

  9. fix(apps/furo): card height

    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    9e7af94 View commit details
    Browse the repository at this point in the history

  10. fix(apps/swap): remove gap-4

    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    6a63701 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into feature/egn-417 

    # Conflicts:
#	apps/_root/ui/swap/widget/Widget.tsx
    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    b7f0806 View commit details
    Browse the repository at this point in the history

  12. fix: v3 remove by using base url

    @matthewlilley
    matthewlilley committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    698a9bc View commit details
    Browse the repository at this point in the history

  13. Merge branch 'feature/egn-417' of https://github.com/sushiswap/sushiswap 

     into feature/egn-417
    @matthewlilley
    matthewlilley committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    801b127 View commit details
    Browse the repository at this point in the history

  14. Merge remote-tracking branch 'origin/feature/egn-417' into feature/eg… 

    …n-417
    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    6faca3e View commit details
    Browse the repository at this point in the history

  15. fix(apps/swap): test ids

    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    6dd221b View commit details
    Browse the repository at this point in the history

  16. fix(apps/earn): test ids

    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    c2d277b View commit details
    Browse the repository at this point in the history

  17. fix(apps/furo): furo e2e tests

    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    f71af8a View commit details
    Browse the repository at this point in the history

  18. fix(packages/ui): remove unused files

    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    8fa9bf6 View commit details
    Browse the repository at this point in the history

  19. fix(packages/wagmi): remove padding

    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    61b4d8a View commit details
    Browse the repository at this point in the history

  20. fix(packages/wagmi): search spacing

    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    024384c View commit details
    Browse the repository at this point in the history

  21. fix(packages/ui): add empty div

    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    4add2e4 View commit details
    Browse the repository at this point in the history

  22. fix(packages/ui): switch unchecked too dark

    @chillichelli
    chillichelli committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    9afe8d7 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Merge branch 'master' into feature/egn-417 

    # Conflicts:
#	apps/_root/ui/swap/widget/Widget.tsx
#	apps/earn/components/AddSection/AddSectionLegacy.tsx
#	apps/earn/components/AddSection/AddSectionStake.tsx
#	apps/earn/components/AddSection/AddSectionTrident.tsx
#	apps/earn/components/PoolsSection/Tables/SharedCells/PoolNameCell.tsx
#	packages/wagmi/src/future/systems/Checker/Amounts.tsx
    @chillichelli
    chillichelli committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    5ff38fe View commit details
    Browse the repository at this point in the history

  2. fix: type error

    @chillichelli
    chillichelli committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    2330b8c View commit details
    Browse the repository at this point in the history