From 4bbb614f2d3ea6d6fd56b78ef7d9c82f52e29c6c Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Thu, 11 Jul 2024 21:50:41 +0300
Subject: [PATCH 01/56] Add "frm-inline-flex" class and refactor "settings.php"
 view

---
 classes/views/frm-fields/back-end/settings.php | 8 ++++----
 css/frm_admin.css                              | 9 +++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/classes/views/frm-fields/back-end/settings.php b/classes/views/frm-fields/back-end/settings.php
index 384b07cc31..3b776d70ef 100644
--- a/classes/views/frm-fields/back-end/settings.php
+++ b/classes/views/frm-fields/back-end/settings.php
@@ -64,9 +64,9 @@
 			<input type="hidden" name="field_options[name_<?php echo esc_attr( $field['id'] ); ?>]" value="<?php echo esc_attr( $field['name'] ); ?>" id="frm_name_<?php echo esc_attr( $field['id'] ); ?>" />
 		<?php } ?>
 
-		<p class="frm-hide-empty">
+		<p class="frm-hide-empty frm-inline-flex frm-gap-sm frm-flex-wrap">
 			<?php if ( $display['required'] ) { ?>
-				<label for="frm_req_field_<?php echo esc_attr( $field['id'] ); ?>" class="frm_inline_label">
+				<label for="frm_req_field_<?php echo esc_attr( $field['id'] ); ?>">
 					<input type="checkbox" id="frm_req_field_<?php echo esc_attr( $field['id'] ); ?>" class="frm_req_field" name="field_options[required_<?php echo esc_attr( $field['id'] ); ?>]" value="1" <?php checked( $field['required'], 1 ); ?> />
 					<?php esc_html_e( 'Required', 'formidable' ); ?>
 				</label>
@@ -75,7 +75,7 @@
 
 			if ( $display['unique'] ) {
 				?>
-				<label for="frm_uniq_field_<?php echo esc_attr( $field['id'] ); ?>" class="frm_inline_label frm_help" title="<?php esc_attr_e( 'Unique: Do not allow the same response multiple times. For example, if one user enters \'Joe\', then no one else will be allowed to enter the same name.', 'formidable' ); ?>"><input type="checkbox" name="field_options[unique_<?php echo esc_attr( $field['id'] ); ?>]" id="frm_uniq_field_<?php echo esc_attr( $field['id'] ); ?>" value="1" <?php checked( $field['unique'], 1 ); ?> class="frm_mark_unique" />
+				<label for="frm_uniq_field_<?php echo esc_attr( $field['id'] ); ?>" class="frm_help" title="<?php esc_attr_e( 'Unique: Do not allow the same response multiple times. For example, if one user enters \'Joe\', then no one else will be allowed to enter the same name.', 'formidable' ); ?>"><input type="checkbox" name="field_options[unique_<?php echo esc_attr( $field['id'] ); ?>]" id="frm_uniq_field_<?php echo esc_attr( $field['id'] ); ?>" value="1" <?php checked( $field['unique'], 1 ); ?> class="frm_mark_unique" />
 					<?php esc_html_e( 'Unique', 'formidable' ); ?>
 				</label>
 				<?php
@@ -83,7 +83,7 @@
 
 			if ( $display['read_only'] ) {
 				?>
-				<label for="frm_read_only_field_<?php echo esc_attr( $field['id'] ); ?>" class="frm_inline_label frm_help" title="<?php esc_attr_e( 'Read Only: Show this field but do not allow the field value to be edited from the front-end.', 'formidable' ); ?>" >
+				<label for="frm_read_only_field_<?php echo esc_attr( $field['id'] ); ?>" class="frm_help" title="<?php esc_attr_e( 'Read Only: Show this field but do not allow the field value to be edited from the front-end.', 'formidable' ); ?>" >
 					<input type="checkbox" id="frm_read_only_field_<?php echo esc_attr( $field['id'] ); ?>" name="field_options[read_only_<?php echo esc_attr( $field['id'] ); ?>]" value="1" <?php checked( $field['read_only'], 1 ); ?>/>
 					<?php esc_html_e( 'Read Only', 'formidable' ); ?>
 				</label>
diff --git a/css/frm_admin.css b/css/frm_admin.css
index bd1a18a6dc..d14e319599 100644
--- a/css/frm_admin.css
+++ b/css/frm_admin.css
@@ -1809,6 +1809,10 @@ input.frm_insert_in_template {
 	display: flex;
 }
 
+#wpbody-content .frm-inline-flex {
+	display: inline-flex;
+}
+
 .frm_hidden,
 .js .frm-hide-js {
 	display: none;
@@ -1874,6 +1878,10 @@ input.frm_insert_in_template {
 	align-items: center;
 }
 
+#wpbody-content .frm-flex-wrap {
+	flex-wrap: wrap;
+}
+
 .frm-transition-ease {
 	transition: all .2s ease;
 }
@@ -1910,6 +1918,7 @@ input.frm_insert_in_template {
 /* End Generic Classes, Start Forced Generic Classes */
 
 .frm-fields p > label.frm_hidden,
+#wpbody-content label.frm_hidden,
 .frm-lookup-modal .dismiss,
 .frm-right-panel .inside a.frm_hidden,
 #form_global_settings .frm_hidden,

From b72bebac3aa3b40a00d1f5e19226cdbeac661fff Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Thu, 11 Jul 2024 21:51:00 +0300
Subject: [PATCH 02/56] Enhance "general.php" view

---
 classes/views/frm-settings/general.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/classes/views/frm-settings/general.php b/classes/views/frm-settings/general.php
index 1cc6e776c6..e1054d8e19 100644
--- a/classes/views/frm-settings/general.php
+++ b/classes/views/frm-settings/general.php
@@ -33,11 +33,11 @@
 
 <?php do_action( 'frm_style_general_settings', $frm_settings ); ?>
 
-<h3><?php esc_html_e( 'Other', 'formidable' ); ?></h3>
+<h3><?php esc_html_e( 'Defaults', 'formidable' ); ?></h3>
 
 <p class="frm_grid_container">
 	<label class="frm4 frm_form_field" for="frm_default_email">
-		<?php esc_html_e( 'Default Email Address', 'formidable' ); ?>
+		<?php esc_html_e( 'Email Address', 'formidable' ); ?>
 		<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'The default email address to receive notifications for new form submissions.', 'formidable' ); ?>"></span>
 	</label>
 	<input class="frm_with_left_label frm8" type="text" name="frm_default_email" id="frm_default_email" value="<?php echo esc_attr( $frm_settings->default_email ); ?>" />
@@ -62,6 +62,8 @@
 
 <div class="clear"></div>
 
+<h3><?php esc_html_e( 'Other', 'formidable' ); ?></h3>
+
 <?php if ( ! FrmAppHelper::pro_is_installed() ) { ?>
 	<input type="hidden" name="frm_menu" id="frm_menu" value="<?php echo esc_attr( $frm_settings->menu ); ?>"/>
 	<input type="hidden" name="frm_mu_menu" id="frm_mu_menu" value="<?php echo esc_attr( $frm_settings->mu_menu ); ?>"/>

From bb347337f0e7bcb9e996d36d986c23a8d3967462 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Fri, 12 Jul 2024 16:30:02 +0300
Subject: [PATCH 03/56] Fix HTML validation, and make better HTML

---
 .../views/frm-fields/back-end/settings.php    | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/classes/views/frm-fields/back-end/settings.php b/classes/views/frm-fields/back-end/settings.php
index 3b776d70ef..124d37d6c8 100644
--- a/classes/views/frm-fields/back-end/settings.php
+++ b/classes/views/frm-fields/back-end/settings.php
@@ -64,35 +64,41 @@
 			<input type="hidden" name="field_options[name_<?php echo esc_attr( $field['id'] ); ?>]" value="<?php echo esc_attr( $field['name'] ); ?>" id="frm_name_<?php echo esc_attr( $field['id'] ); ?>" />
 		<?php } ?>
 
-		<p class="frm-hide-empty frm-inline-flex frm-gap-sm frm-flex-wrap">
+		<div class="frm-hide-empty frm-inline-flex frm-gap-sm frm-flex-wrap frm-items-center frm-my-sm">
 			<?php if ( $display['required'] ) { ?>
-				<label for="frm_req_field_<?php echo esc_attr( $field['id'] ); ?>">
-					<input type="checkbox" id="frm_req_field_<?php echo esc_attr( $field['id'] ); ?>" class="frm_req_field" name="field_options[required_<?php echo esc_attr( $field['id'] ); ?>]" value="1" <?php checked( $field['required'], 1 ); ?> />
-					<?php esc_html_e( 'Required', 'formidable' ); ?>
-				</label>
+				<div class="frm_form_field">
+					<label for="frm_req_field_<?php echo esc_attr( $field['id'] ); ?>" class="frm-mb-0">
+						<input type="checkbox" id="frm_req_field_<?php echo esc_attr( $field['id'] ); ?>" class="frm_req_field" name="field_options[required_<?php echo esc_attr( $field['id'] ); ?>]" value="1" <?php checked( $field['required'], 1 ); ?> />
+						<?php esc_html_e( 'Required', 'formidable' ); ?>
+					</label>
+				</div>
 				<?php
 			}
 
 			if ( $display['unique'] ) {
 				?>
-				<label for="frm_uniq_field_<?php echo esc_attr( $field['id'] ); ?>" class="frm_help" title="<?php esc_attr_e( 'Unique: Do not allow the same response multiple times. For example, if one user enters \'Joe\', then no one else will be allowed to enter the same name.', 'formidable' ); ?>"><input type="checkbox" name="field_options[unique_<?php echo esc_attr( $field['id'] ); ?>]" id="frm_uniq_field_<?php echo esc_attr( $field['id'] ); ?>" value="1" <?php checked( $field['unique'], 1 ); ?> class="frm_mark_unique" />
-					<?php esc_html_e( 'Unique', 'formidable' ); ?>
-				</label>
+				<div class="frm_form_field">
+					<label for="frm_uniq_field_<?php echo esc_attr( $field['id'] ); ?>" class="frm_help frm-mb-0" title="<?php esc_attr_e( 'Unique: Do not allow the same response multiple times. For example, if one user enters \'Joe\', then no one else will be allowed to enter the same name.', 'formidable' ); ?>"><input type="checkbox" name="field_options[unique_<?php echo esc_attr( $field['id'] ); ?>]" id="frm_uniq_field_<?php echo esc_attr( $field['id'] ); ?>" value="1" <?php checked( $field['unique'], 1 ); ?> class="frm_mark_unique" />
+						<?php esc_html_e( 'Unique', 'formidable' ); ?>
+					</label>
+				</div>
 				<?php
 			}
 
 			if ( $display['read_only'] ) {
 				?>
-				<label for="frm_read_only_field_<?php echo esc_attr( $field['id'] ); ?>" class="frm_help" title="<?php esc_attr_e( 'Read Only: Show this field but do not allow the field value to be edited from the front-end.', 'formidable' ); ?>" >
-					<input type="checkbox" id="frm_read_only_field_<?php echo esc_attr( $field['id'] ); ?>" name="field_options[read_only_<?php echo esc_attr( $field['id'] ); ?>]" value="1" <?php checked( $field['read_only'], 1 ); ?>/>
-					<?php esc_html_e( 'Read Only', 'formidable' ); ?>
-				</label>
+				<div class="frm_form_field">
+					<label for="frm_read_only_field_<?php echo esc_attr( $field['id'] ); ?>" class="frm_help frm-mb-0" title="<?php esc_attr_e( 'Read Only: Show this field but do not allow the field value to be edited from the front-end.', 'formidable' ); ?>" >
+						<input type="checkbox" id="frm_read_only_field_<?php echo esc_attr( $field['id'] ); ?>" name="field_options[read_only_<?php echo esc_attr( $field['id'] ); ?>]" value="1" <?php checked( $field['read_only'], 1 ); ?>/>
+						<?php esc_html_e( 'Read Only', 'formidable' ); ?>
+					</label>
+				</div>
 				<?php
 			}
 
 			do_action( 'frm_field_options_form_top', $field, $display, $values );
 			?>
-		</p>
+		</div>
 
 		<?php
 		if ( $display['range'] ) {
@@ -100,7 +106,6 @@
 		}
 
 		$field_obj->show_primary_options( compact( 'field', 'display', 'values' ) );
-
 		?>
 
 		<?php if ( $display['css'] ) { ?>

From 107b596aad4fc33b4dc59350907b7b6419d7be21 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Fri, 12 Jul 2024 16:30:30 +0300
Subject: [PATCH 04/56] Add `.frm-my-sm` class

---
 css/frm_admin.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/css/frm_admin.css b/css/frm_admin.css
index d14e319599..c24027db97 100644
--- a/css/frm_admin.css
+++ b/css/frm_admin.css
@@ -1697,6 +1697,11 @@ input.frm_insert_in_template {
 	margin-right: var(--gap-sm) !important;
 }
 
+#wpbody-content .frm-my-sm {
+	margin-top: var(--gap-sm) !important;
+	margin-bottom: var(--gap-sm) !important;
+}
+
 .frm-p-0 {
 	padding: 0 !important;
 }

From ce1fc48c5e9b05f6b91ce2af803e89c65a6e95f6 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Tue, 10 Dec 2024 15:05:37 +0300
Subject: [PATCH 05/56] Add is_hidden param to show_format_option method and
 refactor it

---
 classes/controllers/FrmFieldsController.php | 14 ++++++++------
 classes/models/fields/FrmFieldPhone.php     |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/classes/controllers/FrmFieldsController.php b/classes/controllers/FrmFieldsController.php
index 1f4feaa1df..3658b6258c 100644
--- a/classes/controllers/FrmFieldsController.php
+++ b/classes/controllers/FrmFieldsController.php
@@ -468,15 +468,17 @@ public static function display_field_options( $settings, $field_info = null ) {
 	 *
 	 * @since 3.0
 	 *
-	 * @param array $field
+	 * @param array $field Field array.
+	 * @param bool  $is_hidden Whether the format option should be hidden.
 	 * @return void
 	 */
-	public static function show_format_option( $field ) {
-		$attributes          = array();
-		$attributes['class'] = 'frm-has-modal';
+	public static function show_format_option( $field, $is_hidden = false ) {
+		$attributes          = array(
+			'class' => 'frm-has-modal',
+			'id'    => 'phone' === $field['type'] ? 'frm-phone-field-custom-format-' . $field['id'] : 'frm-field-format-custom-' . $field['id'],
+		);
 
-		if ( 'phone' === $field['type'] ) {
-			$attributes['id']     = 'frm-phone-field-custom-format-' . $field['id'];
+		if ( $is_hidden ) {
 			$attributes['class'] .= ' frm_hidden';
 		}
 
diff --git a/classes/models/fields/FrmFieldPhone.php b/classes/models/fields/FrmFieldPhone.php
index 1b9c68c7eb..00df8f979d 100644
--- a/classes/models/fields/FrmFieldPhone.php
+++ b/classes/models/fields/FrmFieldPhone.php
@@ -47,7 +47,7 @@ public function show_primary_options( $args ) {
 		$field = $args['field'];
 
 		include FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/phone/phone-type.php';
-		FrmFieldsController::show_format_option( $field );
+		FrmFieldsController::show_format_option( $field, true );
 
 		parent::show_primary_options( $args );
 	}

From cc581b19ceb4bb16045eeb97b49987d38ccb538c Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Tue, 10 Dec 2024 15:06:20 +0300
Subject: [PATCH 06/56] Add print_format_number_option method to FrmFieldText
 class

---
 classes/models/fields/FrmFieldText.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/classes/models/fields/FrmFieldText.php b/classes/models/fields/FrmFieldText.php
index 30fa019c6d..ce74a30619 100644
--- a/classes/models/fields/FrmFieldText.php
+++ b/classes/models/fields/FrmFieldText.php
@@ -47,4 +47,24 @@ public function validate( $args ) {
 
 		return $errors;
 	}
+
+	/**
+	 * Print the format number option for a field.
+	 *
+	 * @since x.x
+	 *
+	 * @return void
+	 */
+	public function print_format_number_option() {
+		?>
+		<option
+			value=""
+			class="frm_show_upgrade frm_noallow"
+			data-upgrade="<?php esc_attr_e( 'Format number field', 'formidable' ); ?>"
+			data-medium="format-number-field"
+		>
+			<?php esc_html_e( 'Number', 'formidable' ); ?>
+		</option>
+		<?php
+	}
 }

From ca8a9e297ac5e4bd1f24fdf044e5f93bb64b2682 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Tue, 10 Dec 2024 15:06:40 +0300
Subject: [PATCH 07/56] Add format-type view template

---
 .../views/frm-fields/back-end/format-type.php | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 classes/views/frm-fields/back-end/format-type.php

diff --git a/classes/views/frm-fields/back-end/format-type.php b/classes/views/frm-fields/back-end/format-type.php
new file mode 100644
index 0000000000..5328e7df98
--- /dev/null
+++ b/classes/views/frm-fields/back-end/format-type.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package Formidable
+ * @since x.x
+ *
+ * @var array        $field Field array.
+ * @var array        $args  Includes 'field', 'display', and 'values' settings.
+ * @var FrmFieldType $this  Field type object.
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	die( 'You are not allowed to call this page directly.' );
+}
+
+$field_id = $field['id'];
+$format   = FrmField::get_option( $field, 'format' );
+?>
+<p class="frm6 frm6_followed frm_form_field frm-format-type">
+	<label for="format_type_<?php echo esc_attr( $field_id ); ?>">
+		<?php esc_html_e( 'Format', 'formidable' ); ?>
+	</label>
+
+	<select
+		name="field_options[format_type_<?php echo esc_attr( $field_id ); ?>]"
+		id="format_type_<?php echo esc_attr( $field_id ); ?>"
+		class="frm_format_type_dropdown frm_select_with_upgrade frm_select_with_dependency"
+		data-field-id="<?php echo intval( $field_id ); ?>"
+	>
+		<option value="none" <?php selected( $format, '' ); ?>>
+			<?php esc_html_e( 'None', 'formidable' ); ?>
+		</option>
+
+		<?php FrmFieldFactory::get_field_type( $field['type'] )->print_format_number_option(); ?>
+
+		<option value="custom" data-dependency="#frm-field-format-custom-<?php echo esc_attr( $field_id ); ?>" <?php selected( ! empty( $format ) && 'number' !== $format, true ); ?>>
+			<?php esc_html_e( 'Custom', 'formidable' ); ?>
+		</option>
+	</select>
+</p>

From a764391eb1724263f0e3279b4984501e751da183 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Tue, 10 Dec 2024 15:06:50 +0300
Subject: [PATCH 08/56] Move format setting

---
 classes/views/frm-fields/back-end/settings.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/classes/views/frm-fields/back-end/settings.php b/classes/views/frm-fields/back-end/settings.php
index 5371e8c7cc..0c7d58b7f0 100644
--- a/classes/views/frm-fields/back-end/settings.php
+++ b/classes/views/frm-fields/back-end/settings.php
@@ -106,6 +106,12 @@
 		}
 
 		$field_obj->show_primary_options( compact( 'field', 'display', 'values' ) );
+
+		if ( $display['format'] ) {
+			include FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/format-type.php';
+
+			FrmFieldsController::show_format_option( $field, true );
+		}
 		?>
 
 		<?php if ( $display['css'] ) { ?>
@@ -259,13 +265,7 @@
 			</p>
 		<?php } ?>
 
-		<?php
-		if ( $display['format'] ) {
-			FrmFieldsController::show_format_option( $field );
-		}
-
-		do_action( 'frm_field_options', compact( 'field', 'display', 'values' ) );
-		?>
+		<?php do_action( 'frm_field_options', compact( 'field', 'display', 'values' ) ); ?>
 
 		<?php if ( $display['required'] ) { ?>
 			<p class="frm6 frm_form_field frm_required_details<?php echo esc_attr( $field['id'] . ( $field['required'] ? '' : ' frm_hidden' ) ); ?>">

From 0016cb222e4227b3505d028591130b8543af110a Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Tue, 10 Dec 2024 20:36:59 +0300
Subject: [PATCH 09/56] Update text field to include format settings

---
 classes/models/fields/FrmFieldText.php            | 2 +-
 classes/views/frm-fields/back-end/format-type.php | 2 +-
 classes/views/frm-fields/back-end/settings.php    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/models/fields/FrmFieldText.php b/classes/models/fields/FrmFieldText.php
index ce74a30619..3bf2db0720 100644
--- a/classes/models/fields/FrmFieldText.php
+++ b/classes/models/fields/FrmFieldText.php
@@ -55,7 +55,7 @@ public function validate( $args ) {
 	 *
 	 * @return void
 	 */
-	public function print_format_number_option() {
+	public function print_format_number_option( $field ) {
 		?>
 		<option
 			value=""
diff --git a/classes/views/frm-fields/back-end/format-type.php b/classes/views/frm-fields/back-end/format-type.php
index 5328e7df98..03cb64438c 100644
--- a/classes/views/frm-fields/back-end/format-type.php
+++ b/classes/views/frm-fields/back-end/format-type.php
@@ -30,7 +30,7 @@ class="frm_format_type_dropdown frm_select_with_upgrade frm_select_with_dependen
 			<?php esc_html_e( 'None', 'formidable' ); ?>
 		</option>
 
-		<?php FrmFieldFactory::get_field_type( $field['type'] )->print_format_number_option(); ?>
+		<?php FrmFieldFactory::get_field_type( $field['type'] )->print_format_number_option( $field ); ?>
 
 		<option value="custom" data-dependency="#frm-field-format-custom-<?php echo esc_attr( $field_id ); ?>" <?php selected( ! empty( $format ) && 'number' !== $format, true ); ?>>
 			<?php esc_html_e( 'Custom', 'formidable' ); ?>
diff --git a/classes/views/frm-fields/back-end/settings.php b/classes/views/frm-fields/back-end/settings.php
index 0c7d58b7f0..1f1dadccfb 100644
--- a/classes/views/frm-fields/back-end/settings.php
+++ b/classes/views/frm-fields/back-end/settings.php
@@ -64,7 +64,7 @@
 			<input type="hidden" name="field_options[name_<?php echo esc_attr( $field['id'] ); ?>]" value="<?php echo esc_attr( $field['name'] ); ?>" id="frm_name_<?php echo esc_attr( $field['id'] ); ?>" />
 		<?php } ?>
 
-		<div class="frm-hide-empty frm-inline-flex frm-gap-sm frm-flex-wrap frm-items-center frm-my-sm">
+		<div class="frm-hide-empty frm-inline-flex frm-gap-sm frm-flex-wrap frm-items-center frm-my-xs">
 			<?php if ( $display['required'] ) { ?>
 				<div class="frm_form_field">
 					<label for="frm_req_field_<?php echo esc_attr( $field['id'] ); ?>" class="frm-mb-0">

From 6a31a6c5929f971d93bda47394523cc1a30c2219 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Tue, 10 Dec 2024 20:37:21 +0300
Subject: [PATCH 10/56] Update Paragraph field to include format settings

---
 classes/models/fields/FrmFieldTextarea.php | 21 +++++++++++++++++++++
 css/frm_admin.css                          | 10 ++++++++++
 2 files changed, 31 insertions(+)

diff --git a/classes/models/fields/FrmFieldTextarea.php b/classes/models/fields/FrmFieldTextarea.php
index f356b5ae66..d5c3a560bc 100644
--- a/classes/models/fields/FrmFieldTextarea.php
+++ b/classes/models/fields/FrmFieldTextarea.php
@@ -26,6 +26,7 @@ protected function field_settings_for_type() {
 		return array(
 			'size'           => true,
 			'clear_on_focus' => true,
+			'format'         => true,
 		);
 	}
 
@@ -97,4 +98,24 @@ public function front_field_input( $args, $shortcode_atts ) {
 			FrmAppHelper::esc_textarea( $this->field['value'] ) .
 			'</textarea>';
 	}
+
+	/**
+	 * Print the format number option for a field.
+	 *
+	 * @since x.x
+	 *
+	 * @return void
+	 */
+	public function print_format_number_option( $field ) {
+		?>
+		<option
+			value=""
+			class="frm_show_upgrade frm_noallow"
+			data-upgrade="<?php esc_attr_e( 'Format number field', 'formidable' ); ?>"
+			data-medium="format-number-field"
+		>
+			<?php esc_html_e( 'Number', 'formidable' ); ?>
+		</option>
+		<?php
+	}
 }
diff --git a/css/frm_admin.css b/css/frm_admin.css
index 903c703168..4fe7f6692b 100644
--- a/css/frm_admin.css
+++ b/css/frm_admin.css
@@ -313,6 +313,11 @@ body.frm-white-body ul#adminmenu > li.current > a.current:after {
 	grid-column: span 6 / span 6;
 }
 
+.frm_form_field.frm12_followed + p,
+.frm_form_field.frm12_followed + div {
+	grid-column: span 12 / span 12 !important;
+}
+
 .frm_form_field.frm-phone-type + p > label,
 .frm_form_field.frm-phone-type + div > label {
 	opacity: 0; /* Hide the label for the format input in the phone field. */
@@ -1721,6 +1726,11 @@ input.frm_insert_in_template {
 	margin-right: var(--gap-sm) !important;
 }
 
+.frm-my-xs {
+	margin-top: var(--gap-xs) !important;
+	margin-bottom: var(--gap-xs) !important;
+}
+
 #wpbody-content .frm-my-sm {
 	margin-top: var(--gap-sm) !important;
 	margin-bottom: var(--gap-sm) !important;

From 6e18e2515522c66d5d0c16fa3780d5ef52b63428 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Thu, 12 Dec 2024 15:07:54 +0300
Subject: [PATCH 11/56] Remove print_format_number_option method

---
 classes/models/fields/FrmFieldText.php     | 20 --------------------
 classes/models/fields/FrmFieldTextarea.php | 20 --------------------
 2 files changed, 40 deletions(-)

diff --git a/classes/models/fields/FrmFieldText.php b/classes/models/fields/FrmFieldText.php
index 3bf2db0720..30fa019c6d 100644
--- a/classes/models/fields/FrmFieldText.php
+++ b/classes/models/fields/FrmFieldText.php
@@ -47,24 +47,4 @@ public function validate( $args ) {
 
 		return $errors;
 	}
-
-	/**
-	 * Print the format number option for a field.
-	 *
-	 * @since x.x
-	 *
-	 * @return void
-	 */
-	public function print_format_number_option( $field ) {
-		?>
-		<option
-			value=""
-			class="frm_show_upgrade frm_noallow"
-			data-upgrade="<?php esc_attr_e( 'Format number field', 'formidable' ); ?>"
-			data-medium="format-number-field"
-		>
-			<?php esc_html_e( 'Number', 'formidable' ); ?>
-		</option>
-		<?php
-	}
 }
diff --git a/classes/models/fields/FrmFieldTextarea.php b/classes/models/fields/FrmFieldTextarea.php
index d5c3a560bc..902eb11798 100644
--- a/classes/models/fields/FrmFieldTextarea.php
+++ b/classes/models/fields/FrmFieldTextarea.php
@@ -98,24 +98,4 @@ public function front_field_input( $args, $shortcode_atts ) {
 			FrmAppHelper::esc_textarea( $this->field['value'] ) .
 			'</textarea>';
 	}
-
-	/**
-	 * Print the format number option for a field.
-	 *
-	 * @since x.x
-	 *
-	 * @return void
-	 */
-	public function print_format_number_option( $field ) {
-		?>
-		<option
-			value=""
-			class="frm_show_upgrade frm_noallow"
-			data-upgrade="<?php esc_attr_e( 'Format number field', 'formidable' ); ?>"
-			data-medium="format-number-field"
-		>
-			<?php esc_html_e( 'Number', 'formidable' ); ?>
-		</option>
-		<?php
-	}
 }

From 50ca0ca50ee2574fd37b62532778feed4e7a9c84 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Thu, 12 Dec 2024 15:08:17 +0300
Subject: [PATCH 12/56] Add Number option to format-type template

---
 .../views/frm-fields/back-end/format-type.php | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/classes/views/frm-fields/back-end/format-type.php b/classes/views/frm-fields/back-end/format-type.php
index 03cb64438c..881a84072d 100644
--- a/classes/views/frm-fields/back-end/format-type.php
+++ b/classes/views/frm-fields/back-end/format-type.php
@@ -30,10 +30,34 @@ class="frm_format_type_dropdown frm_select_with_upgrade frm_select_with_dependen
 			<?php esc_html_e( 'None', 'formidable' ); ?>
 		</option>
 
-		<?php FrmFieldFactory::get_field_type( $field['type'] )->print_format_number_option( $field ); ?>
+		<?php
+		$number_option = '
+			<option value="" class="frm_show_upgrade frm_noallow" data-upgrade="' . esc_attr__( 'Format number field', 'formidable' ) . '" data-medium="format-number-field">
+				' . esc_html__( 'Number', 'formidable' ) . '
+			</option>';
+
+		/**
+		 * Filter the number option HTML for the format dropdown.
+		 *
+		 * @since x.x
+		 *
+		 * @param string $number_option The HTML for the number option.
+		 * @param array  $field         The field array.
+		 */
+		echo apply_filters( 'frm_print_format_number_option', $number_option, $field ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		?>
 
 		<option value="custom" data-dependency="#frm-field-format-custom-<?php echo esc_attr( $field_id ); ?>" <?php selected( ! empty( $format ) && 'number' !== $format, true ); ?>>
 			<?php esc_html_e( 'Custom', 'formidable' ); ?>
 		</option>
 	</select>
 </p>
+
+<?php
+/**
+ * Fires after the format type template is rendered.
+ *
+ * @since x.x
+ */
+do_action( 'frm_after_format_type_template' );
+?>

From eca4564e4a811baeb60dbf8e8e0da72bda861048 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Thu, 12 Dec 2024 15:08:31 +0300
Subject: [PATCH 13/56] Remove frm-my-sm helper class

---
 css/frm_admin.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/css/frm_admin.css b/css/frm_admin.css
index 4fe7f6692b..8b2f9a00e8 100644
--- a/css/frm_admin.css
+++ b/css/frm_admin.css
@@ -1731,11 +1731,6 @@ input.frm_insert_in_template {
 	margin-bottom: var(--gap-xs) !important;
 }
 
-#wpbody-content .frm-my-sm {
-	margin-top: var(--gap-sm) !important;
-	margin-bottom: var(--gap-sm) !important;
-}
-
 .frm-p-0 {
 	padding: 0 !important;
 }

From f5ba756c9669e6e9ede9509dc2e7e9c70eae5775 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Thu, 12 Dec 2024 15:09:50 +0300
Subject: [PATCH 14/56] Fix: International option selection in Lite version

---
 classes/models/fields/FrmFieldPhone.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/classes/models/fields/FrmFieldPhone.php b/classes/models/fields/FrmFieldPhone.php
index 00df8f979d..64ad861901 100644
--- a/classes/models/fields/FrmFieldPhone.php
+++ b/classes/models/fields/FrmFieldPhone.php
@@ -62,11 +62,10 @@ public function show_primary_options( $args ) {
 	protected function print_international_option() {
 		?>
 		<option
-			value="international"
+			value=""
 			class="frm_show_upgrade frm_noallow"
 			data-upgrade="<?php esc_attr_e( 'International phone field', 'formidable' ); ?>"
 			data-medium="international-phone-field"
-			<?php selected( FrmField::get_option( $this->field, 'format' ), 'international' ); ?>
 		>
 			<?php esc_html_e( 'International', 'formidable' ); ?>
 		</option>

From f32e6064ce65fc4020814d3f7ad0ce9fcc0f46c7 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Fri, 13 Dec 2024 16:03:56 +0300
Subject: [PATCH 15/56] Update format input id

---
 classes/controllers/FrmFieldsController.php            | 2 +-
 classes/views/frm-fields/back-end/phone/phone-type.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/controllers/FrmFieldsController.php b/classes/controllers/FrmFieldsController.php
index 3658b6258c..867c60bf38 100644
--- a/classes/controllers/FrmFieldsController.php
+++ b/classes/controllers/FrmFieldsController.php
@@ -475,7 +475,7 @@ public static function display_field_options( $settings, $field_info = null ) {
 	public static function show_format_option( $field, $is_hidden = false ) {
 		$attributes          = array(
 			'class' => 'frm-has-modal',
-			'id'    => 'phone' === $field['type'] ? 'frm-phone-field-custom-format-' . $field['id'] : 'frm-field-format-custom-' . $field['id'],
+			'id'    => 'frm-field-format-custom-' . $field['id'],
 		);
 
 		if ( $is_hidden ) {
diff --git a/classes/views/frm-fields/back-end/phone/phone-type.php b/classes/views/frm-fields/back-end/phone/phone-type.php
index 1f3c30cf23..736ebff953 100644
--- a/classes/views/frm-fields/back-end/phone/phone-type.php
+++ b/classes/views/frm-fields/back-end/phone/phone-type.php
@@ -32,7 +32,7 @@ class="frm_phone_type_dropdown frm_select_with_upgrade frm_select_with_dependenc
 			<?php esc_html_e( 'None', 'formidable' ); ?>
 		</option>
 		<?php $this->print_international_option(); ?>
-		<option value="custom" data-dependency="#frm-phone-field-custom-format-<?php echo esc_attr( $field_id ); ?>" <?php selected( ! empty( $format ) && 'international' !== $format, true ); ?>>
+		<option value="custom" data-dependency="#frm-field-format-custom-<?php echo esc_attr( $field_id ); ?>" <?php selected( ! empty( $format ) && 'international' !== $format, true ); ?>>
 			<?php esc_html_e( 'Custom', 'formidable' ); ?>
 		</option>
 	</select>

From 3ac1abee6cd03af94c3fac74150e2b87f8c99952 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Fri, 13 Dec 2024 16:04:26 +0300
Subject: [PATCH 16/56] Enable format settings

---
 classes/models/fields/FrmFieldHidden.php | 1 +
 classes/models/fields/FrmFieldNumber.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/classes/models/fields/FrmFieldHidden.php b/classes/models/fields/FrmFieldHidden.php
index 42465cce98..c560f5b969 100644
--- a/classes/models/fields/FrmFieldHidden.php
+++ b/classes/models/fields/FrmFieldHidden.php
@@ -41,6 +41,7 @@ protected function field_settings_for_type() {
 		$settings            = parent::field_settings_for_type();
 		$settings['css']     = false;
 		$settings['default'] = true;
+		$settings['format']  = true;
 
 		return $settings;
 	}
diff --git a/classes/models/fields/FrmFieldNumber.php b/classes/models/fields/FrmFieldNumber.php
index 7c01ff984e..0e426c33df 100644
--- a/classes/models/fields/FrmFieldNumber.php
+++ b/classes/models/fields/FrmFieldNumber.php
@@ -28,6 +28,7 @@ protected function field_settings_for_type() {
 			'clear_on_focus' => true,
 			'invalid'        => true,
 			'range'          => true,
+			'format'         => true,
 		);
 
 		$settings['max'] = false;

From d78b213dae0a3671f841c6aebc0de2367aa5d34c Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Fri, 13 Dec 2024 16:04:41 +0300
Subject: [PATCH 17/56] Update format-type template

---
 .../views/frm-fields/back-end/format-type.php | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/classes/views/frm-fields/back-end/format-type.php b/classes/views/frm-fields/back-end/format-type.php
index 881a84072d..cb6fb28755 100644
--- a/classes/views/frm-fields/back-end/format-type.php
+++ b/classes/views/frm-fields/back-end/format-type.php
@@ -12,10 +12,12 @@
 	die( 'You are not allowed to call this page directly.' );
 }
 
-$field_id = $field['id'];
-$format   = FrmField::get_option( $field, 'format' );
+$field_id        = $field['id'];
+$field_type      = $field['type'];
+$is_number_field = 'number' === $field_type;
+$format          = FrmField::get_option( $field, 'format' );
 ?>
-<p class="frm6 frm6_followed frm_form_field frm-format-type">
+<p class="frm6 frm_form_field frm-format-type">
 	<label for="format_type_<?php echo esc_attr( $field_id ); ?>">
 		<?php esc_html_e( 'Format', 'formidable' ); ?>
 	</label>
@@ -31,9 +33,9 @@ class="frm_format_type_dropdown frm_select_with_upgrade frm_select_with_dependen
 		</option>
 
 		<?php
-		$number_option = '
+		$number_option       = '
 			<option value="" class="frm_show_upgrade frm_noallow" data-upgrade="' . esc_attr__( 'Format number field', 'formidable' ) . '" data-medium="format-number-field">
-				' . esc_html__( 'Number', 'formidable' ) . '
+				' . ( ! $is_number_field ? esc_html__( 'Number', 'formidable' ) : esc_html__( 'Custom', 'formidable' ) ) . '
 			</option>';
 
 		/**
@@ -41,15 +43,19 @@ class="frm_format_type_dropdown frm_select_with_upgrade frm_select_with_dependen
 		 *
 		 * @since x.x
 		 *
-		 * @param string $number_option The HTML for the number option.
-		 * @param array  $field         The field array.
+		 * @param string $number_option   The HTML for the number option.
+		 * @param array  $field           The field array.
+		 * @param string $is_number_field Indicates whether the field is a number field ('true' or 'false').
+		 * @return string Filtered HTML for the number option.
 		 */
-		echo apply_filters( 'frm_print_format_number_option', $number_option, $field ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		echo apply_filters( 'frm_print_format_number_option', $number_option, $field, $is_number_field ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		?>
 
-		<option value="custom" data-dependency="#frm-field-format-custom-<?php echo esc_attr( $field_id ); ?>" <?php selected( ! empty( $format ) && 'number' !== $format, true ); ?>>
-			<?php esc_html_e( 'Custom', 'formidable' ); ?>
-		</option>
+		<?php if ( 'text' === $field_type ) { ?>
+			<option value="custom" data-dependency="#frm-field-format-custom-<?php echo esc_attr( $field_id ); ?>" <?php selected( ! empty( $format ) && 'number' !== $format, true ); ?>>
+				<?php esc_html_e( 'Custom', 'formidable' ); ?>
+			</option>
+		<?php } ?>
 	</select>
 </p>
 
@@ -58,6 +64,8 @@ class="frm_format_type_dropdown frm_select_with_upgrade frm_select_with_dependen
  * Fires after the format type template is rendered.
  *
  * @since x.x
+ *
+ * @param array $field The field array.
  */
-do_action( 'frm_after_format_type_template' );
+do_action( 'frm_after_format_type_template', $field );
 ?>

From 2e491fbf1996420fd7fcd724f0c3b09824926c6d Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Fri, 13 Dec 2024 16:05:06 +0300
Subject: [PATCH 18/56] Update styles and fix some issues

---
 css/frm_admin.css | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/css/frm_admin.css b/css/frm_admin.css
index efbe52abf1..57a3fbe172 100644
--- a/css/frm_admin.css
+++ b/css/frm_admin.css
@@ -318,11 +318,20 @@ body.frm-white-body ul#adminmenu > li.current > a.current:after {
 	grid-column: span 12 / span 12 !important;
 }
 
-.frm_form_field.frm-phone-type + p > label,
-.frm_form_field.frm-phone-type + div > label {
+.frm_form_field.frm-phone-type ~ [id*="frm-field-format-custom-"] > label,
+.frm_form_field.frm-format-type ~ [id*="frm-field-format-custom-"] > label {
 	opacity: 0; /* Hide the label for the format input in the phone field. */
 }
 
+.frm_form_field.frm-format-type ~ [id*="frm-field-format-custom-"] {
+	grid-column: span 6 / span 6;
+}
+
+/* Adjust "CSS Layout Classes" to full width when the "Format" setting is present. */
+.frm-single-settings.frm-type-textarea > .frm_grid_container [id*="frm-field-format-custom-"] + p {
+	grid-column: span 12/span 12;
+}
+
 .frm-short-list {
 	overflow: auto;
 	max-height: 190px;

From 2ffcc77e3a3596054f6d1416d0274970eb264cbb Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Fri, 13 Dec 2024 16:05:59 +0300
Subject: [PATCH 19/56] Adjust maybeUpdateFormatInput function

---
 js/formidable_admin.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/js/formidable_admin.js b/js/formidable_admin.js
index 6b785a337a..32258d345f 100644
--- a/js/formidable_admin.js
+++ b/js/formidable_admin.js
@@ -5435,11 +5435,15 @@ function frmAdminBuildJS() {
 	 * @param {Event} event The event object from the phone type selection.
 	 * @return {void}
 	 */
-	function maybeUpdatePhoneFormatInput( event ) {
-		const phoneType = event.target;
-		if ( 'custom' === phoneType.value ) {
-			const formatInput = phoneType.parentElement.nextElementSibling.querySelector( '.frm_format_opt' );
-			if ( 'international' === formatInput.value ) {
+	function maybeUpdateFormatInput( event ) {
+		const formatElement = event.target;
+		const type = formatElement.value
+
+		if ( 'custom' === type ) {
+			const fieldId = formatElement.dataset.fieldId;
+			const formatInput = document.getElementById( `frm-field-format-custom-${fieldId}` ).querySelector( '.frm_format_opt' );
+
+			if ( 'international' === formatInput.value || 'number' === formatInput.value ) {
 				formatInput.setAttribute( 'value', '' );
 			}
 		}
@@ -8445,7 +8449,7 @@ function frmAdminBuildJS() {
 			onClickPreventDefault( continueButton, () => {
 				saveAndReloadFormBuilder();
 			} );
-	
+
 			const cancelButton = frmDom.modal.footerButton({
 				text: __( 'Cancel', 'formidable' ),
 				buttonType: 'cancel'
@@ -10694,7 +10698,7 @@ function frmAdminBuildJS() {
 			jQuery( document ).on( 'blur', '.frm-single-settings ul input[type="text"][name^="field_options[options_"]', onOptionTextBlur );
 
 			frmDom.util.documentOn( 'click', '.frm-show-field-settings', clickVis );
-			frmDom.util.documentOn( 'change', 'select.frm_phone_type_dropdown', maybeUpdatePhoneFormatInput );
+			frmDom.util.documentOn( 'change', 'select.frm_format_type_dropdown, select.frm_phone_type_dropdown', maybeUpdateFormatInput );
 
 			initBulkOptionsOverlay();
 			hideEmptyEle();

From 6caddaf7b2b3b2a3dcdddb89f568cf8b5349eb19 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Fri, 13 Dec 2024 16:06:13 +0300
Subject: [PATCH 20/56] Adjust adjustFormatInputBeforeSave function

---
 js/formidable_admin.js | 41 ++++++++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/js/formidable_admin.js b/js/formidable_admin.js
index 32258d345f..6b6d614278 100644
--- a/js/formidable_admin.js
+++ b/js/formidable_admin.js
@@ -6706,19 +6706,38 @@ function frmAdminBuildJS() {
 	 * @return {void}
 	 */
 	function adjustFormatInputBeforeSave( submitButton ) {
-		const phoneTypes = document.querySelectorAll( '.frm_phone_type_dropdown' );
-		phoneTypes.forEach( phoneType => {
-			const value = phoneType.value;
-			if ( ! [ 'none', 'international' ].includes( value ) ) {
+		const formatTypes = document.querySelectorAll( '.frm_format_type_dropdown, .frm_phone_type_dropdown' );
+		formatTypes.forEach( formatType => {
+			const value = formatType.value;
+			if ( ! [ 'none', 'international', 'number' ].includes( value ) ) {
 				return;
 			}
 
-			const formatInput = phoneType.parentElement.nextElementSibling.querySelector( '.frm_format_opt' );
-			if ( 'none' === value ) {
-				formatInput.setAttribute( 'value', '' );
-			}
-			if ( 'international' === value ) {
-				formatInput.setAttribute( 'value', 'international' );
+			const fieldId = formatType.dataset.fieldId;
+			const formatInput = document.getElementById( `frm-field-format-custom-${fieldId}` ).querySelector( '.frm_format_opt' );
+
+			const currencyEl = document.querySelector(`input[name="field_options[is_currency_${fieldId}]"]`);
+			const customFormatEl = document.querySelector(`input[name="field_options[custom_currency_${fieldId}]"]`);
+
+			switch ( value ) {
+				case 'none':
+				case 'international':
+					formatInput.setAttribute('value', value === 'none' ? '' : 'international');
+
+					// Uncheck the "Custom Format" and "Currency" checkboxes.
+					if ( currencyEl && customFormatEl ) {
+						const changeEvent = new Event('change', { bubbles: true });
+
+						currencyEl.checked = false;
+						currencyEl.dispatchEvent(changeEvent);
+						customFormatEl.checked = false;
+						customFormatEl.dispatchEvent(changeEvent);
+					}
+					break;
+
+				case 'number':
+					formatInput.setAttribute( 'value', currencyEl.checked || customFormatEl.checked ? 'number' : '' );
+					break;
 			}
 		});
 	}
@@ -8383,7 +8402,7 @@ function frmAdminBuildJS() {
 	 * Handles 'change' event on the document.
 	 *
 	 * @since 6.16.3
-	 * 
+	 *
 	 * @param {Event} event
 	 * @returns {Void}
 	 */

From 2faa6889ccbd5df2bf3227351d45f8d98fcebe00 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Fri, 13 Dec 2024 23:25:19 +0300
Subject: [PATCH 21/56] Remove format number checkboxes

---
 .../views/frm-fields/back-end/format-type.php | 15 +++---
 js/formidable_admin.js                        | 53 +++++--------------
 2 files changed, 20 insertions(+), 48 deletions(-)

diff --git a/classes/views/frm-fields/back-end/format-type.php b/classes/views/frm-fields/back-end/format-type.php
index cb6fb28755..5199de8696 100644
--- a/classes/views/frm-fields/back-end/format-type.php
+++ b/classes/views/frm-fields/back-end/format-type.php
@@ -33,9 +33,10 @@ class="frm_format_type_dropdown frm_select_with_upgrade frm_select_with_dependen
 		</option>
 
 		<?php
-		$number_option       = '
+		$number_option_text = in_array( $field_type, array( 'number', 'range' ) ) ? esc_html__( 'Custom', 'formidable' ) : esc_html__( 'Number', 'formidable' );
+		$number_option      = '
 			<option value="" class="frm_show_upgrade frm_noallow" data-upgrade="' . esc_attr__( 'Format number field', 'formidable' ) . '" data-medium="format-number-field">
-				' . ( ! $is_number_field ? esc_html__( 'Number', 'formidable' ) : esc_html__( 'Custom', 'formidable' ) ) . '
+				' . $number_option_text . '
 			</option>';
 
 		/**
@@ -43,12 +44,12 @@ class="frm_format_type_dropdown frm_select_with_upgrade frm_select_with_dependen
 		 *
 		 * @since x.x
 		 *
-		 * @param string $number_option   The HTML for the number option.
-		 * @param array  $field           The field array.
-		 * @param string $is_number_field Indicates whether the field is a number field ('true' or 'false').
-		 * @return string Filtered HTML for the number option.
+		 * @param string $number_option      The HTML for the number option.
+		 * @param string $number_option_text The text for the number option.
+		 * @param array  $field              The field array.
+		 * @return string The filtered HTML for the number option.
 		 */
-		echo apply_filters( 'frm_print_format_number_option', $number_option, $field, $is_number_field ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		echo apply_filters( 'frm_print_format_number_option', $number_option, $number_option_text, $field ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		?>
 
 		<?php if ( 'text' === $field_type ) { ?>
diff --git a/js/formidable_admin.js b/js/formidable_admin.js
index 6b6d614278..7fc5673211 100644
--- a/js/formidable_admin.js
+++ b/js/formidable_admin.js
@@ -5424,15 +5424,11 @@ function frmAdminBuildJS() {
 	}
 
 	/**
-	 * Update the phone format input based on the selected phone type.
-	 *
-	 * This function is triggered when a phone type is selected.
-	 * If the selected type is 'custom' and the current format is 'international',
-	 * the format input value is cleared to allow for custom input.
+	 * Update the format input based on the selected format type.
 	 *
 	 * @since 6.9
 	 *
-	 * @param {Event} event The event object from the phone type selection.
+	 * @param {Event} event The event object from the format type selection.
 	 * @return {void}
 	 */
 	function maybeUpdateFormatInput( event ) {
@@ -6693,12 +6689,7 @@ function frmAdminBuildJS() {
 	}
 
 	/**
-	 * Updates the format input based on the selected phone type from dropdowns during the form save process.
-	 *
-	 * Triggered within the preFormSave function, this function iterates through all phone type dropdown elements
-	 * and adjusts the format input value accordingly. Specifically, if the phone type is 'custom' but the format input
-	 * is empty, it sets it to 'none'. If the phone type is 'international', it sets the format input value to 'international'
-	 * before the form is saved.
+	 * Updates the format input based on the selected format type from dropdowns during the form save process.
 	 *
 	 * @since 6.9
 	 *
@@ -6707,37 +6698,17 @@ function frmAdminBuildJS() {
 	 */
 	function adjustFormatInputBeforeSave( submitButton ) {
 		const formatTypes = document.querySelectorAll( '.frm_format_type_dropdown, .frm_phone_type_dropdown' );
+		const valueMap = {
+			none: '',
+			international: 'international',
+			number: 'number'
+		};
+
 		formatTypes.forEach( formatType => {
 			const value = formatType.value;
-			if ( ! [ 'none', 'international', 'number' ].includes( value ) ) {
-				return;
-			}
-
-			const fieldId = formatType.dataset.fieldId;
-			const formatInput = document.getElementById( `frm-field-format-custom-${fieldId}` ).querySelector( '.frm_format_opt' );
-
-			const currencyEl = document.querySelector(`input[name="field_options[is_currency_${fieldId}]"]`);
-			const customFormatEl = document.querySelector(`input[name="field_options[custom_currency_${fieldId}]"]`);
-
-			switch ( value ) {
-				case 'none':
-				case 'international':
-					formatInput.setAttribute('value', value === 'none' ? '' : 'international');
-
-					// Uncheck the "Custom Format" and "Currency" checkboxes.
-					if ( currencyEl && customFormatEl ) {
-						const changeEvent = new Event('change', { bubbles: true });
-
-						currencyEl.checked = false;
-						currencyEl.dispatchEvent(changeEvent);
-						customFormatEl.checked = false;
-						customFormatEl.dispatchEvent(changeEvent);
-					}
-					break;
-
-				case 'number':
-					formatInput.setAttribute( 'value', currencyEl.checked || customFormatEl.checked ? 'number' : '' );
-					break;
+			if ( value in valueMap ) {
+				const formatInput = document.getElementById( `frm-field-format-custom-${formatType.dataset.fieldId}` ).querySelector( '.frm_format_opt' );
+				formatInput.setAttribute( 'value', valueMap[value] );
 			}
 		});
 	}

From d3e6f5ec7bbe9715d5ba34e2f0bc5e7b83e3cc09 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Tue, 17 Dec 2024 16:01:00 +0300
Subject: [PATCH 22/56] Update number option value

---
 js/formidable_admin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/formidable_admin.js b/js/formidable_admin.js
index 7fc5673211..35f3710485 100644
--- a/js/formidable_admin.js
+++ b/js/formidable_admin.js
@@ -6701,7 +6701,7 @@ function frmAdminBuildJS() {
 		const valueMap = {
 			none: '',
 			international: 'international',
-			number: 'number'
+			number: 'currency'
 		};
 
 		formatTypes.forEach( formatType => {

From a4156e642b9d2525cc98bf9e86a08155624d79fa Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Wed, 18 Dec 2024 15:37:05 +0300
Subject: [PATCH 23/56] Use "currency" value for number format

---
 classes/views/frm-fields/back-end/format-type.php | 2 +-
 js/formidable_admin.js                            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/views/frm-fields/back-end/format-type.php b/classes/views/frm-fields/back-end/format-type.php
index 5199de8696..4a0ea06a1f 100644
--- a/classes/views/frm-fields/back-end/format-type.php
+++ b/classes/views/frm-fields/back-end/format-type.php
@@ -53,7 +53,7 @@ class="frm_format_type_dropdown frm_select_with_upgrade frm_select_with_dependen
 		?>
 
 		<?php if ( 'text' === $field_type ) { ?>
-			<option value="custom" data-dependency="#frm-field-format-custom-<?php echo esc_attr( $field_id ); ?>" <?php selected( ! empty( $format ) && 'number' !== $format, true ); ?>>
+			<option value="custom" data-dependency="#frm-field-format-custom-<?php echo esc_attr( $field_id ); ?>" <?php selected( ! empty( $format ) && 'currency' !== $format, true ); ?>>
 				<?php esc_html_e( 'Custom', 'formidable' ); ?>
 			</option>
 		<?php } ?>
diff --git a/js/formidable_admin.js b/js/formidable_admin.js
index 35f3710485..76d51947c9 100644
--- a/js/formidable_admin.js
+++ b/js/formidable_admin.js
@@ -5439,7 +5439,7 @@ function frmAdminBuildJS() {
 			const fieldId = formatElement.dataset.fieldId;
 			const formatInput = document.getElementById( `frm-field-format-custom-${fieldId}` ).querySelector( '.frm_format_opt' );
 
-			if ( 'international' === formatInput.value || 'number' === formatInput.value ) {
+			if ( 'international' === formatInput.value || 'currency' === formatInput.value ) {
 				formatInput.setAttribute( 'value', '' );
 			}
 		}
@@ -6701,7 +6701,7 @@ function frmAdminBuildJS() {
 		const valueMap = {
 			none: '',
 			international: 'international',
-			number: 'currency'
+			currency: 'currency'
 		};
 
 		formatTypes.forEach( formatType => {

From ad97b196e504e9d7228e02b490c9e0533254ef0a Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Sun, 22 Dec 2024 15:14:05 +0300
Subject: [PATCH 24/56] Fix JS error when searching fields

---
 js/formidable_admin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/formidable_admin.js b/js/formidable_admin.js
index 1729296c18..34c119f606 100644
--- a/js/formidable_admin.js
+++ b/js/formidable_admin.js
@@ -8554,7 +8554,7 @@ function frmAdminBuildJS() {
 	 * @returns {Boolean}
 	 */
 	function isContextualShortcode( item ) {
-		const shortcode = item.querySelector( 'a' ).dataset.code;
+		const shortcode = item.querySelector( 'a' )?.dataset.code;
 		return frmAdminJs.contextualShortcodes.address.includes( shortcode ) || frmAdminJs.contextualShortcodes.body.includes( shortcode );
 	}
 

From e4a5c908608cd6f4b76d479c6cc385c57498dbd5 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 23 Dec 2024 10:46:18 +0300
Subject: [PATCH 25/56] Tweak

---
 classes/views/frm-fields/back-end/format-type.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/views/frm-fields/back-end/format-type.php b/classes/views/frm-fields/back-end/format-type.php
index 4a0ea06a1f..b08b2be5fb 100644
--- a/classes/views/frm-fields/back-end/format-type.php
+++ b/classes/views/frm-fields/back-end/format-type.php
@@ -44,7 +44,7 @@ class="frm_format_type_dropdown frm_select_with_upgrade frm_select_with_dependen
 		 *
 		 * @since x.x
 		 *
-		 * @param string $number_option      The HTML for the number option.
+		 * @param string $number_option       The HTML for the number option.
 		 * @param string $number_option_text The text for the number option.
 		 * @param array  $field              The field array.
 		 * @return string The filtered HTML for the number option.

From 05ec90018cd05d9fc74ffc8fa7f50bf1a4e646b6 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 23 Dec 2024 17:18:03 +0300
Subject: [PATCH 26/56] Fix adjustFormatInputBeforeSave function

---
 js/formidable_admin.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/formidable_admin.js b/js/formidable_admin.js
index 34c119f606..8cee4d2504 100644
--- a/js/formidable_admin.js
+++ b/js/formidable_admin.js
@@ -6695,10 +6695,9 @@ function frmAdminBuildJS() {
 	 *
 	 * @since 6.9
 	 *
-	 * @param {HTMLButtonElement} submitButton The button that was submitted.
 	 * @return {void}
 	 */
-	function adjustFormatInputBeforeSave( submitButton ) {
+	function adjustFormatInputBeforeSave() {
 		const formatTypes = document.querySelectorAll( '.frm_format_type_dropdown, .frm_phone_type_dropdown' );
 		const valueMap = {
 			none: '',
@@ -6709,7 +6708,7 @@ function frmAdminBuildJS() {
 		formatTypes.forEach( formatType => {
 			const value = formatType.value;
 			if ( value in valueMap ) {
-				const formatInput = document.getElementById( `frm-field-format-custom-${formatType.dataset.fieldId}` ).querySelector( '.frm_format_opt' );
+				const formatInput = document.getElementById( `frm_format_${formatType.dataset.fieldId}` );
 				formatInput.setAttribute( 'value', valueMap[value] );
 			}
 		});

From 755619cdb35ae9430a6712ee2cc0ae05f3bc4753 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 23 Dec 2024 21:20:33 +0300
Subject: [PATCH 27/56] Add format class

---
 classes/controllers/FrmFieldsController.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/classes/controllers/FrmFieldsController.php b/classes/controllers/FrmFieldsController.php
index 867c60bf38..5ee83b56f5 100644
--- a/classes/controllers/FrmFieldsController.php
+++ b/classes/controllers/FrmFieldsController.php
@@ -529,6 +529,13 @@ private static function add_input_classes( $field, array &$class ) {
 		if ( isset( $field['size'] ) && $field['size'] > 0 ) {
 			$class[] = 'auto_width';
 		}
+
+		if (
+			in_array( $field['type'], array( 'text', 'textarea', 'number', 'hidden' ) )
+			&& isset( $field['format'] ) && 'currency' === $field['format'] && empty( $field['calc'] )
+		) {
+			$class[] = 'frm-has-number-format';
+		}
 	}
 
 	/**

From 15e2621928cd517ac383309d75989e366cf1d9d4 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Thu, 26 Dec 2024 11:44:04 +0300
Subject: [PATCH 28/56] Fix conflict between custom format and number format

---
 classes/controllers/FrmFieldsController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/controllers/FrmFieldsController.php b/classes/controllers/FrmFieldsController.php
index 5ee83b56f5..665f4acfbf 100644
--- a/classes/controllers/FrmFieldsController.php
+++ b/classes/controllers/FrmFieldsController.php
@@ -970,7 +970,8 @@ private static function should_allow_input_attribute( $key ) {
 	 * @return void
 	 */
 	private static function add_pattern_attribute( $field, array &$add_html ) {
-		$has_format   = FrmField::is_option_true_in_array( $field, 'format' );
+		$format_value = FrmField::get_option( $field, 'format' );
+		$has_format   = $format_value && 'currency' !== $format_value;
 		$format_field = FrmField::is_field_type( $field, 'text' );
 
 		if ( $field['type'] === 'phone' || ( $has_format && $format_field ) ) {

From 0e6716d8212dfd850779defdd3984e38e2952c8e Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Wed, 1 Jan 2025 17:10:04 +0300
Subject: [PATCH 29/56] Review part one

---
 classes/controllers/FrmFieldsController.php   |  9 +++-----
 .../{format-type.php => format-dropdown.php}  | 23 +++++++++----------
 .../views/frm-fields/back-end/settings.php    |  2 +-
 css/frm_admin.css                             |  4 ++--
 js/formidable_admin.js                        |  4 ++--
 5 files changed, 19 insertions(+), 23 deletions(-)
 rename classes/views/frm-fields/back-end/{format-type.php => format-dropdown.php} (74%)

diff --git a/classes/controllers/FrmFieldsController.php b/classes/controllers/FrmFieldsController.php
index 665f4acfbf..cf762fe863 100644
--- a/classes/controllers/FrmFieldsController.php
+++ b/classes/controllers/FrmFieldsController.php
@@ -468,12 +468,12 @@ public static function display_field_options( $settings, $field_info = null ) {
 	 *
 	 * @since 3.0
 	 *
-	 * @param array $field Field array.
+	 * @param array $field Field data.
 	 * @param bool  $is_hidden Whether the format option should be hidden.
 	 * @return void
 	 */
 	public static function show_format_option( $field, $is_hidden = false ) {
-		$attributes          = array(
+		$attributes = array(
 			'class' => 'frm-has-modal',
 			'id'    => 'frm-field-format-custom-' . $field['id'],
 		);
@@ -530,10 +530,7 @@ private static function add_input_classes( $field, array &$class ) {
 			$class[] = 'auto_width';
 		}
 
-		if (
-			in_array( $field['type'], array( 'text', 'textarea', 'number', 'hidden' ) )
-			&& isset( $field['format'] ) && 'currency' === $field['format'] && empty( $field['calc'] )
-		) {
+		if ( isset( $field['format'] ) && 'currency' === $field['format'] && empty( $field['calc'] ) && 'range' !== $field['type'] ) {
 			$class[] = 'frm-has-number-format';
 		}
 	}
diff --git a/classes/views/frm-fields/back-end/format-type.php b/classes/views/frm-fields/back-end/format-dropdown.php
similarity index 74%
rename from classes/views/frm-fields/back-end/format-type.php
rename to classes/views/frm-fields/back-end/format-dropdown.php
index b08b2be5fb..722dce6a24 100644
--- a/classes/views/frm-fields/back-end/format-type.php
+++ b/classes/views/frm-fields/back-end/format-dropdown.php
@@ -3,7 +3,7 @@
  * @package Formidable
  * @since x.x
  *
- * @var array        $field Field array.
+ * @var array        $field Field data.
  * @var array        $args  Includes 'field', 'display', and 'values' settings.
  * @var FrmFieldType $this  Field type object.
  */
@@ -12,20 +12,19 @@
 	die( 'You are not allowed to call this page directly.' );
 }
 
-$field_id        = $field['id'];
-$field_type      = $field['type'];
-$is_number_field = 'number' === $field_type;
-$format          = FrmField::get_option( $field, 'format' );
+$field_id   = $field['id'];
+$field_type = $field['type'];
+$format     = FrmField::get_option( $field, 'format' );
 ?>
-<p class="frm6 frm_form_field frm-format-type">
-	<label for="format_type_<?php echo esc_attr( $field_id ); ?>">
+<p class="frm6 frm_form_field frm-format-dropdown">
+	<label for="format_dropdown_<?php echo esc_attr( $field_id ); ?>">
 		<?php esc_html_e( 'Format', 'formidable' ); ?>
 	</label>
 
 	<select
-		name="field_options[format_type_<?php echo esc_attr( $field_id ); ?>]"
-		id="format_type_<?php echo esc_attr( $field_id ); ?>"
-		class="frm_format_type_dropdown frm_select_with_upgrade frm_select_with_dependency"
+		name="field_options[format_dropdown_<?php echo esc_attr( $field_id ); ?>]"
+		id="frm_format_dropdown_<?php echo esc_attr( $field_id ); ?>"
+		class="frm_format_dropdown frm_select_with_upgrade frm_select_with_dependency"
 		data-field-id="<?php echo intval( $field_id ); ?>"
 	>
 		<option value="none" <?php selected( $format, '' ); ?>>
@@ -62,11 +61,11 @@ class="frm_format_type_dropdown frm_select_with_upgrade frm_select_with_dependen
 
 <?php
 /**
- * Fires after the format type template is rendered.
+ * Fires after the format dropdown template is rendered.
  *
  * @since x.x
  *
  * @param array $field The field array.
  */
-do_action( 'frm_after_format_type_template', $field );
+do_action( 'frm_after_format_dropdown_template', $field );
 ?>
diff --git a/classes/views/frm-fields/back-end/settings.php b/classes/views/frm-fields/back-end/settings.php
index 1f1dadccfb..5d9b5f94fe 100644
--- a/classes/views/frm-fields/back-end/settings.php
+++ b/classes/views/frm-fields/back-end/settings.php
@@ -108,7 +108,7 @@
 		$field_obj->show_primary_options( compact( 'field', 'display', 'values' ) );
 
 		if ( $display['format'] ) {
-			include FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/format-type.php';
+			include FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/format-dropdown.php';
 
 			FrmFieldsController::show_format_option( $field, true );
 		}
diff --git a/css/frm_admin.css b/css/frm_admin.css
index 57a3fbe172..afcc8284bc 100644
--- a/css/frm_admin.css
+++ b/css/frm_admin.css
@@ -319,11 +319,11 @@ body.frm-white-body ul#adminmenu > li.current > a.current:after {
 }
 
 .frm_form_field.frm-phone-type ~ [id*="frm-field-format-custom-"] > label,
-.frm_form_field.frm-format-type ~ [id*="frm-field-format-custom-"] > label {
+.frm_form_field.frm-format-dropdown ~ [id*="frm-field-format-custom-"] > label {
 	opacity: 0; /* Hide the label for the format input in the phone field. */
 }
 
-.frm_form_field.frm-format-type ~ [id*="frm-field-format-custom-"] {
+.frm_form_field.frm-format-dropdown ~ [id*="frm-field-format-custom-"] {
 	grid-column: span 6 / span 6;
 }
 
diff --git a/js/formidable_admin.js b/js/formidable_admin.js
index 8cee4d2504..03ed6e8f22 100644
--- a/js/formidable_admin.js
+++ b/js/formidable_admin.js
@@ -6698,7 +6698,7 @@ function frmAdminBuildJS() {
 	 * @return {void}
 	 */
 	function adjustFormatInputBeforeSave() {
-		const formatTypes = document.querySelectorAll( '.frm_format_type_dropdown, .frm_phone_type_dropdown' );
+		const formatTypes = document.querySelectorAll( '.frm_format_dropdown, .frm_phone_type_dropdown' );
 		const valueMap = {
 			none: '',
 			international: 'international',
@@ -10689,7 +10689,7 @@ function frmAdminBuildJS() {
 			jQuery( document ).on( 'blur', '.frm-single-settings ul input[type="text"][name^="field_options[options_"]', onOptionTextBlur );
 
 			frmDom.util.documentOn( 'click', '.frm-show-field-settings', clickVis );
-			frmDom.util.documentOn( 'change', 'select.frm_format_type_dropdown, select.frm_phone_type_dropdown', maybeUpdateFormatInput );
+			frmDom.util.documentOn( 'change', 'select.frm_format_dropdown, select.frm_phone_type_dropdown', maybeUpdateFormatInput );
 
 			initBulkOptionsOverlay();
 			hideEmptyEle();

From 66bb225a8fdb83edf0a3970f1ed9b11e9aa5c740 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Wed, 1 Jan 2025 17:33:50 +0300
Subject: [PATCH 30/56] Review part two

---
 classes/views/frm-fields/back-end/settings.php | 1 -
 classes/views/frm-settings/general.php         | 2 +-
 css/frm_admin.css                              | 7 ++-----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/classes/views/frm-fields/back-end/settings.php b/classes/views/frm-fields/back-end/settings.php
index 5d9b5f94fe..f7198a6ece 100644
--- a/classes/views/frm-fields/back-end/settings.php
+++ b/classes/views/frm-fields/back-end/settings.php
@@ -109,7 +109,6 @@
 
 		if ( $display['format'] ) {
 			include FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/format-dropdown.php';
-
 			FrmFieldsController::show_format_option( $field, true );
 		}
 		?>
diff --git a/classes/views/frm-settings/general.php b/classes/views/frm-settings/general.php
index 0a50f8fd5e..500e6eacd0 100644
--- a/classes/views/frm-settings/general.php
+++ b/classes/views/frm-settings/general.php
@@ -12,7 +12,7 @@
 	<?php do_action( 'frm_before_settings' ); ?>
 </div>
 
-<h3><?php esc_html_e( 'Other', 'formidable' ); ?></h3>
+<h3><?php esc_html_e( 'Defaults', 'formidable' ); ?></h3>
 
 <p class="frm_grid_container">
 	<label class="frm4 frm_form_field" for="frm_default_email">
diff --git a/css/frm_admin.css b/css/frm_admin.css
index afcc8284bc..396c1d40e9 100644
--- a/css/frm_admin.css
+++ b/css/frm_admin.css
@@ -1878,7 +1878,8 @@ input.frm_insert_in_template {
 	display: inline-block !important;
 }
 
-.frm-inline-flex {
+.frm-inline-flex,
+#wpbody-content .frm-inline-flex {
 	display: inline-flex;
 }
 
@@ -1886,10 +1887,6 @@ input.frm_insert_in_template {
 	display: flex;
 }
 
-#wpbody-content .frm-inline-flex {
-	display: inline-flex;
-}
-
 .frm_hidden,
 .js .frm-hide-js {
 	display: none;

From 703058666c394386b80a1a0f3dd57e73d6644684 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Fri, 10 Jan 2025 10:33:57 +0300
Subject: [PATCH 31/56] Move the format fields input class to the Pro version

---
 classes/controllers/FrmFieldsController.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/classes/controllers/FrmFieldsController.php b/classes/controllers/FrmFieldsController.php
index cf762fe863..8fb240de82 100644
--- a/classes/controllers/FrmFieldsController.php
+++ b/classes/controllers/FrmFieldsController.php
@@ -529,10 +529,6 @@ private static function add_input_classes( $field, array &$class ) {
 		if ( isset( $field['size'] ) && $field['size'] > 0 ) {
 			$class[] = 'auto_width';
 		}
-
-		if ( isset( $field['format'] ) && 'currency' === $field['format'] && empty( $field['calc'] ) && 'range' !== $field['type'] ) {
-			$class[] = 'frm-has-number-format';
-		}
 	}
 
 	/**

From 2f45cc45a9ab54bb5354fd2a30457cc3a5219a79 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Fri, 10 Jan 2025 11:34:20 +0300
Subject: [PATCH 32/56] Enhance kses method to include $echo parameter

---
 classes/helpers/FrmAppHelper.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php
index c33f35e351..23c4b3a1e5 100644
--- a/classes/helpers/FrmAppHelper.php
+++ b/classes/helpers/FrmAppHelper.php
@@ -861,13 +861,19 @@ private static function decode_amp( &$string ) {
 	 *
 	 * @param string       $value
 	 * @param array|string $allowed 'all' for everything included as defaults.
+	 * @param bool         $echo    Whether to output the sanitized value directly.
 	 *
 	 * @return string
 	 */
-	public static function kses( $value, $allowed = array() ) {
-		$allowed_html = self::allowed_html( $allowed );
+	public static function kses( $value, $allowed = array(), $echo = false ) {
+		$allowed_html    = self::allowed_html( $allowed );
+		$sanitized_value = wp_kses( $value, $allowed_html );
 
-		return wp_kses( $value, $allowed_html );
+		if ( ! $echo ) {
+			return wp_kses( $value, $allowed_html );
+		}
+
+		echo $sanitized_value; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	}
 
 	/**

From 7dd51c6be035fab2de59e186f61bc9c7d12cc5ff Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Fri, 10 Jan 2025 11:35:51 +0300
Subject: [PATCH 33/56] Make format-dropdown template file echo safer

---
 classes/helpers/FrmAppHelper.php                     |  4 ++++
 .../views/frm-fields/back-end/format-dropdown.php    | 12 ++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php
index 23c4b3a1e5..333d864f4f 100644
--- a/classes/helpers/FrmAppHelper.php
+++ b/classes/helpers/FrmAppHelper.php
@@ -1095,6 +1095,10 @@ private static function safe_html() {
 			'legend'     => array(
 				'class' => true,
 			),
+			'option'     => array(
+				'value'    => true,
+				'selected' => true,
+			),
 		);
 	}
 
diff --git a/classes/views/frm-fields/back-end/format-dropdown.php b/classes/views/frm-fields/back-end/format-dropdown.php
index 722dce6a24..0b96d1a0e2 100644
--- a/classes/views/frm-fields/back-end/format-dropdown.php
+++ b/classes/views/frm-fields/back-end/format-dropdown.php
@@ -48,7 +48,16 @@ class="frm_format_dropdown frm_select_with_upgrade frm_select_with_dependency"
 		 * @param array  $field              The field array.
 		 * @return string The filtered HTML for the number option.
 		 */
-		echo apply_filters( 'frm_print_format_number_option', $number_option, $number_option_text, $field ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		$number_option = apply_filters( 'frm_print_format_number_option', $number_option, $number_option_text, $field );
+
+		$add_allowed_html = function ( $allowed_html ) {
+			$allowed_html['option']['data-dependency'] = true;
+			return $allowed_html;
+		};
+
+		add_filter( 'frm_striphtml_allowed_tags', $add_allowed_html );
+		FrmAppHelper::kses( $number_option, array( 'option' ), true );
+		remove_filter( 'frm_striphtml_allowed_tags', $add_allowed_html );
 		?>
 
 		<?php if ( 'text' === $field_type ) { ?>
@@ -68,4 +77,3 @@ class="frm_format_dropdown frm_select_with_upgrade frm_select_with_dependency"
  * @param array $field The field array.
  */
 do_action( 'frm_after_format_dropdown_template', $field );
-?>

From a72422e15f43aece82e505fa3fbd8cb369527cd8 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Fri, 10 Jan 2025 16:25:06 +0300
Subject: [PATCH 34/56] Improve the kses method implementation

---
 classes/helpers/FrmAppHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php
index 333d864f4f..d2734719c0 100644
--- a/classes/helpers/FrmAppHelper.php
+++ b/classes/helpers/FrmAppHelper.php
@@ -870,7 +870,7 @@ public static function kses( $value, $allowed = array(), $echo = false ) {
 		$sanitized_value = wp_kses( $value, $allowed_html );
 
 		if ( ! $echo ) {
-			return wp_kses( $value, $allowed_html );
+			return $sanitized_value;
 		}
 
 		echo $sanitized_value; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped

From 1e23391a91352648f290612ef23e9afc90eaf44c Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Thu, 23 Jan 2025 19:00:01 +0300
Subject: [PATCH 35/56] Fix text field validation

---
 classes/models/FrmEntryValidate.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/models/FrmEntryValidate.php b/classes/models/FrmEntryValidate.php
index 35ff7e3a89..0d976534e0 100644
--- a/classes/models/FrmEntryValidate.php
+++ b/classes/models/FrmEntryValidate.php
@@ -228,7 +228,8 @@ public static function validate_field_types( &$errors, $posted_field, $value, $a
 	}
 
 	public static function validate_phone_field( &$errors, $field, $value, $args ) {
-		if ( $field->type === 'phone' || ( $field->type === 'text' && FrmField::is_option_true_in_object( $field, 'format' ) ) ) {
+		$format_value = FrmField::get_option( $field, 'format' );
+		if ( $field->type === 'phone' || ( $field->type === 'text' && $format_value && 'currency' !== $format_value ) ) {
 
 			$pattern = self::phone_format( $field );
 

From 220ef845cad200e6cde2a0ecaba3d4eff7cf102d Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Thu, 30 Jan 2025 12:55:41 +0300
Subject: [PATCH 36/56] Normalize formatted numbers before saving

---
 classes/models/FrmEntryValidate.php | 20 ++++++++++++++++++++
 stubs.php                           |  3 +++
 2 files changed, 23 insertions(+)

diff --git a/classes/models/FrmEntryValidate.php b/classes/models/FrmEntryValidate.php
index 0d976534e0..6158c555b5 100644
--- a/classes/models/FrmEntryValidate.php
+++ b/classes/models/FrmEntryValidate.php
@@ -136,6 +136,8 @@ public static function validate_field( $posted_field, &$errors, $values, $args =
 			$value = $values;
 		}
 
+		self::maybe_normalize_formatted_numbers( $posted_field, $value );
+
 		// Check for values in "Other" fields
 		FrmEntriesHelper::maybe_set_other_validation( $posted_field, $value, $args );
 
@@ -337,6 +339,24 @@ public static function spam_check( $exclude, $values, &$errors ) {
 		}
 	}
 
+	/**
+	 * Normalizes formatted numbers in a value based on the field format settings, if applicable
+	 *
+	 * @since x.x
+	 *
+	 * @param array  $field The field settings.
+	 * @param string $value The value to be normalized (passed by reference).
+	 * @return void
+	 */
+	private static function maybe_normalize_formatted_numbers( $field, &$value ) {
+		if (
+			is_callable( 'FrmProCurrencyHelper::normalize_formatted_numbers' )
+			&& 'currency' === FrmField::get_option( $field, 'format' )
+		) {
+			$value = FrmProCurrencyHelper::normalize_formatted_numbers( $field, $value );
+		}
+	}
+
 	/**
 	 * Checks if form is in progress.
 	 *
diff --git a/stubs.php b/stubs.php
index b82cfde206..0adc1fa547 100644
--- a/stubs.php
+++ b/stubs.php
@@ -155,6 +155,9 @@ public static function admin_banner() {
 		public static function get_readable_license_type() {
 		}
 	}
+	class FrmProCurrencyHelper {
+		public static function normalize_formatted_numbers( $field, $formatted_value ) {}
+	}
 	class FrmProDb {
 		public static $plug_version;
 	}

From c34b41495760cf0899223f63d03e5681580de98a Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 3 Feb 2025 16:32:48 +0300
Subject: [PATCH 37/56] Add render_currency_selector method

---
 classes/controllers/FrmSettingsController.php | 5 +++++
 stubs.php                                     | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/classes/controllers/FrmSettingsController.php b/classes/controllers/FrmSettingsController.php
index ffaf29e0e1..1b9ea17d70 100644
--- a/classes/controllers/FrmSettingsController.php
+++ b/classes/controllers/FrmSettingsController.php
@@ -207,6 +207,11 @@ public static function general_settings() {
 	 * @return void
 	 */
 	public static function maybe_render_currency_selector( $frm_settings, $more_html ) {
+		if ( is_callable( 'FrmProSettingsController::render_currency_selector' ) ) {
+			FrmProSettingsController::render_currency_selector();
+			return;
+		}
+
 		if ( false !== strpos( $more_html, 'id="frm_currency"' ) ) {
 			// Avoid rendering the Currency setting if it gets rendered from the frm_settings_form hook.
 			// This is for backward compatibility. If Pro is outdated there won't be two currency dropdowns.
diff --git a/stubs.php b/stubs.php
index 0adc1fa547..7d507cc7e4 100644
--- a/stubs.php
+++ b/stubs.php
@@ -424,8 +424,8 @@ class FrmProSettingsController {
 		 * @param string $count
 		 * @return string
 		 */
-		public static function inbox_badge( $count ) {
-		}
+		public static function inbox_badge( $count ) {}
+		public static function render_currency_selector() {}
 	}
 }
 

From 1a5e74d09bdac5b7092b48919aec00aa7d3f10f6 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 3 Feb 2025 16:33:06 +0300
Subject: [PATCH 38/56] Fix tooltip style issue

---
 classes/views/frm-settings/_currency.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/views/frm-settings/_currency.php b/classes/views/frm-settings/_currency.php
index f16de50ffc..0a345e0bba 100644
--- a/classes/views/frm-settings/_currency.php
+++ b/classes/views/frm-settings/_currency.php
@@ -4,8 +4,9 @@
 }
 ?>
 <p class="frm_grid_container">
-	<label for="frm_currency" class="frm4 frm_form_field frm_help" title="<?php esc_attr_e( 'Select the currency to be used by Formidable globally.', 'formidable' ); ?>">
+	<label for="frm_currency" class="frm4 frm_form_field frm_help">
 		<?php esc_html_e( 'Currency', 'formidable' ); ?>
+		<?php FrmAppHelper::tooltip_icon( __( 'Select the currency to be used by Formidable globally.', 'formidable' ) ); ?>
 	</label>
 	<select id="frm_currency" name="frm_currency" class="frm8 frm_form_field">
 		<?php

From fdc9864cefc4864af4255c3adab33a3cd352690b Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 3 Feb 2025 16:33:54 +0300
Subject: [PATCH 39/56] Add frm_other_settings_form do_action

---
 classes/views/frm-settings/general.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/classes/views/frm-settings/general.php b/classes/views/frm-settings/general.php
index 5453c70e01..0c3c5a6dd1 100644
--- a/classes/views/frm-settings/general.php
+++ b/classes/views/frm-settings/general.php
@@ -76,3 +76,11 @@
 		<?php FrmAppHelper::tooltip_icon( __( 'Only turn this on if IP addresses are incorrect in entries. Some server setups may require spoofable headers to determine an accurate IP address.', 'formidable' ) ); ?>
 	</label>
 </p>
+
+<?php
+/**
+ * Trigger an action so Pro can display additional General settings in the Other section.
+ *
+ * @param FrmSettings $frm_settings
+ */
+do_action( 'frm_other_settings_form', $frm_settings );

From 56dd10a698c41b58fd1d35a8b6be7f462c880fac Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 3 Feb 2025 16:34:14 +0300
Subject: [PATCH 40/56] Add formidable_settings localize script

---
 classes/controllers/FrmAppController.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/classes/controllers/FrmAppController.php b/classes/controllers/FrmAppController.php
index b00550a184..f7d3ce0f80 100644
--- a/classes/controllers/FrmAppController.php
+++ b/classes/controllers/FrmAppController.php
@@ -668,7 +668,12 @@ public static function admin_js() {
 		wp_register_script( 'formidable_embed', $plugin_url . '/js/admin/embed.js', array( 'formidable_dom', 'jquery-ui-autocomplete' ), $version, true );
 		self::register_popper1();
 		wp_register_script( 'bootstrap_tooltip', $plugin_url . '/js/bootstrap.min.js', array( 'jquery', 'popper' ), '4.6.1', true );
+
+		$settings_js_vars = array(
+			'currencies' => FrmCurrencyHelper::get_currencies(),
+		);
 		wp_register_script( 'formidable_settings', $plugin_url . '/js/admin/settings.js', array(), $version, true );
+		wp_localize_script( 'formidable_settings', 'frmSettings', $settings_js_vars );
 
 		if ( self::should_show_floating_links() ) {
 			self::enqueue_floating_links( $plugin_url, $version );

From 017ea430fccb92b99038e99e3303a063f89cb8a4 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 3 Feb 2025 16:35:57 +0300
Subject: [PATCH 41/56] Add syncCurrencyOptoins

---
 js/admin/settings.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/js/admin/settings.js b/js/admin/settings.js
index d725830e68..833f7a6a6b 100644
--- a/js/admin/settings.js
+++ b/js/admin/settings.js
@@ -9,6 +9,10 @@
 		if ( 'INPUT' === e.target.nodeName && 'checkbox' === e.target.type && e.target.parentNode.classList.contains( 'frm_toggle_block' ) ) {
 			handleToggleChangeEvent( e );
 		}
+
+		if ( 'frm_currency' === e.target.id) {
+			syncCurrencyOptoins( e.target );
+		}
 	}
 
 	function handleKeyDownEvent( e ) {
@@ -23,6 +27,19 @@
 		e.target.nextElementSibling.setAttribute( 'aria-checked', e.target.checked ? 'true' : 'false' );
 	}
 
+	/**
+	 * Updates the currency formatting options based on the selected currency.
+	 *
+	 * @param {HTMLSelectElement} currencySelect The currency select element.
+	 */
+	function syncCurrencyOptoins( currencySelect ) {
+		const currency = frmSettings.currencies[ currencySelect.value ];
+
+		document.getElementById( 'frm_thousand_separator' ).setAttribute( 'value', currency.thousand_separator );
+		document.getElementById( 'frm_decimal_separator' ).setAttribute( 'value', currency.decimal_separator );
+		document.getElementById( 'frm_decimals' ).setAttribute( 'value', currency.decimals );
+	}
+
 	function handleSpaceDownEvent( e ) {
 		if ( e.target.classList.contains( 'frm_toggle' ) ) {
 			e.preventDefault(); // Prevent automatic browser scroll when space is pressed.

From 7383229e245d8acc6494f9eaf5466ee4f58f7df1 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 3 Feb 2025 17:51:01 +0300
Subject: [PATCH 42/56] Add kses_echo helper method

---
 classes/helpers/FrmAppHelper.php              | 23 ++++++++++++-------
 .../frm-fields/back-end/format-dropdown.php   |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php
index 4236e0ab9a..c018599ef0 100644
--- a/classes/helpers/FrmAppHelper.php
+++ b/classes/helpers/FrmAppHelper.php
@@ -861,19 +861,26 @@ private static function decode_amp( &$string ) {
 	 *
 	 * @param string       $value
 	 * @param array|string $allowed 'all' for everything included as defaults.
-	 * @param bool         $echo    Whether to output the sanitized value directly.
 	 *
 	 * @return string
 	 */
-	public static function kses( $value, $allowed = array(), $echo = false ) {
-		$allowed_html    = self::allowed_html( $allowed );
-		$sanitized_value = wp_kses( $value, $allowed_html );
+	public static function kses( $value, $allowed = array() ) {
+		$allowed_html = self::allowed_html( $allowed );
 
-		if ( ! $echo ) {
-			return $sanitized_value;
-		}
+		return wp_kses( $value, $allowed_html );
+	}
 
-		echo $sanitized_value; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+	/**
+	 * Sanitizes and echoes a given value.
+	 *
+	 * @since x.x
+	 *
+	 * @param string       $value   The value to sanitize and output.
+	 * @param array|string $allowed Allowed HTML tags and attributes.
+	 * @return void
+	 */
+	public static function kses_echo( $value, $allowed = array() ) {
+		echo self::kses( $value, $allowed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	}
 
 	/**
diff --git a/classes/views/frm-fields/back-end/format-dropdown.php b/classes/views/frm-fields/back-end/format-dropdown.php
index 0b96d1a0e2..f95eac8f70 100644
--- a/classes/views/frm-fields/back-end/format-dropdown.php
+++ b/classes/views/frm-fields/back-end/format-dropdown.php
@@ -56,7 +56,7 @@ class="frm_format_dropdown frm_select_with_upgrade frm_select_with_dependency"
 		};
 
 		add_filter( 'frm_striphtml_allowed_tags', $add_allowed_html );
-		FrmAppHelper::kses( $number_option, array( 'option' ), true );
+		FrmAppHelper::kses_echo( $number_option, array( 'option' ) );
 		remove_filter( 'frm_striphtml_allowed_tags', $add_allowed_html );
 		?>
 

From 38047889922e86ffbf3430f24770da7c078cdae2 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 3 Feb 2025 19:27:54 +0300
Subject: [PATCH 43/56] Remove format settings

---
 classes/models/fields/FrmFieldHidden.php   | 1 -
 classes/models/fields/FrmFieldNumber.php   | 1 -
 classes/models/fields/FrmFieldTextarea.php | 1 -
 3 files changed, 3 deletions(-)

diff --git a/classes/models/fields/FrmFieldHidden.php b/classes/models/fields/FrmFieldHidden.php
index c560f5b969..42465cce98 100644
--- a/classes/models/fields/FrmFieldHidden.php
+++ b/classes/models/fields/FrmFieldHidden.php
@@ -41,7 +41,6 @@ protected function field_settings_for_type() {
 		$settings            = parent::field_settings_for_type();
 		$settings['css']     = false;
 		$settings['default'] = true;
-		$settings['format']  = true;
 
 		return $settings;
 	}
diff --git a/classes/models/fields/FrmFieldNumber.php b/classes/models/fields/FrmFieldNumber.php
index 0e426c33df..7c01ff984e 100644
--- a/classes/models/fields/FrmFieldNumber.php
+++ b/classes/models/fields/FrmFieldNumber.php
@@ -28,7 +28,6 @@ protected function field_settings_for_type() {
 			'clear_on_focus' => true,
 			'invalid'        => true,
 			'range'          => true,
-			'format'         => true,
 		);
 
 		$settings['max'] = false;
diff --git a/classes/models/fields/FrmFieldTextarea.php b/classes/models/fields/FrmFieldTextarea.php
index 902eb11798..f356b5ae66 100644
--- a/classes/models/fields/FrmFieldTextarea.php
+++ b/classes/models/fields/FrmFieldTextarea.php
@@ -26,7 +26,6 @@ protected function field_settings_for_type() {
 		return array(
 			'size'           => true,
 			'clear_on_focus' => true,
-			'format'         => true,
 		);
 	}
 

From 0addb4cf318c9242067e133612e01413bd5ee007 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 3 Feb 2025 19:28:32 +0300
Subject: [PATCH 44/56] Refactor format-dropdown view and add options view

---
 .../back-end/format-dropdown-options.php      | 40 +++++++++++++++++++
 .../frm-fields/back-end/format-dropdown.php   | 38 +++---------------
 2 files changed, 45 insertions(+), 33 deletions(-)
 create mode 100644 classes/views/frm-fields/back-end/format-dropdown-options.php

diff --git a/classes/views/frm-fields/back-end/format-dropdown-options.php b/classes/views/frm-fields/back-end/format-dropdown-options.php
new file mode 100644
index 0000000000..40d6291a2d
--- /dev/null
+++ b/classes/views/frm-fields/back-end/format-dropdown-options.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package Formidable
+ * @since x.x
+ *
+ * @var array        $field Field data.
+ * @var array        $args  Includes 'field', 'display', and 'values' settings.
+ * @var FrmFieldType $this  Field type object.
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	die( 'You are not allowed to call this page directly.' );
+}
+
+$field_type = $field['type'];
+$format     = FrmField::get_option( $field, 'format' );
+
+FrmHtmlHelper::echo_dropdown_option( __( 'None', 'formidable' ), '' === $format, array( 'value' => 'none' ) );
+
+FrmHtmlHelper::echo_dropdown_option(
+	in_array( $field_type, array( 'number', 'range' ) ) ? __( 'Custom', 'formidable' ) : __( 'Number', 'formidable' ),
+	false,
+	array(
+		'value'        => '',
+		'class'        => 'frm_show_upgrade frm_noallow',
+		'data-upgrade' => __( 'Format number field', 'formidable' ),
+		'data-medium'  => 'format-number-field',
+	)
+);
+
+if ( 'text' === $field_type ) {
+	FrmHtmlHelper::echo_dropdown_option(
+		__( 'Custom', 'formidable' ),
+		! empty( $format ) && 'currency' !== $format,
+		array(
+			'value'           => 'custom',
+			'data-dependency' => '#frm-field-format-custom-' . $field_id,
+		)
+	);
+}
diff --git a/classes/views/frm-fields/back-end/format-dropdown.php b/classes/views/frm-fields/back-end/format-dropdown.php
index f95eac8f70..7b72caa012 100644
--- a/classes/views/frm-fields/back-end/format-dropdown.php
+++ b/classes/views/frm-fields/back-end/format-dropdown.php
@@ -12,9 +12,7 @@
 	die( 'You are not allowed to call this page directly.' );
 }
 
-$field_id   = $field['id'];
-$field_type = $field['type'];
-$format     = FrmField::get_option( $field, 'format' );
+$field_id = $field['id'];
 ?>
 <p class="frm6 frm_form_field frm-format-dropdown">
 	<label for="format_dropdown_<?php echo esc_attr( $field_id ); ?>">
@@ -27,44 +25,18 @@
 		class="frm_format_dropdown frm_select_with_upgrade frm_select_with_dependency"
 		data-field-id="<?php echo intval( $field_id ); ?>"
 	>
-		<option value="none" <?php selected( $format, '' ); ?>>
-			<?php esc_html_e( 'None', 'formidable' ); ?>
-		</option>
-
 		<?php
-		$number_option_text = in_array( $field_type, array( 'number', 'range' ) ) ? esc_html__( 'Custom', 'formidable' ) : esc_html__( 'Number', 'formidable' );
-		$number_option      = '
-			<option value="" class="frm_show_upgrade frm_noallow" data-upgrade="' . esc_attr__( 'Format number field', 'formidable' ) . '" data-medium="format-number-field">
-				' . $number_option_text . '
-			</option>';
+		$options_view_path = FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/format-dropdown-options.php';
 
 		/**
-		 * Filter the number option HTML for the format dropdown.
+		 * Includes the formatted options view file.
 		 *
 		 * @since x.x
 		 *
-		 * @param string $number_option       The HTML for the number option.
-		 * @param string $number_option_text The text for the number option.
-		 * @param array  $field              The field array.
-		 * @return string The filtered HTML for the number option.
+		 * @param string $options_view_path The path to the options view file.
 		 */
-		$number_option = apply_filters( 'frm_print_format_number_option', $number_option, $number_option_text, $field );
-
-		$add_allowed_html = function ( $allowed_html ) {
-			$allowed_html['option']['data-dependency'] = true;
-			return $allowed_html;
-		};
-
-		add_filter( 'frm_striphtml_allowed_tags', $add_allowed_html );
-		FrmAppHelper::kses_echo( $number_option, array( 'option' ) );
-		remove_filter( 'frm_striphtml_allowed_tags', $add_allowed_html );
+		require apply_filters( 'frm_format_options_view_path', $options_view_path );
 		?>
-
-		<?php if ( 'text' === $field_type ) { ?>
-			<option value="custom" data-dependency="#frm-field-format-custom-<?php echo esc_attr( $field_id ); ?>" <?php selected( ! empty( $format ) && 'currency' !== $format, true ); ?>>
-				<?php esc_html_e( 'Custom', 'formidable' ); ?>
-			</option>
-		<?php } ?>
 	</select>
 </p>
 

From 1bf735ad8e46c9c56affd3301bfc3cee4bb1805f Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 3 Feb 2025 19:34:53 +0300
Subject: [PATCH 45/56] Use value instead of setAttribute

---
 js/formidable_admin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/formidable_admin.js b/js/formidable_admin.js
index 7c462f3df5..850fd1a484 100644
--- a/js/formidable_admin.js
+++ b/js/formidable_admin.js
@@ -6709,7 +6709,7 @@ function frmAdminBuildJS() {
 			const value = formatType.value;
 			if ( value in valueMap ) {
 				const formatInput = document.getElementById( `frm_format_${formatType.dataset.fieldId}` );
-				formatInput.setAttribute( 'value', valueMap[value] );
+				formatInput.value = valueMap[ value ];
 			}
 		});
 	}

From 062b00868ca3d11b9f021532edda9a05c8ec5872 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 3 Feb 2025 19:36:39 +0300
Subject: [PATCH 46/56] Enable in_array strict

---
 classes/views/frm-fields/back-end/format-dropdown-options.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/views/frm-fields/back-end/format-dropdown-options.php b/classes/views/frm-fields/back-end/format-dropdown-options.php
index 40d6291a2d..191d5ae4c5 100644
--- a/classes/views/frm-fields/back-end/format-dropdown-options.php
+++ b/classes/views/frm-fields/back-end/format-dropdown-options.php
@@ -18,7 +18,7 @@
 FrmHtmlHelper::echo_dropdown_option( __( 'None', 'formidable' ), '' === $format, array( 'value' => 'none' ) );
 
 FrmHtmlHelper::echo_dropdown_option(
-	in_array( $field_type, array( 'number', 'range' ) ) ? __( 'Custom', 'formidable' ) : __( 'Number', 'formidable' ),
+	in_array( $field_type, array( 'number', 'range' ), true ) ? __( 'Custom', 'formidable' ) : __( 'Number', 'formidable' ),
 	false,
 	array(
 		'value'        => '',

From dae5ec61b352b0a51043f3f1647bb6ed94163efe Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 3 Feb 2025 19:38:08 +0300
Subject: [PATCH 47/56] Allow class attribute in <option> tags

---
 classes/helpers/FrmAppHelper.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php
index c018599ef0..94e924325e 100644
--- a/classes/helpers/FrmAppHelper.php
+++ b/classes/helpers/FrmAppHelper.php
@@ -1103,6 +1103,7 @@ private static function safe_html() {
 				'class' => true,
 			),
 			'option'     => array(
+				'class'    => true,
 				'value'    => true,
 				'selected' => true,
 			),

From 776bc47a290ddcb712d84bf36d50d82bed70a284 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Tue, 4 Feb 2025 18:10:57 +0300
Subject: [PATCH 48/56] Add number format

---
 classes/controllers/FrmFieldsController.php         |  2 +-
 classes/helpers/FrmCurrencyHelper.php               | 10 ++++++++++
 classes/models/FrmEntryValidate.php                 |  4 ++--
 .../frm-fields/back-end/format-dropdown-options.php | 13 ++++++++++++-
 js/formidable_admin.js                              |  5 +++--
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/classes/controllers/FrmFieldsController.php b/classes/controllers/FrmFieldsController.php
index 8fb240de82..410cc1c8e6 100644
--- a/classes/controllers/FrmFieldsController.php
+++ b/classes/controllers/FrmFieldsController.php
@@ -964,7 +964,7 @@ private static function should_allow_input_attribute( $key ) {
 	 */
 	private static function add_pattern_attribute( $field, array &$add_html ) {
 		$format_value = FrmField::get_option( $field, 'format' );
-		$has_format   = $format_value && 'currency' !== $format_value;
+		$has_format   = $format_value && ! FrmCurrencyHelper::is_currency_format( $format_value );
 		$format_field = FrmField::is_field_type( $field, 'text' );
 
 		if ( $field['type'] === 'phone' || ( $has_format && $format_field ) ) {
diff --git a/classes/helpers/FrmCurrencyHelper.php b/classes/helpers/FrmCurrencyHelper.php
index ca4bf87f41..62e43715d7 100644
--- a/classes/helpers/FrmCurrencyHelper.php
+++ b/classes/helpers/FrmCurrencyHelper.php
@@ -26,6 +26,16 @@ public static function get_currency( $currency ) {
 		return $currency;
 	}
 
+	/**
+	 * Checks if the given format is a valid currency format.
+	 *
+	 * @param string $format_value The format value to check.
+	 * @return bool
+	 */
+	public static function is_currency_format( $format_value ) {
+		return ! empty( $format_value ) && in_array( $format_value, array( 'currency', 'number' ), true );
+	}
+
 	/**
 	 * Get a list of all supported currencies.
 	 *
diff --git a/classes/models/FrmEntryValidate.php b/classes/models/FrmEntryValidate.php
index 6158c555b5..19d0d29b39 100644
--- a/classes/models/FrmEntryValidate.php
+++ b/classes/models/FrmEntryValidate.php
@@ -231,8 +231,8 @@ public static function validate_field_types( &$errors, $posted_field, $value, $a
 
 	public static function validate_phone_field( &$errors, $field, $value, $args ) {
 		$format_value = FrmField::get_option( $field, 'format' );
-		if ( $field->type === 'phone' || ( $field->type === 'text' && $format_value && 'currency' !== $format_value ) ) {
 
+		if ( $field->type === 'phone' || ( $field->type === 'text' && ! FrmCurrencyHelper::is_currency_format( $format_value ) ) ) {
 			$pattern = self::phone_format( $field );
 
 			if ( ! preg_match( $pattern, $value ) ) {
@@ -351,7 +351,7 @@ public static function spam_check( $exclude, $values, &$errors ) {
 	private static function maybe_normalize_formatted_numbers( $field, &$value ) {
 		if (
 			is_callable( 'FrmProCurrencyHelper::normalize_formatted_numbers' )
-			&& 'currency' === FrmField::get_option( $field, 'format' )
+			&& FrmCurrencyHelper::is_currency_format( FrmField::get_option( $field, 'format' ) )
 		) {
 			$value = FrmProCurrencyHelper::normalize_formatted_numbers( $field, $value );
 		}
diff --git a/classes/views/frm-fields/back-end/format-dropdown-options.php b/classes/views/frm-fields/back-end/format-dropdown-options.php
index 191d5ae4c5..2ed73b031f 100644
--- a/classes/views/frm-fields/back-end/format-dropdown-options.php
+++ b/classes/views/frm-fields/back-end/format-dropdown-options.php
@@ -28,10 +28,21 @@
 	)
 );
 
+FrmHtmlHelper::echo_dropdown_option(
+	__( 'Currency', 'formidable' ),
+	false,
+	array(
+		'value'        => '',
+		'class'        => 'frm_show_upgrade frm_noallow',
+		'data-upgrade' => __( 'Format currency field', 'formidable' ),
+		'data-medium'  => 'format-currency-field',
+	)
+);
+
 if ( 'text' === $field_type ) {
 	FrmHtmlHelper::echo_dropdown_option(
 		__( 'Custom', 'formidable' ),
-		! empty( $format ) && 'currency' !== $format,
+		! empty( $format ) && ! FrmCurrencyHelper::is_currency_format( $format ),
 		array(
 			'value'           => 'custom',
 			'data-dependency' => '#frm-field-format-custom-' . $field_id,
diff --git a/js/formidable_admin.js b/js/formidable_admin.js
index 850fd1a484..cba75520f3 100644
--- a/js/formidable_admin.js
+++ b/js/formidable_admin.js
@@ -5439,7 +5439,7 @@ function frmAdminBuildJS() {
 			const fieldId = formatElement.dataset.fieldId;
 			const formatInput = document.getElementById( `frm-field-format-custom-${fieldId}` ).querySelector( '.frm_format_opt' );
 
-			if ( 'international' === formatInput.value || 'currency' === formatInput.value ) {
+			if ( 'international' === formatInput.value || 'currency' === formatInput.value || 'number' === formatInput.value ) {
 				formatInput.setAttribute( 'value', '' );
 			}
 		}
@@ -6702,7 +6702,8 @@ function frmAdminBuildJS() {
 		const valueMap = {
 			none: '',
 			international: 'international',
-			currency: 'currency'
+			currency: 'currency',
+			number: 'number'
 		};
 
 		formatTypes.forEach( formatType => {

From ccc302b047d6ff84b0d2c819da058f4bac49d548 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Wed, 5 Feb 2025 13:05:33 +0300
Subject: [PATCH 49/56] Add data-dependency-skip option

---
 js/formidable_admin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/formidable_admin.js b/js/formidable_admin.js
index cba75520f3..b68b61ce1d 100644
--- a/js/formidable_admin.js
+++ b/js/formidable_admin.js
@@ -10358,7 +10358,7 @@ function frmAdminBuildJS() {
 		 */
 		function toggleDependencyVisibility( select ) {
 			const selectedOption = select.options[ select.selectedIndex ];
-			select.querySelectorAll( 'option[data-dependency]' ).forEach( option => {
+			select.querySelectorAll( 'option[data-dependency]:not([data-dependency-skip])' ).forEach( option => {
 				const dependencyElement = document.querySelector( option.dataset.dependency );
 				dependencyElement?.classList.toggle( 'frm_hidden', selectedOption !== option );
 			});

From 60bb212908051b258edc8f4ac2e738f17fa3b965 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Thu, 6 Feb 2025 10:51:42 +0300
Subject: [PATCH 50/56] Refactor validation logic for clarity

---
 classes/models/fields/FrmFieldNumber.php | 29 ++++++++++++------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/classes/models/fields/FrmFieldNumber.php b/classes/models/fields/FrmFieldNumber.php
index 7c01ff984e..14a0f0bc7a 100644
--- a/classes/models/fields/FrmFieldNumber.php
+++ b/classes/models/fields/FrmFieldNumber.php
@@ -65,23 +65,22 @@ public function validate( $args ) {
 			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
 		}
 
-		// validate number settings
-		if ( $args['value'] != '' ) {
-			// only check if options are available in settings
-			$minnum = FrmField::get_option( $this->field, 'minnum' );
-			$maxnum = FrmField::get_option( $this->field, 'maxnum' );
-			if ( $maxnum !== '' && $minnum !== '' ) {
-				$value = (float) $args['value'];
-				if ( $value < $minnum ) {
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a higher number', 'formidable' );
-				} elseif ( $value > $maxnum ) {
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a lower number', 'formidable' );
-				}
-			}
-
-			$this->validate_step( $errors, $args );
+		if ( $args['value'] === '' ) {
+			return $errors;
 		}
 
+		$value  = (float) $args['value'];
+		$minnum = FrmField::get_option( $this->field, 'minnum' );
+		$maxnum = FrmField::get_option( $this->field, 'maxnum' );
+
+		if ( $minnum !== '' && $value < $minnum ) {
+			$errors[ 'field' . $args['id'] ] = __( 'Please select a higher number', 'formidable' );
+		} elseif ( $maxnum !== '' && $value > $maxnum ) {
+			$errors[ 'field' . $args['id'] ] = __( 'Please select a lower number', 'formidable' );
+		}
+
+		$this->validate_step( $errors, $args );
+
 		return $errors;
 	}
 

From 6c978aaf6ed68b93fa8d1d0208e7bc6a25b7df4e Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Fri, 7 Feb 2025 10:54:03 +0300
Subject: [PATCH 51/56] Fix Turkish Liras symbol_right

---
 classes/helpers/FrmCurrencyHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/helpers/FrmCurrencyHelper.php b/classes/helpers/FrmCurrencyHelper.php
index 62e43715d7..61e7ece689 100644
--- a/classes/helpers/FrmCurrencyHelper.php
+++ b/classes/helpers/FrmCurrencyHelper.php
@@ -300,7 +300,7 @@ public static function get_currencies() {
 			'TRY' => array(
 				'name'               => __( 'Turkish Liras', 'formidable' ),
 				'symbol_left'        => '',
-				'symbol_right'       => '&#8364;',
+				'symbol_right'       => '&#8378;',
 				'symbol_padding'     => ' ',
 				'thousand_separator' => '.',
 				'decimal_separator'  => ',',

From ddafe3039ed14318a3cc9be2f41f17d466297b68 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 10 Feb 2025 19:10:02 +0300
Subject: [PATCH 52/56] Address feedback

---
 classes/controllers/FrmSettingsController.php |  6 ------
 classes/helpers/FrmCurrencyHelper.php         |  2 +-
 classes/models/FrmEntryValidate.php           | 20 -------------------
 classes/views/frm-settings/general.php        |  2 ++
 js/admin/settings.js                          |  4 ++--
 stubs.php                                     |  3 +++
 6 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/classes/controllers/FrmSettingsController.php b/classes/controllers/FrmSettingsController.php
index 1b9ea17d70..4915d15ccc 100644
--- a/classes/controllers/FrmSettingsController.php
+++ b/classes/controllers/FrmSettingsController.php
@@ -212,12 +212,6 @@ public static function maybe_render_currency_selector( $frm_settings, $more_html
 			return;
 		}
 
-		if ( false !== strpos( $more_html, 'id="frm_currency"' ) ) {
-			// Avoid rendering the Currency setting if it gets rendered from the frm_settings_form hook.
-			// This is for backward compatibility. If Pro is outdated there won't be two currency dropdowns.
-			return;
-		}
-
 		$currencies = FrmCurrencyHelper::get_currencies();
 		include FrmAppHelper::plugin_path() . '/classes/views/frm-settings/_currency.php';
 	}
diff --git a/classes/helpers/FrmCurrencyHelper.php b/classes/helpers/FrmCurrencyHelper.php
index 61e7ece689..4d2d2b7448 100644
--- a/classes/helpers/FrmCurrencyHelper.php
+++ b/classes/helpers/FrmCurrencyHelper.php
@@ -33,7 +33,7 @@ public static function get_currency( $currency ) {
 	 * @return bool
 	 */
 	public static function is_currency_format( $format_value ) {
-		return ! empty( $format_value ) && in_array( $format_value, array( 'currency', 'number' ), true );
+		return in_array( $format_value, array( 'currency', 'number' ), true );
 	}
 
 	/**
diff --git a/classes/models/FrmEntryValidate.php b/classes/models/FrmEntryValidate.php
index 19d0d29b39..dd0f42c16b 100644
--- a/classes/models/FrmEntryValidate.php
+++ b/classes/models/FrmEntryValidate.php
@@ -136,8 +136,6 @@ public static function validate_field( $posted_field, &$errors, $values, $args =
 			$value = $values;
 		}
 
-		self::maybe_normalize_formatted_numbers( $posted_field, $value );
-
 		// Check for values in "Other" fields
 		FrmEntriesHelper::maybe_set_other_validation( $posted_field, $value, $args );
 
@@ -339,24 +337,6 @@ public static function spam_check( $exclude, $values, &$errors ) {
 		}
 	}
 
-	/**
-	 * Normalizes formatted numbers in a value based on the field format settings, if applicable
-	 *
-	 * @since x.x
-	 *
-	 * @param array  $field The field settings.
-	 * @param string $value The value to be normalized (passed by reference).
-	 * @return void
-	 */
-	private static function maybe_normalize_formatted_numbers( $field, &$value ) {
-		if (
-			is_callable( 'FrmProCurrencyHelper::normalize_formatted_numbers' )
-			&& FrmCurrencyHelper::is_currency_format( FrmField::get_option( $field, 'format' ) )
-		) {
-			$value = FrmProCurrencyHelper::normalize_formatted_numbers( $field, $value );
-		}
-	}
-
 	/**
 	 * Checks if form is in progress.
 	 *
diff --git a/classes/views/frm-settings/general.php b/classes/views/frm-settings/general.php
index 0c3c5a6dd1..c4a7e7df7f 100644
--- a/classes/views/frm-settings/general.php
+++ b/classes/views/frm-settings/general.php
@@ -81,6 +81,8 @@
 /**
  * Trigger an action so Pro can display additional General settings in the Other section.
  *
+ * @since x.x
+ *
  * @param FrmSettings $frm_settings
  */
 do_action( 'frm_other_settings_form', $frm_settings );
diff --git a/js/admin/settings.js b/js/admin/settings.js
index 833f7a6a6b..149fbf5508 100644
--- a/js/admin/settings.js
+++ b/js/admin/settings.js
@@ -11,7 +11,7 @@
 		}
 
 		if ( 'frm_currency' === e.target.id) {
-			syncCurrencyOptoins( e.target );
+			syncCurrencyOptions( e.target );
 		}
 	}
 
@@ -32,7 +32,7 @@
 	 *
 	 * @param {HTMLSelectElement} currencySelect The currency select element.
 	 */
-	function syncCurrencyOptoins( currencySelect ) {
+	function syncCurrencyOptions( currencySelect ) {
 		const currency = frmSettings.currencies[ currencySelect.value ];
 
 		document.getElementById( 'frm_thousand_separator' ).setAttribute( 'value', currency.thousand_separator );
diff --git a/stubs.php b/stubs.php
index 7d507cc7e4..e2257c4f67 100644
--- a/stubs.php
+++ b/stubs.php
@@ -425,6 +425,9 @@ class FrmProSettingsController {
 		 * @return string
 		 */
 		public static function inbox_badge( $count ) {}
+		/**
+		 * @return void
+		 */
 		public static function render_currency_selector() {}
 	}
 }

From 4c2324a319ccbafab4e838894fdaab96dca26d8e Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 10 Feb 2025 23:08:57 +0300
Subject: [PATCH 53/56] Fix phpdoc

---
 classes/helpers/FrmCurrencyHelper.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/classes/helpers/FrmCurrencyHelper.php b/classes/helpers/FrmCurrencyHelper.php
index 4d2d2b7448..7d360d5d38 100644
--- a/classes/helpers/FrmCurrencyHelper.php
+++ b/classes/helpers/FrmCurrencyHelper.php
@@ -29,6 +29,8 @@ public static function get_currency( $currency ) {
 	/**
 	 * Checks if the given format is a valid currency format.
 	 *
+	 * @since x.x
+	 *
 	 * @param string $format_value The format value to check.
 	 * @return bool
 	 */

From 239260ab059ec22f7610961812e2346fafb3877a Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Mon, 10 Feb 2025 23:19:36 +0300
Subject: [PATCH 54/56] Refine method name

---
 classes/controllers/FrmSettingsController.php | 4 ++--
 stubs.php                                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/controllers/FrmSettingsController.php b/classes/controllers/FrmSettingsController.php
index 4915d15ccc..1dda4ee6be 100644
--- a/classes/controllers/FrmSettingsController.php
+++ b/classes/controllers/FrmSettingsController.php
@@ -207,8 +207,8 @@ public static function general_settings() {
 	 * @return void
 	 */
 	public static function maybe_render_currency_selector( $frm_settings, $more_html ) {
-		if ( is_callable( 'FrmProSettingsController::render_currency_selector' ) ) {
-			FrmProSettingsController::render_currency_selector();
+		if ( is_callable( 'FrmProSettingsController::add_currency_settings' ) ) {
+			FrmProSettingsController::add_currency_settings();
 			return;
 		}
 
diff --git a/stubs.php b/stubs.php
index e2257c4f67..9305a853dc 100644
--- a/stubs.php
+++ b/stubs.php
@@ -428,7 +428,7 @@ public static function inbox_badge( $count ) {}
 		/**
 		 * @return void
 		 */
-		public static function render_currency_selector() {}
+		public static function add_currency_settings() {}
 	}
 }
 

From 72b5bb80fbf4b322496d586ddf91fe61bac15267 Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Tue, 11 Feb 2025 18:21:05 +0300
Subject: [PATCH 55/56] Fix custom format validate issue

---
 classes/models/FrmEntryValidate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/models/FrmEntryValidate.php b/classes/models/FrmEntryValidate.php
index dd0f42c16b..69c1f2b05c 100644
--- a/classes/models/FrmEntryValidate.php
+++ b/classes/models/FrmEntryValidate.php
@@ -230,7 +230,7 @@ public static function validate_field_types( &$errors, $posted_field, $value, $a
 	public static function validate_phone_field( &$errors, $field, $value, $args ) {
 		$format_value = FrmField::get_option( $field, 'format' );
 
-		if ( $field->type === 'phone' || ( $field->type === 'text' && ! FrmCurrencyHelper::is_currency_format( $format_value ) ) ) {
+		if ( $field->type === 'phone' || ( $field->type === 'text' && $format_value && ! FrmCurrencyHelper::is_currency_format( $format_value ) ) ) {
 			$pattern = self::phone_format( $field );
 
 			if ( ! preg_match( $pattern, $value ) ) {

From bc26fe690cbdd0d06dc4f6cb24e3a5250eb99a7b Mon Sep 17 00:00:00 2001
From: Sherv <sherv.elmi@gmail.com>
Date: Tue, 11 Feb 2025 19:16:57 +0300
Subject: [PATCH 56/56] change validate_step visibility to protected

---
 classes/models/fields/FrmFieldNumber.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/models/fields/FrmFieldNumber.php b/classes/models/fields/FrmFieldNumber.php
index 14a0f0bc7a..6847e5c64c 100644
--- a/classes/models/fields/FrmFieldNumber.php
+++ b/classes/models/fields/FrmFieldNumber.php
@@ -94,7 +94,7 @@ public function validate( $args ) {
 	 *
 	 * @return void
 	 */
-	private function validate_step( &$errors, $args ) {
+	protected function validate_step( &$errors, $args ) {
 		if ( isset( $errors[ 'field' . $args['id'] ] ) ) {
 			// Don't need to check if value is invalid before.
 			return;