From 1d5b8ced9963402b9df13c2121abd2098f396b32 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 3 Jun 2016 12:50:37 -0300
Subject: [PATCH] bump version to 2.0.0 + change note to "descrition"

---
 cordova/config.xml                      | 6 +++---
 cordova/wp/Package.appxmanifest         | 2 +-
 cordova/wp/Properties/WMAppManifest.xml | 2 +-
 package.json                            | 4 ++--
 public/views/modals/tx-details.html     | 4 +---
 public/views/modals/txp-details.html    | 2 +-
 public/views/walletHome.html            | 2 +-
 src/js/controllers/index.js             | 6 +++---
 webkitbuilds/.desktop                   | 2 +-
 webkitbuilds/setup-win.iss              | 2 +-
 10 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/cordova/config.xml b/cordova/config.xml
index 8da7b4375..94305a93c 100644
--- a/cordova/config.xml
+++ b/cordova/config.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <widget id="com.bitpay.copay" 
-  version="1.12.14"
-  android-versionCode="104"
-  ios-CFBundleVersion="1.12.14">
+  version="2.0.0"
+  android-versionCode="105"
+  ios-CFBundleVersion="2.0.0">
     <name>Copay</name>
     <description>
       A secure bitcoin wallet for friends and companies.
diff --git a/cordova/wp/Package.appxmanifest b/cordova/wp/Package.appxmanifest
index cf7369c6c..89311af34 100644
--- a/cordova/wp/Package.appxmanifest
+++ b/cordova/wp/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest" xmlns:m3="http://schemas.microsoft.com/appx/2014/manifest" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest">
-  <Identity Name="18C7659D.CopayWallet" Publisher="CN=F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" Version="1.12.14.0" />
+  <Identity Name="18C7659D.CopayWallet" Publisher="CN=F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" Version="2.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="5381aa50-9069-11e4-84cc-293caf9cbdc8" PhonePublisherId="F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" />
   <Properties>
     <DisplayName>Copay Bitcoin Wallet</DisplayName>
diff --git a/cordova/wp/Properties/WMAppManifest.xml b/cordova/wp/Properties/WMAppManifest.xml
index 86de2b523..f8bb1e098 100644
--- a/cordova/wp/Properties/WMAppManifest.xml
+++ b/cordova/wp/Properties/WMAppManifest.xml
@@ -11,7 +11,7 @@
     <Language code="pl" />
     <Language code="cs" />
   </Languages>
-  <App Author="Bitpay Inc." BitsPerPixel="32" Description="A multisignature Bitcoin Wallet" Genre="apps.normal" ProductID="{5381aa50-9069-11e4-84cc-293caf9cbdc8}" Publisher="Copay Bitcoin Wallet" PublisherID="{31cdd08b-457c-413d-b440-f6665eec847d}" RuntimeType="Silverlight" Title="Copay Bitcoin Wallet" Version="1.12.14.0" xmlns="" NotificationService="MPN">
+  <App Author="Bitpay Inc." BitsPerPixel="32" Description="A multisignature Bitcoin Wallet" Genre="apps.normal" ProductID="{5381aa50-9069-11e4-84cc-293caf9cbdc8}" Publisher="Copay Bitcoin Wallet" PublisherID="{31cdd08b-457c-413d-b440-f6665eec847d}" RuntimeType="Silverlight" Title="Copay Bitcoin Wallet" Version="2.0.0.0" xmlns="" NotificationService="MPN">
     <IconPath IsRelative="true" IsResource="false">Assets\icon@2.png</IconPath>
     <Capabilities>
       <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
diff --git a/package.json b/package.json
index ac580e726..55c254da6 100644
--- a/package.json
+++ b/package.json
@@ -2,8 +2,8 @@
   "name": "copay",
   "description": "A multisignature wallet",
   "author": "BitPay",
