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

PWN-8895, PWN-8776 - striga. payment api #1878

Merged
merged 13 commits into from
Jun 28, 2023
Merged

PWN-8895, PWN-8776 - striga. payment api #1878

merged 13 commits into from
Jun 28, 2023

Commits on Jun 26, 2023

  1. PWN-8895, PWN-8776 - striga. payment api

    @eduardmaximovich
    eduardmaximovich committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    137d188 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github_p2p:p2p-org/key-app-android into fea… 

    …ture/PWN-8895-striga-payment-api
    @eduardmaximovich
    eduardmaximovich committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    465a39c View commit details
    Browse the repository at this point in the history

  3. PWN-8895, PWN-8776 - removed class doc

    @eduardmaximovich
    eduardmaximovich committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    114ba5f View commit details
    Browse the repository at this point in the history

  4. PWN-8895, PWN-8776 - comment fix

    @eduardmaximovich
    eduardmaximovich committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    e96e43e View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. PWN-8904 - Striga API. get_user_wallets (#1883)

    @gslevinkov
    gslevinkov authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    44a66ec View commit details
    Browse the repository at this point in the history

  2. PWN-8895 - namings and improvements

    @eduardmaximovich
    eduardmaximovich committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    671888f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of github_p2p:p2p-org/key-app-android into fea… 

    …ture/PWN-8895-striga-payment-api
    @eduardmaximovich
    eduardmaximovich committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    2cd226b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/PWN-8895-striga-payment-api' of github_p2p:p2p-… 

    …org/key-app-android into feature/PWN-8895-striga-payment-api

� Conflicts:
�	app/src/main/java/org/p2p/wallet/striga/wallet/api/StrigaWalletApi.kt
�	app/src/main/java/org/p2p/wallet/striga/wallet/repository/StrigaWalletRemoteRepository.kt
�	app/src/main/java/org/p2p/wallet/striga/wallet/repository/StrigaWalletRepository.kt
�	app/src/test/java/org/p2p/wallet/striga/wallet/repository/StrigaWalletRepositoryEnrichAccountTest.kt
    @eduardmaximovich
    eduardmaximovich committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    01bc40e View commit details
    Browse the repository at this point in the history

  5. PWN-8895 - merge

    @eduardmaximovich
    eduardmaximovich committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    c93e741 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' of github_p2p:p2p-org/key-app-android into fea… 

    …ture/PWN-8895-striga-payment-api
    @eduardmaximovich
    eduardmaximovich committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    fc96602 View commit details
    Browse the repository at this point in the history

  7. PWN-8895 - amount -> amountInUnits

    @eduardmaximovich
    eduardmaximovich committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    018ed0d View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. PWN-8904 - Striga API. get_estimated_fees (#1884) 

    * PWN-8904 - Striga API. get_estimated_fees

* PWN-8904 - comment fixes

* PWN-8904 - change base url

* PWN-8904 - add StrigaUserWalletsMapper to koin

* PWN-8904 - add ending slashes to new striga urls

---------

Co-authored-by: Eduard Maximovich <[email protected]>
    @gslevinkov @eduardmaximovich
    gslevinkov and eduardmaximovich authored Jun 28, 2023
    Configuration menu
    Copy the full SHA
    4310a6c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github_p2p:p2p-org/key-app-android into fea… 

    …ture/PWN-8895-striga-payment-api
    @eduardmaximovich
    eduardmaximovich committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    9d14529 View commit details
    Browse the repository at this point in the history