-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Revert/8081 engine slice (#8576)
## **Description** <!-- Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions: 1. What is the reason for the change? 2. What is the improvement/solution? --> This PR reverts #8081 . ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've clearly explained what problem this PR is solving and how it is solved. - [ ] I've linked related issues - [ ] I've included manual testing steps - [ ] I've included screenshots/recordings if applicable - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. - [ ] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [ ] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.
- Loading branch information
Showing
11 changed files
with
305 additions
and
291 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| import engineReducer, { initBgState, updateBgState } from '.'; | ||
|
|
||
| jest.mock('../../../Engine', () => ({ | ||
| init: () => jest.requireActual('../../../Engine').default.init({}), | ||
| state: {}, | ||
| })); | ||
| // importing Engine after mocking to avoid global mock from overwriting its values | ||
| import Engine from '../../../Engine'; | ||
|
|
||
| describe('engineReducer', () => { | ||
| it('should return the initial state in default', () => { | ||
| jest.isolateModules(() => { | ||
| jest.mock('../../../Engine', () => ({ | ||
| init: () => jest.requireActual('../../../Engine').default.init({}), | ||
| state: {}, | ||
| })); | ||
| }); | ||
|
|
||
| const initialStatDefault = { backgroundState: {} }; | ||
| const nextState = engineReducer(undefined, {} as any); | ||
| expect(nextState).toEqual(initialStatDefault); | ||
| }); | ||
|
|
||
| it('should initialize backgroundState when dispatching INIT_BG_STATE action', () => { | ||
| const initialState = { backgroundState: {} }; | ||
| const nextState = engineReducer(initialState, initBgState()); | ||
| expect(nextState).toEqual({ backgroundState: Engine.state }); | ||
| }); | ||
|
|
||
| it('should update backgroundState when dispatching UPDATE_BG_STATE action', () => { | ||
| const reduxInitialState = { | ||
| backgroundState: { | ||
| AccountTrackerController: {}, | ||
| }, | ||
| }; | ||
|
|
||
| const key = 'AccountTrackerController'; | ||
| // changing the mock version to suit this test manually due to our current global mock | ||
| (Engine as any).state = { | ||
| AccountTrackerController: { accounts: 'testValue' }, | ||
| }; | ||
| const { backgroundState } = engineReducer( | ||
| reduxInitialState, | ||
| updateBgState({ key }), | ||
| ); | ||
| expect(backgroundState).toEqual({ | ||
| ...reduxInitialState.backgroundState, | ||
| AccountTrackerController: Engine.state[key], | ||
| }); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| import Engine from '../../../Engine'; | ||
| import { createAction, PayloadAction } from '@reduxjs/toolkit'; | ||
|
|
||
| const initialState = { | ||
| backgroundState: {} as any, | ||
| }; | ||
|
|
||
| // Create an action to initialize the background state | ||
| export const initBgState = createAction('INIT_BG_STATE'); | ||
|
|
||
| // Create an action to update the background state | ||
| export const updateBgState = createAction('UPDATE_BG_STATE', (key) => ({ | ||
| payload: key, | ||
| })); | ||
|
|
||
| export const counter: any = {}; | ||
| const engineReducer = ( | ||
| // eslint-disable-next-line @typescript-eslint/default-param-last | ||
| state = initialState, | ||
| action: PayloadAction<{ key: any } | undefined>, | ||
| ) => { | ||
| switch (action.type) { | ||
| case initBgState.type: { | ||
| return { backgroundState: Engine.state }; | ||
| } | ||
| case updateBgState.type: { | ||
| const newState = { ...state }; | ||
| if (action.payload) { | ||
| newState.backgroundState[action.payload?.key] = | ||
| Engine.state[action.payload.key as keyof typeof Engine.state]; | ||
| } | ||
| return newState; | ||
| } | ||
| default: | ||
| return state; | ||
| } | ||
| }; | ||
|
|
||
| export default engineReducer; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.