aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-04-22 18:03:56 +0200
committerFlorian Dold <florian.dold@gmail.com>2016-04-22 18:03:56 +0200
commit52707f87e7faf1ae985c88b6787b688d121b538b (patch)
tree71d9d71ef88d69896d011325dabbd4758e3e63fd
parentf6ba6074b7f729ddd9790b2c465451401d8caf2f (diff)
downloadwallet-core-52707f87e7faf1ae985c88b6787b688d121b538b.tar.xz
adapt to protocol changes and improve error handling
-rw-r--r--lib/wallet/cryptoLib.ts1
-rw-r--r--lib/wallet/emscriptif.ts2
-rw-r--r--lib/wallet/types.ts3
-rw-r--r--manifest.json2
-rw-r--r--pages/confirm-create-reserve.tsx5
5 files changed, 10 insertions, 3 deletions
diff --git a/lib/wallet/cryptoLib.ts b/lib/wallet/cryptoLib.ts
index 769cb3356..967fc23c8 100644
--- a/lib/wallet/cryptoLib.ts
+++ b/lib/wallet/cryptoLib.ts
@@ -125,6 +125,7 @@ namespace RpcFunctions {
fee_deposit: (new native.Amount(denom.fee_deposit)).toNbo(),
fee_refresh: (new native.Amount(denom.fee_refresh)).toNbo(),
fee_withdraw: (new native.Amount(denom.fee_withdraw)).toNbo(),
+ fee_refund: (new native.Amount(denom.fee_refund)).toNbo(),
});
let nativeSig = new native.EddsaSignature();
diff --git a/lib/wallet/emscriptif.ts b/lib/wallet/emscriptif.ts
index b03bc9bc7..4ec029e52 100644
--- a/lib/wallet/emscriptif.ts
+++ b/lib/wallet/emscriptif.ts
@@ -866,6 +866,7 @@ export interface DenominationKeyValidityPS_args {
fee_withdraw: AmountNbo;
fee_deposit: AmountNbo;
fee_refresh: AmountNbo;
+ fee_refund: AmountNbo;
denom_hash: HashCode;
}
@@ -889,6 +890,7 @@ export class DenominationKeyValidityPS extends SignatureStruct {
["fee_withdraw", AmountNbo],
["fee_deposit", AmountNbo],
["fee_refresh", AmountNbo],
+ ["fee_refund", AmountNbo],
["denom_hash", HashCode]
];
}
diff --git a/lib/wallet/types.ts b/lib/wallet/types.ts
index 8aa03d82b..5045a5b9a 100644
--- a/lib/wallet/types.ts
+++ b/lib/wallet/types.ts
@@ -75,6 +75,9 @@ export class Denomination {
@Checkable.Value(AmountJson)
fee_refresh: AmountJson;
+ @Checkable.Value(AmountJson)
+ fee_refund: AmountJson;
+
@Checkable.String
stamp_start: string;
diff --git a/manifest.json b/manifest.json
index 185232f57..215f9dcba 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"description": "Privacy preserving and transparent payments",
"manifest_version": 2,
"name": "GNU Taler Wallet (git)",
- "version": "0.5.19",
+ "version": "0.5.20",
"applications": {
"gecko": {
diff --git a/pages/confirm-create-reserve.tsx b/pages/confirm-create-reserve.tsx
index be84fff2b..1c3bf7cbb 100644
--- a/pages/confirm-create-reserve.tsx
+++ b/pages/confirm-create-reserve.tsx
@@ -121,8 +121,9 @@ class Controller {
console.log("get exchange info rejected");
if (e.hasOwnProperty("httpStatus")) {
this.statusString = `request failed with status ${this.request.status}`;
- } else {
- this.statusString = `unknown request error`;
+ } else if (e.hasOwnProperty("errorResponse")) {
+ let resp = e.errorResponse;
+ this.statusString = `error: ${resp.error} (${resp.hint})`;
}
m.endComputation();
});