Skip to content

Commit 3afbdf7

Browse files
authored
Merge pull request #323 from Bitcoin-com/wallet/hotfix/578
578 - Shapeshift item on home tab now links to the Shapeshift website.
2 parents 1c45041 + 00e4f8a commit 3afbdf7

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

app-template/bitcoincom/appConfig.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
"windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
2525
"pushSenderId": "1036948132229",
2626
"description": "A Secure Bitcoin Wallet",
27-
"version": "5.0.2",
28-
"fullVersion": "5.0-rc3",
29-
"androidVersion": "500200",
27+
"version": "5.0.3",
28+
"fullVersion": "5.0-hotfix1",
29+
"androidVersion": "500300",
3030
"_extraCSS": "",
3131
"_enabledExtensions": {
3232
"coinbase": false,

src/js/controllers/servicesController.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
angular.module('copayApp.controllers').controller('servicesController', function($scope, $ionicScrollDelegate, $timeout, servicesService, configService) {
3+
angular.module('copayApp.controllers').controller('servicesController', function(externalLinkService, $scope, $ionicScrollDelegate, $timeout, servicesService, configService) {
44
$scope.hide = false;
55

66
configService.whenAvailable(function(config) {
@@ -20,4 +20,8 @@ angular.module('copayApp.controllers').controller('servicesController', function
2020
}, 10);
2121
};
2222

23+
$scope.open = function(url) {
24+
externalLinkService.open(url, false);
25+
}
26+
2327
});

src/js/services/servicesService.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ angular.module('copayApp.services').factory('servicesService', function(configSe
55
name: 'shapeshift',
66
title: 'Shapeshift',
77
icon: 'icon-shapeshift',
8-
sref: 'tabs.shapeshift',
8+
href: 'https://shapeshift.io/'
99
}];
1010

1111
root.register = function(serviceInfo) {

www/views/includes/services.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@
66
</div>
77
<div ng-show="!hide">
88
<div ng-repeat="service in services track by $index">
9-
<a ui-sref="{{service.sref}}" id="home_{{service.name}}" title="{{service.title || service.name}}" class="track_link_click_out item item-sub item-icon-left item-big-icon-left item-icon-right next-step">
9+
<a ng-if="service.sref" ui-sref="{{service.sref}}" id="home_{{service.name}}" title="{{service.title || service.name}}" class="track_link_click_out item item-sub item-icon-left item-big-icon-left item-icon-right next-step">
10+
<i class="icon big-icon-svg theme-circle theme-circle-services">
11+
<div class="bg {{service.icon}}"></div>
12+
</i>
13+
<span>{{service.title || service.name}}</span>
14+
<i class="icon bp-arrow-right"></i>
15+
</a>
16+
<a ng-if="!service.sref" ng-click="open('{{service.href}}')" id="home_{{service.name}}" title="{{service.title || service.name}}" class="track_link_click_out item item-sub item-icon-left item-big-icon-left item-icon-right next-step">
1017
<i class="icon big-icon-svg theme-circle theme-circle-services">
1118
<div class="bg {{service.icon}}"></div>
1219
</i>

0 commit comments

Comments
 (0)