SGP: add overlay to whey, fix image in season pass set 2, disable reward btn, fix member ui & flow

xml/page_board.xml

@@ -833,7 +833,7 @@
 		Var TextPriceMenuY = 266
 		Var TextPriceMenuBlendX = 180
 		Var TextPriceMenuHotX = 48
-		Var ShowButtonClick2 = "Enable"
+		Var ShowButtonClick2 = "Invisible"
 		Var ButtontoTopupMenu = "Invisible"
 
 		Var PriceUnitText = "Price in SGD"
@@ -1111,11 +1111,6 @@
 	DEBUGVAR SettingDisableTaobinCredit
 	If SettingDisableTaobinCredit = "true" Then
 		Var ShowButtonClick2 = "Invisible"
-		If CountryName = "Singapore" Then
-			If SELLONLINE = 1 Then
-				Var ShowButtonClick2 = "Enable"
-			EndIf
-		EndIf
 	EndIf
 	DEBUGVAR ShowButtonClick2
 
@@ -1396,13 +1391,6 @@
 	;SAVELOG ShowButtonClickFull
 
 	If TaobinOnlineX = "true" Then
-	
-		If CountDownShowButton < 33 Then
-			If CountryName = "Singapore" Then
-				Var ShowButtonClick2 = "Invisible"
-				Refresh
-			EndIf
-		EndIf
 
 		If CountDownShowButton = 31 Then
 			Var ShowButtonClickFull = "Enable"
@@ -1413,9 +1401,6 @@
 		If CountDownShowButton = 3 Then
 			
 			Var ShowButtonClick = "Enable"
-			If CountryName = "Singapore" Then
-				Var ShowButtonClick2 = "Enable"
-			EndIf
 			Var ShowButtonClickFull = "Invisible"	
 			Refresh
 		EndIf

xml/page_payment_cash-SGP.xml

@@ -2461,32 +2461,6 @@ EndIf
 <Value> ShowNetworkProblemText </Value>
 </Text>
 
-<Button>
-<X> 0 </X>
-<Y> 1870 </Y>
-<State> SGPSimMode </State>
-<Color> "0xFFBF00" </Color>
-<Width> 1080 </Width>
-<Height> 60 </Height>
-<EventClick>
-	DEBUGVAR SGPSimMode
-	MakeDrinkV1  SelectDrink SelectSugarID
-	Open "ROOT/taobin_project/xml/page_thankyou.xml"
-</EventClick>
-</Button>
-
-<Text>
-<X> 5 </X>
-<Y> 1880 </Y>
-<State> SGPSimMode </State>
-<Size> 24 </Size>
-<Align> Center </Align>
-<Width> 1080 </Width>
-<Font> RobotoRegular </Font>
-<Color> 0xFFFFFF </Color>
-<Value> "Test Bypass Payment" </Value>
-</Text>
-
 
 <EventUnitTest1>