From de32460fd7136db712f91051c98b8745b4e5030e Mon Sep 17 00:00:00 2001
From: Sebastiaan Pasma <sebastiaan@enkodo.nl>
Date: Wed, 4 Jul 2018 11:05:31 +0200
Subject: [PATCH] bannerService fixes + some space for the loader

---
 src/js/controllers/tab-home.js   |  8 +++-----
 src/js/services/bannerService.js | 12 ++++++------
 src/sass/views/tab-home.scss     |  3 +++
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 3f1526cbd..3a56e6d5c 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -25,11 +25,9 @@ angular.module('copayApp.controllers').controller('tabHomeController',
       startupService.ready();
 
       bannerService.getBanner(function (banner) {
-        $scope.$apply(function () {
-          $scope.bannerImageUrl = banner.imageURL;
-          $scope.bannerUrl = banner.url;
-          $scope.bannerIsLoading = false;
-        });
+        $scope.bannerImageUrl = banner.imageURL;
+        $scope.bannerUrl = banner.url;
+        $scope.bannerIsLoading = false;
       });
     });
 
diff --git a/src/js/services/bannerService.js b/src/js/services/bannerService.js
index 00a72a6c6..cb32793a0 100644
--- a/src/js/services/bannerService.js
+++ b/src/js/services/bannerService.js
@@ -20,7 +20,7 @@ angular.module('copayApp.services').factory('bannerService', function ($http, $l
   var fetchSettings = function (cb) {
     var req = {
       method: 'GET',
-      url: marketingApiService+'/settings',
+      url: API_URL+'/settings',
       headers: {
         'Content-Type': 'application/json',
         'Accept': 'application/json'
@@ -28,10 +28,10 @@ angular.module('copayApp.services').factory('bannerService', function ($http, $l
     };
     $http(req).then(function (response) {
       $log.info('Get banner settings: SUCCESS');
-      banners = response.data
+      banners = response.data;
       return cb(true);
     }, function (error) {
-      $log.error('Get banner settings: ERROR ' + data.statusText);
+      $log.error('Get banner settings: ERROR ' + response.statusText);
       return cb(false);
     });
   };
@@ -44,7 +44,7 @@ angular.module('copayApp.services').factory('bannerService', function ($http, $l
 
       // If never fetch, lets fetch
       fetchSettings(function (isSuccess) {
-        root.getBannerImage(cb);
+        root.getBanner(cb);
       });
 
     // If fetch, and got banners, lets have a look
@@ -55,14 +55,14 @@ angular.module('copayApp.services').factory('bannerService', function ($http, $l
 
         // Generate the URL for the banner
         var fileName = banner.image.substring(0, banner.image.lastIndexOf('.'));
-        var extension = banner.image.substring(banner.image.lastIndexOf('.'));
+        var extension = banner.image.substring(banner.image.lastIndexOf('.')+1);
         banner.imageURL = API_URL +'/banners/'+fileName+"/"+extension;
 
         // Add the banner
         selectedBanners.push(banners[i]);
       }
 
-      // If no banner activated, I return the default one
+      // If no banner activated, return the default one
       if (selectedBanners.length == 0) {
         return cb(defaultBanner);
       } else {
diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss
index 46fb15224..66a2f1d58 100644
--- a/src/sass/views/tab-home.scss
+++ b/src/sass/views/tab-home.scss
@@ -59,6 +59,9 @@
       }
     }
     &-banner {
+      svg {
+        margin: 40px auto 40px;
+      }
       padding: 0;
       &__img {
         width: 100%;