@moneylion/react-native-offer-carousel 1.10.1 → 1.10.2

package/src/capabilities/offer-catalog/src/utils/stats/index.ts

@@ -1,5 +1,3 @@
-import { match } from "ts-pattern";
-
 import {
 	annualFee,
 	creditBureaus,
@@ -29,113 +27,46 @@ export const statsToElementPropsBuilder = (
 	offer: BaseOffer
 ): StatElementProps[] =>
 	stats
-		.map((stat) =>
-			match(stat)
-				.with(
-					{
-						format: "rangeCurrency",
-					},
-					fromRangeCurrencyStat(offer)
-				)
-				.with(
-					{
-						format: "rangeCurrencyUnabbreviated",
-					},
-					fromRangeCurrencyUnabbreviatedStat(offer)
-				)
-				.with(
-					{
-						format: "BureausStat",
-					},
-					creditBureaus(offer)
-				)
-				.with(
-					{
-						format: "rangePercent",
-					},
-					fromRangePercentStat(offer)
-				)
-				.with(
-					{
-						format: "rangeCurrencyOrBasis",
-					},
-					fromRangeCurrencyOrBasisStat(offer)
-				)
-				.with(
-					{
-						format: "common",
-					},
-					fromCommonStat(offer)
-				)
-				.with(
-					{
-						format: "rangeCurrencyByTime",
-					},
-					fromRangeCurrencyByTimeStat(offer)
-				)
-				.with(
-					{
-						format: "freeTrial",
-					},
-					fromFreeTrialStat(offer)
-				)
-				.with(
-					{
-						format: "monthlyOrAnnualCurrency",
-					},
-					fromMonthlyOrAnnualCurrencyStat(offer)
-				)
-				.with(
-					{
-						format: "boolean",
-					},
-					fromBooleanStat(offer)
-				)
-				.with({ format: "rangeMonths" }, fromRangeMonthsStat(offer))
-				.with(
-					{
-						format: "listStringWithAnd",
-					},
-					fromListStringWithAnd(offer)
-				)
-				.with(
-					{
-						format: "currency",
-					},
-					fromCurrencyStat(offer)
-				)
-				.with(
-					{
-						format: "percentage",
-					},
-					fromPercentageStat(offer)
-				)
-				.with(
-					{
-						format: "recommendedCredit",
-					},
-					recommendedCredit(offer)
-				)
-				.with(
-					{
-						format: "rewardsDisplay",
-					},
-					rewardsDisplay(offer)
-				)
-				.with(
-					{
-						format: "purchaseApr",
-					},
-					purchaseApr(offer)
-				)
-				.with(
-					{
-						format: "annualFee",
-					},
-					annualFee(offer)
-				)
-				.exhaustive()
-		)
+		.map((stat): StatElementProps => {
+			switch (stat.format) {
+				case "rangeCurrency":
+					return fromRangeCurrencyStat(offer)(stat);
+				case "rangeCurrencyUnabbreviated":
+					return fromRangeCurrencyUnabbreviatedStat(offer)(stat);
+				case "BureausStat":
+					return creditBureaus(offer)(stat);
+				case "rangePercent":
+					return fromRangePercentStat(offer)(stat);
+				case "rangeCurrencyOrBasis":
+					return fromRangeCurrencyOrBasisStat(offer)(stat);
+				case "common":
+					return fromCommonStat(offer)(stat);
+				case "rangeCurrencyByTime":
+					return fromRangeCurrencyByTimeStat(offer)(stat);
+				case "freeTrial":
+					return fromFreeTrialStat(offer)(stat);
+				case "monthlyOrAnnualCurrency":
+					return fromMonthlyOrAnnualCurrencyStat(offer)(stat);
+				case "boolean":
+					return fromBooleanStat(offer)(stat);
+				case "rangeMonths":
+					return fromRangeMonthsStat(offer)(stat);
+				case "listStringWithAnd":
+					return fromListStringWithAnd(offer)(stat);
+				case "currency":
+					return fromCurrencyStat(offer)(stat);
+				case "percentage":
+					return fromPercentageStat(offer)(stat);
+				case "recommendedCredit":
+					return recommendedCredit(offer)(stat);
+				case "rewardsDisplay":
+					return rewardsDisplay(offer)(stat);
+				case "purchaseApr":
+					return purchaseApr(offer)(stat);
+				case "annualFee":
+					return annualFee(offer)(stat);
+			}
+		})
 		.filter((stat) => stat !== null);
 
 export type { Stat, StatElementProps } from "./types";

package/src/capabilities/offers/pipeline/src/sources/ratetables/withDeviceSignals.ts

@@ -1,4 +1,3 @@
-import defu from "defu";
 import { get, mapValues } from "radash";
 import { createDerivedBrands } from "../../../../../configuration/src/brands/createDerivedBrands";
 import type { CnfContext } from "../../../../../core/src/system/cnfContext/CnfContext";
@@ -63,21 +62,31 @@ export function withDeviceSignals<
 		cnfEnvironment,
 	};
 
