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

Swaps: Create a new swap #11124

Merged
merged 9 commits into from
May 21, 2021
Merged

Swaps: Create a new swap #11124

merged 9 commits into from
May 21, 2021

Commits on May 18, 2021

  1. Show the Close button when a swap is completed

    @dan437
    dan437 committed May 18, 2021
    Configuration menu
    Copy the full SHA
    78f740b View commit details
    Browse the repository at this point in the history

  2. Remove swapViewToken from translations

    @dan437
    dan437 committed May 18, 2021
    Configuration menu
    Copy the full SHA
    b10c44f View commit details
    Browse the repository at this point in the history

  3. Add a link to make another swap

    @dan437
    dan437 committed May 18, 2021
    Configuration menu
    Copy the full SHA
    0fd8574 View commit details
    Browse the repository at this point in the history

  4. “Make another swap” -> “Create a new swap”

    @dan437
    dan437 committed May 18, 2021
    Configuration menu
    Copy the full SHA
    94b9927 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2021

  1. Merge branch 'develop' of https://github.com/MetaMask/metamask-extension 

     into swaps-make-another-swap

# Conflicts:
#	ui/pages/swaps/awaiting-swap/awaiting-swap.js
    @dan437
    dan437 committed May 19, 2021
    Configuration menu
    Copy the full SHA
    d02b12f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/MetaMask/metamask-extension 

     into swaps-make-another-swap
    @dan437
    dan437 committed May 19, 2021
    Configuration menu
    Copy the full SHA
    9e81dba View commit details
    Browse the repository at this point in the history

Commits on May 20, 2021

  1. Merge branch 'develop' of https://github.com/MetaMask/metamask-extension 

     into swaps-make-another-swap
    @dan437
    dan437 committed May 20, 2021
    Configuration menu
    Copy the full SHA
    ce3e5c5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/MetaMask/metamask-extension 

     into swaps-make-another-swap
    @dan437
    dan437 committed May 20, 2021
    Configuration menu
    Copy the full SHA
    f3f56a5 View commit details
    Browse the repository at this point in the history

  3. Revert back redirection to token’s page Activity (instead of main pag… 

    …e Activity)
    @dan437
    dan437 committed May 20, 2021
    Configuration menu
    Copy the full SHA
    66b4c5f View commit details
    Browse the repository at this point in the history