Merge branch 'main' into dina/remove-AdYouLike-code

Author: deedeeh

dotcom-rendering/src/components/ListenToArticle.importable.tsx

@@ -38,15 +38,14 @@ export const ListenToArticle = ({ articleId }: Props) => {
 				getListenToArticleClient().isPlaying(articleId),
 				getListenToArticleClient().getAudioDurationSeconds(articleId),
 			])
-				.then(() => {
-					// TODO pending design implementation and AB test set up.
-					// .then(({ isAvailable, isPlaying, audioDurationSeconds }) => {
-					// setAudioDuration(
-					// 	audioDurationSeconds ? audioDurationSeconds : undefined,
-					// );
-					// setShowButton(isAvailable && !isPlaying);
-					setAudioDurationSeconds(undefined);
-					setShowButton(false);
+				.then(([isAvailable, isPlaying, durationSeconds]) => {
+					setAudioDurationSeconds(
+						typeof durationSeconds === 'number' &&
+							durationSeconds > 0
+							? durationSeconds
+							: undefined,
+					);
+					setShowButton(isAvailable && !isPlaying);
 				})
 				.catch((error) => {
 					console.error(

dotcom-rendering/src/layouts/ImmersiveLayout.tsx

@@ -601,6 +601,9 @@ export const ImmersiveLayout = (props: WebProps | AppProps) => {
 													article.config.shortUrlId
 												}
 											/>
+											{!!article.affiliateLinksDisclaimer && (
+												<AffiliateDisclaimer />
+											)}
 										</Hide>
 									</>
 								) : (

dotcom-rendering/src/layouts/ShowcaseLayout.tsx

@@ -486,6 +486,9 @@ export const ShowcaseLayout = (props: WebProps | AppsProps) => {
 													article.config.shortUrlId
 												}
 											/>
+											{!!article.affiliateLinksDisclaimer && (
+												<AffiliateDisclaimer />
+											)}
 										</Hide>
 									</>
 								) : (

dotcom-rendering/src/layouts/StandardLayout.tsx

@@ -645,6 +645,9 @@ export const StandardLayout = (props: WebProps | AppProps) => {
 												}
 											/>
 										</div>
+										{!!article.affiliateLinksDisclaimer && (
+											<AffiliateDisclaimer />
+										)}
 									</Hide>
 								</>
 							) : (