Merge pull request #165 from aeternity/change-untrusted-not-verified

Change untrusted not verified

src/common/variables.scss

@@ -2,43 +2,43 @@ $main-font-color: #333;
 
 $main-color: #08c;
 
-$input-background:#ececec;
-$input-toolbar-background:#e0e0e0;
-$input-toolbar-color:#000;
-$primary-color:#FF0D6A;
-$input-border-color:#B300FF;
-$color-neutral-negative-1: #76818C;
+$input-background: #ececec;
+$input-toolbar-background: #e0e0e0;
+$input-toolbar-color: #000;
+$primary-color: #ff0d6a;
+$input-border-color: #b300ff;
+$color-neutral-negative-1: #76818c;
 $color-neutral-negative-2: #203040;
-$color-alternative: #14CCB7;
-$color-secondary:#6948A1;
-$ledger-color:#203040;
+$color-alternative: #14ccb7;
+$color-secondary: #6948a1;
+$ledger-color: #203040;
 
+/** Colors for new designs */
 
-/** Colors for new designs */ 
-
-$bg-color: #16161D;
-$white-color: #F1F1F1;
-$border-color: #34343B;
+$bg-color: #16161d;
+$white-color: #f1f1f1;
+$border-color: #34343b;
 $input-bg-color: #121217;
-$button-color: #2A9CFF;
-$button-text-color: #FFFFFF;
-$modal-background: #1B1B23;
-$placeholder-color: #67676D;
-$text-color: #BCBCC4;
+$button-color: #2a9cff;
+$button-text-color: #ffffff;
+$modal-background: #1b1b23;
+$placeholder-color: #67676d;
+$text-color: #bcbcc4;
 $accent-color: #67f7b8;
 $secondary-color: #2a9cff;
-$nav-bg-color: #21212A;
+$nav-bg-color: #21212a;
 $input-focus-color: #2a9cff;
-$input-error-color: #FF5857;
+$input-error-color: #ff5857;
 $transactions-bg: #12121b;
-$nav-border-color: #3A3A47;
+$nav-border-color: #3a3a47;
 $tx-border-color: #33343e;
 $box-button-color: #33343e;
-$scrollbar-color:#707075;
-$submenu-bg: #1B1B23;
+$scrollbar-color: #707075;
+$submenu-bg: #1b1b23;
 $black-color: #000;
-$filters-bg:#111117;
-$untrusted-badge-bg: #FF5857;
+$filters-bg: #111117;
+$untrustred-badge-bg: #ff5857;
+$not-verified-badge-bg: #ffa857;
 $tour-bg-color: #12121b;
-$tour-start-bg-color: #33343E;
-$font-size: 16px;
+$tour-start-bg-color: #33343e;
+$font-size: 16px;

src/popup/locales/en.json

@@ -42,7 +42,7 @@
   },
   "badges": {
     "verified": "Verfied",
-    "untrusted": "Untrusted"
+    "notVerified": "Not verified"
   },
   "modals": {
     "transaction-failed": {
@@ -177,7 +177,6 @@
       "urlNotExisting": "Tip for this url does not exist",
       "moreOracles": "There are not enough active oracles to verify your claim request, please try again later.",
       "oracleFailed": "Oracle service check claim failed, please try again later."
-
     },
     "accountPassword": {
       "heading": "",
@@ -560,7 +559,6 @@
       "our-superhero-wallet": "Our Superhero Wallet",
       "section01Content": "THE SOFTWARE IS PROVIDED BY SUPERHERO.COM LVC “AS IS” WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.",
 
-
       "section02Content": "These {terms-of-use} {terms-with-quotes} apply exclusively for the {superHero-wallet} (hereinafter referred to as the “{wallet}“ or the “{application}”) and all the content available on the {website-extension}. Please make sure that you have carefully read the {terms} before using the {application}. Otherwise, by using it, we consider these actions implicit agreement to the {terms-of-use}. These {terms-of-use} represent a binding agreement between you, the legal entity you represent and the legal entity that registered you (collectively „{you}“) and Superhero.com LVC {superhero-we-us-with-quotes} or {our-with-quotes} in connection to your use of the {superHero-wallet} {website-extension}.",
       "superHero-wallet": "SuperHero Wallet",
       "wallet": "Wallet",
@@ -570,9 +568,6 @@
       "superhero-we-us-with-quotes": "(“Superhero”, “we”, “us”",
       "our-with-quotes": "“our”)",
 
-
-
-
       "section1Title": "1. Definitions",
       "section1Content": "1.1. Superhero.com Establishment (Superhero.com ”, “we”, “us”, “our” or “the company”) ​is a company with email address for communication related to SuperHero Wallet: superherowallet@protonmail.com. Superhero.com ​is the company, which created and developed SuperHero Wallet​. \n 1.2. ​„USER“ or ​„YOU“ means a natural or legal person, who has downloaded and uses the SuperHero Wallet ​website extension. \n 1.3. „​Blockchain​“ means the list of records, also known as ​blocks,​ which are linked with the method of cryptography. The technology allows large groups of people to connect and reach agreement on data, which is afterwards permanently recorded without the presence of central authority. ​USERS can access, create and save information on the aeternity blockchain. The decentralized, distributed and public digital ledger is used for the purpose of recording transactions in blocks of information with the help of ​Validators​, which cannot be altered retroactively. \n 1.4. SuperHero Wallet​” (“​WALLET​” or “​the application​”) is a website extension, which allows supporters to send value to content creators, causes, charities, groups, or regular individuals online as a reward for contributing accurate information, relevant insights, quality content. The website extension is a piece of software which acts as an add-on to the web browser Firefox and contributes to the browser’s additional functionality. The application is available at: https://addons.mozilla.org/en-US/firefox/addon/superhero-wallet-extension/ . The results of the donations and comments are published on the website ​https://beta.superhero.com/​ . \n 1.5. “​Validators​” are independent physical persons or entities, which are not in any way part of Superhero.com . ​Their function in the system includes responsibility for ​blocks constitution and broadcast of these ​blocks​ with the​ aeternity ​network. \n 1.6. “​Account address​” is a hashed version of the ​USER’s ​public key​, used to identify USERS​ on ​the application​. \n 1.7. “​Keys​” represent uniquely related private and public cryptographic keys of random numbers used for encryption and decryption of information.",
       "section2Title": "2. GENERAL PROVISIONS",
@@ -612,8 +607,8 @@
       "tipWebsite": "Website",
       "heading": "Send",
       "sendTipConfirmationHeader": "Send Tip Confirmation",
-      "sendTipConfirmationBody": "You are going to send tip to untrusted URL. Third party issues prevent us to ensure that tips will be directly delivered to the URL owner.",
-      "sendTipConfirmationQstn":"Are you sure you would like to send the tip anyway?",
+      "sendTipConfirmationBody": "You are going to send tip to not verified URL. Third party issues may prevent us to ensure that tips will be directly delivered to the URL owner.",
+      "sendTipConfirmationQstn": "Are you sure you would like to send the tip anyway?",
       "headingSending": "Sending",
       "selectTip": "Select amount to tip",
       "tipDomain": "Tip domain",
@@ -635,8 +630,8 @@
       "cancel": "Cancel",
       "edit": "Edit AE Details",
       "whatIsVerifieddUrl": "What is \"Verified\" URL?",
-      "whatIsUntrustedUrl": "What is \"Untrusted\" URL?",
-      "untrustedUrlInfo": "Third party issues prevent us to ensure that tips will be directly delivered to the URL owner. You are sending the tip at your own risk.",
+      "whatIsNotVerifiedUrl": "What is \"Not verified\" URL?",
+      "notVerifiedUrlInfo": "This URL has not yet been verified. Third party issues prevent us to ensure that tips will be directly delivered to the URL owner. You are sending the tip at your own risk.",
       "verifiedUrlInfo": "If a URL is marked as verified, it means the owner of this URL is already a fellow Superhero — and that is awesome! An AE address has been included in the URL and tips can be claimed."
     },
     "successTip": {

src/popup/router/components/Modals/TipBadgeModal.vue

@@ -2,19 +2,19 @@
   <Modal @close="resolve">
     <div class="badge-modal-header" slot="header">
       <UrlBadge :type="verifiedStatus" />
+    </div>
+    <div slot="body">
       <h4>
         {{
           verifiedStatus == 'verified'
             ? $t('pages.tipPage.whatIsVerifieddUrl')
-            : $t('pages.tipPage.whatIsUntrustedUrl')
+            : $t('pages.tipPage.whatIsNotVerifiedUrl')
         }}
       </h4>
-    </div>
-    <div slot="body">
       {{
         verifiedStatus == 'verified'
           ? $t('pages.tipPage.verifiedUrlInfo')
-          : $t('pages.tipPage.untrustedUrlInfo')
+          : $t('pages.tipPage.notVerifiedUrlInfo')
       }}
     </div>
     <div slot="footer">

src/popup/router/components/UrlBadge.vue

@@ -4,7 +4,7 @@
       <TickIcon />
       {{ $t(`badges.verified`) }}
     </template>
-    <template v-if="type === 'untrusted'"> ! {{ $t(`badges.untrusted`) }} </template>
+    <template v-if="type === 'not-verified'"> ! {{ $t(`badges.notVerified`) }} </template>
   </Badge>
 </template>
 
@@ -36,8 +36,8 @@ export default {
     background: $accent-color;
   }
 
-  &.badge-untrusted {
-    background: $untrusted-badge-bg;
+  &.badge-not-verified {
+    background: $not-verified-badge-bg;
   }
 }
 </style>

src/popup/router/pages/Retip.vue

@@ -6,11 +6,11 @@
         <span class="secondary-text">{{ $t('pages.appVUE.aeid') }}</span>
         {{ $t('pages.tipPage.to') }}
       </div>
-      <UrlBadge :type="urlVerified ? 'verified' : 'untrusted'" />
+      <UrlBadge :type="urlVerified ? 'verified' : 'not-verified'" />
     </div>
 
     <div class="url-bar">
-      <a class="link-sm text-left" :class="{ untrusted: !urlVerified }">{{ tip.url }}</a>
+      <a class="link-sm text-left" :class="{ 'not-verified': !urlVerified }">{{ tip.url }}</a>
     </div>
 
     <AmountSend :amountError="amountError" @changeAmount="val => (amount = val)" :value="amount" />
@@ -146,8 +146,8 @@ export default {
   :first-child {
     flex-grow: 1;
     text-decoration: none;
-    &.untrusted {
-      color: $untrusted-badge-bg;
+    &.not-verified {
+      color: $not-verified-badge-bg;
     }
   }
 }

src/popup/router/pages/TipPage.vue

@@ -128,7 +128,7 @@ export default {
       );
     },
     verifiedStatus() {
-      return this.urlVerified || this.tourRunning ? 'verified' : 'untrusted';
+      return this.urlVerified || this.tourRunning ? 'verified' : 'not-verified';
     },
   },
   watch: {
@@ -267,8 +267,8 @@ export default {
     flex-grow: 1;
     color: $text-color;
     text-decoration: none;
-    &.untrusted {
-      color: $untrusted-badge-bg;
+    &.not-verified {
+      color: $not-verified-badge-bg;
     }
   }
 }