diff --git a/src/js/controllers/feedback/complete.js b/src/js/controllers/feedback/complete.js
index c4313e9d8..836142143 100644
--- a/src/js/controllers/feedback/complete.js
+++ b/src/js/controllers/feedback/complete.js
@@ -1,8 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('completeController', function($scope, $stateParams, $timeout, $log, $ionicHistory, $state, platformInfo, configService, storageService, lodash) {
- $scope.score = parseInt($stateParams.score);
- $scope.skipped = $stateParams.skipped == 'false' ? false : true;
$scope.isCordova = platformInfo.isCordova;
var config = configService.getSync();
@@ -32,6 +30,9 @@ angular.module('copayApp.controllers').controller('completeController', function
$scope.$on("$ionicView.beforeEnter", function(event, data) {
+ $scope.score = (data.stateParams && data.stateParams.score) ? parseInt(data.stateParams.score) : null;
+ $scope.skipped = (data.stateParams && data.stateParams.skipped) ? true : false;
+
storageService.getFeedbackInfo(function(error, info) {
var feedbackInfo = lodash.isString(info) ? JSON.parse(info) : null;
feedbackInfo.sent = true;
@@ -92,13 +93,10 @@ angular.module('copayApp.controllers').controller('completeController', function
});
$scope.close = function() {
- $ionicHistory.clearHistory();
$ionicHistory.nextViewOptions({
- disableAnimate: true,
+ disableAnimate: false,
historyRoot: true
});
- $timeout(function() {
- $state.go('tabs.home');
- }, 100);
+ $ionicHistory.goBack(-2);
};
});
diff --git a/src/js/controllers/feedback/send.js b/src/js/controllers/feedback/send.js
index 59c5f5f28..5a67fb916 100644
--- a/src/js/controllers/feedback/send.js
+++ b/src/js/controllers/feedback/send.js
@@ -26,13 +26,10 @@ angular.module('copayApp.controllers').controller('sendController', function($sc
popupService.showAlert(gettextCatalog.getString('Thank you!'), gettextCatalog.getString('A member of the team will review your feedback as soon as possible.'), function() {
$scope.feedback.value = '';
$ionicHistory.nextViewOptions({
- disableAnimate: true,
+ disableAnimate: false,
historyRoot: true
});
- $ionicHistory.clearHistory();
- $timeout(function() {
- $state.go('tabs.settings');
- });
+ $ionicHistory.goBack();
});
return;
}
diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js
index 4387685c3..0151862cf 100644
--- a/src/js/controllers/tab-settings.js
+++ b/src/js/controllers/tab-settings.js
@@ -9,6 +9,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
var isWP = platformInfo.isWP;
$scope.usePushNotifications = isCordova && !isWP;
+ $scope.isCordova = isCordova;
$scope.appName = $window.appConfig.nameCase;
diff --git a/src/js/routes.js b/src/js/routes.js
index b06908972..76a712906 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -752,6 +752,18 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
}
})
+ .state('tabs.feedback.shareApp', {
+ url: '/shareApp/:score/:skipped',
+ views: {
+ 'tab-settings@tabs': {
+ controller: 'completeController',
+ templateUrl: 'views/feedback/complete.html'
+ }
+ },
+ customConfig: {
+ hideStatusBar: true
+ }
+ })
.state('tabs.rate', {
url: '/rate',
abstract: true
diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html
index c452c03ac..8a3147d50 100644
--- a/www/views/tab-settings.html
+++ b/www/views/tab-settings.html
@@ -36,6 +36,13 @@
Send Feedback
+
+
+
+
+ Share {{appName}}
+
+