3 files changed, 7 insertions, 9 deletions
diff --git a/extension/lib/wallet/emscriptif.ts b/extension/lib/wallet/emscriptif.ts
index d8fd72289..eb6a292a7 100644
--- a/extension/lib/wallet/emscriptif.ts
+++ b/extension/lib/wallet/emscriptif.ts
@@ -595,7 +595,7 @@ export class HashCode extends PackedArenaObject {
         qual = RandomQuality.NONCE;
         break;
       default:
-        throw Error(format("unknown crypto quality: {0}", qual));
+        throw Error(`unknown crypto quality: ${qual}`);
     }
     this.alloc();
     emsc.hash_create_random(qual, this.nativePtr);
@@ -680,7 +680,7 @@ abstract class SignatureStruct {
       let name = f[0];
       let member = this.members[name];
       if (!member) {
-        throw Error(format("Member {0} not set", name));
+        throw Error(`Member ${name} not set`);
       }
       totalSize += member.size();
     }
@@ -705,7 +705,7 @@ abstract class SignatureStruct {
       let name = f[0];
       let member = this.members[name];
       if (!member) {
-        throw Error(format("Member {0} not set", name));
+        throw Error(`Member ${name} not set`);
       }
       res[name] = member.toJson();
     }
@@ -719,10 +719,10 @@ abstract class SignatureStruct {
       typemap[f[0]] = f[1];
     }
     if (!(name in typemap)) {
-      throw Error(format("Key {0} not found", name));
+      throw Error(`Key ${name} not found`);
     }
     if (!(value instanceof typemap[name])) {
-      throw Error(format("Wrong type for {0}", name));
+      throw Error("Wrong type for ${name}");
     }
     this.members[name] = value;
   }
diff --git a/extension/lib/wallet/wxmessaging.js b/extension/lib/wallet/wxmessaging.js
index c656f2632..7a6f501be 100644
--- a/extension/lib/wallet/wxmessaging.js
+++ b/extension/lib/wallet/wxmessaging.js
@@ -98,7 +98,7 @@ System.register(["./wallet", "./db", "./http"], function(exports_1) {
                 if (req.type in handlers) {
                     return handlers[req.type](db, req.detail, onresponse);
                 }
-                console.error(format("Request type {1} unknown, req {0}", JSON.stringify(req), req.type));
+                console.error("Request type " + JSON.stringify(req) + " unknown, req " + req.type);
                 return false;
             });
         });
diff --git a/extension/lib/wallet/wxmessaging.ts b/extension/lib/wallet/wxmessaging.ts
index 1b345e22f..6c8f77a8b 100644
--- a/extension/lib/wallet/wxmessaging.ts
+++ b/extension/lib/wallet/wxmessaging.ts
@@ -127,9 +127,7 @@ export function wxMain() {
         if (req.type in handlers) {
           return handlers[req.type](db, req.detail, onresponse);
         }
-        console.error(format("Request type {1} unknown, req {0}",
-                             JSON.stringify(req),
-                             req.type));
+        console.error(`Request type ${JSON.stringify(req)} unknown, req ${req.type}`);
         return false;
       });
   });