diff --git a/.github/workflows/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from .github/workflows/PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE.md
diff --git a/src/Components/PayNowButton.res b/src/Components/PayNowButton.res
index 85d1ce3dc..f9619cc5e 100644
--- a/src/Components/PayNowButton.res
+++ b/src/Components/PayNowButton.res
@@ -79,18 +79,26 @@ let make = (
 
   let buttonText = sdkHandleConfirmPayment.buttonText->Option.getOr(localeString.payNowButton)
 
-  React.useEffect4(() => {
+  React.useEffect5(() => {
     if showFields {
       if selectedOption === Card {
         setIsDisabled(_ => !validFormat)
       } else {
         setIsDisabled(_ => !areRequiredFieldsValidValue)
       }
+    } else if !customerMethod.requiresCvv {
+      setIsDisabled(_ => customerMethod.requiresCvv)
     } else {
       setIsDisabled(_ => !isSavedMethodCheck)
     }
     None
-  }, (validFormat, areRequiredFieldsValidValue, selectedOption, isSavedMethodCheck))
+  }, (
+    validFormat,
+    areRequiredFieldsValidValue,
+    selectedOption,
+    isSavedMethodCheck,
+    customerMethod.requiresCvv,
+  ))
 
   <div className="flex flex-col gap-1 h-auto w-full items-center">
     <button