Merge pull request #240 from bitshares/develop

Merge develop branch into master branch
bitshares · Mar 8, 2024 · 8d82324 · 8d82324
2 parents 455f55a + 2fc31f4
commit 8d82324
Show file tree

Hide file tree

Showing 59 changed files with 28,996 additions and 19,891 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ Thumbs.db
 /app/app.js
 /app/modal.js
 /app/background.js
+/app/receipt.js
 /app/**/*.map
 /app/*.ttf
 /app/*.woff

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,6 +10,6 @@
     "eslint.provideLintTask": true,
     "eslint.run": "onSave",
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
+        "source.fixAll.eslint": "explicit"
     }
 }
diff --git a/app/receipt.html b/app/receipt.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8">
+</head>
+<body class="text-center">
+  <div class="main" id="receipt">
+    <Receipt ref="receiptComp"></Receipt>
+  </div>
+  <script src="receipt.js"></script>
+</body>
+</html>
diff --git a/app/translations/operations/en.json b/app/translations/operations/en.json
@@ -44,7 +44,12 @@
         "accept_btn": "Sign & Broadcast",
         "sign_and_broadcast_btn": "Sign & Broadcast",
         "sign_btn": "Sign",
-        "reject_btn": "Ignore"
+        "reject_btn": "Ignore",
+        "receipt": {
+            "title": "Do you want a receipt?",
+            "yes": "Yes, I want a receipt.",
+            "no": "No, I don't want a receipt."
+        }
     },
     "whitelist": {
         "prompt": "Whitelist subsequent '{{method}}' requests from this app?"

diff --git a/build/webpack.app.config.js b/build/webpack.app.config.js
@@ -7,6 +7,7 @@ module.exports = env => {
     entry: {
       background: "./src/background.js",
       modal: "./src/modal.js",
+      receipt: "./src/receipt.js",
       app: "./src/app.js"
     },
     output: {