Merge branch 'development' into 2171-align-design-of-transactions-det…

…ails
LiskHQ · Jul 18, 2019 · a3700c3 · a3700c3
2 parents 31004df + b0132be
commit a3700c3
Show file tree

Hide file tree

Showing 145 changed files with 100 additions and 9,546 deletions.
diff --git a/i18n/locales/en/common.json b/i18n/locales/en/common.json
diff --git a/jest.config.js b/jest.config.js
@@ -43,7 +43,6 @@ module.exports = {
     'app/src/ledger.js',
     'src/actions/liskService.js',
     'src/actions/transactions.js',
-    'src/components/account/stories.js',
     'src/components/accountInitialization/index.js',
     'src/components/backgroundMaker/index.js',
     'src/components/dashboard/currencyGraph.js', // This should be unskipped in issue #1499
@@ -64,7 +63,6 @@ module.exports = {
     'src/components/request/index.js',
     'src/components/request/index.js',
     'src/components/request/specifyRequest.js',
-    'src/components/resultBox/index.js',
     'src/components/searchBar/index.js', // Passing in mocha but not in Jest
     'src/components/send/steps/form/stories.js',
     'src/components/spinner/stories.js',

diff --git a/src/components/account/account.css b/src/components/account/account.css
diff --git a/src/components/account/account.js b/src/components/account/account.js
diff --git a/src/components/account/account.test.js b/src/components/account/account.test.js
diff --git a/src/components/account/index.js b/src/components/account/index.js
diff --git a/src/components/account/stories.js b/src/components/account/stories.js
diff --git a/src/components/accountInitialization/accountInit.css b/src/components/accountInitialization/accountInit.css