anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #28 from bitpay/bug/activity/created

Browse source 
wallet created
This commit is contained in:
Gustavo Maximiliano Cortez 2016-08-31 23:21:18 -03:00 • committed by GitHub
commit 48a182e658
7 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
chrome-app/manifest.json
View file

@ -5,7 +5,7 @@
"manifest_version": 2, "manifest_version": 2,
"name": "BitPay", "name": "BitPay",
"description": "The BitPay Bitcoin Wallet", "description": "The BitPay Bitcoin Wallet",
"version": "0.6.0", "version": "0.7.0",
"permissions": [ "permissions": [
"storage", "storage",
"unlimitedStorage", "unlimitedStorage",

2
package.json
View file

@ -6,7 +6,7 @@
"name": "bitpay", "name": "bitpay",
"description": "The BitPay Bitcoin Wallet", "description": "The BitPay Bitcoin Wallet",
"author": "BitPay", "author": "BitPay",
"version": "0.6.0", "version": "0.7.0",
"keywords": [ "keywords": [
"wallet", "wallet",
"copay", "copay",

7
public/views/includes/walletActivity.html
View file

@ -1,5 +1,12 @@
<span class="wallet-activity"> <span class="wallet-activity">
<div ng-if="x.types.indexOf('NewCopayer')>=0 && x.wallet.n>1">
Copayer joined
</div>
<div ng-if="x.types.indexOf('NewCopayer')>=0 && x.wallet.n==1">
Wallet created
</div>
<div ng-if="x.types.indexOf('NewOutgoingTx')>=0"> <div ng-if="x.types.indexOf('NewOutgoingTx')>=0">
<span>Payment Sent </span> <span>Payment Sent </span>

4
public/views/tab-home.html
View file

@ -79,11 +79,11 @@
<div class="item item-heading"> <div class="item item-heading">
Next steps Next steps
</div> </div>
<a ng-show="!wallets[1]" ui-sref="add.main" class="item item-icon-left item-big-icon-left item-icon-right"> <a ng-show="!wallets[1]" ui-sref="tabs.add" class="item item-icon-left item-big-icon-left item-icon-right">
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<img class="icon-create-wallet"/> <img class="icon-create-wallet"/>
</i> </i>
<span>Crate a bitcoin wallet</span> <span>Create a bitcoin wallet</span>
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i> <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
</a> </a>
<a ng-show="!externalServices.BuyAndSell" ui-sref="buyandsell" class="item item-icon-left item-big-icon-left item-icon-right"> <a ng-show="!externalServices.BuyAndSell" ui-sref="buyandsell" class="item item-icon-left item-big-icon-left item-icon-right">

1
src/js/routes.js
View file

@ -859,6 +859,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} else { } else {
profileService.storeProfileIfDirty(); profileService.storeProfileIfDirty();
$log.debug('Profile loaded ... Starting UX.'); $log.debug('Profile loaded ... Starting UX.');
$state.transitionTo('tabs.home'); $state.transitionTo('tabs.home');
} }
}); });

2
webkitbuilds/.desktop
View file

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Version=0.6.0 Version=0.7.0
Name=BitPay Name=BitPay
Comment=The BitPay Bitcoin Wallet Comment=The BitPay Bitcoin Wallet
Exec=bitpay Exec=bitpay

2
webkitbuilds/setup-win.iss
View file

@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "bitpay" #define MyAppName "bitpay"
#define MyAppVersion "0.6.0" #define MyAppVersion "0.7.0"
#define MyAppPublisher "BitPay" #define MyAppPublisher "BitPay"
#define MyAppURL "https://bitpay.com" #define MyAppURL "https://bitpay.com"
#define MyAppExeName "*NAMECASENOSPACE.exe" #define MyAppExeName "*NAMECASENOSPACE.exe"