Fixing SubmitButton colours. Possibly from a bad rebase

Automattic · Mar 6, 2020 · 30a52b9 · 30a52b9
1 parent 3c15158
commit 30a52b9
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/extensions/shared/submit-button.js b/extensions/shared/submit-button.js
@@ -116,15 +116,17 @@ class SubmitButton extends Component {
 	render() {
 		const {
 			attributes,
+			backgroundButtonColor,
+			textButtonColor,
 			fallbackBackgroundColor,
 			fallbackTextColor,
 			setAttributes,
 			setBackgroundButtonColor,
 			setTextButtonColor,
 		} = this.props;
 
-		const backgroundColor = attributes.customBackgroundButtonColor || fallbackBackgroundColor;
-		const color = attributes.customTextButtonColor || fallbackTextColor;
+		const backgroundColor = backgroundButtonColor.color || fallbackBackgroundColor;
+		const color = textButtonColor.color || fallbackTextColor;
 		const buttonStyle = { border: 'none', backgroundColor, color };
 		const buttonClasses = getButtonClasses(
 			pick( this.attributes, [ 'backgroundButtonColor', 'textButtonColor' ] )
@@ -160,6 +162,7 @@ class SubmitButton extends Component {
 						] }
 					/>
 					<ContrastChecker
+						isLargeText={ false }
 						textColor={ color }
 						backgroundColor={ backgroundColor }
 						fallbackBackgroundColor