From 3bf8923f10666153ed5ee19565ed95b2c7589ab0 Mon Sep 17 00:00:00 2001
From: Andy Phillipson <andy@bitpay.com>
Date: Thu, 5 Jan 2017 17:57:25 -0500
Subject: [PATCH] Remove obsolete key on storage upgrade. Improve log output.

---
 src/js/services/storageService.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js
index 1ec64acd9..d982b7846 100644
--- a/src/js/services/storageService.js
+++ b/src/js/services/storageService.js
@@ -177,11 +177,14 @@ angular.module('copayApp.services')
             });
           }
         });
-        if (upgraded.length > 0) {
-          cb(null, 'upgraded \'bitpayAccounts\':' + upgraded);
-        } else {
-          cb();
-        }
+        // Remove obsolete key.
+        storage.remove('bitpayAccounts-' + network, function() {
+          if (upgraded.length > 0) {
+            cb(null, 'upgraded to \'bitpayAccounts-v2-' + network + '\':' + upgraded);
+          } else {
+            cb();
+          }          
+        });
       });
     };
     //
@@ -277,11 +280,11 @@ angular.module('copayApp.services')
           var storagekey = key.split('_')[1];
           _upgraders[key](storagekey, network, function(err, msg) {
             if (err) {
-              _handleUpgradeError(storagekey, err);
+              _handleUpgradeError(storagekey + '-' + network, err);
               errorCount++;
               errorMessage = errorCount + ' storage upgrade failures';
             }
-            if (msg) _handleUpgradeSuccess(storagekey, msg);
+            if (msg) _handleUpgradeSuccess(storagekey + '-' + network, msg);
           });
         });
       });