mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #3104 from cmgustavo/bug/start-copay
Bug/start copay
This commit is contained in:
Matias Alejo Garcia
commit
3f71f44701
|
|
@ -19,11 +19,13 @@
|
|||
|
||||
<div ng-show="!agreed">
|
||||
<p translate>I affirm that I have read, understood, and agree with these terms.</p>
|
||||
<button class="black round expand" ng-click="agree()">
|
||||
<span translate> Agree </span>
|
||||
<button class="black round expand" ng-click="agree()" ng-disabled="loading" translate>
|
||||
Agree
|
||||
</button>
|
||||
</div>
|
||||
<button ng-show="agreed && !index.hasProfile" class="round" ng-click="agree()" translate>Go back</button>
|
||||
<button ng-show="agreed && !index.hasProfile" class="round expand" ng-click="agree()" translate>
|
||||
Go back
|
||||
</button>
|
||||
</div>
|
||||
<div class="extra-margin-bottom"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
<div class="content preferences" ng-controller="preferencesController as preferences">
|
||||
|
||||
<ul class="no-bullet m0 size-14" ng-show="!index.noFocusedWallet">
|
||||
<ul class="no-bullet m0 size-14" ng-show="!index.noFocusedWallet">
|
||||
<h4 class="title m0">{{index.alias}} [{{index.walletName}}] <span translate>settings</span></h4>
|
||||
|
||||
|
||||
|
|
@ -55,29 +55,28 @@
|
|||
|
||||
<h4 class="title m0" translate>Global settings</h4>
|
||||
|
||||
<li class="line-b p20" ng-click="$root.go('preferencesLanguage')">
|
||||
<li class="line-b p20" ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesLanguage')">
|
||||
<span translate>Language</span>
|
||||
<span class="right text-gray">
|
||||
<i class="icon-arrow-right3 size-24 right"></i>
|
||||
{{index.defaultLanguageName|translate}}
|
||||
</span>
|
||||
</li>
|
||||
|
||||
<li class="line-b p20" ng-click="$root.go('preferencesUnit')">
|
||||
<li class="line-b p20" ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesUnit')">
|
||||
<span translate>Unit</span>
|
||||
<span class="right text-gray">
|
||||
<i class="icon-arrow-right3 size-24 right"></i>
|
||||
{{preferences.unitName}}
|
||||
</span>
|
||||
</li>
|
||||
<li class="line-b p20" ng-click="$root.go('preferencesAltCurrency')">
|
||||
<li class="line-b p20" ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesAltCurrency')">
|
||||
<span translate>Alternative Currency</span>
|
||||
<span class="right text-gray">
|
||||
<i class="icon-arrow-right3 size-24 right"></i>
|
||||
{{preferences.selectedAlternative.name}}
|
||||
</span>
|
||||
</li>
|
||||
<li class="line-b p20" ng-click="$root.go('preferencesFee')"
|
||||
<li class="line-b p20" ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesFee')"
|
||||
ng-show="(index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)">
|
||||
<span translate>Bitcoin Network Fee Policy</span>
|
||||
<span class="right text-gray">
|
||||
|
|
@ -85,7 +84,7 @@
|
|||
{{index.feeOpts[index.currentFeeLevel]|translate}}
|
||||
</span>
|
||||
</li>
|
||||
<li class="line-b p20">
|
||||
<li class="line-b p20" ng-show="!index.noFocusedWallet">
|
||||
<span translate>Use Unconfirmed Funds</span>
|
||||
<switch id="spend-unconfirmed" name="spendUnconfirmed" ng-model="spendUnconfirmed" class="green right"></switch>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
<div class="content preferences p20v" ng-controller="preferencesAbout as about">
|
||||
<div class="text-center small-5 small-centered columns m20b" >
|
||||
<img src="img/logo.png" alt="Copay" width="100%">
|
||||
<img src="img/logo.png" alt="Copay">
|
||||
</div>
|
||||
<h4 class="title m0" translate>Release Information</h4>
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
</li>
|
||||
</ul>
|
||||
|
||||
<div class="row column m20t">
|
||||
<div class="row m20t">
|
||||
<div class="text-gray size-12 text-center" ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet :
|
||||
index.feeLevels.testnet)" ng-if="fee.level == index.currentFeeLevel">
|
||||
<div ng-show="fee.nbBlocks">
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row column m20t">
|
||||
<div class="row m20t">
|
||||
<div class="text-gray size-12 text-center" translate>
|
||||
Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy.
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
<div class="content p20v" ng-controller="preferencesLogs as logs">
|
||||
|
||||
<div class="row columns">
|
||||
<button class="black radius small expand" ng-show="logs.isCordova" ng-style="{'background-color':index.backgroundColor}" ng-click="logs.sendLogs()" ><i class="fi-mail"></i>
|
||||
<div class="row columns large-centered medium-centered">
|
||||
<button class="black round small expand" ng-show="logs.isCordova" ng-style="{'background-color':index.backgroundColor}" ng-click="logs.sendLogs()"><i class="fi-mail"></i>
|
||||
|
||||
<span translate>Send by email</span>
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -1,14 +1,16 @@
|
|||
<div class="text-center splash" ng-if="!index.hasProfile">
|
||||
<div class="splash content text-center" ng-if="!index.hasProfile">
|
||||
<div class="row">
|
||||
<div class="medium-6 large-4 medium-centered small-centered large-centered columns">
|
||||
<div class="p20">
|
||||
<div class="medium-centered small-centered large-centered columns">
|
||||
<div class="m20t">
|
||||
<span class="text-bold size-16 text-white" translate>WELCOME TO COPAY</span>
|
||||
<p class="text-gray size-14 m0 text-light" translate>A multisignature bitcoin wallet</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="gif-splash">
|
||||
<img src="img/icon-splash.png" alt="icon" width="25%">
|
||||
<div class="row">
|
||||
<div class="container-image large-3 medium-3 small-3 medium-centered small-centered large-centered columns">
|
||||
<img src="img/icon-splash.png" alt="icon" width="100%">
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-center size-12 text-warning" ng-show="error && !creatingProfile">
|
||||
{{(error)|translate}}. <span translate>Retrying...</span>
|
||||
|
|
@ -25,9 +27,13 @@
|
|||
<span translate>Creating Profile...</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row columns start-button" ng-show="!creatingProfile">
|
||||
<button ng-click="create()" class="button black expand round size-12 text-spacing" translate> GET STARTED </button>
|
||||
<p class="text-gray m5b size-12" translate>Already have a wallet?</p>
|
||||
<button ng-click="create(true)" class="button round outline dark-gray tiny" translate>Import backup </button>
|
||||
<div class="row" ng-show="!creatingProfile">
|
||||
<div class="start-button large-8 medium-8 small-8 medium-centered small-centered large-centered columns">
|
||||
<button ng-click="create()" class="button black expand round size-12 text-spacing" translate>
|
||||
GET STARTED
|
||||
</button>
|
||||
<p class="text-gray m5b size-12" translate>Already have a wallet?</p>
|
||||
<button ng-click="create(true)" class="button round outline dark-gray tiny" translate>Import backup </button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<li class="line-b p10">cmgustavo83<span class="right text-gray size-12" translate>Spanish</span></li>
|
||||
<li class="line-b p10">lax5<span class="right text-gray size-12" translate>Russian</span></li>
|
||||
</ul>
|
||||
<div class="row column m20t">
|
||||
<div class="row m20t">
|
||||
<div class="size-12 text-gray text-center">
|
||||
<p class="size-12 text-black">
|
||||
<span translate>All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at</span>
|
||||
|
|
|
|||
|
|
@ -1085,20 +1085,13 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
|
|||
}
|
||||
|
||||
.splash {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
top: 0;
|
||||
background: #2C3E50;
|
||||
position: absolute;
|
||||
background-image: -webkit-linear-gradient(#3D5672 0%, #223243 100%);
|
||||
background-image: -o-linear-gradient(#3D5672 0%, #223243 100%);
|
||||
background-image: linear-gradient(#3D5672 0%, #223243 100%);
|
||||
}
|
||||
|
||||
.splash .start-button {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
}
|
||||
|
||||
.splash .start-button button.black {
|
||||
background-color: #4B6178;
|
||||
}
|
||||
|
|
@ -1107,7 +1100,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
|
|||
font-size: 0.58rem;
|
||||
}
|
||||
|
||||
.gif-splash {
|
||||
.splash .container-image {
|
||||
padding: 2rem 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -89,25 +89,27 @@ angular
|
|||
$scope.create = function(noWallet) {
|
||||
$scope.creatingProfile = true;
|
||||
|
||||
profileService.create({
|
||||
noWallet: noWallet
|
||||
}, function(err) {
|
||||
if (err) {
|
||||
$scope.creatingProfile = false;
|
||||
$log.warn(err);
|
||||
$scope.error = err;
|
||||
$scope.$apply();
|
||||
$timeout(function() {
|
||||
$scope.create(noWallet);
|
||||
}, 3000);
|
||||
}
|
||||
});
|
||||
$timeout(function() {
|
||||
profileService.create({
|
||||
noWallet: noWallet
|
||||
}, function(err) {
|
||||
if (err) {
|
||||
$scope.creatingProfile = false;
|
||||
$log.warn(err);
|
||||
$scope.error = err;
|
||||
$scope.$apply();
|
||||
$timeout(function() {
|
||||
$scope.create(noWallet);
|
||||
}, 3000);
|
||||
}
|
||||
});
|
||||
}, 100);
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
$stateProvider
|
||||
.state('translators', {
|
||||
url: '/translators',
|
||||
|
|
@ -125,7 +127,7 @@ angular
|
|||
views: {
|
||||
'main': {
|
||||
templateUrl: 'views/disclaimer.html',
|
||||
controller: function($scope, $timeout, storageService, applicationService, go) {
|
||||
controller: function($scope, $timeout, storageService, applicationService, go, gettextCatalog, isCordova) {
|
||||
storageService.getCopayDisclaimerFlag(function(err, val) {
|
||||
$scope.agreed = val;
|
||||
$timeout(function() {
|
||||
|
|
@ -134,11 +136,20 @@ angular
|
|||
});
|
||||
|
||||
$scope.agree = function() {
|
||||
storageService.setCopayDisclaimerFlag(function(err) {
|
||||
$timeout(function() {
|
||||
applicationService.restart();
|
||||
}, 1000);
|
||||
});
|
||||
if (isCordova) {
|
||||
window.plugins.spinnerDialog.show(null, gettextCatalog.getString('Loading...'), true);
|
||||
}
|
||||
$scope.loading = true;
|
||||
$timeout(function() {
|
||||
storageService.setCopayDisclaimerFlag(function(err) {
|
||||
$timeout(function() {
|
||||
if (isCordova) {
|
||||
window.plugins.spinnerDialog.hide();
|
||||
}
|
||||
applicationService.restart();
|
||||
}, 1000);
|
||||
});
|
||||
}, 100);
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -531,7 +542,7 @@ angular
|
|||
event.preventDefault();
|
||||
}
|
||||
|
||||
/*
|
||||
/*
|
||||
* --------------------
|
||||
*/
|
||||
|
||||
|
|
@ -630,7 +641,6 @@ angular
|
|||
cachedBackPanel.getElementsByClassName('content')[0].scrollTop = sc;
|
||||
|
||||
cachedTransitionState = desiredTransitionState;
|
||||
//console.log('CACHing animation', cachedTransitionState);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue