Don't clear state if you're gonna show a popup

#5445

Author: dianabarsan

tests/e2e/reports-subject.js

@@ -250,7 +250,7 @@ describe('Reports Summary', () => {
     return browser
       .wait(() => element(
         by.cssContainingText('#reports-content .item-summary .sender .phone', CAROL.phone)).isPresent(),
-        10000
+        20000
       )
       .catch(loadReport);
   };
@@ -260,7 +260,7 @@ describe('Reports Summary', () => {
   const getElementText = (css, attempt) => {
     attempt = attempt || 0;
 
-    return helper.getTextFromElement(element(by.css(css))) 
+    return helper.getTextFromElement(element(by.css(css)))
       .then((text) => {
         return text;
       }, (err) => {

webapp/src/js/controllers/inbox.js

@@ -199,17 +199,18 @@ const LAST_REPLICATED_SEQ_KEY = require('../bootstrapper/purger').LAST_REPLICATE
     });
 
     $rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState){
-      if (toState.name.indexOf('reports') === -1 || toState.name.indexOf('contacts') === -1 || toState.name.indexOf('tasks') === -1 || toState.name.indexOf('messages.detail') === -1) {
-        $scope.unsetSelected();
-      }
-      if (toState.name.indexOf('tasks.detail') === -1) {
-        Enketo.unload($scope.form);
-        $scope.unsetSelected();
-      }
-      if (toState.name.split('.')[0] !== fromState.name.split('.')[0]){
-        $scope.$broadcast('ClearSelected');
-      }
       if (!$scope.enketoStatus.edited){
+        if (toState.name.indexOf('reports') === -1 || toState.name.indexOf('contacts') === -1 || toState.name.indexOf('tasks') === -1 || toState.name.indexOf('messages.detail') === -1) {
+          $scope.unsetSelected();
+        }
+        if (toState.name.indexOf('tasks.detail') === -1) {
+          Enketo.unload($scope.form);
+          $scope.unsetSelected();
+        }
+        if (toState.name.split('.')[0] !== fromState.name.split('.')[0]){
+          $scope.$broadcast('ClearSelected');
+        }
+
         return;
       }
       if ($scope.cancelCallback){