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

Merge pull request #2538 from cmgustavo/bug/modal-txp-01

Browse source 
Fix TXP modal events. Update BWS host
This commit is contained in:
Matias Alejo Garcia 2015-04-17 18:10:54 -03:00
commit 2d934dee10
9 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cordova/android/AndroidManifest.xml
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<manifest android:hardwareAccelerated="true" android:versionCode="1" android:versionName="v0.10.0" android:windowSoftInputMode="adjustPan" package="com.bitpay.copay" xmlns:android="http://schemas.android.com/apk/res/android">
<manifest android:hardwareAccelerated="true" android:versionCode="1" android:versionName="v0.10.3" android:windowSoftInputMode="adjustPan" package="com.bitpay.copay" xmlns:android="http://schemas.android.com/apk/res/android">
<supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
<uses-permission android:name="android.permission.INTERNET" />
<application android:hardwareAccelerated="true" android:icon="@drawable/copay" android:label="@string/app_name">

6
cordova/config.xml
View file

@ -1,8 +1,8 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.bitpay.copay"
version="0.10.2"
android-versionCode="28"
ios-CFBundleVersion="0.10.2">
version="0.10.3"
android-versionCode="29"
ios-CFBundleVersion="0.10.3">
<name>Copay</name>
<description>
A secure bitcoin wallet for friends and companies.

4
cordova/ios/Copay-Info.plist
View file

@ -57,11 +57,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.10.2</string>
<string>0.10.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0.10.2</string>
<string>0.10.3</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSMainNibFile</key>

2
cordova/wp/Package.appxmanifest
View file

@ -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="0.10.2.0" />
<Identity Name="18C7659D.CopayWallet" Publisher="CN=F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" Version="0.10.3.0" />
<mp:PhoneIdentity PhoneProductId="5381aa50-9069-11e4-84cc-293caf9cbdc8" PhonePublisherId="F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" />
<Properties>
<DisplayName>Copay Wallet</DisplayName>

2
package.json
View file

@ -2,7 +2,7 @@
"name": "copay",
"description": "A multisignature wallet",
"author": "BitPay",
"version": "0.10.2",
"version": "0.10.3",
"keywords": [
"wallet",
"copay",

23
public/views/modals/txp-details.html
View file

@ -94,7 +94,7 @@
<div class="row column m20t" ng-if="tx.couldRemove">
<button class="button expand outline dark-gray m0 expand" ng-click="hideTxInfo = true; remove(tx);"
<button class="button expand outline dark-gray m0 expand" ng-click="remove(tx);"
ng-disabled="loading" ng-show="tx.couldRemove">
<i class="fi-x icon-sign x"></i>
<span translate>Remove</span>
@ -106,14 +106,14 @@
<div class="row m20t" ng-if="tx.pendingForUs">
<div class="large-5 medium-5 small-6 columns">
<button class="button outline dark-gray m0 expand" ng-click="hideTxInfo = true; reject(tx);"
<button class="button outline dark-gray m0 expand" ng-click="reject(tx);"
ng-disabled="loading">
<i class="fi-x"></i>
<span translate>Reject</span>
</button>
</div>
<div class="large-5 medium-5 small-6 columns text-right">
<button class="button primary m0 expand" ng-click="hideTxInfo = true; sign(tx)"
<button class="button primary m0 expand" ng-click="sign(tx)"
ng-style="{'background-color':color}"
ng-disabled="loading">
<i class="fi-check"></i>
@ -122,9 +122,22 @@
</div>
</div>
<div class="text-center" ng-show="tx.status != 'pending'">
<div class="text-success m10t"
<div class="text-center text-gray" ng-show="tx.status != 'pending'">
<div class="m10t"
ng-show="tx.status=='accepted'" translate>
Transaction accepted...
</div>
<div class="m10t"
ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'">
<div translate>But not broadcasted. Try to send manually</div>
<button class="primary"
ng-click="broadcast(tx)"
ng-disabled="loading"> <i class="fi-upload-cloud"></i>
<span translate>Broadcast Transaction</span>
</button>
</div>
<div class="text-success m10t"
ng-show="tx.status=='broadcasted'" translate>
Transaction sent!
</div>
<div class="text-center text-warning"

4
src/css/mobile.css
View file

@ -9,7 +9,6 @@
body {
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
@ -17,14 +16,12 @@ body {
input {
-webkit-user-select: auto !important;
-khtml-user-select: auto !important;
-moz-user-select: auto !important;
-ms-user-select: auto !important;
user-select: auto !important;
}
* {
-webkit-user-drag: none;
-moz-user-drag: none;
-ms-user-drag: none;
user-drag: none;
}
@ -36,7 +33,6 @@ body, div, .row {
.enable_text_select {
-webkit-user-select: text;
-khtml-user-select: text;
-moz-user-select: text;
-ms-user-select: text;
user-select: text;
}

2
src/js/controllers/walletHome.js
View file

@ -37,7 +37,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
return fc.credentials.networkName.substring(0, 4);
};
lodash.each(['TxProposalRejectedBy', 'TxProposalAcceptedBy', 'transactionProposalRemoved', 'TxProposalRemoved'], function(eventName) {
lodash.each(['TxProposalRejectedBy', 'TxProposalAcceptedBy', 'transactionProposalRemoved', 'TxProposalRemoved', 'NewOutgoingTx'], function(eventName) {
$rootScope.$on(eventName, function() {
fc.getTx($scope.tx.id, function(err, tx) {
if (err) {

2
src/js/services/configService.js
View file

@ -12,7 +12,7 @@ angular.module('copayApp.services').factory('configService', function(localStora
// Bitcore wallet service URL
bws: {
url: 'https://copay.io:3232/bws/api',
url: 'https://bws.bitpay.com/bws/api',
},
// insight