diff --git a/app-template/config-template.xml b/app-template/config-template.xml
index 9f54116f4..406dc1c34 100644
--- a/app-template/config-template.xml
+++ b/app-template/config-template.xml
@@ -65,6 +65,7 @@
+
diff --git a/src/js/controllers/feedback/complete.js b/src/js/controllers/feedback/complete.js
index 80018be79..2422a22ec 100644
--- a/src/js/controllers/feedback/complete.js
+++ b/src/js/controllers/feedback/complete.js
@@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('completeController', function
var config = configService.getSync();
$scope.shareFacebook = function() {
- window.plugins.socialsharing.shareViaFacebook(config.download.url, null, null, null);
+ window.plugins.socialsharing.shareVia($scope.shareFacebookVia, config.download.url, null, null, null, null, null);
};
$scope.shareTwitter = function() {
@@ -31,7 +31,7 @@ angular.module('copayApp.controllers').controller('completeController', function
};
$scope.$on("$ionicView.beforeEnter", function(event, data) {
- if(window.StatusBar){
+ if (window.StatusBar) {
$log.debug('Hiding status bar...');
StatusBar.hide();
}
@@ -49,17 +49,28 @@ angular.module('copayApp.controllers').controller('completeController', function
$scope.socialsharing = isAvailable;
if (isAvailable) {
window.plugins.socialsharing.canShareVia('com.apple.social.facebook', 'msg', null, null, null, function(e) {
+ $scope.shareFacebookVia = 'com.apple.social.facebook';
$scope.facebook = true;
}, function(e) {
- $log.debug('facebook error: ' + e);
- $scope.facebook = false;
+ window.plugins.socialsharing.canShareVia('com.facebook.katana', 'msg', null, null, null, function(e) {
+ $scope.shareFacebookVia = 'com.facebook.katana';
+ $scope.facebook = true;
+ }, function(e) {
+ $log.debug('facebook error: ' + e);
+ $scope.facebook = false;
+ });
});
- window.plugins.socialsharing.canShareVia('com.twitter.android', 'msg', null, null, null, function(e) {
- $scope.shareTwitterVia = 'com.twitter.android';
+ window.plugins.socialsharing.canShareVia('com.apple.social.twitter', 'msg', null, null, null, function(e) {
+ $scope.shareTwitterVia = 'com.apple.social.twitter';
$scope.twitter = true;
}, function(e) {
- $log.debug('twitter error: ' + e);
- $scope.twitter = false;
+ window.plugins.socialsharing.canShareVia('com.twitter.android', 'msg', null, null, null, function(e) {
+ $scope.shareTwitterVia = 'com.twitter.android';
+ $scope.twitter = true;
+ }, function(e) {
+ $log.debug('twitter error: ' + e);
+ $scope.twitter = false;
+ });
});
window.plugins.socialsharing.canShareVia('com.google.android.apps.plus', 'msg', null, null, null, function(e) {
$scope.shareGooglePlusVia = 'com.google.android.apps.plus';
@@ -85,7 +96,7 @@ angular.module('copayApp.controllers').controller('completeController', function
});
$scope.$on("$ionicView.afterLeave", function() {
- if(window.StatusBar){
+ if (window.StatusBar) {
$log.debug('Showing status bar...');
StatusBar.show();
}
diff --git a/src/js/controllers/feedback/send.js b/src/js/controllers/feedback/send.js
index e65e7cd17..59c5f5f28 100644
--- a/src/js/controllers/feedback/send.js
+++ b/src/js/controllers/feedback/send.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.controllers').controller('sendController', function($scope, $state, $log, $timeout, $stateParams, $ionicNavBarDelegate, $ionicHistory, $ionicConfig, gettextCatalog, popupService, configService, lodash, feedbackService, ongoingProcess) {
+angular.module('copayApp.controllers').controller('sendController', function($scope, $state, $log, $timeout, $stateParams, $ionicNavBarDelegate, $ionicHistory, $ionicConfig, $window, gettextCatalog, popupService, configService, lodash, feedbackService, ongoingProcess) {
$scope.sendFeedback = function(feedback, skip) {
@@ -9,7 +9,10 @@ angular.module('copayApp.controllers').controller('sendController', function($sc
var dataSrc = {
"Email": lodash.values(config.emailFor)[0] || ' ',
"Feedback": skip ? ' ' : feedback,
- "Score": $stateParams.score || ' '
+ "Score": $stateParams.score || ' ',
+ "AppVersion": $window.version,
+ "Platform": ionic.Platform.platform(),
+ "DeviceVersion": ionic.Platform.version()
};
ongoingProcess.set('sendingFeedback', true);
@@ -47,8 +50,7 @@ angular.module('copayApp.controllers').controller('sendController', function($sc
if ($scope.score) {
$ionicNavBarDelegate.showBackButton(false);
$ionicConfig.views.swipeBackEnabled(false);
- }
- else $ionicNavBarDelegate.showBackButton(true);
+ } else $ionicNavBarDelegate.showBackButton(true);
switch ($scope.score) {
case 1:
@@ -78,4 +80,8 @@ angular.module('copayApp.controllers').controller('sendController', function($sc
}
});
+ $scope.$on("$ionicView.afterEnter", function() {
+ $scope.showForm = true;
+ });
+
});
diff --git a/src/sass/views/feedback/send.scss b/src/sass/views/feedback/send.scss
index b4c383587..2277729f1 100644
--- a/src/sass/views/feedback/send.scss
+++ b/src/sass/views/feedback/send.scss
@@ -28,7 +28,9 @@
}
.user-feedback {
border-top: 1px solid $subtle-gray;
+ padding: 20px;
width: 100%;
+ margin-bottom: 20px;
}
.send-feedback-star {
height: 1rem;
diff --git a/www/views/feedback/send.html b/www/views/feedback/send.html
index dcb96534b..bb5dc977e 100644
--- a/www/views/feedback/send.html
+++ b/www/views/feedback/send.html
@@ -31,9 +31,11 @@
-
-
+
+
+
+
diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html
index 6d460df2b..c452c03ac 100644
--- a/www/views/tab-settings.html
+++ b/www/views/tab-settings.html
@@ -20,7 +20,7 @@
Address Book
-
+