Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
"@babel/preset-typescript": "^7.18.6",
"@babel/runtime": "^7.0.0",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-json": "^6.1.0",
"@rollup/plugin-node-resolve": "^15.0.1",
"@sucrase/webpack-loader": "^2.0.0",
"@types/chai": "^4.2.16",
Expand Down
7 changes: 5 additions & 2 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import babel from '@rollup/plugin-babel'
import json from '@rollup/plugin-json'
import resolve from '@rollup/plugin-node-resolve'
import flowEntry from 'rollup-plugin-flow-entry'
import mjs from 'rollup-plugin-mjs-entry'
Expand Down Expand Up @@ -29,7 +30,8 @@ export default [
resolve(resolveOpts),
babel(babelOpts),
flowEntry({ types: './lib/flow/exports.js' }),
mjs()
mjs(),
json()
]
},
{
Expand All @@ -40,7 +42,8 @@ export default [
resolve(resolveOpts),
babel(babelOpts),
flowEntry({ types: './lib/flow/types.js' }),
mjs()
mjs(),
json()
]
}
]
9 changes: 9 additions & 0 deletions src/core/account/account-pixie.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { AccountState, initialCustomTokens } from './account-reducer'
import {
loadBuiltinTokens,
loadCustomTokens,
migrateEnabledTokensToCustomTokens,
saveCustomTokens
} from './custom-tokens'

Expand Down Expand Up @@ -103,6 +104,14 @@ const accountPixie: TamePixie<AccountProps> = combinePixies({
await loadAllFiles()
log.warn('Login: loaded files')

// Migrate enabled tokens from builtinTokens to customTokens
await migrateEnabledTokensToCustomTokens(ai, accountId).catch(
error => {
log.warn('Migration failed:', error)
}
)
log.warn('Login: migrated enabled tokens')

// Create the API object:
input.onOutput(makeAccountApi(ai, accountId))
log.warn('Login: complete')
Expand Down
Loading