Staging to Main #138
Merged
Staging to Main #138
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Test App Refactor | Logic separation
Increasing timeout for test app to avoid timeouts
#Conflict in : OffersScreen
This reverts commit d33eaab.
This reverts commit 082be35.
… timeout for test app to avoid timeouts" This reverts commit 5226471
Increasing timeout for test app to avoid timeouts (cherry picked from commit 5226471)
(cherry picked from commit d33eaab)
Share, clear logs and close button functionalities added Alert dialogues added for errors.
[MOB-22735] Logger functionality for Optimize Test App
Adding support for Json Arrays in Offer Content
Updating version to 3.2.3
Dev v3.2.3 to Staging
* Moving request logic to viewmodel from compose * Removing custom logs * Removing custom logs * Applying Spotless * Adding: MainScreen Preview Timeout Configuration in Settings Screen * Adding support for List type Json in Offer Content Increasing timeout for test app to avoid timeouts * Fixing UT * Applying Spotless * Revert "Applying Spotless" This reverts commit d33eaab. * Revert "Fixing UT" This reverts commit 082be35. * Revert "Adding support for List type Json in Offer Content Increasing timeout for test app to avoid timeouts" This reverts commit 5226471 * Update to reusable workflows and remove migrated files * Fix Edge is a published dependency * Update to 3.2.0 and add ci-lint * Update workflows to 3.3.0 and update lint rule to include all checks required by CI --------- Co-authored-by: sagar-sharma-adobe <sagsharma@adobe.com>
Share, clear logs and close button functionalities added Alert dialogues added for errors.
Dev to Staging and conflicts resolved
# Conflicts: # code/testapp/src/main/java/com/adobe/marketing/optimizeapp/OffersScreen.kt # code/testapp/src/main/java/com/adobe/marketing/optimizeapp/ui/compose/SettingsScreen.kt # code/testapp/src/main/java/com/adobe/marketing/optimizeapp/viewmodels/MainViewModel.kt
Resolving Merge conflicts with Main branch
Removing logs
sagar-sharma-adobe
approved these changes
Feb 6, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Related Issue
Motivation and Context
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist: