From 10fdc1a88884e176c94efc1fc7748c5f78e362e6 Mon Sep 17 00:00:00 2001
From: Yury Shapkarin <yury@shapkarin.me>
Date: Thu, 11 Mar 2021 13:21:47 +0300
Subject: [PATCH] finish the issue report popup

---
 src/components/ErrorModal.vue  | 46 ++++++++++++++++++----------------
 src/locales/en.json            |  3 ++-
 src/locales/es.json            |  3 ++-
 src/locales/fr.json            |  3 ++-
 src/locales/zh.json            |  3 ++-
 src/store/modules/aeternity.js |  1 +
 6 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/src/components/ErrorModal.vue b/src/components/ErrorModal.vue
index 6eaaa0701..4ce8f8b1a 100644
--- a/src/components/ErrorModal.vue
+++ b/src/components/ErrorModal.vue
@@ -34,14 +34,20 @@
           :placeholder="$t('reportBug.Placeholder')"
         />
         <button
-          class="button right"
+          class="button cancel"
+          @click="resolve"
+        >
+          {{ $t('reportBug.Cancel') }}
+        </button>
+        <button
+          class="button"
           @click="send"
         >
           {{ $t('reportBug.Send') }}
         </button>
       </template>
       <template v-else>
-        <iconOK />
+        <IconOK />
         <h1 class="successTitle">
           {{ $t('reportBug.Success.Title') }}
         </h1>
@@ -68,7 +74,7 @@ import { detect } from 'detect-browser';
 import FailureIcon from '../assets/APIError.svg?icon-component';
 import IconClose from '../assets/iconCloseRebranded.svg?icon-component';
 import IconEye from '../assets/iconEye.svg?icon-component';
-import iconOK from '../assets/iconOK.svg?icon-component';
+import IconOK from '../assets/iconOK.svg?icon-component';
 import { backendFetch } from '../utils/backend';
 
 export default {
@@ -76,11 +82,11 @@ export default {
     FailureIcon,
     IconClose,
     IconEye,
-    iconOK,
+    IconOK,
   },
   props: {
     resolve: { type: Function, required: true },
-    error: { type: Error, required: true },
+    error: { type: [Error, PromiseRejectionEvent], required: true },
   },
   data() {
     return {
@@ -100,13 +106,13 @@ export default {
         time: new Date().toISOString(),
       };
 
-      // await backendFetch('errorreport', {
-      //   method: 'POST',
-      //   headers: {
-      //     'Content-Type': 'application/json',
-      //   },
-      //   body: JSON.stringify(report),
-      // });
+      await backendFetch('errorreport', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(report),
+      });
 
       this.step = 2;
     },
@@ -159,7 +165,7 @@ export default {
     }
 
     h2 {
-      font-family: IBM Plex Sans;
+      color: #fff;
       font-style: normal;
       font-weight: 500;
       font-size: 15px;
@@ -168,13 +174,11 @@ export default {
 
     .description {
       font-size: 15px;
-      font-family: IBM Plex Sans;
       line-height: 24px;
       color: #BABAC0;
     }
 
     .reportTitle {
-      font-family: IBM Plex Sans;
       font-size: 15px;
       color: #787878;
       text-align: left;
@@ -190,9 +194,13 @@ export default {
       justify-self: center;
       line-height: 1.125;
       padding: 0.65rem 1rem;
+      font-size: 16px;
+      color: #fff;
 
-      .right {
-        float: right;
+      &.cancel {
+        background: #232323;
+        color: #babac0;
+        margin-right: 24px;
       }
     }
   }
@@ -218,13 +226,11 @@ export default {
     }
 
     &::placeholder {
-      font-family: IBM Plex Sans;
       font-size: 14px;
     }
   }
 
   .detailsButton {
-    font-family: IBM Plex Sans;
     font-size: 15px;
     cursor: pointer;
     margin-bottom: 24px;
@@ -249,14 +255,12 @@ export default {
   }
 
   .successSubTitle {
-    font-family: IBM Plex Sans;
     font-weight: bold;
     font-size: 15px;
     line-height: 24px;
   }
 
   .successDescription {
-    font-family: IBM Plex Sans;
     font-weight: normal;
     font-size: 15px;
     line-height: 24px;
diff --git a/src/locales/en.json b/src/locales/en.json
index 8c26187c0..069958571 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -708,7 +708,8 @@
     "ViewDetails": "View full technical details to be submitted",
     "Description": "We have encountered an error while loading this page. Be a fellow superhero and help us improve our service by sending us a bug report. Only technical details and no personal data will be submitted.",
     "DescriptionTitle": "Bug description",
-    "Send": "Send a report",
+    "Send": "Submit",
+    "Cancel": "Cancel",
     "Placeholder": "Describe the bug you encountered (optional)",
     "Success": {
       "Title": "Thank you!",
diff --git a/src/locales/es.json b/src/locales/es.json
index 74751e29d..0cc191f6a 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -752,7 +752,8 @@
     "ViewDetails": "View full technical details to be submitted",
     "Description": "We have encountered an error while loading this page. Be a fellow superhero and help us improve our service by sending us a bug report. Only technical details and no personal data will be submitted.",
     "DescriptionTitle": "Bug description",
-    "Send": "Send a report",
+    "Send": "Submit",
+    "Cancel": "Cancel",
     "Placeholder": "Describe the bug you encountered (optional)",
     "Success": {
       "Title": "Thank you!",
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 91df9a0ee..be19ff87c 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -691,7 +691,8 @@
     "ViewDetails": "View full technical details to be submitted",
     "Description": "We have encountered an error while loading this page. Be a fellow superhero and help us improve our service by sending us a bug report. Only technical details and no personal data will be submitted.",
     "DescriptionTitle": "Bug description",
-    "Send": "Send a report",
+    "Send": "Submit",
+    "Cancel": "Cancel",
     "Placeholder": "Describe the bug you encountered (optional)",
     "Success": {
       "Title": "Thank you!",
diff --git a/src/locales/zh.json b/src/locales/zh.json
index c8886ca46..19b9c4b8d 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -582,7 +582,8 @@
     "ViewDetails": "View full technical details to be submitted",
     "Description": "We have encountered an error while loading this page. Be a fellow superhero and help us improve our service by sending us a bug report. Only technical details and no personal data will be submitted.",
     "DescriptionTitle": "Bug description",
-    "Send": "Send a report",
+    "Send": "Submit",
+    "Cancel": "Cancel",
     "Placeholder": "Describe the bug you encountered (optional)",
     "Success": {
       "Title": "Thank you!",
diff --git a/src/store/modules/aeternity.js b/src/store/modules/aeternity.js
index ee5194595..fdd86e911 100644
--- a/src/store/modules/aeternity.js
+++ b/src/store/modules/aeternity.js
@@ -114,6 +114,7 @@ export default {
           commit('setSdk', { instance });
           await dispatch('initTippingContractIfNeeded');
         }
+        return true;
       } catch (error) {
         return error;
       }