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

Modals #560

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open

Modals #560

wants to merge 36 commits into from

Conversation

RanCohenn
Copy link
Contributor

Fixes #367

@cloudflare-workers-and-pages
Copy link

cloudflare-workers-and-pages bot commented Jul 13, 2022

Deploying with  Cloudflare Pages  Cloudflare Pages

Latest commit: e36fc58
Status: ✅  Deploy successful!
Preview URL: https://1e36ca7d.falafel.pages.dev
Branch Preview URL: https://feature-modals.falafel.pages.dev

View logs

@RanCohenn RanCohenn requested a review from zavelevsky July 24, 2022 15:00
@RanCohenn RanCohenn marked this pull request as ready for review July 24, 2022 15:41
Ran Cohen added 9 commits July 29, 2022 10:44
# Conflicts:
#	src/elements/earn/pools/TopPools.tsx
#	src/elements/earn/pools/poolsTable/PoolsTable.tsx
#	src/elements/earn/pools/poolsTable/PoolsTableCellActions.tsx
#	src/elements/earn/portfolio/v3/V3AvailableToStake.tsx
#	src/elements/earn/portfolio/v3/earningsTable/V3EarningTable.tsx
#	src/elements/modalApprove/modalApprove.tsx
#	src/elements/swapLimit/SwapLimit.tsx
#	src/modals/DepositV3Modal.tsx
#	src/modals/V3WithdrawModal.tsx
#	src/services/api/keeperDao.ts
# Conflicts:
#	src/App.tsx
#	src/components/modal/Modal.tsx
#	src/components/modalFullscreen/ModalFullscreen.tsx
#	src/components/searchableTokenList/SearchableTokenList.tsx
#	src/elements/earn/pools/poolsTable/PoolsTable.tsx
#	src/elements/earn/pools/poolsTable/PoolsTableCellActions.tsx
#	src/elements/earn/pools/poolsTable/v3/DepositDisabledModal.tsx
#	src/elements/earn/portfolio/liquidityProtection/protectedPositions/ProtectedPositionTableCellActions.tsx
#	src/elements/earn/portfolio/v3/V3AvailableToStake.tsx
#	src/elements/swapLimit/SwapLimit.tsx
#	src/modals/ApproveModal.tsx
#	src/modals/DepositFAQ.tsx
#	src/modals/DepositV3Modal.tsx
# Conflicts:
#	src/elements/earn/pools/poolsTable/PoolsTableCellActions.tsx
#	src/elements/earn/portfolio/v3/holdings/V3HoldingsItemStaked.tsx
#	src/elements/earn/portfolio/v3/holdings/V3HoldingsItemUnstaked.tsx
#	src/elements/earn/portfolio/v3/holdings/V3HoldingsItemWithdraw.tsx
#	src/modals/DepositV3Modal.tsx
#	src/modals/V3UnstakeModal.tsx
src/store/modals/modals.ts Outdated Show resolved Hide resolved
src/store/modals/modals.ts Outdated Show resolved Hide resolved
src/store/modals/modals.ts Outdated Show resolved Hide resolved
src/store/modals/modals.ts Show resolved Hide resolved
src/components/selectPool/SelectPool.tsx Outdated Show resolved Hide resolved
src/elements/earn/portfolio/v3/bonuses/useV3Bonuses.ts Outdated Show resolved Hide resolved
src/elements/swapLimit/SwapLimit.tsx Outdated Show resolved Hide resolved
src/pages/Vote.tsx Outdated Show resolved Hide resolved
src/modals/index.tsx Show resolved Hide resolved
zavelevsky
zavelevsky previously approved these changes Oct 13, 2022
@zavelevsky
Copy link
Collaborator

@RanCohenn code looks good - please resolve the conflicts and we'll do one final quick review

Ran Cohen added 2 commits October 19, 2022 15:51
# Conflicts:
#	src/components/tokenInputField/TokenInputField.tsx
#	src/elements/earn/pools/addLiquidity/single/AddLiquiditySingle.tsx
#	src/elements/earn/pools/poolsTable/PoolsTable.tsx
#	src/elements/earn/portfolio/v3/holdings/V3HoldingPage.tsx
#	src/elements/layoutHeader/LayoutHeader.tsx
#	src/elements/swapLimit/SwapLimit.tsx
#	src/elements/trade/TradeWidgetInput.tsx
#	src/modals/DepositV3Modal.tsx
#	src/modals/V3WithdrawModal.tsx
#	src/modals/VbntModal.tsx
@RanCohenn RanCohenn requested a review from zavelevsky October 25, 2022 14:01
Copy link
Collaborator

@zavelevsky zavelevsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

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.

Change how we use modals
2 participants