[DDW-820] Resolve merge conflicts and updates Settings -> General sto…

…ries where needed

.eslintignore

@@ -5,7 +5,7 @@ main.js
 logs
 node_modules
 translations
-tests
+./tests
 features/tests/e2e/documents/*
 mainnet-genesis-dryrun-with-stakeholders.json
 source/renderer/app/i18n/locales

CHANGELOG.md

@@ -1,50 +1,56 @@
 Changelog
 =========
 
-## vNext
+## 0.15.0
 
 ### Features
 
 - Reorganized Storybook by domain ([PR 1537](https://github.com/input-output-hk/daedalus/pull/1537))
 - Removed select dropdown arrow ([PR 1550](https://github.com/input-output-hk/daedalus/pull/1550))
-- Implemented automated and manual update flows unification ([PR 1491](https://github.com/input-output-hk/daedalus/pull/1491))
+- Implemented "Newsfeed" feature ([PR 1570](https://github.com/input-output-hk/daedalus/pull/1570))
+- Implemented "Wallet recovery phrase verification" feature ([PR 1565](https://github.com/input-output-hk/daedalus/pull/1565))
+- Implemented new "Automated update" notification design ([PR 1491](https://github.com/input-output-hk/daedalus/pull/1491))
+- Improved "Wallets" list scrollbar UX ([PR 1475](https://github.com/input-output-hk/daedalus/pull/1475))
+- Removed "Ada Redemption" feature ([PR 1510](https://github.com/input-output-hk/daedalus/pull/1510))
 - Updated behavior of system dialogs ([PR 1494](https://github.com/input-output-hk/daedalus/pull/1494))
-- Implemented the new "Wallet Creation" process ([PR 1499](https://github.com/input-output-hk/daedalus/pull/1499), [PR 1515](https://github.com/input-output-hk/daedalus/pull/1515), [PR 1530](https://github.com/input-output-hk/daedalus/issues/1530))
-- Implemented css rules automatic sort ([PR 1483](https://github.com/input-output-hk/daedalus/pull/1483))
-- Improved scrollbar look and feel on wallets list ([PR 1475](https://github.com/input-output-hk/daedalus/pull/1475))
-- Implemented new delegation countdown design ([PR 1481](https://github.com/input-output-hk/daedalus/pull/1481))
-- "Delegation" screens UI:
-  - Improved "Delegation setup" wizard ([PR 1503](https://github.com/input-output-hk/daedalus/pull/1503))
-  - Implemented "Search and Filtering" logic on "Stake pools" screen ([PR 1468](https://github.com/input-output-hk/daedalus/pull/1468))
 
 ### Fixes
 
+- Fixed the "Numeric input" component caret positioning issues ([PR 1511](https://github.com/input-output-hk/daedalus/pull/1511))
+- Fixed the "Feature Request" menu item Japanese translation ([PR 1533](https://github.com/input-output-hk/daedalus/pull/1533))
 - Implemented disk space check error handling ([PR 1562](https://github.com/input-output-hk/daedalus/pull/1562))
-- Fixed UI issues across different app themes ([PR 1547](https://github.com/input-output-hk/daedalus/pull/1547))
-- Fixed minor UI issues on the "Delegation center" screen and "Delegation setup" wizard ([PR 1545](https://github.com/input-output-hk/daedalus/pull/1545))
-- Fixed "White" theme styles ([PR 1532](https://github.com/input-output-hk/daedalus/pull/1532))
-- Removed tooltip on Diagnostics Screen connection error message ([PR 1535](https://github.com/input-output-hk/daedalus/pull/1535))
-- Fixed "Storybook" dialog content overflow issues in Chrome 76+ versions ([PR 1536](https://github.com/input-output-hk/daedalus/pull/1536))
-- Fixed single/plural wording in "confirmation" word on Transaction Assurance Level ([PR 1531](https://github.com/input-output-hk/daedalus/pull/1531))
-- Fixed the "Feature Request" menu item in Japanese to "機能リクエスト" ([PR 1533](https://github.com/input-output-hk/daedalus/pull/1533))
-- Fixed external and copy icons inconsistencies ([PR 1512](https://github.com/input-output-hk/daedalus/pull/1512))
-- Fixed broken wallets storybook stories ([PR 1473](https://github.com/input-output-hk/daedalus/pull/1473))
-- Implemented Storybook menu using queryStrings over localStorage ([PR 1426](https://github.com/input-output-hk/daedalus/pull/1426))
+- Implemented platform specific main window minimum heights ([PR 1485](https://github.com/input-output-hk/daedalus/pull/1485))
+- Implemented pluralization for number of confirmations in transaction details ([PR 1531](https://github.com/input-output-hk/daedalus/pull/1531))
+- Minor UI fixes:
+  - Fixed external and copy icons positioning inconsistencies ([PR 1512](https://github.com/input-output-hk/daedalus/pull/1512))
+  - Fixed minor UI issues across different themes ([PR 1547](https://github.com/input-output-hk/daedalus/pull/1547))
+  - Fixed "White" theme styling ([PR 1532](https://github.com/input-output-hk/daedalus/pull/1532))
+  - Removed select dropdown arrow ([PR 1550](https://github.com/input-output-hk/daedalus/pull/1550))
+  - Removed tooltip from connection error message on "Daedalus Diagnostics" screen ([PR 1535](https://github.com/input-output-hk/daedalus/pull/1535))
+- Storybook fixes:
+  - Fixed Storybook dialog content overflow issues in Chrome 76+ versions ([PR 1536](https://github.com/input-output-hk/daedalus/pull/1536))
+  - Fixed Storybook "Wallets" stories ([PR 1473](https://github.com/input-output-hk/daedalus/pull/1473))
 
 ### Chores
 
-- Use "daedalus" `Buildkite` to build macOS installers ([PR 1568](https://github.com/input-output-hk/daedalus/pull/1568))
-- Use improved `NumericInput` component of `React-Polymorph` v0.9.0 ([1511](https://github.com/input-output-hk/daedalus/pull/1511))
-- Added minimum heights of main app window for different environments (Windows, Linux, MacOS) ([1485](https://github.com/input-output-hk/daedalus/pull/1485))
-- Removed "Ada Redemption" feature ([PR 1510](https://github.com/input-output-hk/daedalus/pull/1510))
-- Changed `themes:check` to `themes:check:createTheme` and added a 4 part "Theme Management in Daedalus" tutorial series to a README document in the themes directory ([PR 1525](https://github.com/input-output-hk/daedalus/pull/1525))
-- Refactored theme management code to be scalable ([PR 1502](https://github.com/input-output-hk/daedalus/pull/1502))
+- Implemented automatic sorting of CSS properties ([PR 1483](https://github.com/input-output-hk/daedalus/pull/1483))
 - Improved "Netlify" build setup ([PR 1509](https://github.com/input-output-hk/daedalus/pull/1509))
-- Unified support request data handling in common method ([1472](https://github.com/input-output-hk/daedalus/pull/1472))
+- Unified "Support request" data handling ([PR 1472](https://github.com/input-output-hk/daedalus/pull/1472))
+- Updated Storybook to the latest version ([PR 1426](https://github.com/input-output-hk/daedalus/pull/1426))
+- Updated "Buildkite" to use "daedalus" queue for macOS builds ([PR 1568](https://github.com/input-output-hk/daedalus/pull/1568))
+- Theming improvements:
+  - Improved scalability of theme management code ([PR 1502](https://github.com/input-output-hk/daedalus/pull/1502))
+  - Renamed `themes:check` script and updated "Daedalus Theme Management" documentation ([PR 1525](https://github.com/input-output-hk/daedalus/pull/1525))
 
 ### Specifications
 
-- News feed ([PR 1569](https://github.com/input-output-hk/daedalus/pull/1569))
+- Newsfeed ([PR 1569](https://github.com/input-output-hk/daedalus/pull/1569))
+- New "Wallet Creation" process ([PR 1499](https://github.com/input-output-hk/daedalus/pull/1499), [PR 1515](https://github.com/input-output-hk/daedalus/pull/1515), [PR 1530](https://github.com/input-output-hk/daedalus/issues/1530))
+- "Delegation" screens UI:
+  - Improved "Delegation setup" wizard ([PR 1503](https://github.com/input-output-hk/daedalus/pull/1503))
+  - Implemented "Stake pools" screen "Search and Filtering" logic ([PR 1468](https://github.com/input-output-hk/daedalus/pull/1468))
+  - Implemented "Delegation countdown" design update ([PR 1481](https://github.com/input-output-hk/daedalus/pull/1481))
+  - Fixed minor UI issues on the "Delegation center" screen and "Delegation setup" wizard ([PR 1545](https://github.com/input-output-hk/daedalus/pull/1545))
 
 ## 0.14.0
 

cardano-sl-src.json

@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/input-output-hk/cardano-sl",
-  "rev": "51ad7c0503b1c52a75a6eb36096c407934136468",
-  "date": "2019-08-10T03:35:47+00:00",
-  "sha256": "0cqaxk3k8i5z4q4b5na0pcln9fblglmn7900vp1xdzmw75pp1rrz",
+  "rev": "1a792d7cd0f0c93a0f0c28f66372bce3c3808dbd",
+  "date": "2019-09-25T010:53:54+00:00",
+  "sha256": "1vk71zn9bnkgkhgcyj59wzrp28crjwcd0lgnm013mhzpvxycgn61",
   "fetchSubmodules": false
 }

features/data-layer-migration.feature

@@ -15,6 +15,6 @@ Feature: Data Layer Migration
     | Wallet |           |
     Then I should see the Data Layer Migration screen
     When I click the migration button
-    Then I should see the initial screen
+    Then I should see the main ui
     When I refresh the main window
     Then I should not see the Data Layer Migration screen

features/newsfeed.feature

@@ -0,0 +1,87 @@
+@e2e @newsfeed @noReload
+Feature: Newsfeed
+
+  Newsfeed delivers important information to Daedalus users, like information about network failures, bugs and other
+  issues, information about upcoming and recent releases and so on. News are categorised in 4 types:
+  incident, alert, announcement and info. Incidents and alerts cover the whole user interface,
+  announcements and info are delivered in the newsfeed part of the user interface.
+
+  Background:
+    Given I have completed the basic setup
+
+  @reconnectApp
+  Scenario: Newsfeed icon is visible on the connecting screen
+    Given im on the connecting screen
+    Then i should see the newsfeed icon
+
+  @reconnectApp
+  Scenario: Newsfeed icon is visible on the syncing screen
+    Given im on the syncing screen
+    Then i should see the newsfeed icon
+
+  Scenario: Newsfeed icon is visible in the main ui
+    Given I should see the main ui
+    Then i should see the newsfeed icon
+
+  Scenario: Newsfeed icon is highlighted when there are unread infos
+    Given there are unread infos
+    Then the newsfeed icon is highlighted
+
+  Scenario: Newsfeed icon is highlighted when there are unread announcements
+    Given there are unread announcements
+    Then the newsfeed icon is highlighted
+
+  Scenario: Newsfeed icon is not highlighted when all infos have been read
+    Given there are read infos
+    Then the newsfeed icon is not highlighted
+
+  Scenario: Open the newsfeed by clicking the newsfeed icon
+    Given I click on the newsfeed icon
+    Then the newsfeed is open
+
+  Scenario: No news available in the feed
+    Given there is no news
+    When I open the newsfeed
+    Then the newsfeed is empty
+
+  Scenario: Only read infos available in the feed
+    Given there are 2 read infos
+    When I open the newsfeed
+    Then the newsfeed contains 2 read infos
+
+  Scenario: Displaying an incident
+    Given there is an incident
+    Then the incident will cover the screen
+
+  Scenario: Dismissing an alert
+    Given there is 1 unread alert
+    When I dismiss the alert
+    Then the alert disappears
+
+  Scenario: Opening and dismissing a read alert
+    Given there is 1 read alert
+    When I open the newsfeed
+    When I click on the alert in the newsfeed
+    Then the alert overlay opens
+    When I dismiss the alert
+    Then the alert disappears
+
+  Scenario: Reading an announcement
+    Given there is 1 unread announcement
+    When I open the newsfeed
+    And I click on the unread announcement to expand it
+    Then the announcement content is shown
+    And the announcement is marked as read
+
+  Scenario: Reading an info
+    Given there is 1 unread info
+    When I open the newsfeed
+    And I click on the unread info to expand it
+    Then the info content is shown
+    And the info is marked as read
+    And the newsfeed icon is not highlighted
+
+  Scenario: News unavailable
+    Given the newsfeed server is unreachable
+    When I open the newsfeed
+    Then no news are available

features/node-update-notification.feature

@@ -8,8 +8,8 @@ Feature: Node Update Notification
     When I set next update version to "10"
     And I set next application version to "15"
     Then I should see the node update notification overlay
-    And Overlay should display "newer version" as available version and actions
-  
+    And Overlay should display "a newer version" as available version and actions
+
   Scenario: Application version and next update version match
     When I set next application version to "15"
     And I set next update version to "15"
@@ -31,4 +31,4 @@ Feature: Node Update Notification
     Then I should see the node update notification overlay
     And Overlay should display "0.14.0" as available version and actions
     When I click the accept update button
-    Then Daedalus should quit 
+    Then Daedalus should quit