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

Feature/vip codes #681

Merged
merged 78 commits into from
Jul 15, 2024
Merged

Feature/vip codes #681

merged 78 commits into from
Jul 15, 2024

Commits on Dec 14, 2023

  1. batch transaction

    elvis committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    0629921 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2023

  1. batch transaction

    elvis committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    54bac6c View commit details
    Browse the repository at this point in the history

  2. fix quad ads filtering

    elvis committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    581e1ac View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2023

  1. btc batch

    elvis committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    3e2c6a0 View commit details
    Browse the repository at this point in the history

  2. btc batch

    elvis committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    354deec View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. btc batch

    elvis committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    3482c5a View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. add vip screen layout

    ismurzin committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    42dc560 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. update vip codes tab ui

    ismurzin committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    1865723 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. change api version to v2 

    fix bug linked to versionchanging
    elvis committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    5c6c002 View commit details
    Browse the repository at this point in the history

  2. try to fix github build problem

    elvis committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    ea6e17f View commit details
    Browse the repository at this point in the history

  3. try to fix github build problem

    elvis committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    c50157b View commit details
    Browse the repository at this point in the history

  4. Update InvestmentAccount.kt

    @kurtnebiev-elvis4
    kurtnebiev-elvis4 authored Feb 21, 2024
    Configuration menu
    Copy the full SHA
    6511ee0 View commit details
    Browse the repository at this point in the history

  5. try to fix github build problem

    elvis committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    17b1ace View commit details
    Browse the repository at this point in the history

  6. try to fix github build problem

    elvis committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    9a1bac2 View commit details
    Browse the repository at this point in the history

  7. try to fix github build problem

    elvis committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    0ddf8a1 View commit details
    Browse the repository at this point in the history

  8. try to fix github build problem

    elvis committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    4dab0a2 View commit details
    Browse the repository at this point in the history

  9. fix ci building

    elvis committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    cd9708a View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. fix ci building (#2171)

    @AlexanderPavlenko
    AlexanderPavlenko authored Feb 22, 2024
    Configuration menu
    Copy the full SHA
    a5a6501 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/batch

    @kurtnebiev-elvis4
    kurtnebiev-elvis4 authored Feb 22, 2024
    Configuration menu
    Copy the full SHA
    f2111a9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feature/changelly-update

    @kurtnebiev-elvis4
    kurtnebiev-elvis4 authored Feb 22, 2024
    Configuration menu
    Copy the full SHA
    ff351cf View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into bug/quads-ads

    @kurtnebiev-elvis4
    kurtnebiev-elvis4 authored Feb 22, 2024
    Configuration menu
    Copy the full SHA
    64276e9 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. add vip codes mock logic

    ismurzin committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    7afdbfb View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. add api signing

    ismurzin committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    a8fcec8 View commit details
    Browse the repository at this point in the history

  2. changelly expected amount calculation

    elvis committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    36efe7a View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/feature/changelly-update' into f… 

    …eature/changelly-update
    elvis committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    fd69b8b View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. fix text on help page

    elvis committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    d875e7a View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. add activate and check vip status

    ismurzin committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    177baac View commit details
    Browse the repository at this point in the history

  2. cleanup code + migrate changelly interceptor to kotlin

    ismurzin committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    f88d0d7 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. migrate to changelly2

    ismurzin committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    035bd50 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2024

  1. #rm5834 open url in app context

    elvis committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    1dd23b4 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. add vip screen ui improvements

    ismurzin committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    68d2ed8 View commit details
    Browse the repository at this point in the history

  2. fix quad ads filtering (#2168)

    @AlexanderPavlenko
    AlexanderPavlenko authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    b5436f8 View commit details
    Browse the repository at this point in the history

  3. #rm5832 Feature/batch (#2169)

    @AlexanderPavlenko
    AlexanderPavlenko authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    24735ba View commit details
    Browse the repository at this point in the history

  4. #rm5833 change changelly api version to v2 (#2170) 

    fix bug linked to versionchanging
    @AlexanderPavlenko
    AlexanderPavlenko authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    3d2144d View commit details
    Browse the repository at this point in the history

  5. #rm5834 open url in app context (#2173)

    @AlexanderPavlenko
    AlexanderPavlenko authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    1be2314 View commit details
    Browse the repository at this point in the history

  6. #rm5835 fix text on help page (#2172)

    @AlexanderPavlenko
    AlexanderPavlenko authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    fa928a3 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. add mycelium host

    ismurzin committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    79f6542 View commit details
    Browse the repository at this point in the history

  2. remove unneccessary files

    ismurzin committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    c533443 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. replace master seed with account seed

    ismurzin committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    d515f28 View commit details
    Browse the repository at this point in the history

  2. update gala contract to v2

    elvis committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    40b3bd5 View commit details
    Browse the repository at this point in the history

  3. update gala contract to v2 (#2175)

    @AlexanderPavlenko
    AlexanderPavlenko authored Mar 18, 2024
    Configuration menu
    Copy the full SHA
    99454dd View commit details
    Browse the repository at this point in the history

  4. add cake erc20 token

    elvis committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    46c001e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into feature/GALA-v2

    @kurtnebiev-elvis4
    kurtnebiev-elvis4 authored Mar 18, 2024
    Configuration menu
    Copy the full SHA
    d96b39a View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. redesign vip codes

    ismurzin committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    39a0eb5 View commit details
    Browse the repository at this point in the history

  2. fix vip fragment text clip

    ismurzin committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    58a4d74 View commit details
    Browse the repository at this point in the history

  3. fix text

    elvis committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    9d98845 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/master' into feature/vip_codes2 

    # Conflicts:
#	mbw/src/main/java/com/mycelium/wallet/external/changelly/ChangellyAPIService.kt
#	mbw/src/main/java/com/mycelium/wallet/external/changelly/ChangellyActivity.java
#	mbw/src/main/java/com/mycelium/wallet/external/changelly/bch/ConfirmExchangeFragment.java
#	mbw/src/main/java/com/mycelium/wallet/external/changelly/bch/ExchangeFragment.java
#	mbw/src/main/java/com/mycelium/wallet/external/changelly/model/ChangellyResponse.kt
#	mbw/src/main/java/com/mycelium/wallet/external/changelly/model/FixRateForAmount.kt
#	mbw/src/main/java/com/mycelium/wallet/external/changelly2/ExchangeFragment.kt
#	mbw/src/main/java/com/mycelium/wallet/external/changelly2/remote/Changelly2Repository.kt
#	mbw/src/main/res/values/strings.xml
    elvis committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    32070f0 View commit details
    Browse the repository at this point in the history

  5. fix merge

    elvis committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    1e28351 View commit details
    Browse the repository at this point in the history

  6. add cake erc20 token (#2176)

    @AlexanderPavlenko
    AlexanderPavlenko authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    4fb1f3b View commit details
    Browse the repository at this point in the history

  7. remove text on the vip page

    elvis committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    383860b View commit details
    Browse the repository at this point in the history

  8. up size icon

    elvis committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    78dc2f9 View commit details
    Browse the repository at this point in the history

  9. Feature/vip codes2 (#2178)

    @AlexanderPavlenko
    AlexanderPavlenko authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    9284eb4 View commit details
    Browse the repository at this point in the history

  10. v3.17.0

    @AlexanderPavlenko
    AlexanderPavlenko committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    d0791e8 View commit details
    Browse the repository at this point in the history

  11. v3.17.0 (#2179)

    @AlexanderPavlenko
    AlexanderPavlenko authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    9ca11b0 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2024

  1. fix text in ru localization

    elvis committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    20307a7 View commit details
    Browse the repository at this point in the history

  2. fix cursor bg

    elvis committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    74c2a42 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. fix amountTo in dialog

    elvis committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    ef2994b View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. fix cursor bg (#2181)

    @AlexanderPavlenko
    AlexanderPavlenko authored Apr 2, 2024
    Configuration menu
    Copy the full SHA
    6f158d6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into bugfix/changelly

    @kurtnebiev-elvis4
    kurtnebiev-elvis4 authored Apr 2, 2024
    Configuration menu
    Copy the full SHA
    672e617 View commit details
    Browse the repository at this point in the history

  3. fix text in ru localization (#2180)

    @AlexanderPavlenko
    AlexanderPavlenko authored Apr 2, 2024
    Configuration menu
    Copy the full SHA
    b561425 View commit details
    Browse the repository at this point in the history

  4. fix amountTo in dialog (#2182)

    @AlexanderPavlenko
    AlexanderPavlenko authored Apr 2, 2024
    Configuration menu
    Copy the full SHA
    9f2f767 View commit details
    Browse the repository at this point in the history

  5. fixed gettransaction api

    elvis committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    a05d215 View commit details
    Browse the repository at this point in the history

  6. fixed gettransaction api

    elvis committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    9f4c4e1 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. fixed gettransaction api (#2184)

    @AlexanderPavlenko
    AlexanderPavlenko authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    3eb0e23 View commit details
    Browse the repository at this point in the history

  2. fix landscape vip codes screen

    ismurzin committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    1c6cd33 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'changelly-vip/feature/vip_codes' into f… 

    …eature/vip_codes2

# Conflicts:
#	mbw/src/main/res/layout/fragment_vip.xml
    elvis committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    4cd8daa View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Feature/vip codes2 (#2185)

    @AlexanderPavlenko
    AlexanderPavlenko authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    1c1de31 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. fixed fiat save for batch tx

    elvis committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    906e107 View commit details
    Browse the repository at this point in the history

  2. fixed in call api in main thread

    elvis committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    95e4e92 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. fix user repository injection + infinity loading

    ismurzin committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    0f0e9ce View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. add vip caching

    ismurzin committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    2e83082 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. fix broken exchange logic + add network fee to calculation

    ismurzin committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    c03b4c1 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. separate changelly and viper + add local status storing

    ismurzin committed May 14, 2024
    Configuration menu
    Copy the full SHA
    6c94cb3 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. separate viper calls

    ismurzin committed May 17, 2024
    Configuration menu
    Copy the full SHA
    c4dedcf View commit details
    Browse the repository at this point in the history

  2. fix viper rates issue

    ismurzin committed May 17, 2024
    Configuration menu
    Copy the full SHA
    5e6d2a4 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. add vip dependency to getFixRateFrorAmount + remove double request fr… 

    …om createFixTransaction
    ismurzin committed May 31, 2024
    Configuration menu
    Copy the full SHA
    1d16817 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. fix viper exchange history

    ismurzin committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    7f15585 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. remove unnecessary networkFee subtraction

    ismurzin committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    4447b2b View commit details
    Browse the repository at this point in the history