Merge pull request #34 from dhealthproject/next

v1.3.1: Security, Bridge updates, Branding
dhealthproject · Mar 27, 2022 · 4e1c206 · 4e1c206
2 parents 860a473 + 50c087c
commit 4e1c206
Show file tree

Hide file tree

Showing 147 changed files with 4,623 additions and 4,651 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,32 @@ 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
+
+- plugins: Adds @dhealthdapps/bridge in version `v1.0.0`.
+- plugins: Improves plugins list with human-friendly names
+
+#### Changed
+
+- deps: Updates @dhealthdapps/bridge to version v1.0.0.
+
 ## [1.2.2][1.2.2] - 08-Dec-2021
 
 #### Added
@@ -68,6 +94,8 @@ 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
 [1.1.4]: https://github.com/dhealthproject/dhealth-wallet/compare/v1.0.0...v1.1.4

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -0,0 +1,29 @@
+pipeline {
+    agent any
+    stages {
+        stage('Download dependencies') {
+            steps {
+                sh 'npm install'
+                sh 'cp public/plugins/plugins.empty.js public/plugins/plugins.js'
+            }
+        }
+
+        stage('Run linter checks') {
+            steps {
+                sh 'npm run lint'
+            }
+        }
+
+        stage('Build software') {
+            steps {
+                sh 'npm run build'
+            }
+        }
+
+        stage('Run unit tests') {
+            steps {
+                sh 'npm run test'
+            }
+        }
+    }
+}
diff --git a/__tests__/components/ButtonCopyToClipboard.spec.ts b/__tests__/components/ButtonCopyToClipboard.spec.ts
@@ -26,7 +26,7 @@ describe('ButtonCopyToClipboard', () => {
     test('receive a property "value" correctly', () => {
         expect(vm.value).toBe('123');
     });
-    test('Click on Button should call method "copyToClipboard" when prop "value" exists', () => {
+    test('Click on Button should not call method "copyToClipboard" when prop "value" does not exists', () => {
         UIHelpers.copyToClipboard = jest.fn();
         wrapper.find('Button').trigger('click');
         expect(UIHelpers.copyToClipboard).toBeCalledWith('123');

diff --git a/__tests__/e2e/MosaicServiceIntegrationTest.spec.ts b/__tests__/e2e/MosaicServiceIntegrationTest.spec.ts
@@ -17,10 +17,12 @@ import {
     AccountInfo,
     AccountRepository,
     Address,
+    Currency,
     MosaicFlags,
     MosaicId,
     MosaicInfo,
     MosaicRepository,
+    NamespaceId,
     NetworkCurrencies,
     NetworkType,
     Page,
@@ -85,7 +87,28 @@ when(mockRepoFactory.createMosaicRepository()).thenReturn(mosaicRepository);
 when(mockRepoFactory.getEpochAdjustment()).thenReturn(of(1573430400));
 when(mockRepoFactory.getGenerationHash()).thenReturn(of('Some Gen Hash'));
 when(mockRepoFactory.getNetworkType()).thenReturn(of(NetworkType.MIJIN_TEST));
-when(mockRepoFactory.getCurrencies()).thenReturn(of(NetworkCurrencies.PUBLIC));
+when(mockRepoFactory.getCurrencies()).thenReturn(
+    of(
+        new NetworkCurrencies(
+            new Currency({
+                namespaceId: new NamespaceId('dhealth.dhp'),
+                mosaicId: new MosaicId('5A4935C1D66E6AC4'),
+                transferable: true,
+                supplyMutable: false,
+                restrictable: false,
+                divisibility: 6,
+            }),
+            new Currency({
+                namespaceId: new NamespaceId('dhealth.dhp'),
+                mosaicId: new MosaicId('5A4935C1D66E6AC4'),
+                transferable: true,
+                supplyMutable: false,
+                restrictable: false,
+                divisibility: 6,
+            }),
+        ),
+    ),
+);
 const repositoryFactory = instance(mockRepoFactory);
 
 describe('services/MosaicService', () => {