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

Merge/5.16.2 #3536

Merged
merged 18 commits into from
Oct 10, 2024
Merged

Merge/5.16.2 #3536

merged 18 commits into from
Oct 10, 2024

Commits on Oct 4, 2024

  1. AND-8534 ring flow

    @kozarezvlad
    kozarezvlad committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    683235d View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2024

  1. Merge pull request #3508 from tangem/release 

    Release to hotfix/5.16.2
    @Mama1emon
    Mama1emon authored Oct 6, 2024
    Configuration menu
    Copy the full SHA
    c0e0523 View commit details
    Browse the repository at this point in the history

  2. AND-8665 Total balance update 

    Signed-off-by: Mama1emon <[email protected]>
    @Mama1emon
    Mama1emon committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    6c659ff View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. AND-8667 Send info about ring to Express 

    Signed-off-by: Mama1emon <[email protected]>
    @Mama1emon
    Mama1emon committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    ce9d455 View commit details
    Browse the repository at this point in the history

  2. AND-8693 Update lokalise 

    Signed-off-by: Mama1emon <[email protected]>
    @Mama1emon
    Mama1emon committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    0912e65 View commit details
    Browse the repository at this point in the history

  3. AND-8684 Fixed pending transaction behavior. (#3512)

    @Sateetas
    Sateetas authored Oct 7, 2024
    Configuration menu
    Copy the full SHA
    0ed7aea View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. AND-8706 Define Ring product type using saved data (#3517) 

    * AND-8706 Define Ring product type using saved data

Signed-off-by: Mama1emon <[email protected]>

* AND-8706 Fix image loading

Signed-off-by: Mama1emon <[email protected]>

---------

Signed-off-by: Mama1emon <[email protected]>
    @Mama1emon
    Mama1emon authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    4c26f1e View commit details
    Browse the repository at this point in the history

  2. AND-8711 Express: refcode should be sent to all express endpoints 

    Signed-off-by: Mama1emon <[email protected]>
    @Mama1emon
    Mama1emon committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    4bf5ba9 View commit details
    Browse the repository at this point in the history

  3. AND-8704 Remove CardId for ring 

    Signed-off-by: Mama1emon <[email protected]>
    @Mama1emon
    Mama1emon committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    56abeff View commit details
    Browse the repository at this point in the history

  4. AND-8666, AND-8689 Ring Changelly baner 

    Signed-off-by: Mama1emon <[email protected]>
    @Mama1emon
    Mama1emon committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    0c6f7c3 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. AND-8707 Add a new param for [Basic] Transaction Sent 

    Signed-off-by: Mama1emon <[email protected]>
    @Mama1emon
    Mama1emon committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    9b4fe22 View commit details
    Browse the repository at this point in the history

  2. AND-8690 Delete InitBackup step 

    Signed-off-by: Mama1emon <[email protected]>
    @Mama1emon
    Mama1emon committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    c3a704b View commit details
    Browse the repository at this point in the history

  3. AND-8719 Fixed Ring's banner: there is only two lines for text

    @iMaks99 @Mama1emon
    iMaks99 authored and Mama1emon committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    afa1ed1 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3531 from tangem/hotfix/5.16.2 

    Hotfix/5.16.2
    @Mama1emon
    Mama1emon authored Oct 9, 2024
    Configuration menu
    Copy the full SHA
    2381f4d View commit details
    Browse the repository at this point in the history

  5. AND-8725 Update ring promo title 

    Signed-off-by: Mama1emon <[email protected]>
    @Mama1emon
    Mama1emon committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    c8b6ccd View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3534 from tangem/hotfix/5.16.2 

    AND-8725 Update ring promo title
    @Mama1emon
    Mama1emon authored Oct 9, 2024
    Configuration menu
    Copy the full SHA
    fd8575c View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Merge remote-tracking branch 'refs/remotes/origin/develop' into merge… 

    …/5.16.2

# Conflicts:
#	app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt
#	app/src/main/java/com/tangem/tap/TangemApplication.kt
#	app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt
#	app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
#	app/src/main/java/com/tangem/tap/domain/sdk/impl/DefaultTangemSdkManager.kt
#	app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt
#	app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
#	app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt
#	app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt
#	app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
#	app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt
#	app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
#	core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt
#	core/res/src/main/res/values-de/strings.xml
#	core/res/src/main/res/values-es/strings.xml
#	core/res/src/main/res/values-fr/strings.xml
#	core/res/src/main/res/values-ja/strings.xml
#	core/res/src/main/res/values-ru/strings.xml
#	core/res/src/main/res/values/strings.xml
#	domain/staking/src/main/java/com/tangem/domain/staking/InvalidatePendingTransactionsUseCase.kt
#	gradle/dependencies.toml
    @Mama1emon
    Mama1emon committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    d748c77 View commit details
    Browse the repository at this point in the history

  2. Fix detekt 

    Signed-off-by: Mama1emon <[email protected]>
    @Mama1emon
    Mama1emon committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    4c29943 View commit details
    Browse the repository at this point in the history