Index: src/main/webapp/app/src/session/dashboard/sessionDashboardCtrl.js
===================================================================
diff -u -r13dcded0ad8a7558ed83b2f591ee527428a0adbd -r4d440865aeb1fb6e1ab231c1a36d1491ebf19dd5
--- src/main/webapp/app/src/session/dashboard/sessionDashboardCtrl.js	(.../sessionDashboardCtrl.js)	(revision 13dcded0ad8a7558ed83b2f591ee527428a0adbd)
+++ src/main/webapp/app/src/session/dashboard/sessionDashboardCtrl.js	(.../sessionDashboardCtrl.js)	(revision 4d440865aeb1fb6e1ab231c1a36d1491ebf19dd5)
@@ -740,24 +740,31 @@
                 ['filter.filterPanelEditting.salesHistoryMin', 'filter.filterPanelEditting.salesHistoryMax'],
                 (newValue, oldValue) => {
                     let [salesHistoryMin, salesHistoryMax] = newValue;
-                    $("#btnConfirm").prop('disabled', false);
-                    if((typeof(salesHistoryMin) === 'number' && typeof(salesHistoryMax)=== 'number') && salesHistoryMin > salesHistoryMax){
-                        toastr.error('Enter valid sales history value');
-                        $("#btnConfirm").prop('disabled', true);
-                    }
                     salesHistoryMin = salesHistoryMin === 0 ? 1 : salesHistoryMin;
                     salesHistoryMax = salesHistoryMax === 0 ? 1 : salesHistoryMax;
                     $scope.filter.filterPanelEditting.isSalesHistory = (salesHistoryMin || salesHistoryMax) || false;
                 }
             ) 
+            $scope.vm.toggleDashboardFilter = (key, value) => {
+                if(key == 'isSalesHistory'){
+                    $scope.filter.filterPanelEditting.isSalesHistory = value ? false : true;
+                    $scope.filter.filterPanelEditting.salesHistoryMin = value ? null : $scope.filter.filterPanelEditting.salesHistoryMin;
+                    $scope.filter.filterPanelEditting.salesHistoryMax = value ? null : $scope.filter.filterPanelEditting.salesHistoryMax;
+                }
+            }
             
-            
             $uibModalInstance.result.then(
                 function () {
                     $scope.filter.filterPanel = angular.copy(
                         $scope.filter.filterPanelEditting
                     );
+                    if($scope.filter.filterPanel.salesHistoryMin && $scope.filter.filterPanel.salesHistoryMax && (typeof($scope.filter.filterPanel.salesHistoryMin) === 'number' && typeof($scope.filter.filterPanel.salesHistoryMax)=== 'number') && $scope.filter.filterPanel.salesHistoryMin > $scope.filter.filterPanel.salesHistoryMax){
+                        toastr.error('Enter valid sales history value','errorSalesHistoryInput');
+                        $scope.openDashboardFilter();
+                        return false;
+                    }
                     $scope.vm.activeDashboardItem = null;
+
                 },
                 function () { }
             );
@@ -1074,6 +1081,9 @@
             });
 
             function initLoadTableData(initLoad, scroll) {
+                if($scope.filter.filterPanel.isSalesHistory && $scope.filter.filterPanel.salesHistoryMin && $scope.filter.filterPanel.salesHistoryMax && (typeof($scope.filter.filterPanel.salesHistoryMin) === 'number' && typeof($scope.filter.filterPanel.salesHistoryMax)=== 'number') && $scope.filter.filterPanel.salesHistoryMin > $scope.filter.filterPanel.salesHistoryMax){
+                    return false;
+                }
                 dashboardFilter.page.currentPage = 1;
                 $scope.setting.dashboardTable.tableLoading = true;
                 dashboardFilter.initCount =
Index: src/main/webapp/app/src/session/dashboard/templates/sessionDashboardFilterPanel.html
===================================================================
diff -u -r72401057ff16dc3196771dd5d541db0f3b1e3800 -r4d440865aeb1fb6e1ab231c1a36d1491ebf19dd5
--- src/main/webapp/app/src/session/dashboard/templates/sessionDashboardFilterPanel.html	(.../sessionDashboardFilterPanel.html)	(revision 72401057ff16dc3196771dd5d541db0f3b1e3800)
+++ src/main/webapp/app/src/session/dashboard/templates/sessionDashboardFilterPanel.html	(.../sessionDashboardFilterPanel.html)	(revision 4d440865aeb1fb6e1ab231c1a36d1491ebf19dd5)
@@ -40,7 +40,7 @@
 				<div class="d-flex mt-2 ">
 					<div class="switch-container" simple-switch type="filter.filterPanelEditting.isSalesHistory"
 						on="filter.filterPanelEditting.isSalesHistory"
-						ng-click="filter.filterPanelEditting.isSalesHistory=!filter.filterPanelEditting.isSalesHistory">
+						ng-click="vm.toggleDashboardFilter('isSalesHistory', filter.filterPanelEditting.isSalesHistory)">
 					</div>
 					<span style="white-space: nowrap;">Sales History</span>
 					<span class="d-flex space-x-2 adjust-positions">