Merge branch 'wallet/task/423' into wallet/task/416

This commit is contained in:
Sebastiaan Pasma 2018-07-10 14:32:24 +02:00
commit c6571c98ff
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
3 changed files with 1 additions and 11 deletions

View file

@ -270,15 +270,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
}
})
.state('tabs.send2', {
url: '/send2',
views: {
'tab-send': {
controller: 'tabSendV2Controller',
templateUrl: 'views/tab-send-v2.html',
}
}
})
.state('tabs.settings', {
url: '/settings',
views: {

View file

@ -8,7 +8,6 @@
@import "tab-receive";
@import "tab-scan";
@import "tab-send";
@import "tab-send-v2";
@import "tab-settings";
@import "wallet-colors";
@import "walletBalance";

View file

@ -12,7 +12,7 @@
<ion-nav-view name="tab-scan"></ion-nav-view>
</ion-tab>
<ion-tab title="{{'Send'|translate}}" icon-off="ico-send" icon-on="ico-send-selected" ui-sref="tabs.send2">
<ion-tab title="{{'Send'|translate}}" icon-off="ico-send" icon-on="ico-send-selected" ui-sref="tabs.send">
<ion-nav-view name="tab-send"></ion-nav-view>
</ion-tab>