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

Translations additions + some (s)css + review transaction changes

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-08-02 16:05:12 +02:00
commit f49e8725e8
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
6 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/controllers/review.controller.js
View file

@ -4,7 +4,7 @@ angular
.module('copayApp.controllers')
.controller('reviewController', reviewController);
function reviewController(addressbookService, configService, profileService, $log, $scope, txFormatService) {
function reviewController(addressbookService, configService, gettextCatalog, profileService, $log, $scope, txFormatService) {
var vm = this;
vm.destination = {
@ -33,6 +33,7 @@ function reviewController(addressbookService, configService, profileService, $lo
vm.secondaryAmount = '';
vm.secondaryCurrency = '';
vm.thirdParty = false;
vm.sendingTitle = gettextCatalog.getString('You are sending');
var config = null;
var coin = '';
@ -62,6 +63,7 @@ function reviewController(addressbookService, configService, profileService, $lo
vm.thirdParty = JSON.parse(data.stateParams.thirdParty); // Parse stringified JSON-object
if (vm.thirdParty) {
if (vm.thirdParty.id === 'shapeshift') {
vm.sendingTitle = gettextCatalog.getString('You are shifting');
if (!vm.thirdParty.data) {
vm.thirdParty.data = {};
}

4
src/sass/views/review.scss
View file

@ -10,4 +10,8 @@
position: absolute;
bottom: 92px;
}
.shapeshift-banner {
box-shadow: none;
}
}

6
src/sass/views/shapeshift.scss
View file

@ -1,7 +1,8 @@
#shapeshift {
.swap-image {
width: 70%;
width: auto;
max-width: 400px;
max-height: 25vh;
}
.empty-case {
@include empty-case();
@ -17,5 +18,6 @@
}
}
.header.shapeshift {
background: #243F5D;
background: url(../img/shapeshiftbg.jpg) center center no-repeat #28394d;
opacity: 0.99;
}