RHide recommendation prop added

client/my-sites/plugins/marketplace/marketplace-domain-upsell/index.tsx

@@ -44,6 +44,7 @@ function DomainPickerContainer( { onDomainSelect, selectedDomain } ) {
 			analyticsFlowId={ MARKETPLACE_FLOW_ID }
 			onDomainSelect={ onDomainSelect }
 			currentDomain={ selectedDomain }
+			hideRecommendationLabel={ true }
 		/>
 	);
 }

packages/domain-picker/src/components/index.tsx

@@ -119,6 +119,9 @@ export interface Props {
 
 	/** Vendor string for domain suggestions */
 	vendor?: string;
+
+	/** Hides the recommendation label */
+	hideRecommendationLabel?: boolean;
 }
 
 const DomainPicker: FunctionComponent< Props > = ( {
@@ -144,6 +147,7 @@ const DomainPicker: FunctionComponent< Props > = ( {
 	orderSubDomainsLast = false,
 	onUseYourDomainClick,
 	vendor = getDomainSuggestionsVendor(),
+	hideRecommendationLabel = false,
 } ) => {
 	const { __ } = useI18n();
 	const label = __( 'Search for a domain', __i18n_text_domain__ );
@@ -400,7 +404,7 @@ const DomainPicker: FunctionComponent< Props > = ( {
 															}
 															hstsRequired={ suggestion.hsts_required }
 															isFree={ suggestion.is_free }
-															isRecommended={ false && isRecommended }
+															isRecommended={ hideRecommendationLabel ? false : isRecommended }
 															railcarId={
 																baseRailcarId ? `${ baseRailcarId }${ index }` : undefined
 															}

packages/shopping-cart/src/cart-functions.ts

@@ -226,8 +226,7 @@ export function addItemsToResponseCart(
 	responseCart: TempResponseCart,
 	products: RequestCartProduct[]
 ): TempResponseCart {
-	//FIXME: this should be removed before committing
-	if ( shouldProductsReplaceCart( products, responseCart ) && false ) {
+	if ( shouldProductsReplaceCart( products, responseCart ) ) {
 		debug( 'items should replace response cart', products );
 		return replaceAllItemsInResponseCart( responseCart, products );
 	}