-
+
diff --git a/src/app/components/send/send.component.ts b/src/app/components/send/send.component.ts
index ca3587875..a27b41f3f 100644
--- a/src/app/components/send/send.component.ts
+++ b/src/app/components/send/send.component.ts
@@ -170,7 +170,7 @@ export class SendComponent implements OnInit {
this.messageService.startSpinner('Signing transaction...');
let keys;
try {
- keys = await this.walletService.getKeys(pwd, this.activeAccount.address);
+ keys = await this.walletService.getKeys(pwd, this.activeAccount.pkh);
} catch {
this.messageService.stopSpinner();
}
@@ -220,19 +220,21 @@ export class SendComponent implements OnInit {
updateMaxAmount() {
if (this.sendMax) {
const max = this.maxToSend(this.activeAccount);
+ let maxAmount = '0';
if (max.length && max.slice(0, 1) !== '-') {
- this.amount = max;
- } else {
- this.amount = '0';
+ maxAmount = max;
+ }
+ if (this.amount !== maxAmount) {
+ this.amount = maxAmount;
}
}
}
maxToSend(account: Account): string {
if (account && (account instanceof ImplicitAccount)) {
let accountBalance = Big(account.balanceXTZ).div(1000000);
- accountBalance = accountBalance.minus(this.fee ? Number(this.fee) : this.defaultTransactionParams.fee);
+ accountBalance = accountBalance.minus(this.fee && Number(this.fee) ? Number(this.fee) : this.defaultTransactionParams.fee);
if (!this.isMultipleDestinations) {
- accountBalance = accountBalance.minus(this.storage ? Number(this.storage) / 1000 : this.defaultTransactionParams.burn);
+ accountBalance = accountBalance.minus(this.storage && Number(this.storage) ? Number(this.storage) / 1000 : this.defaultTransactionParams.burn);
} else {
accountBalance = accountBalance.minus(this.defaultTransactionParams.burn);
}
@@ -454,6 +456,7 @@ export class SendComponent implements OnInit {
if (res) {
console.log(res);
this.defaultTransactionParams = res;
+ this.updateMaxAmount();
}
this.latestSimError = '';
this.formInvalid = '';
@@ -471,6 +474,7 @@ export class SendComponent implements OnInit {
this.latestSimError = prevSimError;
if (this.isMultipleDestinations ? !this.toMultipleDestinationsString : !this.toPkh) {
this.defaultTransactionParams = zeroTxParams;
+ this.updateMaxAmount();
this.prevEquiClass = '';
}
}
@@ -522,7 +526,7 @@ export class SendComponent implements OnInit {
if (!this.inputValidationService.address(toPkh) || toPkh === this.activeAccount.address) {
return this.translate.instant('SENDCOMPONENT.INVALIDRECEIVERADDRESS');
} else if (!this.inputValidationService.amount(amount) ||
- (finalCheck && (amount === '0' || amount === ''))) {
+ (finalCheck && (((amount === '0') || amount === '') && (toPkh.slice(0, 3) !== 'KT1')))) {
return this.translate.instant('SENDCOMPONENT.INVALIDAMOUNT');
} else if (!this.inputValidationService.gas(this.gas)) {
return this.translate.instant('SENDCOMPONENT.INVALIDGASLIMIT');
@@ -583,22 +587,22 @@ export class SendComponent implements OnInit {
}
return totalSent.toString();
}
- getTotalCost(): string {
+ getTotalCost(display: boolean = false): string {
const totalFee = Big(this.getTotalFee()).plus(Big(this.getTotalBurn())).toString();
- setTimeout(() => {
- this.updateMaxAmount();
- }, 100);
+ if (display && totalFee === '0') {
+ return '-';
+ }
return totalFee;
}
getTotalFee(): number {
- if (this.fee !== '') {
+ if (this.fee !== '' && Number(this.fee)) {
return Number(this.fee);
}
return Number(this.defaultTransactionParams.fee);
}
getTotalBurn(): number {
- if (this.storage) {
- return (Number(this.storage) * this.transactions.length) / 1000;
+ if (this.storage !== '' && Number(this.storage)) {
+ return Number(Big(this.storage).mul(this.transactions.length).div('1000').toString());
}
return Number(this.defaultTransactionParams.burn);
}
diff --git a/src/app/services/estimate/estimate.service.spec.ts b/src/app/services/estimate/estimate.service.spec.ts
index 0d31fd6dc..30fdb1b00 100644
--- a/src/app/services/estimate/estimate.service.spec.ts
+++ b/src/app/services/estimate/estimate.service.spec.ts
@@ -52,7 +52,7 @@ describe('EstimateService', () => {
gasLimit: 10287,
storageLimit: 257
}],
- fee: 0.003988,
+ fee: 0.003991,
burn: 0.257,
gas: 11980,
storage: 86,
diff --git a/src/app/services/estimate/estimate.service.ts b/src/app/services/estimate/estimate.service.ts
index 052f4d97d..c3b40790f 100644
--- a/src/app/services/estimate/estimate.service.ts
+++ b/src/app/services/estimate/estimate.service.ts
@@ -48,7 +48,7 @@ export class EstimateService {
storageLimit: 60000
};
for (const tx of transactions) {
- if (!invoke) {
+ if (tx.to.slice(0, 3) !== 'KT1') {
tx.amount = 0.000001;
}
tx.gasLimit = simulation.gasLimit;
diff --git a/src/app/services/import/import.service.spec.ts b/src/app/services/import/import.service.spec.ts
index 3c8093f29..5dd9a4b72 100644
--- a/src/app/services/import/import.service.spec.ts
+++ b/src/app/services/import/import.service.spec.ts
@@ -209,7 +209,7 @@ describe('[ ImportService ]', () => {
describe('> Legacy v3', async () => {
beforeEach(() => {
spyOn(conseil, 'getContractAddresses').and.callFake(async function(address: string) {
- if (address.slice(0,2) === 'tz') {
+ if (address.slice(0, 2) === 'tz') {
return ['KT1KwPDCVmkrXQ2ZKWhVAiiFzYxiXCEyhE7U'];
} else {
return [];
diff --git a/src/app/services/ledger/ledger.service.ts b/src/app/services/ledger/ledger.service.ts
index 87e615211..f8e7e7e2a 100644
--- a/src/app/services/ledger/ledger.service.ts
+++ b/src/app/services/ledger/ledger.service.ts
@@ -1,7 +1,6 @@
import { Injectable } from '@angular/core';
import 'babel-polyfill';
import TransportU2F from '@ledgerhq/hw-transport-u2f';
-import TransportWebAuthn from '@ledgerhq/hw-transport-webauthn';
import Tezos from '@obsidiansystems/hw-app-xtz';
import { OperationService } from '../operation/operation.service';
import { MessageService } from '../message/message.service';
@@ -14,9 +13,7 @@ export class LedgerService {
constructor(
private operationService: OperationService,
private messageService: MessageService
- ) {
- this.setTransport();
- }
+ ) {}
async setTransport() {
if (!this.transport) {
console.log('Trying to use U2F for transport...');
@@ -27,15 +24,6 @@ export class LedgerService {
console.log('Couldn\'t use U2F for transport!');
}
}
- if (!this.transport) {
- console.log('Trying to use WebAuthn for transport...');
- try {
- this.transport = await TransportWebAuthn.create();
- console.log('Transport is now set to use WebAuthn!');
- } catch (e) {
- console.log('Couldn\'t use WebAuthn for transport!');
- }
- }
}
async transportCheck() {
if (!this.transport) {