From 1219f368a73ca4d2bc09268b887ebe0f2696f487 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 7 Nov 2016 17:22:51 -0500 Subject: [PATCH] show wallet not backed up warning in wallet detail view --- src/js/controllers/walletDetails.js | 13 +++++++++++-- src/sass/views/walletDetails.scss | 11 +++++++++++ www/views/walletDetails.html | 3 +++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 382c870e0..5addca3b0 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, profileService, lodash, configService, gettextCatalog, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService) { +angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, profileService, lodash, configService, gettextCatalog, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService, storageService, $ionicHistory) { var HISTORY_SHOW_LIMIT = 10; var currentTxHistoryPage = 0; @@ -225,9 +225,18 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }); }; + $scope.backup = function() { + //$state.go('tabs.preferences', {walletId: $scope.walletId}); + //$state.transitionTo('tabs.preferences.backupWarning'); + }; + $scope.$on("$ionicView.beforeEnter", function(event, data) { - $scope.wallet = profileService.getWallet(data.stateParams.walletId); + $scope.walletId = data.stateParams.walletId; + storageService.getBackupFlag($scope.walletId, function(err, flag) { + $scope.isBackedUp = flag ? true : false; + }); + $scope.wallet = profileService.getWallet($scope.walletId); $scope.requiresMultipleSignatures = $scope.wallet.credentials.m > 1; addressbookService.list(function(err, ab) { diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 9939127c6..d424e217e 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -145,3 +145,14 @@ font-size: 20px; color: #fff; } + +.wallet-not-backed-up-warning { + margin-top: -10px; + margin-bottom: 1rem; + background: #E15061; + text-align: center; + color: white; + font-size: 14px; + display: block; + text-decoration: none; +} diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index aeab8a2c6..22ac125d5 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -64,6 +64,9 @@ + + Wallet not backed up +