Merge pull request #33 from dhealthproject/greg/techn-21-change-broad…

…cast-process-to-synchronous v1.3.1-RC: Bridge update, Health2Earn and dHealth layout
dhealthproject · Mar 26, 2022 · 9d579a0 · 9d579a0
2 parents f621243 + 6b0c0ba
commit 9d579a0
Show file tree

Hide file tree

Showing 93 changed files with 987 additions and 1,618 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,21 @@ All notable changes to this project will be documented in this file.
 
 The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.3.1][1.3.1] - 01-Mar-2022
+
+#### Added
+
+- feat/ui: Adds secret lock & secret proof transaction views 
+- feat/ui: Adds warning message on co-signature modal
+- fix: Fixes transaction contact mismatch (fixes #18)
+- fix: Fixes issues with swaps amounts in plugins
+
+#### Changed
+
+- deps: Updates dependencies to remove warnings (fixes #13)
+- ui: Changes theme colors and fixes static colors to use theme
+- ui: Updates colorway to changed colors for dHealth
+
 ## [1.3.0][1.3.0] - 01-Feb-2022
 
 #### Added
@@ -79,6 +94,7 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
 
 - Some missing re-branding items for dHealth logos.
 
+[1.3.1]: https://github.com/dhealthproject/dhealth-wallet/compare/v1.3.0...v1.3.1
 [1.3.0]: https://github.com/dhealthproject/dhealth-wallet/compare/v1.2.2...v1.3.0
 [1.2.2]: https://github.com/dhealthproject/dhealth-wallet/compare/v1.2.1...v1.2.2
 [1.2.1]: https://github.com/dhealthproject/dhealth-wallet/compare/v1.1.4...v1.2.1

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "dhealth-wallet",
     "description": "dHealth Wallet",
     "homepage": "https://github.com/dhealthproject/dhealth-wallet",
-    "version": "1.3.1-alpha202202091306",
+    "version": "1.3.1-RC",
     "license": "Apache-2.0",
     "author": {
         "name": "Using Blockchain Ltd",
@@ -59,7 +59,7 @@
     },
     "dependencies": {
         "@dhealth/plugin-node-monitor": "latest",
-        "@dhealth/sdk": "1.0.3-alpha-202110081200",
+        "@dhealth/sdk": "1.0.3-alpha-202201201200",
         "@dhealth/wallet-api-bridge": "^1.3.0",
         "@dhealth/wallet-components": "^1.3.0",
         "@dhealthdapps/bridge": "latest",

diff --git a/public/plugins/plugins.json b/public/plugins/plugins.json
@@ -4,5 +4,5 @@
   "@yourdlt/plugin-ninjazzz": "1.0.8",
   "@dhealth/plugin-node-monitor": "1.0.3",
   "@dhealthdapps/health-to-earn": "1.1.1",
-  "@dhealthdapps/bridge": "1.0.0"
+  "@dhealthdapps/bridge": "1.1.0"
 }
diff --git a/src/components/AccountLinks/AccountLinks.less b/src/components/AccountLinks/AccountLinks.less
@@ -25,7 +25,7 @@
 
 .trigger-accountlink {
     font-size: @normalFont !important;
-    color: @purpleDark;
+    color: @primary;
     display: flex;
     align-items: center;
 }

diff --git a/src/components/AccountMultisigGraph/AccountMultisigGraph.vue b/src/components/AccountMultisigGraph/AccountMultisigGraph.vue
@@ -22,7 +22,7 @@ export default class AccountLinks extends AccountMultisigGraphTs {}
     /deep/.ivu-tree-title {
         font-family: @symbolFont;
         font-size: @normalFont;
-        color: @purpleDark;
+        color: @primary;
     }
 }
 </style>
diff --git a/src/components/AccountRestrictionsList/AccountRestrictionsList.less b/src/components/AccountRestrictionsList/AccountRestrictionsList.less
@@ -167,7 +167,7 @@
                             box-shadow: none;
                         }
                         .ivu-select-prefix {
-                            color: @purpleDark;
+                            color: @primary;
                         }
                         .ivu-select-selected-value {
                             padding-right: 0.35rem !important;
@@ -177,8 +177,8 @@
                     .ivu-select-visible {
                         .ivu-select-selection {
                             color: @white !important;
-                            background-color: @purpleDark;
-                            border: 0.01rem solid @purpleDark;
+                            background-color: @primary;
+                            border: 0.01rem solid @primary;
                         }
 
                         .ivu-icon-ios-arrow-down::before {
@@ -252,7 +252,7 @@
             display: grid;
             width: 100%;
             text-align: right;
-            color: @purpleDark;
+            color: @primary;
             background-color: @white;
             font-size: @normalFont;
             font-family: @symbolFontMedium;
@@ -279,7 +279,7 @@
             position: relative;
             font-family: @symbolFontLight;
             font-size: @normalFont;
-            color: @purpleDark;
+            color: @primary;
             .table-rows-container {
                 width: 100%;
                 height: 100%;

diff --git a/src/components/AccountSelectorPanel/AccountSelectorPanel.less b/src/components/AccountSelectorPanel/AccountSelectorPanel.less
@@ -27,7 +27,7 @@
 
             .section-title {
                 font-weight: 600;
-                color: @purpleDark;
+                color: @primary;
                 font-family: @symbolFont;
             }
         }
@@ -53,7 +53,7 @@
             margin-left: 30px;
             padding-top: 40px;
             font-size: @bigFont;
-            color: @purpleDark;
+            color: @primary;
             font-family: @symbolFontSemiBold;
         }
         .active-background {
@@ -113,7 +113,7 @@
         font-size: @normalFont;
         font-family: @symbolFont;
         line-height: 22px;
-        color: @purpleLightest;
+        color: @secondaryLighten;
 
         .add-account {
             .ivu-icon {
@@ -146,7 +146,7 @@
     align-items: center;
     border-bottom: 0.01rem solid @line;
     position: relative;
-    color: @purpleDark;
+    color: @primary;
     font-family: @symbolFontLight;
 
     .namege_img {
@@ -238,7 +238,7 @@
 .icon-left-button {
     width: 0.15rem;
     height: 0.15rem;
-    color: @purpleDark;
+    color: @primary;
 }
 
 .account-selector-panel {

diff --git a/src/components/AppLogo/AppLogoTs.ts b/src/components/AppLogo/AppLogoTs.ts
@@ -20,7 +20,7 @@ import { appConfig } from '@/config';
 
 // import logo as an image
 // @ts-ignore
-import logo from '@/views/resources/logo-dhealth.png';
+import logo from '@/views/resources/logo.dhealth.blue.png';
 
 @Component
 export class AppLogoTs extends Vue {

diff --git a/src/components/ButtonCopyToClipboard/ButtonCopyToClipboard.less b/src/components/ButtonCopyToClipboard/ButtonCopyToClipboard.less
@@ -6,7 +6,7 @@
 .copy-icon {
     width: 0.24rem;
     height: 0.24rem;
-    color: @purpleDark;
+    color: @primary;
     padding: 2px;
     margin-left: 5px;
 }

diff --git a/src/components/ContactDetailPanel/ContactDetailPanel.less b/src/components/ContactDetailPanel/ContactDetailPanel.less
@@ -97,7 +97,7 @@
                 /deep/ .value {
                     font-family: @symbolFontLight;
                     text-overflow: ellipsis;
-                    color: @purpleDark;
+                    color: @primary;
                 }
 
                 /deep/ .value {
@@ -134,7 +134,7 @@
 .icon-left-button {
     width: 0.3rem;
     height: 0.3rem;
-    color: @purpleDark;
+    color: @primary;
     margin-right: 0.18rem;
 }
 

diff --git a/src/components/ContactSelectorPanel/ContactSelectorPanel.less b/src/components/ContactSelectorPanel/ContactSelectorPanel.less
@@ -27,7 +27,7 @@
 
             .section-title {
                 font-weight: 600;
-                color: @purpleDark;
+                color: @primary;
                 font-family: @symbolFont;
             }
         }
@@ -106,7 +106,7 @@
         font-size: @normalFont;
         font-family: @symbolFont;
         line-height: 22px;
-        color: @purpleLightest;
+        color: @secondaryLighten;
 
         .add-account {
             .ivu-icon {
@@ -139,7 +139,7 @@
     align-items: center;
     border-bottom: 0.01rem solid @line;
     position: relative;
-    color: @purpleDark;
+    color: @primary;
     font-family: @symbolFontLight;
 
     .namege_img {
@@ -231,7 +231,7 @@
 .icon-left-button {
     width: 0.15rem;
     height: 0.15rem;
-    color: @purpleDark;
+    color: @primary;
 }
 
 .account-selector-panel {

diff --git a/src/components/FaqPage/FaqImageItem/FaqImageItem.less b/src/components/FaqPage/FaqImageItem/FaqImageItem.less
@@ -22,7 +22,7 @@
     margin: auto;
 
     .roadmap-description {
-        color: @purpleDark;
+        color: @primary;
         font-size: 0.16rem;
         font-family: 'noto-sans-regular';
         cursor: default;

diff --git a/src/components/FaqPage/FaqPageItem/FaqPageItem.less b/src/components/FaqPage/FaqPageItem/FaqPageItem.less
@@ -20,17 +20,17 @@
     overflow: hidden;
 
     .faq-title {
-        color: @purpleDark;
+        color: @primary;
         font-weight: 600;
         font-size: 0.18rem;
         cursor: pointer;
-        border-bottom: 0.02rem solid @purpleLightest;
+        border-bottom: 0.02rem solid @secondaryLighten;
         width: max-content;
         margin-bottom: 10px;
     }
 
     .faq-content {
-        color: @purpleDark;
+        color: @primary;
         font-size: 0.16rem;
         font-family: 'noto-sans-regular';
         cursor: default;

diff --git a/src/components/HarvestStatisticsPanel/HarvestStatisticsPanel.less b/src/components/HarvestStatisticsPanel/HarvestStatisticsPanel.less
@@ -54,7 +54,7 @@
                 .title_txt {
                     font-size: 20px;
                     line-height: 33px;
-                    color: @purpleDark;
+                    color: @primary;
                 }
             }
         }
@@ -75,7 +75,7 @@
         .txt-small {
             font-size: @normalFont;
             text-transform: uppercase;
-            color: @purpleLightest;
+            color: @secondaryLighten;
             line-height: 40px;
         }
 

diff --git a/src/components/LogoutButton/LogoutButton.less b/src/components/LogoutButton/LogoutButton.less
@@ -2,7 +2,7 @@
 
 .logout-link {
     font-size: 0.16rem;
-    color: @purpleDark;
+    color: @primary;
     margin: 0 0.15rem;
 
     i {

diff --git a/src/components/MnemonicDisplay/MnemonicDisplay.less b/src/components/MnemonicDisplay/MnemonicDisplay.less
@@ -35,7 +35,7 @@
 
     span {
         display: inline-block;
-        background-color: @purpleDark;
+        background-color: @primary;
         padding: 0.1rem 0.2rem;
         border-radius: 0.04rem;
         margin: 0.05rem;

diff --git a/src/components/MnemonicInput/MnemonicInput.less b/src/components/MnemonicInput/MnemonicInput.less
@@ -13,7 +13,7 @@
         display: inline-block;
         padding: 0.08rem 0.2rem;
         background-color: @grayLight;
-        color: @purpleDark;
+        color: @primary;
         border-radius: 0.05rem;
         margin-right: 0.15rem;
         margin-bottom: 0.2rem;

diff --git a/src/components/MosaicBalanceList/MosaicBalanceList.less b/src/components/MosaicBalanceList/MosaicBalanceList.less
@@ -207,7 +207,7 @@
         width: 1.8rem;
         font-size: @normalFont;
         font-weight: 400;
-        color: @purpleDark;
+        color: @primary;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
@@ -216,7 +216,7 @@
     .mosaic_value {
         margin-left: 0.5rem;
         text-align: right;
-        color: @purpleDark;
+        color: @primary;
 
         div:first-of-type {
             font-size: 0.16rem;

diff --git a/src/components/NavigationTabs/NavigationTabs.less b/src/components/NavigationTabs/NavigationTabs.less
@@ -42,7 +42,7 @@
         margin: 0.2rem 0;
         line-height: 0.2rem;
         text-align: center;
-        color: @purpleDark;
+        color: @primary;
         opacity: 0.5;
 
         img {
@@ -61,7 +61,7 @@
     }
 
     .active {
-        color: @purpleDark;
+        color: @primary;
         opacity: 1;
         font-weight: 600;
         cursor: default !important;

diff --git a/src/components/NetworkNodeSelector/NetworkNodeSelector.less b/src/components/NetworkNodeSelector/NetworkNodeSelector.less
@@ -46,7 +46,7 @@
     padding: 0.04rem;
     cursor: pointer;
     background-color: transparent;
-    color: @purpleLightest;
+    color: @secondaryLighten;
 }
 .clickable-input {
     cursor: pointer;

diff --git a/src/components/NetworkStatisticsPanel/NetworkStatisticsPanel.less b/src/components/NetworkStatisticsPanel/NetworkStatisticsPanel.less
@@ -45,7 +45,7 @@
                 .title_txt {
                     font-size: 20px;
                     line-height: 33px;
-                    color: @purpleDark;
+                    color: @primary;
                 }
             }
         }
@@ -55,7 +55,7 @@
             font-weight: 400;
             width: 180px;
             display: inline-block;
-            color: #5200c6;
+            color: @secondary;
             line-height: 40px;
 
             button.button-style {
@@ -70,7 +70,7 @@
         .speed-blocks {
             font-size: 16px;
             line-height: 22px;
-            color: rgba(82, 0, 198, 1);
+            color: @secondary;
             opacity: 0.75;
             text-transform: lowercase;
         }