Skip to content

Commit

Permalink
release: 2.6.0 (#2013)
Browse files Browse the repository at this point in the history
* Update README.md (#1967)

* Russian localization (#1969)

* add russian localization

* fix tests

* Bump websocket-extensions from 0.1.3 to 0.1.4 (#1972)

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](faye/websocket-extensions-node@0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feature: implements dark theme reskin / add new font family (#1992)

* release: 2.5.0 (#1962)

* Updates LX hash

* Updates NEO and GAS logo assets

* Updates config.yml such that the windows config references electronuserland/builder:wine-01.19 (#1947)

* feature: Internationalization (#1933)

* First pass at gathering translations

* Adds more copy

* Adds react-intl

* Creates Intl wrapper component and begins implementation of translations

* Fixes key warning

* More translation implementation

* More translation implementation

* Updates snapshots fixes broken tests

* Adds language options to settings and state tree

* Fixes liting errors

* Fixes liting errors

* Adds translation support to CreateImportWalletForm.jsx

* Adds the korean translations for create/import wallet pages and login

* Updates snapshot tests and fixes flakey test

* Fixes broken tests

* Adds remaining korean and implements dashboard and sidebar translations

* Fixes flow and linting errors

* fixes linting issues

* Updates snapshot tests, test suite still failing

* Fixes broken test suite

* Updates settings view

* Updates progress panel HOC and encrypt form with translations

* Updates snapshot tests

* More translation additions and implementations

* Fixes broken tests and updates snapshots

* More translation implementation

* Fixes broken test

* Fixes broken test

* Cleans up buggy styles in WalletManager.scss

* Adds missing translations to import screen and finishes wallet manager translation implementation

* Updates snapshots

* Very close to full translation implementation

* Reverts changes to sketch file

* Fixes test suite

* Fixes linting errors

* Adds french translation file and settings constant

* Fixes small misc defects

* Updates snapshot tests

* Adds vietnamese translation file and settings constant

* Adds german translation file and settings constant

* Adds chinese to language options (#1949)

* feature: language setting dropdown (#1950)

* Squashes commits implements language option dropdown on home screen

* Updates snapshot tests

* Reverts unintentional changes

* Reverts unintentional changes

* Fixes linting error breaking CI

* audits npm deps for security issues (#1952)

* Updates package.json resolutions to fix numerous npm security warnings

* Updates package.json resolutions to fix numerous npm security warnings

* Updates package.json resolutions to fix numerous npm security warnings

* Fixes new linting errors introduces by dep upgrades

* Fixes new flow errors introduces by dep upgrades

* Fixes new linting errors introduces by dep upgrades

* Updates base docker image in config.yml

* Reverts changes to config.yml

* updates config.yml

* Try with --ignore-engines  flag

* Removes storybook and associated files (#1953)

* Removes storybook and associated files

* Adds --maxWorkers=10 flag to test command

* Adds --forceExit flag to test command

* attempting to debug circleCI timeout issue with --detectOpenHandles flag

* attempting to debug circleCI timeout issue with --detectOpenHandles flag

* More debugging nonsense

* More debugging nonsense

* updates test-ci command

* Adds back code coverage reporting

* remove --forceExit flag

* Reverts changes to code coverage upload

* Update README.md

* feature: Fixes broken dev build, cleans up dependency issues (#1955)

* Updates config.yml

* Cleans up issues in resolutions of package.json

* feature: updates core dependencies (where feasible) (#1956)

* Updates flow and react adds many instances of

* Renames deprecated lifecycle methods

* Fixes linting issues

* Fixes Sidebar.test.js

* Revert "feature: updates core dependencies (where feasible) (#1956)" (#1957)

This reverts commit 097df4b.

* feature: Fixes buggy CSS for network config tooltip (#1958)

* Fixes bug breaking layout and animations for NetworkConfigurationTooltip.jsx

* Updates snapshots

* Removes dead comment

* feature: final major round of translation polish (#1960)

* Implements missing translations in tooltip

* Adds missing translations and fixes various UI bugs

* Updates snapshots fixes broken tests

* Fixes broken test

* Updates snapshots

* More translation work

* Bumps version in package.json

* feature: improve language setting UI (#1964)

* Adds country flags to settings and login dropdowns

* Fixes flow errors

* Removes unused flag assets

* Adds unit tests for new component

* Fixes bug in Settings.jsx

* feature: implements feedback on release 2.5.0 (#1965)

* Adds missing translations, updates portuguese

* updates snapshots

* Adds additional missing translations

* Updates snapshots

* Finishes feedback implementation

* Adds missing tooltip translations to activity page

* Updates snapshots

* Adds updates assets, design elements and rebranding for dark theme

* Revert changes to notification autodismiss

* Comments out no longer relevant test

* Remove dead code

* Update webpack prod config to load new file format

* Fix french language translation (#1978)

* Fix french language translation

* Fix Francés to Français

* Bump http-proxy from 1.18.0 to 1.18.1 (#1987)

Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.18.0 to 1.18.1.
- [Release notes](https://github.com/http-party/node-http-proxy/releases)
- [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md)
- [Commits](http-party/node-http-proxy@1.18.0...1.18.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump node-sass from 4.12.0 to 4.13.1 (#1986)

Bumps [node-sass](https://github.com/sass/node-sass) from 4.12.0 to 4.13.1.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](sass/node-sass@v4.12.0...v4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feature: implement light theme reskin (#1995)

* Completes first pass at light theme reskin

* Update snapshots

* Revert unintentional changes

* feature: updates electron to version 8.5.2 (#1996)

* Bumps electron version to 8.5.2 and fixes layout issues on Dashboard

* Updates yarn.lock

* Updates .flowconfig

* Fix build script

* update deploy_win64 script

* Bump @ledgerhq/hw-transport-node-hid

* Bump @ledgerhq/hw-transport-node-hid

* Reverts changes to @ledgerhq/hw-transport-node-hid version

* adds usb_bindings.node and updates dependency list

* Updates flow type checking in neonLedger.js

* Refactor /ledger, fix broken tests, finally sort out deps

* Fix typos

* Adds usb as an external module in webpack config

* Fixes flow error

* Reverts flow fix

* feature: implement button reskin (#2000)

* Implements button redesign

* Update snapshots

* feature: misc enhancements for release 2.6.0 (#2001)

* Updates image asset in LogoWithStrikethrough.jsx

* Update webpack and webpack-dev-server

* Various CSS bug fixes introduced with electron upgrade

* Updates icon and background assets

* Update dark theme colors, adds conditional logo in LogoWithStrikethrough.jsx updates dmg splashscreen background

* fix wallet export/import (#2002)

* fix wallet export

* fix wallet recovery import

* Update app/containers/Settings/Settings.jsx

Co-authored-by: Maxwell Lasky <mlasky46@gmail.com>

* fix failed Github suggestion

Co-authored-by: Maxwell Lasky <mlasky46@gmail.com>

* feature: Sets up auto update for Linux/Windows/MacOS and and code signing/notarization on MacOS [WIP] (#2003)

* Set up auto update and code signing

* Removes extra dotenv dep

* Override default artifact naming convention

* feature: CI enhancements (#2004)

* test commit

* update dist command

* update config.yml

* update config.yml

* Fix publish script

* update pack

* test commit

* Bump version

* refactor config.yml

* refactor config.yml

* Revert unintentional changes

* Revert unintentional changes

* Remove publish script

* Add back author key

* Fixes issues with FullHeightPanel.jsx (#2005)

* feature: fix reskin button design (#2007)

* Fixes dark theme primary disabled button styles

* Fix font loading bugs and input color on dark theme

* remove dead fonts

* create and implement secondary elevated button

* Updates button styles

* Remove commented code

* feature: beta release feedback (#2008)

* Implements numeruous design enhancements, fixes activity export

* Updates snapshots

* Fix icon color in wallet manager

* Massive amounts of design polish on both themes and many components

* Lint and fix snapshots

* Clean up dead code

* Clean up dead code

* Clean up dead code

* lint

* Fix snapshots

* feature: Adds release notes component / rendering logic (#2006)

* Set updateDownloaded flag

* feature: release notes modal (#2009)

* feature: fix reskin button design (#2007)

* Fixes dark theme primary disabled button styles

* Fix font loading bugs and input color on dark theme

* remove dead fonts

* create and implement secondary elevated button

* Updates button styles

* Remove commented code

* feature: beta release feedback (#2008)

* Implements numeruous design enhancements, fixes activity export

* Updates snapshots

* Fix icon color in wallet manager

* Massive amounts of design polish on both themes and many components

* Lint and fix snapshots

* Clean up dead code

* Clean up dead code

* Clean up dead code

* lint

* Fix snapshots

* Sets up logic and finishes implementation of release notes modal

* update snapshots

* conditionally render notes once when running 2.6.0

* Simplify release notes render

* Hide release render for now

* update package.json

* Updates config.yml (#2010)

* feature: various release enhancements (#2011)

* app wide release enhancements

* Updates snapshots

* Fixes button style in QR scanner

* Only render new release notification on Linux

* lint

* Update metadata.js

* remove commented out code

* Feature/panel color update (#2012)

* Update light theme receive panel color

* Update snapshots

* Adds network config reset flow, updates dmg background, updates icon color in nothing.svg, adds github button to release notes

* Removes dead code

* Updates snapshots

* Removes dead code

* Fixes button label inconsistencies

Co-authored-by: Oleg Smirnov <smirnov.os@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Fabian Vilers <fabian.vilers@dev-one.com>
Co-authored-by: Erik van den Brink <git@erikvandenbrink.com>
  • Loading branch information
5 people committed Nov 10, 2020
1 parent 2d84191 commit 568494c
Show file tree
Hide file tree
Showing 173 changed files with 4,488 additions and 2,490 deletions.
63 changes: 17 additions & 46 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,6 @@ jobs:
- run: apt-get -y install libusb-1.0-0-dev graphicsmagick libudev-dev
- run: apt-get -y install libxtst6 libxss1 libgtk2.0-0 libnss3 libasound2 libgconf-2-4
- run: yarn test-ci
# TODO: add these steps back when e2e test suite is functional
# - run:
# name: Running Xvfb for e2e test
# command: Xvfb -ac :99 -screen 0 1280x1024x16
# background: true
# - run:
# name: Run e2e tests
# command: |
# yarn
# yarn assets
# export DISPLAY=:99
# yarn test:e2e
store_artifacts:
- path: artifacts/
- destination: yarnpkg
Expand All @@ -82,44 +70,27 @@ jobs:
- run: apt-get install --no-install-recommends -y gcc-multilib g++-multilib
- run: yarn install --ignore-engines --frozen-lockfile --network-timeout 1000000 --network-concurrency 1
- run: yarn assets
- run: yarn build -w --x64
- store_artifacts:
path: dist
destination: build

deploy_linux:
<<: *container_config
steps:
- checkout
- restore_cache:
key: neon-wallet-dependencies-cache-{{ checksum "yarn.lock" }}
- run: apt-get -y update
- run: apt-get -y install libusb-1.0-0-dev icnsutils graphicsmagick libudev-dev
- run: yarn install --ignore-engines --frozen-lockfile --network-timeout 1000000 --network-concurrency 1
- run: yarn dist
- store_artifacts:
path: dist
destination: build
- run: yarn electron-builder -w --x64

workflows:
version: 2
build_test:
build_test_and_deploy:
jobs:
- build
- build:
filters:
tags:
only: /v.*/
- test:
filters:
tags:
only: /v.*/
requires:
- build
deploy:
jobs:
- deploy_win64
# filters:
# branches:
# ignore: /.*/
# tags:
# only: /[0-9]+(\.[0-9]+)+.*/
- deploy_linux
# filters:
# branches:
# ignore: /.*/
# tags:
# only: /[0-9]+(\.[0-9]+)+.*/
- deploy_win64:
requires:
- test
filters:
branches:
ignore: /.*/
tags:
only: /v.*/
1 change: 1 addition & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.*/test/.*
.*/node_modules/.*/src/.*
.*/node_modules/@ledgerhq/hw-transport/lib/Transport.js.flow
.*/node_modules/roarr/dist/types.js.flow

[include]

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
node_modules/*
dist/
env/
.env
.idea
release-builds/*
.DS_Store
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
- nep9 QR support
- Participate in NEO token sales
- View wallet activity
- Translation support for Arabic, Chinese, French, German, Italian, Korean, Portuguese, Russian, Turkish and Vietnamese.

## Installation

Expand Down
1 change: 1 addition & 0 deletions __mocks__/@ledgerhq/hw-transport-node-hid.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = {}
728 changes: 462 additions & 266 deletions __tests__/components/Modals/__snapshots__/ConfirmModal.test.js.snap

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions __tests__/components/Sidebar.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,15 @@ describe('Sidebar', () => {
expect(container.text()).toEqual('')
})

test('does render the token sale navigation option when NOT in watch only mode', () => {
const { wrapper } = setup()
const label = wrapper.find('#token-sale-label')
expect(label.text()).toEqual(' Token Sale ')
// TODO 2.6.0: this probably should go away from the main navigation
// test('does render the token sale navigation option when NOT in watch only mode', () => {
// const { wrapper } = setup()
// const label = wrapper.find('#token-sale-label')
// expect(label.text()).toEqual(' Token Sale ')

const container = wrapper.find('#tokensale')
expect(container.length).toEqual(3)
})
// const container = wrapper.find('#tokensale')
// expect(container.length).toEqual(3)
// })

test('does not render the token sale navigation option when in watch only mode', () => {
const testState = cloneDeep(initialState)
Expand Down

Large diffs are not rendered by default.

140 changes: 105 additions & 35 deletions __tests__/components/__snapshots__/Settings.test.js.snap

Large diffs are not rendered by default.

43 changes: 0 additions & 43 deletions __tests__/components/__snapshots__/Sidebar.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1021,49 +1021,6 @@ exports[`Sidebar renders without crashing 1`] = `
</Link>
</Route>
</NavLink>
<NavLink
activeClassName="active"
aria-current="page"
className="navItem"
id="tokensale"
to="/token-sale"
>
<Route
path="\\\\/token-sale"
>
<Link
aria-current={null}
className="navItem"
id="tokensale"
replace={false}
to="/token-sale"
>
<a
aria-current={null}
className="navItem"
href="/token-sale"
id="tokensale"
onClick={[Function]}
>
<Component>
<svg />
</Component>
<div
id="token-sale-label"
>
<FormattedMessage
id="sidebarTokenSale"
values={Object {}}
>
Token Sale
</FormattedMessage>
</div>
</a>
</Link>
</Route>
</NavLink>
<NavLink
activeClassName="active"
aria-current="page"
Expand Down
4 changes: 2 additions & 2 deletions __tests__/ledger/ledgerNanoS.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// // NOTE - begin process of testing the ledger app
// import commNode from '../../app/ledger/ledger-comm-node'
// import { ledgerNanoSCreateSignatureAsync } from '../../app/ledger/ledgerNanoS'
// import { legacySignWithLedger } from '../../app/ledger/neonLedger'
// import { BIP44_PATH } from '../../app/core/constants'
//
// const promiseMock = (result, error = false) => {
Expand All @@ -25,7 +25,7 @@
//
describe('ledgerNano Async Signature tests', () => {
test('ledgerNano Async Signature works', async () => {
// const sign = await ledgerNanoSCreateSignatureAsync(unsignedTx, publicKey)
// const sign = await legacySignWithLedger(unsignedTx, publicKey)
// console.log('sign repsonse', sign)
expect(true).toEqual(true)
})
Expand Down
8 changes: 2 additions & 6 deletions app/actions/authActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { bindArgsFromN } from '../util/bindHelpers'
import { resetBalanceState } from './balancesActions'
import { upgradeNEP6AddAddresses } from '../core/account'
import { validatePassphraseLength } from '../core/wallet'
import { ledgerNanoSCreateSignatureAsync } from '../ledger/ledgerNanoS'
import { legacySignWithLedger } from '../ledger/neonLedger'

type WifLoginProps = {
wif: string,
Expand Down Expand Up @@ -130,11 +130,7 @@ export const ledgerLoginActions = createActions(
return {
publicKey,
address: walletAccount.address,
signingFunction: bindArgsFromN(
ledgerNanoSCreateSignatureAsync,
3,
account,
),
signingFunction: bindArgsFromN(legacySignWithLedger, 3, account),
isHardwareLogin: true,
hasInternetConnectivity,
}
Expand Down
2 changes: 1 addition & 1 deletion app/actions/ledgerActions.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @flow
import { createActions } from 'spunky'
import { getDeviceInfo } from '../ledger/ledgerNanoS'
import { getDeviceInfo } from '../ledger/neonLedger'

export const ID = 'ledger'

Expand Down
41 changes: 41 additions & 0 deletions app/assets/flags/russia.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/fonts/Gotham-Black.woff
Binary file not shown.
Binary file removed app/assets/fonts/Gotham-Bold.woff
Binary file not shown.
Binary file removed app/assets/fonts/Gotham-Book.woff
Binary file not shown.
Binary file removed app/assets/fonts/Gotham-BookItalic.woff
Binary file not shown.
Binary file removed app/assets/fonts/Gotham-Light.woff
Binary file not shown.
Binary file removed app/assets/fonts/Gotham-LightItalic.woff
Binary file not shown.
Binary file removed app/assets/fonts/Gotham-Medium.woff
Binary file not shown.
Binary file removed app/assets/fonts/Gotham-MediumItalic.woff
Binary file not shown.
Binary file removed app/assets/fonts/Gotham-Thin.woff
Binary file not shown.
Binary file removed app/assets/fonts/Gotham-ThinItalic.woff
Binary file not shown.
Binary file removed app/assets/fonts/Gotham-UltraItalic.woff
Binary file not shown.
Binary file removed app/assets/fonts/Gotham-XLight.woff
Binary file not shown.
Binary file removed app/assets/fonts/Gotham-XLightItalic.woff
Binary file not shown.
Binary file added app/assets/fonts/sofiapro-bold-webfont.woff
Binary file not shown.
Binary file added app/assets/fonts/sofiapro-light-webfont.woff
Binary file not shown.
Binary file added app/assets/fonts/sofiapro-medium-webfont.woff
Binary file not shown.
Binary file added app/assets/fonts/sofiapro-regular-webfont.woff
Binary file not shown.
Binary file not shown.
Binary file added app/assets/fonts/sofiapro-semibold-webfont.woff
Binary file not shown.
2 changes: 1 addition & 1 deletion app/assets/icons/confirm-circle.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/assets/icons/gift.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/assets/icons/nothing.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions app/assets/icons/wallet-green.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 568494c

Please sign in to comment.