-	return defu(payload, {
-		/**
-		 * The leads API required device ID's be in the UUID format. If the string
-		 * we receive here is not in the expected format, we will create an error
-		 * passing it to the API.
-		 */
+	// all clientTag values must be arrays of strings
+	const toStringArray = (value: unknown): string[] =>
+		Array.isArray(value) ? value.map(String) : [String(value)];
+
+	const defaultClientTags = mapValues(clientTags, toStringArray);
+	const payloadClientTags = mapValues(
+		(payload.clientTags ?? {}) as Record<string, unknown>,
+		toStringArray
+	);
+
+	const mergedClientTags: Record<string, string[]> = { ...defaultClientTags };
+	for (const [key, value] of Object.entries(payloadClientTags)) {
+		const existing = mergedClientTags[key];
+		mergedClientTags[key] = existing ? [...value, ...existing] : value;
+	}
+
+	/**
+	 * The leads API requires device IDs be in the UUID format. If the string
+	 * we receive here is not in the expected format, we omit it so the API can
+	 * reject the request explicitly.
+	 */
+	return {
 		deviceId: isUUIDv4(maybeDeviceId) ? maybeDeviceId : undefined,
-		sessionInformation: {
-			ipAddress,
-			userAgent,
-		},
-		clientTags: mapValues(
-			clientTags,
-			// all values must be arrays of strings
-			(value) => (Array.isArray(value) ? value.map(String) : [String(value)])
-		),
-	});
+		sessionInformation: { ipAddress, userAgent },
+		...payload,
+		clientTags: mergedClientTags,
+	};
 }

package/src/capabilities/ui/elements/src/components/MarkdownText/components.tsx

@@ -7,12 +7,19 @@ import {
 	type RenderRules,
 } from "react-native-markdown-display";
 import Text, {
+	type TextProps,
 	type TextWeight,
 	type Variant,
 } from "../../../../../../components/Text";
 import type { ThemeColors } from "../../../../../../context/ThemeProvider";
 
-const BoldText = ({ children }: { children: React.ReactNode }) => {
+const BoldText = ({
+	children,
+	testID,
+}: {
+	children: React.ReactNode;
+	testID: TextProps["testID"];
+}) => {
 	const processChildren = (_children: React.ReactNode) => {
 		return React.Children.map(_children, (child) => {
 			if (typeof child === "string") {
@@ -20,7 +27,6 @@ const BoldText = ({ children }: { children: React.ReactNode }) => {
 			}
 
 			if (React.isValidElement(child) && child.type === Text) {
-				// Use a properly typed props object
 				const newProps = {
 					weight: "bold" as TextWeight,
 					style: child.props.style,
@@ -30,13 +36,21 @@ const BoldText = ({ children }: { children: React.ReactNode }) => {
 			return child;
 		});
 	};
-	return <>{processChildren(children)}</>;
+	return <Text testID={testID}>{processChildren(children)}</Text>;
 };
 
 // Helper to create text variants
 const createTextVariant =
-	(props: any) => (_node: ASTNode, children: React.ReactNode) => {
-		return <Text {...props}>{children}</Text>;
+	(props: TextProps) => (node: ASTNode, children: React.ReactNode) => {
+		return (
+			<Text
+				key={node.key || `${node.type}-${node.index}`}
+				{...props}
+				testID={`${node.type}-${node.index}`}
+			>
+				{children}
+			</Text>
+		);
 	};
 
 export const createMarkdownComponents = ({
@@ -73,6 +87,7 @@ export const createMarkdownComponents = ({
 					color={color}
 					numberOfLines={numberOfLines}
 					style={styles.bulletList}
+					testID={`${node.type}-${node.index}`}
 				>
 					{children}
 				</Text>
@@ -101,6 +116,7 @@ export const createMarkdownComponents = ({
 					color={color}
 					style={styles.linkText}
 					onPress={() => openUrl(node.attributes.href || "")}
+					testID={`${node.type}-${node.index}`}
 				>
 					{children}
 				</Text>
@@ -136,6 +152,7 @@ export const createMarkdownComponents = ({
 					variant={variant || "body-3"}
 					weight={weight}
 					color={color}
+					testID={`${node.type}-${node.index}`}
 				>
 					<Text variant={"body-1"}>{prefix}• </Text>
 					{children}
@@ -151,6 +168,7 @@ export const createMarkdownComponents = ({
 					variant={variant}
 					weight={weight}
 					color={color}
+					testID={`${node.type}-${node.index}`}
 				>
 					{children}
 				</Text>
@@ -158,7 +176,10 @@ export const createMarkdownComponents = ({
 		},
 
 		strong: (node, children) => (
-			<BoldText key={node.key || `${node.type}-${node.index}`}>
+			<BoldText
+				key={node.key || `${node.type}-${node.index}`}
+				testID={`${node.type}-${node.index}`}
+			>
 				{children}
 			</BoldText>
 		),

package/src/components/DynamicOffers/Render/Offer.tsx

@@ -1,7 +1,5 @@
 import React, { Fragment } from "react";
 
-import { match } from "ts-pattern";
-
 import type { ProductTypeBuilder } from "../../../builder";
 import {
 	DefaultOfferCard,
@@ -58,63 +56,66 @@ export const Offer = ({
 			return <></>;
 		}
 
-		return (
-			<Fragment key={`${offerIndex}-${offer.uuid}`}>
-				{match(builder)
-					.with({ layout: "defaultOfferCard" }, (layout) => (
+		const renderCard = () => {
+			if (!builder) {
+				if (!fallbackTemplate) return <></>;
+				const FallbackTemplate = fallbackTemplate;
+				return (
+					<FallbackTemplate
+						showCardBorder={showCardBorder}
+						offerIndex={offerIndex}
+						key={`${offerIndex}-${offer.uuid}`}
+						offer={offer}
+						showProductTypeLabel={showProductTypeLabel}
+						fullCardWidth={fullCardWidth}
+						isHorizontalScroll={isHorizontalScroll}
+					/>
+				);
+			}
+			switch (builder.layout) {
+				case "defaultOfferCard":
+					return (
 						<DefaultOfferCard
 							offerIndex={offerIndex}
 							key={`${offerIndex}-${offer.uuid}`}
 							offer={offer}
-							productTypeBuilder={layout}
+							productTypeBuilder={builder}
 							showCardBorder={showCardBorder}
 							showProductTypeLabel={showProductTypeLabel}
 							fullCardWidth={fullCardWidth}
 							isHorizontalScroll={isHorizontalScroll}
 						/>
-					))
-					.with({ layout: "creditCardOfferCard" }, (layout) => (
+					);
+				case "creditCardOfferCard":
+					return (
 						<CreditCardOfferCard
 							offerIndex={offerIndex}
 							key={`${offerIndex}-${offer.uuid}`}
 							offer={offer}
-							productTypeBuilder={layout}
+							productTypeBuilder={builder}
 							showCardBorder={showCardBorder}
 							showProductTypeLabel={showProductTypeLabel}
 							fullCardWidth={fullCardWidth}
 							isHorizontalScroll={isHorizontalScroll}
 						/>
-					))
-					.with({ layout: "headlineWithDescriptionCard" }, (layout) => (
+					);
+				case "headlineWithDescriptionCard":
+					return (
 						<HeadlineWithDescriptionCard
 							offerIndex={offerIndex}
 							key={`${offerIndex}-${offer.uuid}`}
 							offer={offer}
-							productTypeBuilder={layout}
+							productTypeBuilder={builder}
 							showCardBorder={showCardBorder}
 							showProductTypeLabel={showProductTypeLabel}
 							fullCardWidth={fullCardWidth}
 							isHorizontalScroll={isHorizontalScroll}
 						/>
-					))
-					.with(undefined, () => {
-						if (!fallbackTemplate) {
-							return <></>;
-						}
-						const FallbackTemplate = fallbackTemplate;
-						return (
-							<FallbackTemplate
-								showCardBorder={showCardBorder}
-								offerIndex={offerIndex}
-								key={`${offerIndex}-${offer.uuid}`}
-								offer={offer}
-								showProductTypeLabel={showProductTypeLabel}
-								fullCardWidth={fullCardWidth}
-								isHorizontalScroll={isHorizontalScroll}
-							/>
-						);
-					})
-					.exhaustive()}
-			</Fragment>
+					);
+			}
+		};
+
+		return (
+			<Fragment key={`${offerIndex}-${offer.uuid}`}>{renderCard()}</Fragment>
 		);
 	});

package/src/version.ts

@@ -1,2 +1,2 @@
 // Version is kept in sync with package.json via the sync-version script
-export const VERSION = "1.10.1";
+export const VERSION = "1.10.2";