From 39cb416c300f2b692f37c67564fbdde72da14d55 Mon Sep 17 00:00:00 2001 From: Sebastiaan Pasma Date: Tue, 10 Jul 2018 11:12:43 +0200 Subject: [PATCH 1/2] changed route and tab --- src/js/routes.js | 9 --------- www/views/tabs.html | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/js/routes.js b/src/js/routes.js index 2399a2db9..4e72246ba 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -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: { diff --git a/www/views/tabs.html b/www/views/tabs.html index 19c33aad9..69cf93309 100644 --- a/www/views/tabs.html +++ b/www/views/tabs.html @@ -12,7 +12,7 @@ - + From 5070a0042c15abbe55b494d04a1a1faf55399692 Mon Sep 17 00:00:00 2001 From: Sebastiaan Pasma Date: Tue, 10 Jul 2018 11:15:17 +0200 Subject: [PATCH 2/2] small refactor --- src/js/controllers/tab-send.js | 2 +- src/sass/views/views.scss | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js index 5c75957c4..a4c4a7152 100644 --- a/src/js/controllers/tab-send.js +++ b/src/js/controllers/tab-send.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabSendV2Controller', function($scope, $rootScope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService, platformInfo, bwcError, gettextCatalog, scannerService, configService, bitcoinCashJsService, $ionicNavBarDelegate, clipboardService) { +angular.module('copayApp.controllers').controller('tabSendController', function($scope, $rootScope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService, platformInfo, bwcError, gettextCatalog, scannerService, configService, bitcoinCashJsService, $ionicNavBarDelegate, clipboardService) { var clipboardHasAddress = false; var clipboardHasContent = false; diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss index 5367ac5aa..37754970f 100644 --- a/src/sass/views/views.scss +++ b/src/sass/views/views.scss @@ -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";