Merge branch 'develop' into remove-locked-aspect-ratio

.buildkite/pipeline.yml

@@ -1,8 +1,8 @@
 steps:
   - label: ":nix::point_right::pipeline:"
     command: |
-      export NIX_PATH="nixpkgs=$(nix eval --raw '(import nix/sources.nix).nixpkgs')"
-      nix eval --json '(import ./.buildkite { pipeline = ./.buildkite/pipeline.nix; })' \
+      export NIX_PATH="nixpkgs=$(nix eval --impure --raw --expr '(import nix/sources.nix).nixpkgs')"
+      nix eval --impure --json --expr '(import ./.buildkite { pipeline = ./.buildkite/pipeline.nix; })' \
       | buildkite-agent pipeline upload --no-interpolation
 
     agents:

src/App.tsx

@@ -2,15 +2,15 @@ import classnames from 'classnames'
 import React, {useEffect} from 'react'
 import _ from 'lodash/fp'
 import {SplashScreen} from './SplashScreen'
-import {
-  BackendState,
-  defaultBackendData,
-  migrationsForBackendData,
-  StoreBackendData,
-} from './common/backend-state'
+import {BackendState, defaultBackendData, StoreBackendData} from './common/backend-state'
 import {rendererLog} from './common/logger'
 import {createPersistentStore, Store} from './common/store'
-import {WalletState, defaultWalletData, StoreWalletData} from './common/wallet-state'
+import {
+  WalletState,
+  defaultWalletData,
+  StoreWalletData,
+  migrationsForWalletData,
+} from './common/wallet-state'
 import {config} from './config/renderer'
 import {Router} from './layout/Router'
 import {Sidebar} from './layout/Sidebar'
@@ -50,7 +50,7 @@ const mergeMigrations = _.mergeAllWith(
   },
 )
 
-const migrations = mergeMigrations([migrationsForBackendData])
+const migrations = mergeMigrations([migrationsForWalletData])
 const store = createPersistentStore({defaults: defaultData, migrations})
 
 const AppContent: React.FC = () => {

src/common/backend-state.ts

@@ -64,9 +64,3 @@ function useBackendState(params?: Partial<BackendStateParams>): BackendState {
 }
 
 export const BackendState = createContainer(useBackendState)
-
-export const migrationsForBackendData = {
-  '0.1.2-mantis-wallet': (store: Store<StoreBackendData>): void => {
-    store.set('networkName', config.networkName)
-  },
-}

src/common/store.ts

@@ -84,10 +84,11 @@ export function createPersistentStore<T extends object>(
     key: K1 | [K1, K2] | [K1, K2, K3],
     value: T[K1] | T[K1][K2] | T[K1][K2][K3],
   ): void {
-    if (_.isArray(key)) {
-      store.set(key.join('.'), value)
+    const path = _.isArray(key) ? key.join('.') : key
+    if (value === undefined) {
+      store.delete(path)
     } else {
-      store.set(key, value)
+      store.set(path, value)
     }
   }
 

src/common/wallet-state.ts

@@ -679,4 +679,10 @@ function useWalletState(initialState?: Partial<WalletStateParams>): WalletData {
   }
 }
 
+export const migrationsForWalletData = {
+  '0.1.0-mantis-wallet': (store: Store<StoreWalletData>): void => {
+    store.set(['wallet', 'txHistory'], {})
+  },
+}
+
 export const WalletState = createContainer(useWalletState)

src/wallets/history/HistoryStore.ts

@@ -5,7 +5,7 @@ import {StoreWalletData} from '../../common/wallet-state'
 import {NetworkName} from '../../config/type'
 
 export interface TxHistoryStoreData {
-  txHistory: Record<NetworkName, StoredHistory.StoredHistory | undefined>
+  txHistory: Record<NetworkName, StoredHistory.StoredHistory>
 }
 export const defaultTxHistoryStoreData: TxHistoryStoreData = {
   txHistory: {},