Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: adds custom network support #2468

Merged
merged 23 commits into from
Mar 23, 2023
Merged

feature: adds custom network support #2468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
93d803f
settings overhaul
comountainclimber Feb 17, 2023
9770fa6
Overhaul settings, implements privatenet support
comountainclimber Feb 18, 2023
4def9fb
Fix typos, remove logging, lint
comountainclimber Feb 18, 2023
60f3ec1
Updates production webpack config
comountainclimber Feb 18, 2023
2505b0f
remove cruft
comountainclimber Feb 18, 2023
ea81e28
remove neoexpress cruft
comountainclimber Feb 18, 2023
e49ad11
Bump version
comountainclimber Feb 18, 2023
022f076
lint
comountainclimber Feb 18, 2023
b2c84d4
lint
comountainclimber Feb 19, 2023
04d22a7
fix test
comountainclimber Feb 19, 2023
8d9c1cc
flow
comountainclimber Feb 19, 2023
142a3cd
temp remove send test
comountainclimber Feb 20, 2023
54aae56
bump version
comountainclimber Feb 20, 2023
9b34304
Adds remaining pieces to MVP
comountainclimber Mar 9, 2023
7b780ba
MVP ready
comountainclimber Mar 10, 2023
594a90e
type check
comountainclimber Mar 10, 2023
c7405f0
lint
comountainclimber Mar 10, 2023
4e19973
lint
comountainclimber Mar 10, 2023
5455a85
delete stupid file
comountainclimber Mar 10, 2023
6260ad1
bump version fix tests
comountainclimber Mar 10, 2023
51b5fca
Add back translations
comountainclimber Mar 15, 2023
78ac841
update snaps
comountainclimber Mar 15, 2023
7d04e7d
fix broken tests, fix merge conflicts clean up
comountainclimber Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
953 changes: 5 additions & 948 deletions __tests__/components/Modals/__snapshots__/ConfirmModal.test.js.snap
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions __tests__/components/NetworkConfigurationTooltip.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import {
MAIN_NETWORK_LABEL,
DEFAULT_LANGUAGE,
} from '../../app/core/constants'
import NetworkConfigurationTooltip, { renderNode } from '../../app/components/NetworkConfigurationTooltip'
import NetworkConfigurationTooltip from '../../app/components/NetworkConfigurationTooltip'
import { renderNode } from '../../app/components/NetworkConfigurationTooltip/NetworkConfigurationTooltip'
import IntlWrapper from '../../app/components/Root/IntlWrapper'

const { LOADED, LOADING } = progressValues
Expand Down Expand Up @@ -62,9 +63,9 @@ const networkConfigTooltipSetup = (
const store = configureStore([thunk])(state)
const wrapper = mount(
<Provider store={store}>
<IntlWrapper lang="en">
<IntlWrapper store={store}>
<MemoryRouter initialEntries={['/']} keyLength={0}>
<NetworkConfigurationTooltip />
<NetworkConfigurationTooltip blockExplorer="Dora" />
</MemoryRouter>
</IntlWrapper>
</Provider>,
Expand All @@ -83,7 +84,7 @@ const renderNodeSetup = (
const store = configureStore([thunk])(state)
const wrapper = mount(
<Provider store={store}>
<IntlWrapper lang="en">
<IntlWrapper store={store}>
<MemoryRouter initialEntries={['/']} keyLength={0}>
<div>{renderNode(node)}</div>
</MemoryRouter>
Expand Down
325 changes: 0 additions & 325 deletions __tests__/components/Send.test.js
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions __tests__/components/Settings.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ const initialState = {
language: DEFAULT_LANGUAGE,
currency: DEFAULT_CURRENCY_CODE,
soundEnabled: true,
chain: 'neo3',
},
},
},
Expand Down
Loading