From b9123db3d2d8120b43e63563fa5df7a4f53923ce Mon Sep 17 00:00:00 2001 From: Ivan Sorokin Date: Fri, 8 Nov 2019 16:34:06 +0100 Subject: [PATCH 1/3] Lowercase account address in redux state and getter --- packages/mobile/src/web3/reducer.ts | 2 +- packages/mobile/src/web3/selectors.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/mobile/src/web3/reducer.ts b/packages/mobile/src/web3/reducer.ts index 1ec445cfbfe..a8339d651be 100644 --- a/packages/mobile/src/web3/reducer.ts +++ b/packages/mobile/src/web3/reducer.ts @@ -49,7 +49,7 @@ export const reducer = ( case Actions.SET_ACCOUNT: return { ...state, - account: action.address, + account: action.address.toLowerCase(), } case Actions.SET_ACCOUNT_IN_WEB3_KEYSTORE: return { diff --git a/packages/mobile/src/web3/selectors.ts b/packages/mobile/src/web3/selectors.ts index 4e2b7b4524d..9312f303862 100644 --- a/packages/mobile/src/web3/selectors.ts +++ b/packages/mobile/src/web3/selectors.ts @@ -1,6 +1,7 @@ import { RootState } from 'src/redux/reducers' -export const currentAccountSelector = (state: RootState) => state.web3.account +export const currentAccountSelector = (state: RootState) => + (state.web3.account && state.web3.account.toLowerCase()) || null export const currentAccountInWeb3KeystoreSelector = (state: RootState) => state.web3.accountInWeb3Keystore export const zeroSyncSelector = (state: RootState) => state.web3.zeroSyncMode From bb2135d3a71bd0f101dc752e64cd6e599f34f592 Mon Sep 17 00:00:00 2001 From: Ivan Sorokin Date: Fri, 8 Nov 2019 16:34:59 +0100 Subject: [PATCH 2/3] Fix `this` issue at update payment request See here why: https://github.com/invertase/react-native-firebase/blob/ea901386db3d2414c124b208b5f8538175528c9d/src/modules/database/Reference.js#L193 --- packages/mobile/src/firebase/saga.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/mobile/src/firebase/saga.ts b/packages/mobile/src/firebase/saga.ts index b7ec092444a..9dbe1dcc2f3 100644 --- a/packages/mobile/src/firebase/saga.ts +++ b/packages/mobile/src/firebase/saga.ts @@ -138,7 +138,12 @@ function* subscribeToPaymentRequests() { function* updatePaymentRequestStatus({ id, status }: UpdatePaymentRequestStatusAction) { try { Logger.debug(TAG, 'Updating payment request', id, status) - yield call(firebase.database().ref(`${REQUEST_DB}/${id}`).update, { status }) + yield call(() => + firebase + .database() + .ref(`${REQUEST_DB}/${id}`) + .update({ status }) + ) Logger.debug(TAG, 'Payment request status updated', id) } catch (error) { Logger.error(TAG, `Error while updating payment request ${id} status`, error) From 9449c0e87103356e5fc606c0428d59f92cd4405b Mon Sep 17 00:00:00 2001 From: Ivan Sorokin Date: Fri, 8 Nov 2019 17:08:01 +0100 Subject: [PATCH 3/3] Fix tests --- packages/mobile/src/app/__snapshots__/Debug.test.tsx.snap | 2 +- packages/mobile/src/qrcode/__snapshots__/QRCode.test.tsx.snap | 2 +- packages/mobile/src/web3/saga.test.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/mobile/src/app/__snapshots__/Debug.test.tsx.snap b/packages/mobile/src/app/__snapshots__/Debug.test.tsx.snap index ea5bfbfaef2..9192020d510 100644 --- a/packages/mobile/src/app/__snapshots__/Debug.test.tsx.snap +++ b/packages/mobile/src/app/__snapshots__/Debug.test.tsx.snap @@ -53,7 +53,7 @@ exports[`Debug renders correctly 1`] = ` } } > - Address: 0x0000000000000000000000000000000000007E57 + Address: 0x0000000000000000000000000000000000007e57 diff --git a/packages/mobile/src/web3/saga.test.ts b/packages/mobile/src/web3/saga.test.ts index 0d1e240e959..bee6ac8009f 100644 --- a/packages/mobile/src/web3/saga.test.ts +++ b/packages/mobile/src/web3/saga.test.ts @@ -59,7 +59,7 @@ describe(getOrCreateAccount, () => { .withState(state) .provide([[select(currentAccountSelector), null]]) .provide([[select(pincodeTypeSelector), '123']]) - .returns('0x0000000000000000000000000000000000007E57') + .returns('0x0000000000000000000000000000000000007e57') .run() }) })