merge redesign fixes

@@ -8,6 +8,7 @@
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$PROJECT_DIR$/../../../../../../gradle-6.6.1" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

@@ -184,7 +184,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 ext {
     PUBLISH_GROUP_ID = 'ly.warp'
-    PUBLISH_VERSION = '4.5.4.6rc56'
+    PUBLISH_VERSION = '4.5.4.6rc58'
     PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
 }
 

@@ -101,6 +101,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
     private ExpandableLayout mElGifts;
     private boolean mIsStayCollapsed = true;
     private CardView mClExp;
+    private boolean mDfyPressed = false;
 
     // ===========================================================
     // Methods for/from SuperClass/Interfaces
@@ -204,6 +205,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
                 mSecondsHandler.postDelayed(this, 1000);
             }
         });
+        mDfyPressed = false;
     }
 
     @Override
@@ -290,6 +292,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
             return;
         }
         if (view.getId() == R.id.cl_mygifts) {
+            if (!mDfyPressed) {
                 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyWalletScreen")
                         .concat(":")
                         .concat("ActiveDealsBanner"));
@@ -297,6 +300,8 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
                 ActiveDFYCouponEventModel activeCouponEventModel = new ActiveDFYCouponEventModel();
                 activeCouponEventModel.setPressed(true);
                 EventBus.getDefault().post(new WarplyEventBusManager(activeCouponEventModel));
+                mDfyPressed = true;
+            }
         }
     }
 
@@ -589,9 +594,9 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
 
                 mScActiveCodes.setVisibility(View.VISIBLE);
                 mLlActiveCodesView.setVisibility(View.VISIBLE);
-                mLlDeals.setVisibility(View.VISIBLE);
             }
 //            mTvActiveCode.setText(codes);
+            mLlDeals.setVisibility(View.VISIBLE);
         } else {
             mLlDeals.setVisibility(View.GONE);
         }

@@ -8,6 +8,7 @@ import android.net.Uri;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDelegate;
 
 import io.github.inflationx.calligraphy3.CalligraphyConfig;
 import io.github.inflationx.calligraphy3.CalligraphyInterceptor;
@@ -22,6 +23,7 @@ public class WarplyProvider extends ContentProvider {
 
     @Override
     public boolean onCreate() {
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
         ViewPump.init(ViewPump.builder()
                 .addInterceptor(new CalligraphyInterceptor(
                         new CalligraphyConfig.Builder()

 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="AppCompatAlertDialogStyle" parent="Theme.AppCompat.Light.Dialog.Alert">
         <item name="android:layout_gravity">right</item>
@@ -27,16 +27,18 @@
         <item name="android:windowMinWidthMinor">90%</item>
     </style>
 
-    <style name="SDKAppTheme" parent="Theme.AppCompat.Light">
+    <style name="SDKAppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <item name="android:statusBarColor">@android:color/white</item>
         <item name="android:windowLightStatusBar">true</item>
+        <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
     </style>
 
-    <style name="GFYAppTheme" parent="Theme.AppCompat.Light">
+    <style name="GFYAppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <item name="android:statusBarColor">@android:color/white</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
     </style>
 
     <style name="ShapeAppearanceProfileImage" parent="">