m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Improving handling for non-existent props in state migrations (#11829)

Browse Source
This commit is contained in:
ryanml 2021-08-17 19:18:53 -07:00 committed by GitHub
parent 932474127e
commit d96973e55b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/scripts/migrations/053.js
View File

@ -23,23 +23,27 @@ function transformState(state) {
state?.IncomingTransactionsController?.incomingTransactions; state?.IncomingTransactionsController?.incomingTransactions;
if (Array.isArray(transactions)) { if (Array.isArray(transactions)) {
transactions.forEach((transaction) => { transactions.forEach((transaction) => {
if ( if (transaction) {
transaction.type !== TRANSACTION_TYPES.RETRY && if (
transaction.type !== TRANSACTION_TYPES.CANCEL transaction.type !== TRANSACTION_TYPES.RETRY &&
) { transaction.type !== TRANSACTION_TYPES.CANCEL
transaction.type = transaction.transactionCategory; ) {
transaction.type = transaction.transactionCategory;
}
delete transaction.transactionCategory;
} }
delete transaction.transactionCategory;
}); });
} }
if (incomingTransactions) { if (incomingTransactions) {
const incomingTransactionsEntries = Object.entries(incomingTransactions); const incomingTransactionsEntries = Object.entries(incomingTransactions);
incomingTransactionsEntries.forEach(([key, transaction]) => { incomingTransactionsEntries.forEach(([key, transaction]) => {
delete transaction.transactionCategory; if (transaction) {
state.IncomingTransactionsController.incomingTransactions[key] = { delete transaction.transactionCategory;
...transaction, state.IncomingTransactionsController.incomingTransactions[key] = {
type: TRANSACTION_TYPES.INCOMING, ...transaction,
}; type: TRANSACTION_TYPES.INCOMING,
};
}
}); });
} }
return state; return state;

6
app/scripts/migrations/056.js
View File

@ -15,14 +15,14 @@ export default {
const { PreferencesController } = versionedData.data; const { PreferencesController } = versionedData.data;
if (Array.isArray(PreferencesController.tokens)) { if (Array.isArray(PreferencesController?.tokens)) {
PreferencesController.tokens = PreferencesController.tokens.filter( PreferencesController.tokens = PreferencesController.tokens.filter(
({ address }) => address, ({ address }) => address,
); );
} }
if ( if (
PreferencesController.accountTokens && PreferencesController?.accountTokens &&
typeof PreferencesController.accountTokens === 'object' typeof PreferencesController.accountTokens === 'object'
) { ) {
Object.keys(PreferencesController.accountTokens).forEach((account) => { Object.keys(PreferencesController.accountTokens).forEach((account) => {
@ -40,7 +40,7 @@ export default {
} }
if ( if (
PreferencesController.assetImages && PreferencesController?.assetImages &&
'undefined' in PreferencesController.assetImages 'undefined' in PreferencesController.assetImages
) { ) {
delete PreferencesController.assetImages.undefined; delete PreferencesController.assetImages.undefined;