Collections #383

Merged
jessopb merged 20 commits from collections into master 2021-06-08 17:51:49 +02:00
2 changed files with 25 additions and 25 deletions
Showing only changes of commit 9e802f47c4 - Show all commits

20
dist/bundle.es.js vendored
View file

@ -1829,12 +1829,12 @@ function extractUserState(rawObj) {
settings,
app_welcome_version,
sharing_3P,
unpublishedCollectionTest,
builtinCollectionTest,
savedCollectionTest
unpublishedCollections,
builtinCollections,
savedCollections
} = rawObj.value;
return _extends$1({}, subscriptions ? { subscriptions } : {}, following ? { following } : {}, tags ? { tags } : {}, blocked ? { blocked } : {}, coin_swap_codes ? { coin_swap_codes } : {}, settings ? { settings } : {}, app_welcome_version ? { app_welcome_version } : {}, sharing_3P ? { sharing_3P } : {}, unpublishedCollectionTest ? { unpublishedCollectionTest } : {}, builtinCollectionTest ? { builtinCollectionTest } : {}, savedCollectionTest ? { savedCollectionTest } : {});
return _extends$1({}, subscriptions ? { subscriptions } : {}, following ? { following } : {}, tags ? { tags } : {}, blocked ? { blocked } : {}, coin_swap_codes ? { coin_swap_codes } : {}, settings ? { settings } : {}, app_welcome_version ? { app_welcome_version } : {}, sharing_3P ? { sharing_3P } : {}, unpublishedCollections ? { unpublishedCollections } : {}, builtinCollections ? { builtinCollections } : {}, savedCollections ? { savedCollections } : {});
}
return {};
@ -1851,9 +1851,9 @@ function doPopulateSharedUserState(sharedSettings) {
settings,
app_welcome_version,
sharing_3P,
unpublishedCollectionTest,
builtinCollectionTest,
savedCollectionTest
unpublishedCollections,
builtinCollections,
savedCollections
} = extractUserState(sharedSettings);
dispatch({
type: USER_STATE_POPULATE,
@ -1866,9 +1866,9 @@ function doPopulateSharedUserState(sharedSettings) {
settings,
welcomeVersion: app_welcome_version,
allowAnalytics: sharing_3P,
unpublishedCollectionTest,
builtinCollectionTest,
savedCollectionTest
unpublishedCollections,
builtinCollections,
savedCollections
}
});
};

View file

@ -13,9 +13,9 @@ type SharedData = {
settings?: any,
app_welcome_version?: number,
sharing_3P?: boolean,
unpublishedCollectionTest: CollectionGroup,
builtinCollectionTest: CollectionGroup,
savedCollectionTest: Array<string>,
unpublishedCollections: CollectionGroup,
builtinCollections: CollectionGroup,
savedCollections: Array<string>,
},
};
@ -30,9 +30,9 @@ function extractUserState(rawObj: SharedData) {
settings,
app_welcome_version,
sharing_3P,
unpublishedCollectionTest,
builtinCollectionTest,
savedCollectionTest,
unpublishedCollections,
builtinCollections,
savedCollections,
} = rawObj.value;
return {
@ -44,9 +44,9 @@ function extractUserState(rawObj: SharedData) {
...(settings ? { settings } : {}),
...(app_welcome_version ? { app_welcome_version } : {}),
...(sharing_3P ? { sharing_3P } : {}),
...(unpublishedCollectionTest ? { unpublishedCollectionTest } : {}),
...(builtinCollectionTest ? { builtinCollectionTest } : {}),
...(savedCollectionTest ? { savedCollectionTest } : {}),
...(unpublishedCollections ? { unpublishedCollections } : {}),
...(builtinCollections ? { builtinCollections } : {}),
...(savedCollections ? { savedCollections } : {}),
};
}
@ -64,9 +64,9 @@ export function doPopulateSharedUserState(sharedSettings: any) {
settings,
app_welcome_version,
sharing_3P,
unpublishedCollectionTest,
builtinCollectionTest,
savedCollectionTest,
unpublishedCollections,
builtinCollections,
savedCollections,
} = extractUserState(sharedSettings);
dispatch({
type: ACTIONS.USER_STATE_POPULATE,
@ -79,9 +79,9 @@ export function doPopulateSharedUserState(sharedSettings: any) {
settings,
welcomeVersion: app_welcome_version,
allowAnalytics: sharing_3P,
unpublishedCollectionTest,
builtinCollectionTest,
savedCollectionTest,
unpublishedCollections,
builtinCollections,
savedCollections,
},
});
};