new keys

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

@@ -133,7 +133,6 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
 
             Intent intent = new Intent(CouponInfoActivity.this, ShopsActivity.class);
             intent.putExtra("couponset", (Serializable) mCouponset);
-            intent.putExtra("merchant", (Serializable) mMerchant);
             startActivity(intent);
             return;
         }

@@ -44,6 +44,7 @@ import ly.warp.sdk.io.models.Couponset;
 import ly.warp.sdk.io.models.Merchant;
 import ly.warp.sdk.io.models.MerchantList;
 import ly.warp.sdk.io.request.WarplyMerchantsRequest;
+import ly.warp.sdk.utils.WarplyManagerHelper;
 import ly.warp.sdk.utils.constants.WarpConstants;
 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
 import ly.warp.sdk.utils.managers.WarplyManager;
@@ -82,7 +83,12 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
         setContentView(R.layout.activity_shops);
 
         mCouponset = (Couponset) getIntent().getSerializableExtra("couponset");
-        mMerchant = (Merchant) getIntent().getSerializableExtra("merchant");
+        for (Merchant merchant : WarplyManagerHelper.getMerchantList()) {
+            if (merchant.getUuid().equals(mCouponset.getMerchantUuid())) {
+                mMerchant = merchant;
+                break;
+            }
+        }
 
         mIvBack = findViewById(R.id.iv_shops_back);
         mMapView = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.mv_shops);