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

5.1-rc4 #366

Merged
merged 20 commits into from
Sep 26, 2018
Merged

5.1-rc4 #366

merged 20 commits into from
Sep 26, 2018

Commits on Sep 25, 2018

  1. Shapeshift, return address should be verified with the coin out

    Jean-Baptiste Dominguez committed Sep 25, 2018
    Configuration menu
    Copy the full SHA
    b5cd9fa View commit details
    Browse the repository at this point in the history
  2. Merge branch 'wallet/task/546' of https://github.com/Bitcoin-com/Wallet

    … into wallet/task/546
    Jean-Baptiste Dominguez committed Sep 25, 2018
    Configuration menu
    Copy the full SHA
    fac91ff View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2018

  1. Configuration menu
    Copy the full SHA
    c657cc5 View commit details
    Browse the repository at this point in the history
  2. Fix for sending ShapeShift transaction to Shapeshift deposit address,…

    … rather than own wallet.
    brendoncoin committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    5b7eb57 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6bf0de9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a9b84f3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a426a5a View commit details
    Browse the repository at this point in the history
  6. Merge with origin.

    brendoncoin committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    eacf207 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #361 from Bitcoin-com/wallet/task/500

    500 - Now handles URIs beginning with 'bch:'.
    Jean-Baptiste Dominguez authored Sep 26, 2018
    Configuration menu
    Copy the full SHA
    b9a4e11 View commit details
    Browse the repository at this point in the history
  8. Solved conflicts

    Jean-Baptiste Dominguez committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    390f8b2 View commit details
    Browse the repository at this point in the history
  9. Set variables before enter in the screen. (Fix lost after merging)

    Jean-Baptiste Dominguez committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    4f7004f View commit details
    Browse the repository at this point in the history
  10. Merge branch 'wallet/sprint/21' into wallet/task/546

    Jean-Baptiste Dominguez authored Sep 26, 2018
    Configuration menu
    Copy the full SHA
    7a78eb1 View commit details
    Browse the repository at this point in the history
  11. Set thirdParty on the sendflow

    Jean-Baptiste Dominguez committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    621c60a View commit details
    Browse the repository at this point in the history
  12. Fix - init wallet list

    Jean-Baptiste Dominguez committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    8f67fde View commit details
    Browse the repository at this point in the history
  13. Merge pull request #363 from Bitcoin-com/wallet/task/546

    546 - Fixes lost after the merge + fix send flow
    Jean-Baptiste Dominguez authored Sep 26, 2018
    Configuration menu
    Copy the full SHA
    b0283ce View commit details
    Browse the repository at this point in the history
  14. Add a link to shapeshift in case it doesn't work

    Jean-Baptiste Dominguez committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    6c0cf4d View commit details
    Browse the repository at this point in the history
  15. Fix go back anyway

    Jean-Baptiste Dominguez committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    dd61e72 View commit details
    Browse the repository at this point in the history
  16. Merge pull request #364 from Bitcoin-com/wallet/task/546

    546 - Handle shapeshift error
    Jean-Baptiste Dominguez authored Sep 26, 2018
    Configuration menu
    Copy the full SHA
    464ed67 View commit details
    Browse the repository at this point in the history
  17. Merge pull request #365 from Bitcoin-com/wallet/sprint/21

    Wallet/sprint/21
    Jean-Baptiste Dominguez authored Sep 26, 2018
    Configuration menu
    Copy the full SHA
    77de49c View commit details
    Browse the repository at this point in the history
  18. Update appConfig.json

    rc4
    Jean-Baptiste Dominguez authored Sep 26, 2018
    Configuration menu
    Copy the full SHA
    e14ab5d View commit details
    Browse the repository at this point in the history