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(earn): Add Claiming Reward line item on enter amount screen #6169

Merged
merged 70 commits into from
Oct 21, 2024
Merged

feat(earn): Add Claiming Reward line item on enter amount screen #6169

merged 70 commits into from
Oct 21, 2024
+76 −4

Commits on Oct 2, 2024

  1. chore: replace EarnDepositMode with EarnEnterMode

    @MuckT
    MuckT committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    6f1d0ee View commit details
    Browse the repository at this point in the history

  2. feat(earn): support partial withdrawals

    @MuckT
    MuckT committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    06ce84e View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Merge branch 'main' into tomm/act-1386

    @MuckT
    MuckT authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    d7769d2 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Merge branch 'main' into tomm/act-1386

    @MuckT
    MuckT authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    f5a612b View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. feat(earn): support partial withdrawals for earn pools

    @MuckT
    MuckT committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    3feb5f8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into tomm/act-1386

    @MuckT
    MuckT authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    5821ff8 View commit details
    Browse the repository at this point in the history

  3. fix(earn): rename EarnDepositMode to EarnEnterMode

    @MuckT
    MuckT committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    dc155d2 View commit details
    Browse the repository at this point in the history

  4. fix(earn): rename EarnDepositMode to EarnEnterMode

    @MuckT
    MuckT committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    a33d30c View commit details
    Browse the repository at this point in the history

  5. fix: remove unused export

    @MuckT
    MuckT committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    4d01e46 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. fix(earn): amount TransactionWithdrawDetails display

    @MuckT
    MuckT committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    73c5067 View commit details
    Browse the repository at this point in the history

  2. test(earn): earn partial withdrawal flow

    @MuckT
    MuckT committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    364f551 View commit details
    Browse the repository at this point in the history

  3. chore: add feature gate for partial withdrawals

    @MuckT
    MuckT committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    292d739 View commit details
    Browse the repository at this point in the history

  4. test(earn): partial withdrawal feature gate and navigation

    @MuckT
    MuckT committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    87990f0 View commit details
    Browse the repository at this point in the history

  5. docs: remove stray todo

    @MuckT
    MuckT committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    6363e9f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into tomm/act-1386 

    # Conflicts:
