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

feat: token approval #211

Merged
merged 34 commits into from
Aug 9, 2023
Merged

feat: token approval #211

merged 34 commits into from
Aug 9, 2023

Commits on Jul 4, 2023

  1. feat: balance query

    @nejcm
    nejcm committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    5b06069 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. refactor: swap component

    @nejcm
    nejcm committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    a80b64e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'staging' into 111-fetch-wallet-token-balances-for-amber… 

    …-swap
    @nejcm
    nejcm committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    7665c23 View commit details
    Browse the repository at this point in the history

  3. feat: token balance hook

    @nejcm
    nejcm committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    299fe64 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2023

  1. refactor: ui

    @nejcm
    nejcm committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    26226ca View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. fix: balance

    @nejcm
    nejcm committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    b3c24f3 View commit details
    Browse the repository at this point in the history

  2. fix: theme ui

    @nejcm
    nejcm committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    6294f9d View commit details
    Browse the repository at this point in the history

  3. fix: lint

    @nejcm
    nejcm committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    80e369e View commit details
    Browse the repository at this point in the history

  4. feat: WIP

    @nejcm
    nejcm committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    b4169ae View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. feat: contract

    @nejcm
    nejcm committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    c3eb58d View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. feat: token allowance

    @nejcm
    nejcm committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    a181809 View commit details
    Browse the repository at this point in the history

  2. feat: token approval

    @nejcm
    nejcm committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    8e0407e View commit details
    Browse the repository at this point in the history

  3. feat: token approval

    @nejcm
    nejcm committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    0066c23 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. feat: add and remove liquidity from swap pool

    @nejcm
    nejcm committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    cd4a8eb View commit details
    Browse the repository at this point in the history

  2. feat: add and remove liquidity from swap pool

    @nejcm
    nejcm committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    721fbe1 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. feat: backstop pools

    @nejcm
    nejcm committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    0e9a3ce View commit details
    Browse the repository at this point in the history

  2. Merge branch 'staging' into feat/token-approval 

    # Conflicts:
#	src/components/Asset/Price/index.tsx
#	src/components/Balance/index.tsx
#	src/components/Pools/Backstop/Modal/Deposit/Form/index.tsx
#	src/components/Pools/Backstop/Modal/Withdraw/Form/index.tsx
#	src/components/Pools/Backstop/index.tsx
#	src/components/Pools/Swap/AddLiquidity/index.tsx
#	src/components/Pools/Swap/Overview/index.tsx
#	src/components/Pools/Swap/WithdrawLiquidity/index.tsx
#	src/components/Pools/Swap/index.tsx
#	src/components/Skeleton/index.tsx
#	src/components/Swap/From/index.tsx
#	src/components/Swap/Progress/index.tsx
#	src/components/Swap/To/index.tsx
#	src/components/Swap/index.tsx
#	src/constants/cache.ts
#	src/contracts/NablaAddresses.ts
#	src/helpers/calc.ts
#	src/hooks/useBalance.ts
#	src/hooks/useContract.ts
    @nejcm
    nejcm committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    ee1bb64 View commit details
    Browse the repository at this point in the history

  3. fix: lint issues

    @nejcm
    nejcm committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    a9a47fb View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2023

  1. feat: swap, progress update

    @nejcm
    nejcm committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    7aee261 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. feat: apps, apps provider

    @nejcm
    nejcm committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    ea6c3cd View commit details
    Browse the repository at this point in the history

  2. fix: imports

    @nejcm
    nejcm committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    59e4361 View commit details
    Browse the repository at this point in the history

  3. fix: backstop ui

    @nejcm
    nejcm committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    64ecb6a View commit details
    Browse the repository at this point in the history

  4. fix: balance

    @nejcm
    nejcm committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    57e6497 View commit details
    Browse the repository at this point in the history

  5. feat: added dev

    @nejcm
    nejcm committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    263d609 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. style: updated scroll-bar

    @nejcm
    nejcm committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    20e321c View commit details
    Browse the repository at this point in the history

  2. feat: tokens

    @nejcm
    nejcm committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    bd58d09 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. fix: add liquidity info

    @nejcm
    nejcm committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    870b574 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. feat: WIP

    @nejcm
    nejcm committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    e8361b2 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2023

  1. fix: contract write

    @nejcm
    nejcm committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    34fc486 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. fix: contract write

    @nejcm
    nejcm committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    297410e View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. refactor: shared hooks

    @nejcm
    nejcm committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    be7c8bd View commit details
    Browse the repository at this point in the history

  2. refactor: shared hooks

    @nejcm
    nejcm committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    0939b5c View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. refactor: updates

    @nejcm
    nejcm committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    66707be View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/staging' into feat/token-approval

    @nejcm
    nejcm committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    46a2958 View commit details
    Browse the repository at this point in the history