status-im/safe-react
2
0
Fork 0
mirror of https://github.com/status-im/safe-react.git synced 2025-03-03 19:00:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix show token balances after sending out all tokens (#1521)

Browse Source
This commit is contained in:
Daniel Sanchez 2020-10-26 11:34:53 +01:00 committed by GitHub
parent 1c53167a9a
commit 95d102d337
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/logic/safe/store/actions/fetchSafe.ts
View File

@ -84,7 +84,7 @@ export const buildSafe = async (
currentVersion: currentVersion ?? '', currentVersion: currentVersion ?? '',
needsUpdate, needsUpdate,
featuresEnabled, featuresEnabled,
balances: Map(), balances: localSafe?.balances || Map(),
latestIncomingTxBlock: 0, latestIncomingTxBlock: 0,
activeAssets: Set(), activeAssets: Set(),
activeTokens: Set(), activeTokens: Set(),

2
src/logic/safe/store/models/safe.ts
View File

@ -39,7 +39,7 @@ const makeSafe = Record<SafeRecordProps>({
activeAssets: Set(), activeAssets: Set(),
blacklistedTokens: Set(), blacklistedTokens: Set(),
blacklistedAssets: Set(), blacklistedAssets: Set(),
balances: Map({}), balances: Map(),
nonce: 0, nonce: 0,
latestIncomingTxBlock: 0, latestIncomingTxBlock: 0,
recurringUser: undefined, recurringUser: undefined,

7
src/logic/safe/store/reducer/safe.ts
View File

@ -53,8 +53,9 @@ const updateSafeProps = (prevSafe, safe) => {
// We check each safe property sent in action.payload // We check each safe property sent in action.payload
safeProperties.forEach((key) => { safeProperties.forEach((key) => {
if (safe[key] && typeof safe[key] === 'object') { if (safe[key] && typeof safe[key] === 'object') {
if (safe[key].length >= 0) { if (safe[key].length >= 0 || Map.isMap(safe[key])) {
// If type is array we update the array // If type is array we replace it
// If type is Immutable Map we replace it
record.update(key, () => safe[key]) record.update(key, () => safe[key])
} else if (safe[key].size >= 0) { } else if (safe[key].size >= 0) {
// If type is Immutable List we replace current List // If type is Immutable List we replace current List
@ -108,7 +109,7 @@ export default handleActions(
return state.updateIn( return state.updateIn(
['safes', safe.address], ['safes', safe.address],
makeSafe({ name: 'LOADED SAFE', address: safe.address }), makeSafe({ name: safe?.name || 'LOADED SAFE', address: safe.address }),
(prevSafe) => updateSafeProps(prevSafe, safe), (prevSafe) => updateSafeProps(prevSafe, safe),
) )
}, },