-  "version": "1.12.14",
-  "androidVersionCode": "104",
+  "version": "2.0.0",
+  "androidVersionCode": "105",
   "keywords": [
     "wallet",
     "copay",
diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index 6ee0aa465..9a3c87ea4 100644
--- a/public/views/modals/tx-details.html
+++ b/public/views/modals/tx-details.html
@@ -28,8 +28,6 @@
           </div>
 
           <div class="size-36" ng-click="copyToClipboard(btx.amountStr)">
-            <span ng-if="btx.action == 'received'">+</span>
-            <span ng-if="btx.action == 'sent'">-</span>
             <span class="enable_text_select">{{btx.amountStr}}</span>
           </div>
           <div class="alternative-amount" ng-click="showRate=!showRate" ng-init="showRate = false">
@@ -100,7 +98,7 @@
 
         <li class="line-b p10 oh" ng-if="btx.message && btx.action != 'received'"
           ng-click="copyToClipboard(btx.message)">
-          <span class="text-gray" translate>Note</span>
+          <span class="text-gray" translate>Description</span>
           <span class="right enable_text_select">{{btx.message}}</span>
         </li>
 
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index 81055b0eb..59f186eb7 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -78,7 +78,7 @@
 
       <ul class="no-bullet size-14 m0">
         <li class="line-b p10 oh" ng-show="tx.message">
-          <span class="text-gray" translate>Note</span>
+          <span class="text-gray" translate>Description</span>
           <span class="right">{{tx.message}}</span>
         </li>
 
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 42734ab33..8d55095c7 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -449,7 +449,7 @@
             </div>
             <div class="row" ng-hide="home.hideNote">
               <div class="large-12 columns">
-                <label for="comment"><span translate>Note</span>
+                <label for="comment"><span translate>Description</span>
                   <small translate ng-hide="!sendForm.comment.$pristine">optional</small>
                   <small translate class="has-error" ng-show="sendForm.comment.$invalid && !sendForm.comment.$pristine">too long!</small>
                 </label>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index eebe2b591..bd3876217 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -765,7 +765,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
         var satToBtc = 1 / 100000000;
         self.csvContent = [];
         self.csvFilename = 'Copay-' + (self.alias || self.walletName) + '.csv';
-        self.csvHeader = ['Date', 'Destination', 'Note', 'Amount', 'Currency', 'Txid', 'Creator', 'Copayers'];
+        self.csvHeader = ['Date', 'Destination', 'Description', 'Amount', 'Currency', 'Txid', 'Creator', 'Copayers'];
 
         var _amount, _note, _copayers, _creator;
         data.forEach(function(it, index) {
@@ -794,7 +794,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
           self.csvContent.push({
             'Date': formatDate(it.time * 1000),
             'Destination': formatString(it.addressTo),
-            'Note': _note,
+            'Description': _note,
             'Amount': _amount,
             'Currency': 'BTC',
             'Txid': it.txid,
@@ -807,7 +807,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
             self.csvContent.push({
               'Date': formatDate(it.time * 1000),
               'Destination': 'Bitcoin Network Fees',
-              'Note': '',
+              'Description': '',
               'Amount': '-' + _fee,
               'Currency': 'BTC',
               'Txid': '',
diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop
index e63420487..49cf7b907 100644
--- a/webkitbuilds/.desktop
+++ b/webkitbuilds/.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Version=1.12.14
+Version=2.0.0
 Name=Copay
 Comment=A multisignature wallet
 Exec=copay
diff --git a/webkitbuilds/setup-win.iss b/webkitbuilds/setup-win.iss
index d4fef1d85..50d153d1c 100755
--- a/webkitbuilds/setup-win.iss
+++ b/webkitbuilds/setup-win.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Copay"
-#define MyAppVersion "1.12.14"
+#define MyAppVersion "2.0.0"
 #define MyAppPublisher "BitPay"
 #define MyAppURL "https://copay.io"
 #define MyAppExeName "Copay.exe"