From 3d9b24575b44de7912fc9dd110f5d35a2024f057 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Wed, 8 Aug 2018 18:57:55 +1200
Subject: [PATCH 1/3] In Review Transaction screen, the note is now visible
 above the fees.

---
 src/sass/views/review.scss | 4 ++++
 www/views/review.html      | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/sass/views/review.scss b/src/sass/views/review.scss
index 79bca1896..110090ebc 100644
--- a/src/sass/views/review.scss
+++ b/src/sass/views/review.scss
@@ -11,6 +11,10 @@
     bottom: 92px;
   }
 
+  .fee-summary-spacer {
+    height: 15px;
+  }
+
   .shapeshift-banner, .bitpay-banner, .egifter-banner {
     box-shadow: none;
   }
diff --git a/www/views/review.html b/www/views/review.html
index e9e5c6d7c..8444142d1 100644
--- a/www/views/review.html
+++ b/www/views/review.html
@@ -80,6 +80,7 @@
           </div>
         </div>
       </div>
+      <div class="fee-summary-spacer"></div>
     </div>
   </ion-content>
 

From ae6dcea81a378613a7fefc7439ccf8a2f71eadb1 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Wed, 8 Aug 2018 18:58:26 +1200
Subject: [PATCH 2/3] Fix for getting Shapeshift working.

---
 src/js/services/shapeshiftService.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/js/services/shapeshiftService.js b/src/js/services/shapeshiftService.js
index 5396f4fa5..1ce9672ce 100644
--- a/src/js/services/shapeshiftService.js
+++ b/src/js/services/shapeshiftService.js
@@ -136,4 +136,6 @@ angular.module('copayApp.services').factory('shapeshiftService', function ($http
       }
     });
   };
+
+  return root;
 });

From ab13478f799af7f763233bcd4ca3a8b28c7a3a6a Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Dominguez <jb@bitcoin.com>
Date: Wed, 8 Aug 2018 16:03:34 +0900
Subject: [PATCH 3/3] Add shapeshift service item

---
 src/js/services/shapeshiftService.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/js/services/shapeshiftService.js b/src/js/services/shapeshiftService.js
index 1ce9672ce..7cf6b4e03 100644
--- a/src/js/services/shapeshiftService.js
+++ b/src/js/services/shapeshiftService.js
@@ -137,5 +137,17 @@ angular.module('copayApp.services').factory('shapeshiftService', function ($http
     });
   };
 
+  var servicesItem = {
+    name: 'shapeshift',
+    title: 'Shapeshift',
+    icon: 'icon-shapeshift',
+    sref: 'tabs.shapeshift',
+  };
+
+  var register = function() {
+    servicesService.register(servicesItem);
+  };
+
+  register();
   return root;
 });