Merge branch 'dev'

phantasma-io-archive · Apr 8, 2021 · c8e01ef · c8e01ef
2 parents cf25ff0 + fa376af
commit c8e01ef
Show file tree

Hide file tree

Showing 20 changed files with 300 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ecto",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "private": true,
   "scripts": {
     "build": "vue-cli-service build",

diff --git a/public/assets/default.png b/public/assets/default.png
diff --git a/public/assets/sem.png b/public/assets/sem.png
diff --git a/src/locales/cn.json b/src/locales/cn.json
@@ -97,6 +97,11 @@
         "removeStakes": "从质押里移出",
         "sendAmount": "发送数额",
         "sendAmount2": "您想要发送多少个？",
+        "burnAmount": "Burn Amount",
+        "burnAmount2": "How many do you want to burn?",
+        "burnConfirmation": "Burn Confirmation",
+        "burnConfirmation1": "Please confirm that you are going to burn",
+        "burnConfirmation2": "<br><br><b>IMPORTANT NOTE:</b> this is definitive and irreversible.",
         "remaining": "保留中",
         "next": "下一步",
         "insertWIF": "输入WIF签署交易。",

diff --git a/src/locales/de.json b/src/locales/de.json
@@ -97,6 +97,11 @@
         "removeStakes": "Von Stakes entfernen",
         "sendAmount": "Betrag Senden",
         "sendAmount2": "Wieviele wollen Sie senden?",
+        "burnAmount": "Burn Amount",
+        "burnAmount2": "How many do you want to burn?",
+        "burnConfirmation": "Burn Confirmation",
+        "burnConfirmation1": "Please confirm that you are going to burn",
+        "burnConfirmation2": "<br><br><b>IMPORTANT NOTE:</b> this is definitive and irreversible.",
         "remaining": "Verbleibend",
         "next": "Nächste",
         "insertWIF": "Fügen Sie Ihr WIF ein, um die Transaktion zu signieren",

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -97,6 +97,11 @@
     "removeStakes": "Remove from Stakes",
     "sendAmount": "Send Amount",
     "sendAmount2": "How many do you want to send?",
+    "burnAmount": "Burn Amount",
+    "burnAmount2": "How many do you want to burn?",
+    "burnConfirmation": "Burn Confirmation",
+    "burnConfirmation1": "Please confirm that you are going to burn",
+    "burnConfirmation2": "<br><br><b>IMPORTANT NOTE:</b> this is definitive and irreversible.",
     "remaining": "Remaining",
     "next": "Next",
     "insertWIF": "Insert your WIF to sign transaction.",

diff --git a/src/locales/es.json b/src/locales/es.json
@@ -97,6 +97,11 @@
         "removeStakes": "Remover participación(unstake)",
         "sendAmount": "Enviar Cantidad",
         "sendAmount2": "¿Cuántos desea enviar?",
+        "burnAmount": "Burn Amount",
+        "burnAmount2": "How many do you want to burn?",
+        "burnConfirmation": "Burn Confirmation",
+        "burnConfirmation1": "Please confirm that you are going to burn",
+        "burnConfirmation2": "<br><br><b>IMPORTANT NOTE:</b> this is definitive and irreversible.",
         "remaining": "Remanente",
         "next": "Próximo",
         "insertWIF": "Agregar su WIF para firmar transacción.",

diff --git a/src/locales/fr.json b/src/locales/fr.json
@@ -97,6 +97,11 @@
     "removeStakes": "A enlever",
     "sendAmount": "A envoyer",
     "sendAmount2": "Combien souhaitez-vous envoyer?",
+    "burnAmount": "A detruire",
+    "burnAmount2": "Combien souhaitez-vous détruire?",
+    "burnConfirmation": "Confirmation",
+    "burnConfirmation1": "Confirmer que vous souhaitez détruire",
+    "burnConfirmation2": "<br><br><b>NOTE IMPORTANTE:</b> cette action est définitive et irréversible.",
     "remaining": "Restant",
     "next": "Suivant",
     "insertWIF": "Entrer votre WIF pour signer la transaction.",

diff --git a/src/locales/it.json b/src/locales/it.json
@@ -97,6 +97,11 @@
         "removeStakes": "Rimuovi da Stake",
         "sendAmount": "Spedisci",
         "sendAmount2": "Che ammontare vorresti spedire?",
+        "burnAmount": "Burn Amount",
+        "burnAmount2": "How many do you want to burn?",
+        "burnConfirmation": "Burn Confirmation",
+        "burnConfirmation1": "Please confirm that you are going to burn",
+        "burnConfirmation2": "<br><br><b>IMPORTANT NOTE:</b> this is definitive and irreversible.",
         "remaining": "Restante",
         "next": "Prossimo",
         "insertWIF": "Inserisci la chiave WIF per firmare la transazione.",

diff --git a/src/locales/nb.json b/src/locales/nb.json
@@ -97,6 +97,11 @@
         "removeStakes": "Løs ut fra låst beløp",
         "sendAmount": "Antall å sende",
         "sendAmount2": "Hvor mye ønsker du å sende?",
+        "burnAmount": "Burn Amount",
+        "burnAmount2": "How many do you want to burn?",
+        "burnConfirmation": "Burn Confirmation",
+        "burnConfirmation1": "Please confirm that you are going to burn",
+        "burnConfirmation2": "<br><br><b>IMPORTANT NOTE:</b> this is definitive and irreversible.",
         "remaining": "Gjenværende",
         "next": "Neste",
         "insertWIF": "Legg inn ditt WIF for å signere transaksjonen.",

diff --git a/src/locales/nl.json b/src/locales/nl.json
@@ -97,6 +97,11 @@
         "removeStakes": "Verwijder Stakes",
         "sendAmount": "Verstuur Aantal",
         "sendAmount2": "Welk aantal wil je versturen?",
+        "burnAmount": "Burn Amount",
+        "burnAmount2": "How many do you want to burn?",
+        "burnConfirmation": "Burn Confirmation",
+        "burnConfirmation1": "Please confirm that you are going to burn",
+        "burnConfirmation2": "<br><br><b>IMPORTANT NOTE:</b> this is definitive and irreversible.",
         "remaining": "Restant",
         "next": "Verder",
         "insertWIF": "Type jouw WIF in om een transactie goed te keuren.",

diff --git a/src/locales/pt.json b/src/locales/pt.json
@@ -97,6 +97,11 @@
         "removeStakes": "Remover dos estaques",
         "sendAmount": "Quantidade a enviar",
         "sendAmount2": "Quanto queres enviar?",
+        "burnAmount": "Burn Amount",
+        "burnAmount2": "How many do you want to burn?",
+        "burnConfirmation": "Burn Confirmation",
+        "burnConfirmation1": "Please confirm that you are going to burn",
+        "burnConfirmation2": "<br><br><b>IMPORTANT NOTE:</b> this is definitive and irreversible.",
         "remaining": "Restante",
         "next": "Próximo",
         "insertWIF": "Insere o teu WIF para assinar a transação.",

diff --git a/src/locales/ru.json b/src/locales/ru.json
@@ -97,6 +97,11 @@
         "removeStakes": "Изъять",
         "sendAmount": "Отправляемое количество",
         "sendAmount2": "Сколько Вы хотите отправить?",
+        "burnAmount": "Burn Amount",
+        "burnAmount2": "How many do you want to burn?",
+        "burnConfirmation": "Burn Confirmation",
+        "burnConfirmation1": "Please confirm that you are going to burn",
+        "burnConfirmation2": "<br><br><b>IMPORTANT NOTE:</b> this is definitive and irreversible.",
         "remaining": "Осталось",
         "next": "Далее",
         "insertWIF": "Введите Ваш приватный ключ в формате WIF для подписания транзакции.",

diff --git a/src/locales/tr.json b/src/locales/tr.json
@@ -97,6 +97,11 @@
     "removeStakes": "Vadeden kaldır",
     "sendAmount": "Gönderim miktarı",
     "sendAmount2": "Ne kadarını göndermek istiyorsun?",
+    "burnAmount": "Burn Amount",
+    "burnAmount2": "How many do you want to burn?",
+    "burnConfirmation": "Burn Confirmation",
+    "burnConfirmation1": "Please confirm that you are going to burn",
+    "burnConfirmation2": "<br><br><b>IMPORTANT NOTE:</b> this is definitive and irreversible.",
     "remaining": "Kalan",
     "next": "İleri",
     "insertWIF": "İşlemi onaylamak için WIF girin.",

diff --git a/src/locales/vn.json b/src/locales/vn.json
@@ -97,6 +97,11 @@
         "removeStakes": "Xóa bỏ cổ phần",
         "sendAmount": "Gửi số lượng",
         "sendAmount2": "Bạn muốn gửi bao nhiêu?",
+        "burnAmount": "Burn Amount",
+        "burnAmount2": "How many do you want to burn?",
+        "burnConfirmation": "Burn Confirmation",
+        "burnConfirmation1": "Please confirm that you are going to burn",
+        "burnConfirmation2": "<br><br><b>IMPORTANT NOTE:</b> this is definitive and irreversible.",
         "remaining": "Còn lại",
         "next": "Kế tiếp",
         "insertWIF": "Chèn WIF của bạn để ký giao dịch.",

diff --git a/src/manifest.development.json b/src/manifest.development.json
@@ -3,7 +3,7 @@
   "name": "__MSG_appName__",
   "description": "__MSG_appDesc__",
   "default_locale": "en",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "browser_action": {
     "default_icon": "icon.png",
     "default_popup": "popup.html"

diff --git a/src/manifest.production.json b/src/manifest.production.json
@@ -3,7 +3,7 @@
   "name": "__MSG_appName__",
   "description": "__MSG_appDesc__",
   "default_locale": "en",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "browser_action": {
     "default_icon": "icon.png",
     "default_popup": "popup.html"

diff --git a/src/popup/PopupState.ts b/src/popup/PopupState.ts
@@ -109,7 +109,7 @@ export class PopupState {
 
   allSwaps: Swap[] = [];
 
-  payload = "4543542D312E312E31";
+  payload = "4543542D312E312E32";
 
   $i18n: any = {
     t: (s: string) => s,