@thecb/components 4.1.15 → 4.1.16-beta.0

package/dist/index.cjs.js

@@ -6121,10 +6121,11 @@ var Text = function Text(_ref) {
       extraStyles = _ref$extraStyles === void 0 ? "" : _ref$extraStyles,
       hoverStyles = _ref.hoverStyles,
       onClick = _ref.onClick,
+      onKeyPress = _ref.onKeyPress,
       as = _ref.as,
       dataQa = _ref.dataQa,
       children = _ref.children,
-      rest = _objectWithoutProperties(_ref, ["themeValues", "weight", "color", "extraStyles", "hoverStyles", "onClick", "as", "dataQa", "children"]);
+      rest = _objectWithoutProperties(_ref, ["themeValues", "weight", "color", "extraStyles", "hoverStyles", "onClick", "onKeyPress", "as", "dataQa", "children"]);
 
   return /*#__PURE__*/React__default.createElement(TextSpan, _extends({
     fontSize: themeValues.fontSize,
@@ -6135,6 +6136,7 @@ var Text = function Text(_ref) {
     extraStyles: extraStyles,
     hoverStyles: hoverStyles,
     onClick: onClick,
+    onKeyPress: onKeyPress,
     "data-qa": dataQa
   }, rest), safeChildren(children, /*#__PURE__*/React__default.createElement("span", null)));
 };
@@ -18372,7 +18374,7 @@ function _templateObject8() {
 }
 
 function _templateObject7() {
-  var data = _taggedTemplateLiteral(["\n  display: inline-block;\n  width: 24px;\n  height: 24px;\n  border-radius: 2px;\n  transition: all 150ms;\n\n  ", " {\n    visibility: ", ";\n  }\n\n  ", ";\n"]);
+  var data = _taggedTemplateLiteral(["\n  display: inline-block;\n  margin-right: 16px;\n  width: 24px;\n  height: 24px;\n  border-radius: 2px;\n  transition: all 150ms;\n\n  ", " {\n    visibility: ", ";\n  }\n\n  ", ";\n"]);
 
   _templateObject7 = function _templateObject7() {
     return data;
@@ -18475,17 +18477,38 @@ var Checkbox = function Checkbox(_ref4) {
       onChange = _ref4$onChange === void 0 ? noop : _ref4$onChange,
       _ref4$disabled = _ref4.disabled,
       disabled = _ref4$disabled === void 0 ? false : _ref4$disabled,
-      _ref4$focused = _ref4.focused,
-      focused = _ref4$focused === void 0 ? false : _ref4$focused,
       themeValues = _ref4.themeValues,
       _ref4$hidden = _ref4.hidden,
       hidden = _ref4$hidden === void 0 ? false : _ref4$hidden,
       _ref4$error = _ref4.error,
       error = _ref4$error === void 0 ? false : _ref4$error;
+
+  var _useState = React.useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      focused = _useState2[0],
+      setFocused = _useState2[1];
+
+  var handleClick = function handleClick(e, func) {
+    if ((e === null || e === void 0 ? void 0 : e.keyCode) === 13) {
+      func();
+    }
+  };
+
   return /*#__PURE__*/React__default.createElement(Box, {
     padding: "0",
+    tabIndex: "0",
+    onFocus: function onFocus() {
+      return setFocused(true);
+    },
+    onBlur: function onBlur() {
+      return setFocused(false);
+    },
+    onKeyDown: function onKeyDown(e) {
+      return handleClick(e, onChange);
+    },
     hiddenStyles: hidden,
-    background: themeValues.backgroundColor
+    background: themeValues.backgroundColor,
+    extraStyles: "outline: none;"
   }, /*#__PURE__*/React__default.createElement(CheckboxLabelContainer, null, /*#__PURE__*/React__default.createElement(CheckboxContainer, {
     "data-qa": "Checkbox"
   }, /*#__PURE__*/React__default.createElement(HiddenCheckbox, {
@@ -19008,7 +19031,6 @@ var Dropdown = function Dropdown(_ref9) {
   return /*#__PURE__*/React__default.createElement(Box, {
     onKeyDown: onKeyDown,
     onClick: onClick,
-    tabIndex: 0,
     padding: "0",
     width: "100%",
     hoverStyles: "background-color: ".concat(themeValues.hoverColor, ";"),
@@ -19022,7 +19044,8 @@ var Dropdown = function Dropdown(_ref9) {
     borderSize: "1px",
     borderColor: isError ? ERROR_COLOR : isOpen ? themeValues.selectedColor : GREY_CHATEAU,
     borderRadius: "2px",
-    extraStyles: "tabindex: 0; height: 48px;",
+    tabIndex: 0,
+    extraStyles: "height: 48px;",
     dataQa: placeholder
   }, /*#__PURE__*/React__default.createElement(Stack, {
     direction: "row",
@@ -19071,18 +19094,8 @@ var Dropdown = function Dropdown(_ref9) {
 
 var Dropdown$1 = themeComponent(Dropdown, "Dropdown", fallbackValues$e);
 
-function _templateObject4$3() {
-  var data = _taggedTemplateLiteral([""]);
-
-  _templateObject4$3 = function _templateObject4() {
-    return data;
-  };
-
-  return data;
-}
-
 function _templateObject3$6() {
-  var data = _taggedTemplateLiteral(["\n  border: 1px solid\n    ", ";\n  border-radius: 2px;\n  height: 48px;\n  width: 100%;\n  padding: 0.75rem 1rem;\n  min-width: 100px;\n  margin: 0;\n  box-sizing: border-box;\n  position: relative;\n  font-size: 1.1rem;\n  font-family: Public Sans;\n  line-height: 2rem;\n  font-weight: ", ";\n  background-color: ", ";\n  color: ", ";\n  box-shadow: none;\n\n  &:focus {\n    border: 1px solid ", ";\n  }\n"]);
+  var data = _taggedTemplateLiteral([""]);
 
   _templateObject3$6 = function _templateObject3() {
     return data;
@@ -19092,7 +19105,7 @@ function _templateObject3$6() {
 }
 
 function _templateObject2$c() {
-  var data = _taggedTemplateLiteral(["\n  color: ", ";\n  font-size: 14px;\n  line-height: 18px;\n  font-weight: ", ";\n  margin-bottom: 4px;\n  font-family: Public Sans;\n\n  &::first-letter {\n    text-transform: uppercase;\n  }\n"]);
+  var data = _taggedTemplateLiteral(["\n  border: 1px solid\n    ", ";\n  border-radius: 2px;\n  height: 48px;\n  width: 100%;\n  padding: 0.75rem 1rem;\n  min-width: 100px;\n  margin: 0;\n  box-sizing: border-box;\n  position: relative;\n  font-size: 1.1rem;\n  font-family: Public Sans;\n  line-height: 2rem;\n  font-weight: ", ";\n  background-color: ", ";\n  color: ", ";\n  box-shadow: none;\n\n  &:focus {\n    border: 1px solid ", ";\n  }\n"]);
 
   _templateObject2$c = function _templateObject2() {
     return data;
@@ -19111,23 +19124,18 @@ function _templateObject$o() {
   return data;
 }
 var SelectContainer = styled__default.div(_templateObject$o());
-var SelectLabel = styled__default.label(_templateObject2$c(), function (_ref) {
+var SelectField = styled__default.select(_templateObject2$c(), function (_ref) {
   var field = _ref.field,
       showErrors = _ref.showErrors;
-  return field.dirty && field.hasErrors || field.hasErrors && showErrors ? ERROR_COLOR : STORM_GREY;
-}, FONT_WEIGHT_REGULAR);
-var SelectField = styled__default.select(_templateObject3$6(), function (_ref2) {
-  var field = _ref2.field,
-      showErrors = _ref2.showErrors;
   return field.dirty && field.hasErrors || field.hasErrors && showErrors ? ERROR_COLOR : GHOST_GREY;
-}, FONT_WEIGHT_REGULAR, function (_ref3) {
-  var themeValues = _ref3.themeValues;
+}, FONT_WEIGHT_REGULAR, function (_ref2) {
+  var themeValues = _ref2.themeValues;
   return themeValues.inputBackgroundColor && themeValues.inputBackgroundColor;
-}, function (_ref4) {
-  var themeValues = _ref4.themeValues;
+}, function (_ref3) {
+  var themeValues = _ref3.themeValues;
   return themeValues.color && themeValues.color;
 }, MATISSE_BLUE);
-var SelectOption = styled__default.option(_templateObject4$3());
+var SelectOption = styled__default.option(_templateObject3$6());
 
 var linkColor$1 = {
   "default": "".concat(MATISSE_BLUE),
@@ -19233,8 +19241,10 @@ var FormSelect = function FormSelect(_ref) {
     variant: "pS",
     color: themeValues.labelColor,
     weight: themeValues.fontWeight,
-    extraStyles: "word-break: break-word;\n              font-family: Public Sans;\n              &::first-letter {\n                text-transform: uppercase;\n              }"
+    extraStyles: "word-break: break-word;\n              font-family: Public Sans;\n              &::first-letter {\n                text-transform: uppercase;\n              }",
+    id: labelTextWhenNoError.replace(/\s+/g, "-")
   }, labelTextWhenNoError))), /*#__PURE__*/React__default.createElement(Dropdown$1, {
+    "aria-labelledby": labelTextWhenNoError.replace(/\s+/g, "-"),
     maxHeight: dropdownMaxHeight,
     placeholder: options[0] ? options[0].text : "",
     options: options,
@@ -19250,9 +19260,9 @@ var FormSelect = function FormSelect(_ref) {
     onClick: function onClick() {
       return setOpen(!open);
     }
-  }), /*#__PURE__*/React__default.createElement(SelectLabel, {
-    field: field,
-    showErrors: showErrors
+  }), /*#__PURE__*/React__default.createElement(Stack, {
+    direction: "row",
+    justify: "space-between"
   }, field.hasErrors && field.dirty || field.hasErrors && showErrors ? /*#__PURE__*/React__default.createElement(Text$1, {
     color: ERROR_COLOR,
     variant: "pXS",
@@ -20456,10 +20466,10 @@ var fallbackValues$h = {
   hoverFocusStyles: hoverFocusStyles$1
 };
 
-function _templateObject4$4() {
+function _templateObject4$3() {
   var data = _taggedTemplateLiteral(["\n      ", "\n    "]);
 
-  _templateObject4$4 = function _templateObject4() {
+  _templateObject4$3 = function _templateObject4() {
     return data;
   };
 
@@ -20540,7 +20550,7 @@ var FormattedInputField = styled__default(function (_ref7) {
   return themeValues.color && themeValues.color;
 }, MATISSE_BLUE, function (_ref12) {
   var extraStyles = _ref12.extraStyles;
-  return styled.css(_templateObject4$4(), extraStyles);
+  return styled.css(_templateObject4$3(), extraStyles);
 });
 
 var FormInput = function FormInput(_ref13) {
@@ -21295,10 +21305,10 @@ function _templateObject5$2() {
   return data;
 }
 
-function _templateObject4$5() {
+function _templateObject4$4() {
   var data = _taggedTemplateLiteral(["", " is not a valid length"]);
 
-  _templateObject4$5 = function _templateObject4() {
+  _templateObject4$4 = function _templateObject4() {
     return data;
   };
 
@@ -21374,7 +21384,7 @@ with interpolation.
 */
 
 
-var DEFAULT_ERROR_MESSAGES = (_DEFAULT_ERROR_MESSAG = {}, _defineProperty(_DEFAULT_ERROR_MESSAG, MIN_LENGTH_ERROR, genErrorMessage(_templateObject$t(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, MAX_LENGTH_ERROR, genErrorMessage(_templateObject2$h(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, EXACT_LENGTH_ERROR, genErrorMessage(_templateObject3$9(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, MULTIPLE_LENGTHS_ERROR, genErrorMessage(_templateObject4$5(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, EMAIL_ERROR, genErrorMessage(_templateObject5$2(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, HAS_NUMBER_ERROR, genErrorMessage(_templateObject6$2(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, HAS_UPPERCASE_LETTER_ERROR, genErrorMessage(_templateObject7$1(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, HAS_LOWERCASE_LETTER_ERROR, genErrorMessage(_templateObject8$1(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, HAS_SPECIAL_CHARACTER_ERROR, genErrorMessage(_templateObject9$1(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, ONLY_NUMBERS_ERROR, genErrorMessage(_templateObject10$1(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, ONLY_LETTERS_ERROR, genErrorMessage(_templateObject11$1(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, REQUIRED_FIELD_ERROR, genErrorMessage(_templateObject12(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, NUM_GREATER_THAN_ERROR, genErrorMessage(_templateObject13(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, NUM_LESS_THAN_ERROR, genErrorMessage(_templateObject14(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, MATCHES_FIELD_ERROR, genErrorMessage(_templateObject15(), "fieldLabel", "matchField")), _defineProperty(_DEFAULT_ERROR_MESSAG, VALID_SELECT_OPTION_ERROR, genErrorMessage(_templateObject16(), "fieldLabel")), _DEFAULT_ERROR_MESSAG); // Constants to represent an input's state
+var DEFAULT_ERROR_MESSAGES = (_DEFAULT_ERROR_MESSAG = {}, _defineProperty(_DEFAULT_ERROR_MESSAG, MIN_LENGTH_ERROR, genErrorMessage(_templateObject$t(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, MAX_LENGTH_ERROR, genErrorMessage(_templateObject2$h(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, EXACT_LENGTH_ERROR, genErrorMessage(_templateObject3$9(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, MULTIPLE_LENGTHS_ERROR, genErrorMessage(_templateObject4$4(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, EMAIL_ERROR, genErrorMessage(_templateObject5$2(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, HAS_NUMBER_ERROR, genErrorMessage(_templateObject6$2(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, HAS_UPPERCASE_LETTER_ERROR, genErrorMessage(_templateObject7$1(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, HAS_LOWERCASE_LETTER_ERROR, genErrorMessage(_templateObject8$1(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, HAS_SPECIAL_CHARACTER_ERROR, genErrorMessage(_templateObject9$1(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, ONLY_NUMBERS_ERROR, genErrorMessage(_templateObject10$1(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, ONLY_LETTERS_ERROR, genErrorMessage(_templateObject11$1(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, REQUIRED_FIELD_ERROR, genErrorMessage(_templateObject12(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, NUM_GREATER_THAN_ERROR, genErrorMessage(_templateObject13(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, NUM_LESS_THAN_ERROR, genErrorMessage(_templateObject14(), "fieldLabel")), _defineProperty(_DEFAULT_ERROR_MESSAG, MATCHES_FIELD_ERROR, genErrorMessage(_templateObject15(), "fieldLabel", "matchField")), _defineProperty(_DEFAULT_ERROR_MESSAG, VALID_SELECT_OPTION_ERROR, genErrorMessage(_templateObject16(), "fieldLabel")), _DEFAULT_ERROR_MESSAG); // Constants to represent an input's state
 // Neutral - has not been validated
 // Invalid - has been validated and has an error
 // Valid - has been validated and has no error
@@ -32337,10 +32347,10 @@ var fallbackValues$r = {
   leftLabelStyles: leftLabelStyles
 };
 
-function _templateObject4$6() {
+function _templateObject4$5() {
   var data = _taggedTemplateLiteral(["\n  position: absolute;\n  width: 14px;\n  height: 14px;\n  top: 3px;\n  left: 3px;\n  right: 3px;\n  bottom: 3px;\n  border-radius: 50%;\n  box-sizing: border-box;\n"]);
 
-  _templateObject4$6 = function _templateObject4() {
+  _templateObject4$5 = function _templateObject4() {
     return data;
   };
 
@@ -32394,7 +32404,7 @@ var VisibleSwitchComponent = styled__default.label(_templateObject2$i(), functio
   return isMobile ? "transform: scale(0.75)" : "";
 });
 var ToggleSwitchMiddleRingComponent = styled__default.div(_templateObject3$a());
-var ToggleSwitchInnerRingComponent = styled__default.div(_templateObject4$6());
+var ToggleSwitchInnerRingComponent = styled__default.div(_templateObject4$5());
 
 var ToggleSwitch = function ToggleSwitch(_ref6) {
   var _ref6$isOn = _ref6.isOn,
@@ -34193,17 +34203,6 @@ var formats = /*#__PURE__*/Object.freeze({
   moneyFormat: moneyFormat
 });
 
-function _templateObject$x() {
-  var data = _taggedTemplateLiteral(["\n  outline: none;\n"]);
-
-  _templateObject$x = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
-var CheckboxWrapper = styled__default.div(_templateObject$x());
-
 var AddressForm = function AddressForm(_ref) {
   var _zipErrorMessages;
 
@@ -34219,17 +34218,6 @@ var AddressForm = function AddressForm(_ref) {
       saveToWallet = _ref.saveToWallet,
       walletCheckboxMarked = _ref.walletCheckboxMarked;
 
-  var _useState = React.useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      checkboxFocused = _useState2[0],
-      focusCheckbox = _useState2[1];
-
-  var handleClick = function handleClick(e, func) {
-    if ((e === null || e === void 0 ? void 0 : e.keyCode) === 13) {
-      func();
-    }
-  };
-
   if (clearOnDismount) {
     React.useEffect(function () {
       return function () {
@@ -34317,24 +34305,12 @@ var AddressForm = function AddressForm(_ref) {
     onKeyDown: function onKeyDown(e) {
       return e.key === "Enter" && handleSubmit(e);
     }
-  }), showWalletCheckbox && /*#__PURE__*/React__default.createElement(CheckboxWrapper, {
-    tabIndex: "0",
-    onFocus: function onFocus() {
-      return focusCheckbox(true);
-    },
-    onBlur: function onBlur() {
-      return focusCheckbox(false);
-    },
-    onKeyDown: function onKeyDown(e) {
-      return handleClick(e, saveToWallet);
-    }
-  }, /*#__PURE__*/React__default.createElement(Checkbox$1, {
+  }), showWalletCheckbox && /*#__PURE__*/React__default.createElement(Checkbox$1, {
     name: "address checkbox",
     title: "Save address to wallet",
     checked: walletCheckboxMarked,
-    onChange: saveToWallet,
-    focused: checkboxFocused
-  }))));
+    onChange: saveToWallet
+  })));
 };
 
 var formConfig = {
@@ -34637,16 +34613,16 @@ function _templateObject2$j() {
   return data;
 }
 
-function _templateObject$y() {
+function _templateObject$x() {
   var data = _taggedTemplateLiteral(["\n  box-sizing: border-box;\n  background: ", ";\n  height: ", ";\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  padding: 1.5rem;\n  :not(:last-child),\n  :not(:first-child) {\n    box-shadow: inset 0px -1px 0px 0px rgb(202, 206, 216);\n  }\n  :first-child {\n    border-top-left-radius: 3px;\n    border-top-right-radius: 3px;\n  }\n  :last-child {\n    border-bottom-left-radius: 3px;\n    border-bottom-right-radius: 3px;\n    box-shadow: none;\n  }\n"]);
 
-  _templateObject$y = function _templateObject() {
+  _templateObject$x = function _templateObject() {
     return data;
   };
 
   return data;
 }
-var EditableListItem = styled__default.div(_templateObject$y(), WHITE, function (_ref) {
+var EditableListItem = styled__default.div(_templateObject$x(), WHITE, function (_ref) {
   var listItemSize = _ref.listItemSize;
   return listItemSize === "big" ? "120px" : "72px";
 });
@@ -34801,10 +34777,10 @@ function _templateObject5$3() {
   return data;
 }
 
-function _templateObject4$7() {
+function _templateObject4$6() {
   var data = _taggedTemplateLiteral(["\n  color: ", ";\n  align-items: center;\n  font-size: 1rem;\n  padding-right: 1rem;\n  cursor: pointer;\n  display: ", ";\n"]);
 
-  _templateObject4$7 = function _templateObject4() {
+  _templateObject4$6 = function _templateObject4() {
     return data;
   };
 
@@ -34831,16 +34807,16 @@ function _templateObject2$k() {
   return data;
 }
 
-function _templateObject$z() {
+function _templateObject$y() {
   var data = _taggedTemplateLiteral(["\n  display: ", ";\n  flex-direction: column;\n  flex: 1;\n"]);
 
-  _templateObject$z = function _templateObject() {
+  _templateObject$y = function _templateObject() {
     return data;
   };
 
   return data;
 }
-var EditableTableContainer = styled__default.div(_templateObject$z(), function (_ref) {
+var EditableTableContainer = styled__default.div(_templateObject$y(), function (_ref) {
   var hide = _ref.hide;
   return hide ? "none" : "flex";
 });
@@ -34858,7 +34834,7 @@ var EditableTableListItem = styled__default.div(_templateObject2$k(), function (
   return isMobile ? "padding: 1rem 0.5rem" : "padding: 0 0.5rem";
 });
 var EditableListItemControls$1 = styled__default.div(_templateObject3$b());
-var EditableListAction = styled__default.div(_templateObject4$7(), MATISSE_BLUE, function (_ref6) {
+var EditableListAction = styled__default.div(_templateObject4$6(), MATISSE_BLUE, function (_ref6) {
   var hide = _ref6.hide;
   return hide ? "none" : "flex";
 });
@@ -34952,17 +34928,6 @@ var TableListItem = function TableListItem(_ref) {
   }, "Edit")) : /*#__PURE__*/React__default.createElement(React.Fragment, null))));
 };
 
-function _templateObject$A() {
-  var data = _taggedTemplateLiteral(["\n  outline: none;\n"]);
-
-  _templateObject$A = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
-var CheckboxWrapper$1 = styled__default.div(_templateObject$A());
-
 var EmailForm = function EmailForm(_ref) {
   var _emailFieldErrorMessa;
 
@@ -34979,17 +34944,6 @@ var EmailForm = function EmailForm(_ref) {
       saveToWallet = _ref.saveToWallet,
       walletCheckboxMarked = _ref.walletCheckboxMarked;
 
-  var _useState = React.useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      checkboxFocused = _useState2[0],
-      focusCheckbox = _useState2[1];
-
-  var handleClick = function handleClick(e, func) {
-    if ((e === null || e === void 0 ? void 0 : e.keyCode) === 13) {
-      func();
-    }
-  };
-
   if (clearOnDismount) {
     React.useEffect(function () {
       return function () {
@@ -35015,24 +34969,12 @@ var EmailForm = function EmailForm(_ref) {
     onKeyDown: function onKeyDown(e) {
       return e.key === "Enter" && handleSubmit(e);
     }
-  }), showWalletCheckbox && /*#__PURE__*/React__default.createElement(CheckboxWrapper$1, {
-    tabIndex: "0",
-    onFocus: function onFocus() {
-      return focusCheckbox(true);
-    },
-    onBlur: function onBlur() {
-      return focusCheckbox(false);
-    },
-    onKeyDown: function onKeyDown(e) {
-      return handleClick(e, saveToWallet);
-    }
-  }, /*#__PURE__*/React__default.createElement(Checkbox$1, {
+  }), showWalletCheckbox && /*#__PURE__*/React__default.createElement(Checkbox$1, {
     name: "email checkbox",
     title: "Save email address to wallet",
     checked: walletCheckboxMarked,
-    onChange: saveToWallet,
-    focused: checkboxFocused
-  }))));
+    onChange: saveToWallet
+  })));
 };
 
 var formConfig$3 = {
@@ -36376,8 +36318,7 @@ var getApplicationNode = function getApplicationNode() {
 };
 
 var Modal$1 = function Modal(_ref) {
-  var ModalLink = _ref.ModalLink,
-      hideModal = _ref.hideModal,
+  var hideModal = _ref.hideModal,
       continueAction = _ref.continueAction,
       cancelAction = _ref.cancelAction,
       modalOpen = _ref.modalOpen,
@@ -36399,12 +36340,13 @@ var Modal$1 = function Modal(_ref) {
       onlyCloseButton = _ref$onlyCloseButton === void 0 ? false : _ref$onlyCloseButton,
       maxHeight = _ref.maxHeight,
       _ref$underlayClickExi = _ref.underlayClickExits,
-      underlayClickExits = _ref$underlayClickExi === void 0 ? true : _ref$underlayClickExi;
+      underlayClickExits = _ref$underlayClickExi === void 0 ? true : _ref$underlayClickExi,
+      children = _ref.children;
 
   var _useContext = React.useContext(styled.ThemeContext),
       isMobile = _useContext.isMobile;
 
-  return /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement(ModalLink, null), modalOpen && /*#__PURE__*/React__default.createElement(reactAriaModal, {
+  return /*#__PURE__*/React__default.createElement(React.Fragment, null, modalOpen && /*#__PURE__*/React__default.createElement(reactAriaModal, {
     onExit: hideModal,
     getApplicationNode: getApplicationNode,
     titleText: modalHeaderText,
@@ -36476,7 +36418,7 @@ var Modal$1 = function Modal(_ref) {
     variant: "primary",
     text: "Close",
     dataQa: "Close"
-  })))))))));
+  })))))))), children);
 };
 
 var fontSize$8 = {
@@ -36613,10 +36555,10 @@ var NavMenuDesktop = function NavMenuDesktop(_ref) {
 
 var NavMenuDesktop$1 = themeComponent(NavMenuDesktop, "NavMenu", fallbackValues$v, "profile");
 
-function _templateObject$B() {
+function _templateObject$z() {
   var data = _taggedTemplateLiteral(["\n  position: fixed;\n  top: 72px;\n"]);
 
-  _templateObject$B = function _templateObject() {
+  _templateObject$z = function _templateObject() {
     return data;
   };
 
@@ -36652,7 +36594,7 @@ var menu = posed.div({
     }
   }
 });
-var ImposterMenu = styled__default(menu)(_templateObject$B());
+var ImposterMenu = styled__default(menu)(_templateObject$z());
 
 var NavMenuMobile = function NavMenuMobile(_ref) {
   var id = _ref.id,
@@ -38175,10 +38117,16 @@ var TitleModule = function TitleModule(_ref) {
 var color$a = "#15749D";
 var hoverColor$4 = "#116285";
 var activeColor$5 = "#0E506D";
+var linkColor$3 = "#357fb8";
+var fontWeight$6 = FONT_WEIGHT_REGULAR;
+var modalLinkHoverFocus = "outline: none;\n  cursor: pointer;\n  text-decoration: underline;\n  text-decoration-color: #357fb8;";
 var fallbackValues$w = {
   color: color$a,
   hoverColor: hoverColor$4,
-  activeColor: activeColor$5
+  activeColor: activeColor$5,
+  linkColor: linkColor$3,
+  fontWeight: fontWeight$6,
+  modalLinkHoverFocus: modalLinkHoverFocus
 };
 
 var AutopayModal = function AutopayModal(_ref) {
@@ -38208,34 +38156,6 @@ var AutopayModal = function AutopayModal(_ref) {
   var activeStyles = "\n   &:active {\n    .autopayIcon { fill: ".concat(themeValues.activeColor, "; text-decoration: underline; }\n    }");
   var defaultStyles = "\n    .autopayIcon { fill: ".concat(themeValues.color, "; text-decoration: underline; }\n     ");
   return /*#__PURE__*/React__default.createElement(Modal$1, _extends({
-    ModalLink: function ModalLink() {
-      return buttonLinkType ? /*#__PURE__*/React__default.createElement(ButtonWithAction, {
-        text: autoPayActive ? "Manage ".concat(planType) : "Set Up ".concat(planType),
-        variant: "tertiary",
-        action: function action() {
-          toggleModal(true);
-        },
-        dataQa: "Manage Autopay",
-        extraStyles: isMobile && "flex-grow: 1; width: 100%;"
-      }) : /*#__PURE__*/React__default.createElement(Box, {
-        padding: "0",
-        onClick: function onClick() {
-          toggleModal(true);
-        },
-        hoverStyles: hoverStyles,
-        activeStyles: activeStyles,
-        extraStyles: defaultStyles
-      }, /*#__PURE__*/React__default.createElement(Cluster, {
-        justify: isMobile ? "flex-start" : "flex-end",
-        align: "center"
-      }, /*#__PURE__*/React__default.createElement(AutopayOnIcon$1, null), /*#__PURE__*/React__default.createElement(ButtonWithAction, {
-        text: "".concat(planType, " On"),
-        variant: "smallGhost",
-        dataQa: "Autopay On",
-        textExtraStyles: "font-size: 0.875rem; ",
-        extraStyles: "min-width: auto; padding: 0 0 0 6px;"
-      })));
-    },
     showModal: function showModal() {
       return toggleModal(true);
     },
@@ -38243,7 +38163,43 @@ var AutopayModal = function AutopayModal(_ref) {
       return toggleModal(false);
     },
     modalOpen: modalOpen
-  }, modalExtraProps));
+  }, modalExtraProps), buttonLinkType ? /*#__PURE__*/React__default.createElement(ButtonWithAction, {
+    text: autoPayActive ? "Manage ".concat(planType) : "Set Up ".concat(planType),
+    variant: "tertiary",
+    action: function action() {
+      toggleModal(true);
+    },
+    dataQa: "Manage Autopay",
+    extraStyles: isMobile && "flex-grow: 1; width: 100%;"
+  }) : /*#__PURE__*/React__default.createElement(Box, {
+    padding: "0",
+    onClick: function onClick() {
+      toggleModal(true);
+    },
+    hoverStyles: hoverStyles,
+    activeStyles: activeStyles,
+    extraStyles: defaultStyles
+  }, /*#__PURE__*/React__default.createElement(Cluster, {
+    justify: isMobile ? "flex-start" : "flex-end",
+    align: "center"
+  }, /*#__PURE__*/React__default.createElement(AutopayOnIcon$1, null), /*#__PURE__*/React__default.createElement(Text$1, {
+    variant: "pS",
+    onClick: function onClick() {
+      return toggleModal(true);
+    },
+    onKeyPress: function onKeyPress(e) {
+      console.log({
+        e: e
+      });
+      e.key === "Enter" && toggleModal(true);
+    },
+    tabIndex: "0",
+    dataQa: "".concat(planType, " On"),
+    color: themeValues.linkColor,
+    weight: themeValues.fontWeight,
+    hoverStyles: themeValues.modalLinkHoverFocus,
+    extraStyles: "padding: 0 0 0 6px;"
+  }, "".concat(planType, " On")))));
 };
 
 var AutopayModalModule = themeComponent(AutopayModal, "AutopayModal", fallbackValues$w);
@@ -38981,32 +38937,27 @@ var PaymentDetails = function PaymentDetails(_ref4) {
 
 var PaymentDetails$1 = themeComponent(PaymentDetails, "PaymentDetails", fallbackValues$x, "default");
 
-var linkColor$3 = {
-  "default": "#357fb8",
-  footer: "#ffffff"
+var linkColor$4 = {
+  "default": "#357fb8"
 };
 var fontSize$9 = {
-  "default": "1rem",
-  footer: "0.875rem"
+  "default": "1rem"
 };
 var lineHeight$5 = {
-  "default": "1.5rem",
-  footer: "1.25rem"
+  "default": "1.5rem"
 };
-var fontWeight$6 = {
-  "default": FONT_WEIGHT_REGULAR,
-  footer: FONT_WEIGHT_SEMIBOLD
+var fontWeight$7 = {
+  "default": FONT_WEIGHT_REGULAR
 };
-var modalLinkHoverFocus = {
-  "default": "",
-  footer: "outline: none; text-decoration: underline;"
+var modalLinkHoverFocus$1 = {
+  "default": "outline: none; text-decoration: underline;"
 };
 var fallbackValues$y = {
-  linkColor: linkColor$3,
+  linkColor: linkColor$4,
   fontSize: fontSize$9,
   lineHeight: lineHeight$5,
-  fontWeight: fontWeight$6,
-  modalLinkHoverFocus: modalLinkHoverFocus
+  fontWeight: fontWeight$7,
+  modalLinkHoverFocus: modalLinkHoverFocus$1
 };
 
 var AccountAndRoutingModal = function AccountAndRoutingModal(_ref) {
@@ -39018,25 +38969,8 @@ var AccountAndRoutingModal = function AccountAndRoutingModal(_ref) {
       acceptText = _ref.acceptText,
       content = _ref.content,
       imageType = _ref.imageType,
-      variant = _ref.variant,
       themeValues = _ref.themeValues;
   return /*#__PURE__*/React__default.createElement(Modal$1, {
-    ModalLink: function ModalLink() {
-      return /*#__PURE__*/React__default.createElement(Text$1, {
-        variant: variant === "default" ? "pS" : "pXS",
-        onClick: function onClick() {
-          return toggleOpen(true);
-        },
-        color: themeValues.linkColor,
-        weight: themeValues.fontWeight,
-        hoverStyles: themeValues.modalLinkHoverFocus,
-        extraStyles: "cursor: pointer;",
-        tabIndex: "0",
-        onKeyPress: function onKeyPress(e) {
-          return e.key === "Enter" && toggleOpen(true);
-        }
-      }, link);
-    },
     modalOpen: isOpen,
     hideModal: function hideModal() {
       return toggleOpen(false);
@@ -39061,33 +38995,24 @@ var AccountAndRoutingModal = function AccountAndRoutingModal(_ref) {
       toggleAccepted(true);
       toggleOpen(false);
     }
-  });
+  }, /*#__PURE__*/React__default.createElement(Text$1, {
+    variant: "pS",
+    onClick: function onClick() {
+      return toggleOpen(true);
+    },
+    onKeyPress: function onKeyPress(e) {
+      return e.key === "Enter" && toggleOpen(true);
+    },
+    tabIndex: "0",
+    color: themeValues.linkColor,
+    weight: themeValues.fontWeight,
+    hoverStyles: themeValues.modalLinkHoverFocus,
+    extraStyles: "cursor: pointer;"
+  }, link));
 };
 
 var AccountAndRoutingModal$1 = themeComponent(AccountAndRoutingModal, "AccountAndRoutingModal", fallbackValues$y, "default");
 
-function _templateObject2$l() {
-  var data = _taggedTemplateLiteral(["\n  outline: none;\n"]);
-
-  _templateObject2$l = function _templateObject2() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject$C() {
-  var data = _taggedTemplateLiteral([""]);
-
-  _templateObject$C = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
-var ModalWrapper = styled__default.div(_templateObject$C());
-var CheckboxWrapper$2 = styled__default.div(_templateObject2$l());
-
 var PaymentFormACH = function PaymentFormACH(_ref) {
   var _routingNumberErrors, _accountNumberErrors;
 
@@ -39108,17 +39033,6 @@ var PaymentFormACH = function PaymentFormACH(_ref) {
       saveToWallet = _ref.saveToWallet,
       walletCheckboxMarked = _ref.walletCheckboxMarked;
 
-  var _useState = React.useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      checkboxFocused = _useState2[0],
-      focusCheckbox = _useState2[1];
-
-  var handleClick = function handleClick(e, func) {
-    if ((e === null || e === void 0 ? void 0 : e.keyCode) === 13) {
-      func();
-    }
-  };
-
   if (clearOnDismount) {
     React.useEffect(function () {
       return function () {
@@ -39127,15 +39041,15 @@ var PaymentFormACH = function PaymentFormACH(_ref) {
     }, []);
   }
 
+  var _useState = React.useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      showRouting = _useState2[0],
+      toggleShowRouting = _useState2[1];
+
   var _useState3 = React.useState(false),
       _useState4 = _slicedToArray(_useState3, 2),
-      showRouting = _useState4[0],
-      toggleShowRouting = _useState4[1];
-
-  var _useState5 = React.useState(false),
-      _useState6 = _slicedToArray(_useState5, 2),
-      showAccount = _useState6[0],
-      toggleShowAccount = _useState6[1];
+      showAccount = _useState4[0],
+      toggleShowAccount = _useState4[1];
 
   var nameErrors = _defineProperty({}, required.error, "Name is required");
 
@@ -39169,19 +39083,14 @@ var PaymentFormACH = function PaymentFormACH(_ref) {
     fieldActions: actions.fields.routingNumber,
     showErrors: showErrors,
     helperModal: function helperModal() {
-      return /*#__PURE__*/React__default.createElement(ModalWrapper, {
-        tabIndex: "0",
-        onKeyDown: function onKeyDown(e) {
-          return e.key === "Enter" && toggleShowAccount(!showRouting);
-        }
-      }, /*#__PURE__*/React__default.createElement(AccountAndRoutingModal$1, {
+      return /*#__PURE__*/React__default.createElement(AccountAndRoutingModal$1, {
         link: "What is this?",
         title: "Where is my routing number?",
         content: "Your routing number is the 9-digit number in the bottom left corner of your check.",
         imageType: "Routing",
         isOpen: showRouting,
         toggleOpen: toggleShowRouting
-      }));
+      });
     },
     onKeyDown: function onKeyDown(e) {
       return e.key === "Enter" && handleSubmit(e);
@@ -39202,19 +39111,14 @@ var PaymentFormACH = function PaymentFormACH(_ref) {
     fieldActions: actions.fields.accountNumber,
     showErrors: showErrors,
     helperModal: function helperModal() {
-      return /*#__PURE__*/React__default.createElement(ModalWrapper, {
-        tabIndex: "0",
-        onKeyDown: function onKeyDown(e) {
-          return e.key === "Enter" && toggleShowAccount(!showAccount);
-        }
-      }, /*#__PURE__*/React__default.createElement(AccountAndRoutingModal$1, {
+      return /*#__PURE__*/React__default.createElement(AccountAndRoutingModal$1, {
         link: "What is this?",
         title: "Where is my account number?",
         content: "Your account number is usually the 10-digit number in the bottom of your check to the right of the routing number.",
         imageType: "Account",
         isOpen: showAccount,
         toggleOpen: toggleShowAccount
-      }));
+      });
     },
     onKeyDown: function onKeyDown(e) {
       return e.key === "Enter" && handleSubmit(e);
@@ -39250,24 +39154,12 @@ var PaymentFormACH = function PaymentFormACH(_ref) {
     onChange: toggleCheckbox,
     checked: defaultMethod.value,
     hidden: hideDefaultPayment
-  }), showWalletCheckbox && /*#__PURE__*/React__default.createElement(CheckboxWrapper$2, {
-    tabIndex: "0",
-    onFocus: function onFocus() {
-      return focusCheckbox(true);
-    },
-    onBlur: function onBlur() {
-      return focusCheckbox(false);
-    },
-    onKeyDown: function onKeyDown(e) {
-      return handleClick(e, saveToWallet);
-    }
-  }, /*#__PURE__*/React__default.createElement(Checkbox$1, {
+  }), showWalletCheckbox && /*#__PURE__*/React__default.createElement(Checkbox$1, {
     name: "bank checkbox",
     title: "Save bank account to wallet",
     checked: walletCheckboxMarked,
-    onChange: saveToWallet,
-    focused: checkboxFocused
-  }))));
+    onChange: saveToWallet
+  })));
 };
 
 var formConfig$6 = {
@@ -39307,17 +39199,6 @@ PaymentFormACH.mapDispatchToProps = mapDispatchToProps$6;
 
 var _creditCardNumberErro, _expirationDateErrors, _cvvErrors, _zipCodeErrors;
 
-function _templateObject$D() {
-  var data = _taggedTemplateLiteral(["\n  outline: none;\n"]);
-
-  _templateObject$D = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
-var CheckboxWrapper$3 = styled__default.div(_templateObject$D());
-
 var nameOnCardErrors = _defineProperty({}, required.error, "Name is required");
 
 var creditCardNumberErrors = (_creditCardNumberErro = {}, _defineProperty(_creditCardNumberErro, required.error, "Credit card number is required"), _defineProperty(_creditCardNumberErro, hasLength.error, "Credit card number is invalid"), _creditCardNumberErro);
@@ -39342,18 +39223,6 @@ var PaymentFormCard = function PaymentFormCard(_ref) {
       showWalletCheckbox = _ref.showWalletCheckbox,
       saveToWallet = _ref.saveToWallet,
       walletCheckboxMarked = _ref.walletCheckboxMarked;
-
-  var _useState = React.useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      checkboxFocused = _useState2[0],
-      focusCheckbox = _useState2[1];
-
-  var handleClick = function handleClick(e, func) {
-    if ((e === null || e === void 0 ? void 0 : e.keyCode) === 13) {
-      func();
-    }
-  };
-
   React.useEffect(function () {
     if (clearOnDismount) {
       return function () {
@@ -39434,24 +39303,12 @@ var PaymentFormCard = function PaymentFormCard(_ref) {
     onKeyDown: function onKeyDown(e) {
       return e.key === "Enter" && handleSubmit(e);
     }
-  })), showWalletCheckbox && /*#__PURE__*/React__default.createElement(CheckboxWrapper$3, {
-    tabIndex: "0",
-    onFocus: function onFocus() {
-      return focusCheckbox(true);
-    },
-    onBlur: function onBlur() {
-      return focusCheckbox(false);
-    },
-    onKeyDown: function onKeyDown(e) {
-      return handleClick(e, saveToWallet);
-    }
-  }, /*#__PURE__*/React__default.createElement(Checkbox$1, {
+  })), showWalletCheckbox && /*#__PURE__*/React__default.createElement(Checkbox$1, {
     name: "credit card checkbox",
     title: "Save credit card to wallet",
     checked: walletCheckboxMarked,
-    onChange: saveToWallet,
-    focused: checkboxFocused
-  }))));
+    onChange: saveToWallet
+  })));
 };
 
 var formConfig$7 = {
@@ -39489,17 +39346,6 @@ PaymentFormCard.reducer = reducer$7;
 PaymentFormCard.mapStateToProps = mapStateToProps$8;
 PaymentFormCard.mapDispatchToProps = mapDispatchToProps$7;
 
-function _templateObject$E() {
-  var data = _taggedTemplateLiteral(["\n  outline: none;\n"]);
-
-  _templateObject$E = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
-var CheckboxWrapper$4 = styled__default.div(_templateObject$E());
-
 var PhoneForm = function PhoneForm(_ref) {
   var _phoneErrorMessage;
 
@@ -39515,17 +39361,6 @@ var PhoneForm = function PhoneForm(_ref) {
       saveToWallet = _ref.saveToWallet,
       walletCheckboxMarked = _ref.walletCheckboxMarked;
 
-  var _useState = React.useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      checkboxFocused = _useState2[0],
-      focusCheckbox = _useState2[1];
-
-  var handleClick = function handleClick(e, func) {
-    if ((e === null || e === void 0 ? void 0 : e.keyCode) === 13) {
-      func();
-    }
-  };
-
   if (clearOnDismount) {
     React.useEffect(function () {
       return function () {
@@ -39549,24 +39384,12 @@ var PhoneForm = function PhoneForm(_ref) {
     onKeyUp: function onKeyUp(e) {
       return e.key === "Enter" && handleSubmit(e);
     }
-  }), showWalletCheckbox && /*#__PURE__*/React__default.createElement(CheckboxWrapper$4, {
-    tabIndex: "0",
-    onFocus: function onFocus() {
-      return focusCheckbox(true);
-    },
-    onBlur: function onBlur() {
-      return focusCheckbox(false);
-    },
-    onKeyDown: function onKeyDown(e) {
-      return handleClick(e, saveToWallet);
-    }
-  }, /*#__PURE__*/React__default.createElement(Checkbox$1, {
+  }), showWalletCheckbox && /*#__PURE__*/React__default.createElement(Checkbox$1, {
     name: "phone checkbox",
     title: "Save phone number to wallet",
     checked: walletCheckboxMarked,
-    onChange: saveToWallet,
-    focused: checkboxFocused
-  }))));
+    onChange: saveToWallet
+  })));
 };
 
 var formConfig$8 = {
@@ -39598,10 +39421,10 @@ var fallbackValues$z = {
   focusStyles: focusStyles
 };
 
-function _templateObject$F() {
+function _templateObject$A() {
   var data = _taggedTemplateLiteral(["\n    height: ", ";\n    width: ", ";\n    ", "\n    transition: opacity 0.3s ease;\n  "]);
 
-  _templateObject$F = function _templateObject() {
+  _templateObject$A = function _templateObject() {
     return data;
   };
 
@@ -39671,7 +39494,7 @@ var RadioSection = function RadioSection(_ref) {
     }
   };
   var borderStyles = "\n    border-width: 0 0 1px 0;\n    border-color: ".concat(themeValues.borderColor, ";\n    border-style: solid;\n    border-radius: 0px;\n    transform-origin: 100% 0;\n\n    &:last-child {\n      border-width: 0;\n    }\n  ");
-  var RightIcon = styled__default.img(_templateObject$F(), function (_ref2) {
+  var RightIcon = styled__default.img(_templateObject$A(), function (_ref2) {
     var isMobile = _ref2.isMobile;
     return isMobile ? "14px" : "18px";
   }, function (_ref3) {
@@ -40132,7 +39955,7 @@ var backgroundColor$9 = {
   "default": "#ffffff",
   footer: "#ffffff"
 };
-var linkColor$4 = {
+var linkColor$5 = {
   "default": "#357fb8",
   footer: "#ffffff"
 };
@@ -40148,22 +39971,22 @@ var lineHeight$6 = {
   "default": "1.5rem",
   footer: "1.25rem"
 };
-var fontWeight$7 = {
+var fontWeight$8 = {
   "default": FONT_WEIGHT_REGULAR,
   footer: FONT_WEIGHT_SEMIBOLD
 };
-var modalLinkHoverFocus$1 = {
-  "default": "",
+var modalLinkHoverFocus$2 = {
+  "default": "outline: none; text-decoration: underline;",
   footer: "outline: none; text-decoration: underline;"
 };
 var fallbackValues$B = {
   backgroundColor: backgroundColor$9,
-  linkColor: linkColor$4,
+  linkColor: linkColor$5,
   border: border$2,
   fontSize: fontSize$a,
   lineHeight: lineHeight$6,
-  fontWeight: fontWeight$7,
-  modalLinkHoverFocus: modalLinkHoverFocus$1
+  fontWeight: fontWeight$8,
+  modalLinkHoverFocus: modalLinkHoverFocus$2
 };
 
 var TermsAndConditionsModal = function TermsAndConditionsModal(_ref) {
@@ -40178,22 +40001,6 @@ var TermsAndConditionsModal = function TermsAndConditionsModal(_ref) {
       variant = _ref.variant,
       themeValues = _ref.themeValues;
   return /*#__PURE__*/React__default.createElement(Modal$1, {
-    ModalLink: function ModalLink() {
-      return /*#__PURE__*/React__default.createElement(Text$1, {
-        variant: variant === "default" ? "pS" : "pXS",
-        onClick: function onClick() {
-          return toggleOpen(true);
-        },
-        color: themeValues.linkColor,
-        weight: themeValues.fontWeight,
-        hoverStyles: themeValues.modalLinkHoverFocus,
-        extraStyles: "cursor: pointer;",
-        tabIndex: "0",
-        onKeyPress: function onKeyPress(e) {
-          return e.key === "Enter" && toggleOpen(true);
-        }
-      }, link);
-    },
     modalOpen: isOpen,
     hideModal: function hideModal() {
       return toggleOpen(false);
@@ -40217,33 +40024,24 @@ var TermsAndConditionsModal = function TermsAndConditionsModal(_ref) {
       toggleAccepted(true);
       toggleOpen(false);
     }
-  });
+  }, /*#__PURE__*/React__default.createElement(Text$1, {
+    variant: variant === "default" ? "pS" : "pXS",
+    onClick: function onClick() {
+      return toggleOpen(true);
+    },
+    onKeyPress: function onKeyPress(e) {
+      return e.key === "Enter" && toggleOpen(true);
+    },
+    tabIndex: "0",
+    color: themeValues.linkColor,
+    weight: themeValues.fontWeight,
+    hoverStyles: themeValues.modalLinkHoverFocus,
+    extraStyles: "cursor: pointer;"
+  }, link));
 };
 
 var TermsAndConditionsModal$1 = themeComponent(TermsAndConditionsModal, "TermsAndConditionsModal", fallbackValues$B, "default");
 
-function _templateObject2$m() {
-  var data = _taggedTemplateLiteral([""]);
-
-  _templateObject2$m = function _templateObject2() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject$G() {
-  var data = _taggedTemplateLiteral(["\n  outline: none;\n"]);
-
-  _templateObject$G = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
-var CheckboxWrapper$5 = styled__default.div(_templateObject$G());
-var ModalWrapper$1 = styled__default.div(_templateObject2$m());
-
 var TermsAndConditions = function TermsAndConditions(_ref) {
   var onCheck = _ref.onCheck,
       isChecked = _ref.isChecked,
@@ -40257,49 +40055,17 @@ var TermsAndConditions = function TermsAndConditions(_ref) {
       showTerms = _useState2[0],
       toggleShowTerms = _useState2[1];
 
-  var _useState3 = React.useState(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      checkboxFocused = _useState4[0],
-      focusCheckbox = _useState4[1];
-
-  var handleClick = function handleClick(e, func) {
-    if ((e === null || e === void 0 ? void 0 : e.keyCode) === 13) {
-      func();
-    }
-  };
-
-  return /*#__PURE__*/React__default.createElement(DisplayBox$1, null, /*#__PURE__*/React__default.createElement(Stack, {
-    direction: "row"
-  }, /*#__PURE__*/React__default.createElement(CheckboxWrapper$5, {
-    tabIndex: "0",
-    onFocus: function onFocus() {
-      return focusCheckbox(true);
-    },
-    onBlur: function onBlur() {
-      return focusCheckbox(false);
-    },
-    onKeyDown: function onKeyDown(e) {
-      return handleClick(e, onCheck);
-    }
-  }, /*#__PURE__*/React__default.createElement(Checkbox$1, {
+  return /*#__PURE__*/React__default.createElement(DisplayBox$1, null, /*#__PURE__*/React__default.createElement(Stack, null, /*#__PURE__*/React__default.createElement(Checkbox$1, {
     name: "terms",
+    title: "Terms and Conditions",
     error: error,
     checked: isChecked,
-    onChange: onCheck,
-    focused: checkboxFocused
-  })), /*#__PURE__*/React__default.createElement(Stack, null, /*#__PURE__*/React__default.createElement(Text$1, {
-    variant: "p",
-    fontWeight: FONT_WEIGHT_BOLD
-  }, "Terms and Conditions"), /*#__PURE__*/React__default.createElement(Box, {
+    onChange: onCheck
+  }), /*#__PURE__*/React__default.createElement(Box, {
+    padding: "0 0 0 58px"
+  }, /*#__PURE__*/React__default.createElement(Stack, null, /*#__PURE__*/React__default.createElement(Box, {
     padding: "0"
-  }, html), terms && /*#__PURE__*/React__default.createElement(ModalWrapper$1, {
-    tabIndex: "0",
-    onKeyDown: function onKeyDown(e) {
-      return handleClick(e, function () {
-        return toggleShowTerms(!showTerms);
-      });
-    }
-  }, /*#__PURE__*/React__default.createElement(TermsAndConditionsModal$1, {
+  }, html), terms && /*#__PURE__*/React__default.createElement(TermsAndConditionsModal$1, {
     link: "Learn More",
     terms: terms,
     isOpen: showTerms,
@@ -40344,29 +40110,29 @@ var Timeout = function Timeout(_ref) {
 
 var Timeout$1 = withWindowSize(Timeout);
 
-var fontWeight$8 = "600";
+var fontWeight$9 = "600";
 var fontColor$1 = WHITE;
 var textAlign$1 = "left";
 var headerBackgroundColor = BRIGHT_GREY;
 var imageBackgroundColor = MATISSE_BLUE;
 var fallbackValues$C = {
-  fontWeight: fontWeight$8,
+  fontWeight: fontWeight$9,
   fontColor: fontColor$1,
   textAlign: textAlign$1,
   headerBackgroundColor: headerBackgroundColor,
   imageBackgroundColor: imageBackgroundColor
 };
 
-function _templateObject$H() {
+function _templateObject$B() {
   var data = _taggedTemplateLiteral(["\n  width: auto;\n  height: 215px;\n"]);
 
-  _templateObject$H = function _templateObject() {
+  _templateObject$B = function _templateObject() {
     return data;
   };
 
   return data;
 }
-var WelcomeImage = styled__default.img(_templateObject$H());
+var WelcomeImage = styled__default.img(_templateObject$B());
 
 var WelcomeModule = function WelcomeModule(_ref) {
   var heading = _ref.heading,