Merge branch 'main' into 'release3.x'

Release 3.3.0

See merge request really-simple-plugins/simplybook-me/simplybook!200

Author: wimbraam

react/src/components/Fields/Partials/ProviderForm.tsx

@@ -205,7 +205,7 @@ const ProviderForm: React.FC<ProviderFormProps> = ({ providerId, provider }) =>
                     </div>
                 ) : null}
             </div>
-            {/* Edit All Properties Button */}
+            {/* Advanced settings Button */}
             {providerId && providerId !== "new" && (
                 <div className="mt-4 max-w-fit">
                     <ButtonLink
@@ -217,7 +217,7 @@ const ProviderForm: React.FC<ProviderFormProps> = ({ providerId, provider }) =>
                         btnVariant="square-ghost-small"
                         loginLink={`/v2/management?hash=providers/edit/details/${providerId}`}
                     >
-                        {__("Edit All Properties", "simplybook")}
+                        {__("Advanced settings", "simplybook")}
                     </ButtonLink>
                 </div>
             )}

react/src/components/Fields/Partials/ServiceForm.tsx

@@ -140,7 +140,7 @@ const ServiceForm: React.FC<ServiceFormProps> = ({ serviceId, service }) => {
                     </div>
                 ) : null}
             </div>
-            {/* Edit All Properties Button */}
+            {/* Advanced settings Button */}
             {serviceId && serviceId !== "new" && (
                 <div className="mt-4 max-w-fit">
                     <ButtonLink
@@ -152,7 +152,7 @@ const ServiceForm: React.FC<ServiceFormProps> = ({ serviceId, service }) => {
                         btnVariant="square-ghost-small"
                         loginLink={`/v2/management?hash=services/edit/details/${serviceId}`}
                     >
-                        {__("Edit All Properties", "simplybook")}
+                        {__("Advanced settings", "simplybook")}
                     </ButtonLink>
                 </div>
             )}

react/src/components/Modals/Partials/FormLogin.jsx

@@ -4,6 +4,7 @@ import { useForm, Controller, set } from "react-hook-form";
 import TextField from "../../Fields/TextField";
 import SelectField from "../../Fields/SelectField";
 import ButtonInput from "../../Inputs/ButtonInput";
+import { ReactComponent as Logo } from "../../../../../assets/img/logo.svg";
 
 // API IMPORTS
 import apiFetch from "@wordpress/api-fetch";
@@ -109,6 +110,11 @@ const formLogin = ({
 
     return (
         <>
+            <div className="flex flex-col items-center mb-8">
+                <Logo className="mx-4 w-65 py-2 my-4" />
+                <h2 className="my-4">{__("Sign In", "simplybook")}</h2>
+                <small>{__("Please enter your SimplyBook.me credentials to sign in.", "simplybook")}</small>
+            </div>
             <form className="flex flex-col relative" onSubmit={submitForm}>
                 <Controller
                     name="company_domain"

react/src/components/Modals/Partials/FormTwoFa.jsx

@@ -5,6 +5,7 @@ import TextField from "../../Fields/TextField";
 import ButtonInput from "../../Inputs/ButtonInput";
 import request from "../../../api/requests/request";
 import SelectField from "../../Fields/SelectField";
+import { ReactComponent as Logo } from "../../../../../assets/img/logo.svg";
 
 // API IMPORTS
 import Error from "../../Errors/Error";
@@ -83,8 +84,17 @@ const FormTwoFa = ({authSessionId, companyLogin, userLogin, domain, twoFaProvide
         }
     };
 
+    const isEmailProvider = (selectedProvider === "email");
+    const twoFaTitle = isEmailProvider ? __("Email verification", "simplybook") : __("2FA authentication", "simplybook");
+    const twoFaSubtitle = isEmailProvider ? __("Fill in the code sent in the email", "simplybook") : __("Please use your 2FA provider to sign in.", "simplybook");
+
     return (
         <>
+            <div className="flex flex-col items-center mb-8">
+                <Logo className="mx-4 w-65 py-2 my-4" />
+                <h2 className="my-4">{twoFaTitle}</h2>
+                <small>{twoFaSubtitle}</small>
+            </div>
             <form className="flex flex-col" onSubmit={handle2faSubmit}>
                 {Object.keys(twoFaProviders).length > 1 ? (
                     <Controller
@@ -97,7 +107,7 @@ const FormTwoFa = ({authSessionId, companyLogin, userLogin, domain, twoFaProvide
                                 fieldState={fieldState}
                                 label={__("Select 2FA provider", "simplybook")}
                                 setting="two_fa_type"
-                                options={selectedProvider}
+                                options={twoFaProviders}
                                 value={selectedProvider}
                                 onChange={(e) => {
                                     setSelectedProvider(e.target.value);
@@ -119,7 +129,7 @@ const FormTwoFa = ({authSessionId, companyLogin, userLogin, domain, twoFaProvide
                                 {...field}
                                 fieldState={fieldState}
                                 className="mb-4"
-                                label={__("Enter 2FA authentication code", "simplybook")}
+                                label={__("Enter authentication code", "simplybook")}
                                 setting="two_fa_code"
                                 type="text"
                                 placeholder={__("Enter code", "simplybook")}

react/src/components/Modals/SignInModal.jsx

@@ -1,5 +1,4 @@
 import { useState } from "react";
-import { ReactComponent as Logo } from "../../../../assets/img/logo.svg";
 import {__} from "@wordpress/i18n";
 
 import FormTwoFa from "./Partials/FormTwoFa";
@@ -18,39 +17,25 @@ const SignInModal = ({onClose}) => {
         <div className="signin-modal-bg fixed z-999 inset-0 flex items-center justify-center bg-black/50 border-2 border-gray-200 ">
             <div className="signin-modal mt-8 w-3/8 bg-white p-4 px-4 rounded border-3 border-gray-200 max-h-[90vh] overflow-y-scroll">
                 {!require2fa ? (
-                    <>
-                        <div className="flex flex-col items-center mb-8">
-                            <Logo className="mx-4 w-65 py-2 my-4" />
-                            <h2 className="my-4">{__("Sign In", "simplybook")}</h2>
-                            <small>{__("Please enter your SimplyBook.me credentials to sign in.", "simplybook")}</small>
-                        </div>
-                        <FormLogin
-                            onClose={onClose}
-                            setRequire2fa={set2fa}
-                            setAuthSessionId={setAuthSessionId}
-                            setCompanyLogin={setCompanyLogin}
-                            setUserLogin={setUserLogin}
-                            setTwoFaProviders={setTwoFaProviders}
-                            setDomain={setDomain}
-                            domain={domain}
-                        />
-                    </>
+                    <FormLogin
+                        onClose={onClose}
+                        setRequire2fa={set2fa}
+                        setAuthSessionId={setAuthSessionId}
+                        setCompanyLogin={setCompanyLogin}
+                        setUserLogin={setUserLogin}
+                        setTwoFaProviders={setTwoFaProviders}
+                        setDomain={setDomain}
+                        domain={domain}
+                    />
                 ) : (
-                    <>
-                        <div className="flex flex-col items-center mb-8">
-                            <Logo className="mx-4 w-65 py-2 my-4" />
-                            <h2 className="my-4">{__("2FA authentication", "simplybook")}</h2>
-                            <small>{__("Please use your 2FA provider to sign in.", "simplybook")}</small>
-                        </div>
-                        <FormTwoFa
-                            authSessionId={authSessionId}
-                            companyLogin={companyLogin}
-                            userLogin={userLogin}
-                            domain={domain}
-                            twoFaProviders={twoFaProviders}
-                            onClose={onClose}
-                        />
-                    </>
+                    <FormTwoFa
+                        authSessionId={authSessionId}
+                        companyLogin={companyLogin}
+                        userLogin={userLogin}
+                        domain={domain}
+                        twoFaProviders={twoFaProviders}
+                        onClose={onClose}
+                    />
                 )}
             </div>
         </div>

readme.txt

@@ -88,14 +88,16 @@ You can skip the onboarding and login with your existing login credentials.
 5. Your appointments schedule is also accessible via the mobile app!
 
 == Changelog ==
-= 3.3.0 - 2026-02-10 =
+= 3.3.0 - 2026-02-16 =
 * Fixed: Message “form contains errors” briefly flashed in settings.
 * Fixed: Direct SimplyBook.me links now work with plain permalinks.
 * Fixed: REST API validation is now more reliable.
 * Fixed: Issue preventing some users from creating Services or Service Providers.
 * Fixed: Rendering issue when no name was provided for a Service (Provider).
 * Added: Login now supports custom SimplyBook.me domains.
+* Added: E-mail 2FA is now supported during log-in.
 * Changed: Onboarding flow is shortened.
+* Changed: Renamed button "Edit all properties" to "Advanced settings" for better clarity.
 
 = 3.2.4 - 2025-12-17 =
 * Fixed: API response codes now better reflect the actual error.