Skip to content
Permalink
Browse files

chore: merge develop to master (ArkEcosystem#1304)

* fix: improve validation for epoch format (ArkEcosystem#1164)

* chore: upgrade Vue and other dependencies and use Node 11 on CI (ArkEcosystem#1160)

* feat: allow using a pool of background workers and use create a unified HTTP client (ArkEcosystem#1120)

* fix: `InputSelect` dropdowns (ArkEcosystem#1174)

* fix: `InputSelect` dropdowns

* refactor: use the new Vue 2.6 syntax for named slots

* fix: do not allow more than 1 `InputSelect` open at the same time

* fix: other network fees when higher than ARK default static fees (ArkEcosystem#1172)

* fix: main sidebar menus (settings and peers/networks) (ArkEcosystem#1175)

* fix: the wallet selection dropdown and the wallet sidebar filters (ArkEcosystem#1184)

* fix: do not fail when navigating to other page while loading transactions (ArkEcosystem#1185)

* fix: use of getStruct in ledger transactions (ArkEcosystem#1190)

* chore: add ItsANameToo as code owner

* fix: add network modal validation (ArkEcosystem#1173)

* fix: network validation being overwritten

* feat: pull active delegates from api

* fix: make sure active delegates value exists

* refactor: improve server regex

* test: network modal for adding network

* chore: replace todo with comment

* fix: use one loop with prefilled values as backup

* refactor: allow string or number for input text

* refactor: allow fetching fees for specific network

* fix: fetch network fees when adding/editing

* fix: fetch fees & wait before add/update

* chore: remove mario from contributors (ArkEcosystem#1196)

* chore: add Altilly Exchange Wallet (ArkEcosystem#1199)

* fix: align the add profile placeholder (ArkEcosystem#1202)

* fix: days on the X axis of the market chart (ArkEcosystem#1203)

* fix: fetch fees only if the network is available (ArkEcosystem#1206)

* fix: stop hover from displacing address container (ArkEcosystem#1242)

* fix: vue-i18n-extract commands (ArkEcosystem#1247)

* refactor: require user action when generating 2nd passphrase (ArkEcosystem#1229)

* feat: store sidebar sorting and filters (ArkEcosystem#1148)

* feat: add option to hide the wallet button text (ArkEcosystem#1146)

* fix: get children of TransitionGroup when available & word-break of vendorfield (ArkEcosystem#1234)

* feat: show remaining bytes in vendorfield helper text (ArkEcosystem#1259)

* chore: use organization-wide GitHub Configuration (ArkEcosystem#1267)

* misc: Italian language update (ArkEcosystem#1268)

* fix: tidy permission method names & check exists (ArkEcosystem#1260)

* feat: add option to export wallets (ArkEcosystem#1244)

* feat: use the theme colours for the wallet filters instead of white (ArkEcosystem#1270)

* deps: upgrade `axios` (CVE-2019-10742) (ArkEcosystem#1271)

* fix: saving of invalid profile name on leave (ArkEcosystem#1101)

* bugfix: saving of invalid profile editions

* refactor: dont disable save button when profile name valid

even when the 'isNameEditable' don't disable save button. Instead disable it only when the name has an error.

* Update en-US.js

* Update ProfileEdition.vue

* refactor: show failed update message on close

* refactor: add update failure reason

* fix: disable both save buttons if name invalid

* fix: display the wallet sidebar filters on the right position (ArkEcosystem#1201)

* fix: highlight filters button when expanded if active

* fix: display the wallet sidebar filters on the right position

* refactor: add the status icon and plus/minus sign in the transaction show modal (ArkEcosystem#1272)

* fix: use webview instead of iframe for changelly (ArkEcosystem#1277)

* revert: worker changes from commit e42290

* refactor: use nock to mock tests (ArkEcosystem#1291)

* fix: add options mock requests

* fix: tests not mocking api

* fix: duplicated key warning on `WalletNew`

* Update src/renderer/pages/Wallet/WalletNew.vue

Co-Authored-By: Edgar Goetzendorff <hello@dated.fun>

* fix: ledger options on build (ArkEcosystem#1300)

* fix: ledger options on build

* fix: use component directly

* fix: change order of arguments in uniqBy call (ArkEcosystem#1297)

* fix: don't close custom peer modal when clicking inside (ArkEcosystem#1204)

* refactor: rename `NetworkCustomPeer` to `NetworkCustomPeerModal`

* fix: do not close the custom peer modal when clicking inside it

* refactor: wallet address & balance clickable on WalletAll page (ArkEcosystem#1301)

* fix: ledger wallet sidebar filter (ArkEcosystem#1292)

* fix: ledger whitescreen (ArkEcosystem#1296)

* fix: ledger whitescreen errors

* refactor: all ledger errors are failures

* refactor: improve ledger connection check

* refactor: improve ledger & use hid-singleton

* test: fix failing

* chore: remove e2e tests

* fix: open transaction modal on dashboard (ArkEcosystem#1281)

* fix: remove deeplink validation prefix

* fix: open transaction modal on dashboard

* fix: don't switch twice when selecting wallet on WalletSidebar (ArkEcosystem#1302)

* chore: bump version to 2.5.0 (ArkEcosystem#1303)
  • Loading branch information...
alexbarnsley committed Jun 26, 2019
1 parent 40bd89b commit c23157968613d7fe67ea5eb04ea2fa7e254c2cb4
Showing with 4,366 additions and 2,342 deletions.
  1. +1 −4 .circleci/config.yml
  2. +0 −71 .github/CODE_OF_CONDUCT.md
  3. +0 −1 .github/CONTRIBUTING.md
  4. +0 −27 .github/ISSUE_TEMPLATE/Bug_report.md
  5. +0 −16 .github/ISSUE_TEMPLATE/Feature_request.md
  6. +0 −35 .github/PULL_REQUEST_TEMPLATE.md
  7. +1 −1 __tests__/e2e.jest.conf.js
  8. +1 −1 __tests__/unit.jest.conf.js
  9. +2 −1 __tests__/unit/__mocks__/@ledgerhq/{hw-transport-node-hid.js → hw-transport-node-hid-singleton.js}
  10. +76 −0 __tests__/unit/components/Modal/ModalExportWallets.spec.js
  11. +3 −3 __tests__/unit/components/Network/{NetworkCustomPeer.spec.js → NetworkCustomPeerModal.spec.js}
  12. +4 −4 ...Wallet/WalletButtons/{WalletButtonAdditionalLedgers.spec.js → WalletButtonLedgerSettings.spec.js}
  13. +55 −39 __tests__/unit/components/Wallet/WalletSidebar.spec.js
  14. +30 −0 __tests__/unit/mixins/strings.spec.js
  15. +6 −9 __tests__/unit/services/crypto-compare.spec.js
  16. +3 −0 __tests__/unit/services/ledger-service.spec.js
  17. +14 −8 __tests__/unit/services/release.spec.js
  18. +5 −0 __tests__/unit/services/uri-handler.spec.js
  19. +17 −8 __tests__/unit/store/modules/delegate.spec.js
  20. +62 −14 __tests__/unit/store/modules/ledger.spec.js
  21. +290 −95 __tests__/unit/store/modules/peer.spec.js
  22. +13 −0 __tests__/unit/store/modules/session.spec.js
  23. +23 −9 __tests__/unit/store/modules/transaction.spec.js
  24. +53 −53 package.json
  25. +19 −0 src/renderer/assets/svg/arrow-export.svg
  26. +10 −0 src/renderer/assets/svg/ledger.svg
  27. +6 −5 src/renderer/components/App/AppSidemenu/AppSidemenuNetworkStatus.vue
  28. +2 −2 src/renderer/components/App/AppSidemenu/AppSidemenuSettings.vue
  29. +4 −0 src/renderer/components/Button/ButtonModal.vue
  30. +9 −0 src/renderer/components/Button/ButtonReload.vue
  31. +4 −0 src/renderer/components/Input/InputFee.vue
  32. +42 −42 src/renderer/components/Input/InputSelect.vue
  33. +4 −4 src/renderer/components/Menu/MenuDropdown/MenuDropdown.vue
  34. +5 −7 src/renderer/components/Menu/MenuDropdown/MenuDropdownHandler.vue
  35. +1 −1 src/renderer/components/Menu/MenuDropdown/MenuDropdownItem.vue
  36. +13 −8 src/renderer/components/Menu/MenuNavigation/MenuNavigation.vue
  37. +3 −3 src/renderer/components/Menu/MenuNavigation/MenuNavigationItem.vue
  38. +10 −2 src/renderer/components/Menu/MenuOptions/MenuOptionsItem.vue
  39. +2 −2 src/renderer/components/Modal/ModalAdditionalLedgers.vue
  40. +276 −0 src/renderer/components/Modal/ModalExportWallets.vue
  41. +2 −0 src/renderer/components/Modal/index.js
  42. 0 src/renderer/components/Network/{NetworkCustomPeer.vue → NetworkCustomPeerModal.vue}
  43. +3 −3 src/renderer/components/Network/index.js
  44. +2 −1 src/renderer/components/Transaction/TransactionAmount.vue
  45. +31 −4 src/renderer/components/Transaction/TransactionForm/TransactionFormSecondSignature.vue
  46. +14 −3 src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue
  47. +11 −1 src/renderer/components/Transaction/TransactionShow.vue
  48. +93 −0 src/renderer/components/Transaction/TransactionStatusIcon.vue
  49. +12 −49 src/renderer/components/Transaction/TransactionTable.vue
  50. +0 −84 src/renderer/components/Wallet/WalletButtons/WalletButtonAdditionalLedgers.vue
  51. +21 −2 src/renderer/components/Wallet/WalletButtons/WalletButtonCreate.vue
  52. +84 −0 src/renderer/components/Wallet/WalletButtons/WalletButtonExport.vue
  53. +21 −2 src/renderer/components/Wallet/WalletButtons/WalletButtonImport.vue
  54. +104 −0 src/renderer/components/Wallet/WalletButtons/WalletButtonLedgerSettings.vue
  55. +4 −2 src/renderer/components/Wallet/WalletButtons/index.js
  56. +142 −0 src/renderer/components/Wallet/WalletHeading/WalletHeadingMenuLedger.vue
  57. +3 −1 src/renderer/components/Wallet/WalletHeading/index.js
  58. +64 −39 src/renderer/components/Wallet/WalletSidebar/WalletSidebar.vue
  59. +52 −65 src/renderer/components/Wallet/WalletSidebar/WalletSidebarFilters.vue
  60. +17 −6 src/renderer/directives/click-outside.js
  61. +32 −3 src/renderer/i18n/locales/en-US.js
  62. +54 −10 src/renderer/i18n/locales/it-IT.js
  63. +4 −0 src/renderer/mixins/collections.js
  64. +9 −0 src/renderer/mixins/currency.js
  65. +1 −0 src/renderer/mixins/index.js
  66. +9 −0 src/renderer/mixins/strings.js
  67. +12 −0 src/renderer/models/profile.js
  68. +9 −2 src/renderer/pages/Dashboard.vue
  69. +31 −2 src/renderer/pages/Profile/ProfileEdition.vue
  70. +24 −47 src/renderer/pages/Wallet/WalletAll.vue
  71. +39 −30 src/renderer/pages/Wallet/WalletNew.vue
  72. +28 −17 src/renderer/services/ledger-service.js
  73. +14 −10 src/renderer/services/plugin-manager.js
  74. +1 −1 src/renderer/services/uri-handler.js
  75. +5 −0 src/renderer/store/modules/ledger.js
  76. +36 −0 src/renderer/store/modules/session.js
  77. +2,309 −1,483 yarn.lock
@@ -3,7 +3,7 @@ jobs:
test-node-11:
working_directory: ~/new-desktop-wallet
docker:
- image: circleci/node:11.10.1-browsers
- image: circleci/node:11-browsers
steps:
- checkout
- run:
@@ -23,9 +23,6 @@ jobs:
- run:
name: Unit tests
command: yarn test:unit --ci --coverage --maxWorkers 4
- run:
name: e2e tests
command: yarn test:e2e:full --coverage
- run:
name: Lint
command: yarn lint

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -20,6 +20,6 @@ module.exports = {
'<rootDir>/__tests__/e2e/pages',
'<rootDir>/__tests__/unit'
],
setupTestFrameworkScriptFile: 'jest-extended',
setupFilesAfterEnv: ['jest-extended'],
watchman: false
}
@@ -37,6 +37,6 @@ module.exports = {
collectCoverageFrom: [
'src/renderer/**/*.{js,vue}'
],
setupTestFrameworkScriptFile: 'jest-extended',
setupFilesAfterEnv: ['jest-extended'],
watchman: false
}
@@ -1,7 +1,8 @@
export default {
create: jest.fn(() => {
return {
close: jest.fn()
close: jest.fn(),
disconected: false
}
})
}
@@ -0,0 +1,76 @@
import Vue from 'vue'
import Vuelidate from 'vuelidate'
import { shallowMount } from '@vue/test-utils'
import useI18nGlobally from '../../__utils__/i18n'
import ModalExportWallets from '@/components/Modal/ModalExportWallets'
import StringMixin from '@/mixins/strings'
import WalletMixin from '@/mixins/wallet'

Vue.use(Vuelidate)

const i18n = useI18nGlobally()

describe('ModalExportWallets', () => {
const mountComponent = () => {
const wallets = [
{ address: 'A1', name: null, balance: 0 },
{ address: 'A2', name: '', balance: 1 },
{ address: 'A3', name: 'wallet_a3', balance: 0 },
{ address: 'A4', name: 'wallet_a4', balance: 1 }
]

const ledgerWallets = [
{ address: 'A5', name: null, balance: 0 },
{ address: 'A6', name: 'ledger_a6', balance: 1 }
]

return shallowMount(ModalExportWallets, {
i18n,
mixins: [StringMixin, WalletMixin],
mocks: {
session_network: {
knownWallets: {}
},
$store: {
getters: {
'delegate/byAddress': jest.fn(),
'wallet/contactsByProfileId': () => [],
'wallet/byProfileId': () => wallets,
'ledger/wallets': () => ledgerWallets
}
}
}
})
}

it('should render modal', () => {
const wrapper = mountComponent()
expect(wrapper.isVueInstance()).toBeTrue()
})

describe('toggleOption', () => {
it('should exclude empty wallets', () => {
const wrapper = mountComponent()
wrapper.vm.toggleOption('excludeEmpty')

const walletsWithBalance = [
{ address: 'A2', name: '', balance: 1 },
{ address: 'A4', name: 'wallet_a4', balance: 1 }
]

expect(wrapper.vm.wallets).toEqual(walletsWithBalance)
})

it('should exclude wallets with no name', () => {
const wrapper = mountComponent()
wrapper.vm.toggleOption('excludeUnnamed')

const walletsWithName = [
{ address: 'A3', name: 'wallet_a3', balance: 0 },
{ address: 'A4', name: 'wallet_a4', balance: 1 }
]

expect(wrapper.vm.wallets).toEqual(walletsWithName)
})
})
})
@@ -2,7 +2,7 @@ import { shallowMount } from '@vue/test-utils'
import { useI18nGlobally } from '../../__utils__/i18n'
import Vue from 'vue'
import Vuelidate from 'vuelidate'
import { NetworkCustomPeer } from '@/components/Network'
import { NetworkCustomPeerModal } from '@/components/Network'

const i18n = useI18nGlobally()

@@ -16,9 +16,9 @@ const mocks = {

Vue.use(Vuelidate)

describe('NetworkCustomPeer', () => {
describe('NetworkCustomPeerModal', () => {
it('should render modal', () => {
const wrapper = shallowMount(NetworkCustomPeer, {
const wrapper = shallowMount(NetworkCustomPeerModal, {
i18n,
mocks
})
@@ -1,11 +1,11 @@
import { shallowMount } from '@vue/test-utils'
import useI18nGlobally from '../../../__utils__/i18n'
import { WalletButtonAdditionalLedgers } from '@/components/Wallet/WalletButtons'
import { WalletButtonLedgerSettings } from '@/components/Wallet/WalletButtons'

const i18n = useI18nGlobally()
let wrapper
beforeEach(() => {
wrapper = shallowMount(WalletButtonAdditionalLedgers, {
wrapper = shallowMount(WalletButtonLedgerSettings, {
i18n,
mocks: {
$store: {
@@ -19,8 +19,8 @@ beforeEach(() => {
})
})

describe('WalletButtonAdditionalLedgers', () => {
it('should render modal', () => {
describe('WalletButtonLedgerSettings', () => {
it('should render', () => {
expect(wrapper.isVueInstance()).toBeTrue()
})
})

0 comments on commit c231579

Please sign in to comment.
You can’t perform that action at this time.