#	src/earn/EarnDepositBottomSheet.tsx
    @MuckT
    MuckT committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    71b13b9 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into tomm/act-1386

    @MuckT
    MuckT authored Oct 9, 2024
    Configuration menu
    Copy the full SHA
    a58d40f View commit details
    Browse the repository at this point in the history

  8. Update test/values.ts 

    Co-authored-by: Finnian Jacobson-Schulte <[email protected]>
    @MuckT @finnian0826
    MuckT and finnian0826 authored Oct 9, 2024
    Configuration menu
    Copy the full SHA
    345b535 View commit details
    Browse the repository at this point in the history

  9. refactor(earn): combine deposit and withdrawal hooks

    @MuckT
    MuckT committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    5fb98c5 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. fix(earn): use correct token amounts

    @MuckT
    MuckT committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    96caa2e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into tomm/act-1386

    @MuckT
    MuckT authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    9e8dcbf View commit details
    Browse the repository at this point in the history

  3. fix(earn): disable continue when transaction is not possible

    @MuckT
    MuckT committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    584acfb View commit details
    Browse the repository at this point in the history

  4. style(earn): use transactionToken instead of isWithdrawal ternaries

    @MuckT
    MuckT committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    4196505 View commit details
    Browse the repository at this point in the history

  5. chore: PR feedback

    @MuckT
    MuckT committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    ebe3a2a View commit details
    Browse the repository at this point in the history

  6. style: naming

    @MuckT
    MuckT committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    1dbf295 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2024

  1. fix(earn): use withdraw token and adjust display

    @MuckT
    MuckT committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    ad16ffa View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Merge branch 'main' into tomm/act-1386

    @MuckT
    MuckT authored Oct 14, 2024
    Configuration menu
    Copy the full SHA
    7420841 View commit details
    Browse the repository at this point in the history

  2. fix: show correct withdrawal amounts

    @MuckT
    MuckT committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    f5fecc5 View commit details
    Browse the repository at this point in the history

  3. fix: use correct fiat value display

    @MuckT
    MuckT committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    3879b52 View commit details
    Browse the repository at this point in the history

  4. test(earn): show correct local amount

    @MuckT
    MuckT committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    9b29dfb View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. fix(earn): deposits should use input token

    @MuckT
    MuckT committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    9ed4dfc View commit details
    Browse the repository at this point in the history

  2. fix(earn): use deposit token amounts in token input

    @MuckT
    MuckT committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    7b20e2d View commit details
    Browse the repository at this point in the history

  3. style(earn): use transaction token balance instead of pool balance

    @MuckT
    MuckT committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    6ed3c09 View commit details
    Browse the repository at this point in the history

  4. test(earn): clean-up mock pool params

    @MuckT
    MuckT committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    ca51c7d View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into tomm/act-1386

    @MuckT
    MuckT authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    3150c45 View commit details
    Browse the repository at this point in the history

  6. Apply suggestions from code review 

    Co-authored-by: Jacob Waterman <[email protected]>
    @MuckT @jh2oman
    MuckT and jh2oman authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    4bd8d62 View commit details
    Browse the repository at this point in the history

  7. style(earn): rename inputToken to depositToken in useTokens

    @MuckT
    MuckT committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    1f1db1e View commit details
    Browse the repository at this point in the history

  8. fix(earn): set transaction token on token select for deposits

    @MuckT
    MuckT committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    819e297 View commit details
    Browse the repository at this point in the history

  9. fix(earn): display withdrawal text on fee bottom sheet

    @MuckT
    MuckT committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    9c6a05d View commit details
    Browse the repository at this point in the history

  10. chore: pr feedback

    @MuckT
    MuckT committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    1da7fac View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. style: create reusable const balanceInTransactionToken

    @MuckT
    MuckT committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    686a01c View commit details
    Browse the repository at this point in the history

  2. style: use input token directly

    @MuckT
    MuckT committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    2681ce6 View commit details
    Browse the repository at this point in the history

  3. fix(earn): use converted token amount in withdrawals

    @MuckT
    MuckT committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    24c47be View commit details
    Browse the repository at this point in the history

  4. fix(earn): convert withdrawal amount correctly usd for analytics

    @MuckT
    MuckT committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    d6a1616 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into tomm/act-1386

    @MuckT
    MuckT authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    6cef451 View commit details
    Browse the repository at this point in the history

  6. fix(earn): remove duplicate condition

    @MuckT
    MuckT committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    da91f3d View commit details
    Browse the repository at this point in the history

  7. fix(earn): naming

    @MuckT
    MuckT committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    f85bed4 View commit details
    Browse the repository at this point in the history

  8. docs: remove unnecessary comment

    @MuckT
    MuckT committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    c662e3b View commit details
    Browse the repository at this point in the history

  9. style(earn): simplify dropdownEnabled

    @MuckT
    MuckT committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    38853d8 View commit details
    Browse the repository at this point in the history

  10. fix(earn): use decimals from input token

    @MuckT
    MuckT committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    b989f05 View commit details
    Browse the repository at this point in the history

  11. style(earn): return single withdrawal and deposit token from useToken… 

    …s hook
    @MuckT
    MuckT committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    2fe5293 View commit details
    Browse the repository at this point in the history

  12. style(earn): PR pair feedback

    @MuckT
    MuckT committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    4af772d View commit details
    Browse the repository at this point in the history

  13. fix(earn): display correct amounts on input amount token toggle

    @MuckT
    MuckT committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    775a925 View commit details
    Browse the repository at this point in the history

  14. Revert "fix(earn): display correct amounts on input amount token toggle" 

    This reverts commit 775a925.
    @MuckT
    MuckT committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    176cb9d View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. fix(earn): add inputToken to dependency array

    @MuckT
    MuckT committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    2d87478 View commit details
    Browse the repository at this point in the history

  2. chore(earn): update analytics for withdrawals

    @MuckT
    MuckT committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    8ccfbfc View commit details
    Browse the repository at this point in the history

  3. fix: analytics build errors

    @MuckT
    MuckT committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    6924060 View commit details
    Browse the repository at this point in the history

  4. test(earn): withdrawals from pools with high price per share

    @MuckT
    MuckT committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    30c6ea9 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into tomm/act-1386

    @MuckT
    MuckT authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    ea9f94e View commit details
    Browse the repository at this point in the history

  6. feat(earn): Show Withdrawing and Claiming card when withdrawalInclude… 

    …sClaim is true
    @finnian0826
    finnian0826 committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    ddb06e3 View commit details
    Browse the repository at this point in the history

  7. feat(earn): Add Claiming Reward line item on enter amount screen

    @finnian0826
    finnian0826 committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    fb586fc View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. add unit test

    @finnian0826
    finnian0826 committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    e6b66b1 View commit details
    Browse the repository at this point in the history

  2. add crypto and test

    @finnian0826
    finnian0826 committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    735e6f8 View commit details
    Browse the repository at this point in the history

  3. cleanup

    @finnian0826
    finnian0826 committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    2c9ef5d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into finnian0826/act-1411-2

    @finnian0826
    finnian0826 authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    98a3fd8 View commit details
    Browse the repository at this point in the history

  5. prettier

    @finnian0826
    finnian0826 committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    b1759af View commit details
    Browse the repository at this point in the history

  6. fix

    @finnian0826
    finnian0826 committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    1c4ba05 View commit details
    Browse the repository at this point in the history

  7. fix wrapping

    @finnian0826
    finnian0826 committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    9c382f1 View commit details
    Browse the repository at this point in the history

  8. use useMemo

    @finnian0826
    finnian0826 committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    acbdd0f View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. feedback

    @finnian0826
    finnian0826 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    abff526 View commit details
    Browse the repository at this point in the history

  2. feedback

    @finnian0826
    finnian0826 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    68e6ade View commit details
    Browse the repository at this point in the history