Corrected button text, reduced code duplication.

Financial-Times · Jan 4, 2023 · 0625ea5 · 0625ea5
1 parent 70f4dad
commit 0625ea5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 33 deletions.
diff --git a/components/x-gift-article/src/Buttons.jsx b/components/x-gift-article/src/Buttons.jsx
@@ -67,7 +67,7 @@ export default ({
 		return (
 			<div className="x-gift-article__buttons">
 				<button className="x-gift-article__button" type="button" onClick={actions.createEnterpriseUrl}>
-					Create enterprise link
+					Create Enterprise Link
 				</button>
 			</div>
 		)

diff --git a/components/x-gift-article/src/RadioButtonsSection.jsx b/components/x-gift-article/src/RadioButtonsSection.jsx
@@ -73,38 +73,31 @@ export default ({
 		</label>
 	)
 
-	if (isFreeArticle) {
-		if (enterpriseEnabled) {
-			return (
-				<div
-					className="o-forms-input o-forms-input--radio-round o-forms-field x-gift-article__radio_buttons"
-					role="group"
-					aria-labelledby="article-share-options"
-				>
-					<span className="x-gift-article--visually-hidden" id="article-share-options">
-						Article share options
-					</span>
-					{freeToReadField()}
-					{enterpriseField()}
-				</div>
-			)
-		}
-
-		return null
+	if (!isFreeArticle || enterpriseEnabled) {
+		return (
+			<div
+				className="o-forms-input o-forms-input--radio-round o-forms-field x-gift-article__radio_buttons"
+				role="group"
+				aria-labelledby="article-share-options"
+			>
+				<span className="x-gift-article--visually-hidden" id="article-share-options">
+					Article share options
+				</span>
+				{isFreeArticle ? (
+					<>
+						{freeToReadField()}
+						{enterpriseField()}
+					</>
+				) : (
+					<>
+						{enterpriseField()}
+						{giftField()}
+						{nonGiftField()}
+					</>
+				)}
+			</div>
+		)
 	}
 
-	return (
-		<div
-			className="o-forms-input o-forms-input--radio-round o-forms-field x-gift-article__radio_buttons"
-			role="group"
-			aria-labelledby="article-share-options"
-		>
-			<span className="x-gift-article--visually-hidden" id="article-share-options">
-				Article share options
-			</span>
-			{enterpriseField()}
-			{giftField()}
-			{nonGiftField()}
-		</div>
-	)
+	return null
 }