diff --git a/erpnext/selling/page/point_of_sale/pos_controller.js b/erpnext/selling/page/point_of_sale/pos_controller.js
index 4c93875..f5c5a0a 100644
--- a/erpnext/selling/page/point_of_sale/pos_controller.js
+++ b/erpnext/selling/page/point_of_sale/pos_controller.js
@@ -276,14 +276,13 @@
 				form_updated: (item, field, value) => {
 					const item_row = frappe.model.get_doc(item.doctype, item.name);
 					if (item_row && item_row[field] != value) {
-
 						const args = {
 							field,
 							value,
 							item: this.item_details.current_item
-						}
+						};
 						return this.on_cart_update(args)
-					}
+					};
 
 					return Promise.resolve();
 				},
diff --git a/erpnext/selling/page/point_of_sale/pos_item_details.js b/erpnext/selling/page/point_of_sale/pos_item_details.js
index 637fb90..6a4d3d5 100644
--- a/erpnext/selling/page/point_of_sale/pos_item_details.js
+++ b/erpnext/selling/page/point_of_sale/pos_item_details.js
@@ -57,7 +57,7 @@
 
 	compare_with_current_item(item) {
 		// returns true if `item` is currently being edited
-		return item && item.name == this.current_item.name
+		return item && item.name == this.current_item.name;
 	}
 
 	toggle_item_details_section(item) {
@@ -76,7 +76,7 @@
 			this.item_row = item;
 			this.currency = this.events.get_frm().doc.currency;
 
-			this.current_item = item
+			this.current_item = item;
 
 			this.render_dom(item);
 			this.render_discount_dom(item);
