diff --git a/api/defaults.go b/api/defaults.go index 1b6f81a6c..26ab03018 100644 --- a/api/defaults.go +++ b/api/defaults.go @@ -93,8 +93,6 @@ func defaultSettings(generatedAccountInfo generator.GeneratedAccountInfo, derive s.TokenGroupByCommunity = false s.ShowCommunityAssetWhenSendingTokens = true s.DisplayAssetsBelowBalance = false - // NOTE 9 decimals of precision. Default value is translated to 0.1 - s.DisplayAssetsBelowBalanceThreshold = 100000000 return s, nil } diff --git a/multiaccounts/settings/database.go b/multiaccounts/settings/database.go index 68f55791c..879288a76 100644 --- a/multiaccounts/settings/database.go +++ b/multiaccounts/settings/database.go @@ -145,14 +145,11 @@ INSERT INTO settings ( omit_transfers_history_scan, mnemonic_was_not_shown, wallet_token_preferences_group_by_community, - wallet_show_community_asset_when_sending_tokens, - wallet_display_assets_below_balance, - wallet_display_assets_below_balance_threshold, wallet_collectible_preferences_group_by_collection, wallet_collectible_preferences_group_by_community ) VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?, -?,?,?,?,?,?,?,?,?,'id',?,?,?,?,?,?,?,?,?,?,?,?)`, +?,?,?,?,?,?,?,?,?,'id',?,?,?,?,?,?,?,?,?)`, s.Address, s.Currency, s.CurrentNetwork, @@ -183,9 +180,6 @@ INSERT INTO settings ( s.OmitTransfersHistoryScan, s.MnemonicWasNotShown, s.TokenGroupByCommunity, - s.ShowCommunityAssetWhenSendingTokens, - s.DisplayAssetsBelowBalance, - s.DisplayAssetsBelowBalanceThreshold, s.CollectibleGroupByCollection, s.CollectibleGroupByCommunity, ) diff --git a/multiaccounts/settings/database_test.go b/multiaccounts/settings/database_test.go index df7f93a4c..93e9244ac 100644 --- a/multiaccounts/settings/database_test.go +++ b/multiaccounts/settings/database_test.go @@ -23,28 +23,31 @@ var ( networks = json.RawMessage("{}") settings = Settings{ - Address: types.HexToAddress("0xdC540f3745Ff2964AFC1171a5A0DD726d1F6B472"), - AnonMetricsShouldSend: false, - CurrentNetwork: "mainnet_rpc", - DappsAddress: types.HexToAddress("0xD1300f99fDF7346986CbC766903245087394ecd0"), - InstallationID: "d3efcff6-cffa-560e-a547-21d3858cbc51", - KeyUID: "0x4e8129f3edfc004875be17bf468a784098a9f69b53c095be1f52deff286935ab", - BackupEnabled: true, - LatestDerivedPath: 0, - Name: "Jittery Cornflowerblue Kingbird", - Networks: &networks, - PhotoPath: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAIAAACRXR/mAAAAjklEQVR4nOzXwQmFMBAAUZXUYh32ZB32ZB02sxYQQSZGsod55/91WFgSS0RM+SyjA56ZRZhFmEWYRRT6h+M6G16zrxv6fdJpmUWYRbxsYr13dKfanpN0WmYRZhGzXz6AWYRZRIfbaX26fT9Jk07LLMIsosPt9I/dTDotswizCG+nhFmEWYRZhFnEHQAA///z1CFkYamgfQAAAABJRU5ErkJggg==", - PreviewPrivacy: false, - PublicKey: "0x04211fe0f69772ecf7eb0b5bfc7678672508a9fb01f2d699096f0d59ef7fe1a0cb1e648a80190db1c0f5f088872444d846f2956d0bd84069f3f9f69335af852ac0", - SigningPhrase: "yurt joey vibe", - SendPushNotifications: true, - ProfilePicturesShowTo: ProfilePicturesShowToContactsOnly, - ProfilePicturesVisibility: ProfilePicturesVisibilityContactsOnly, - DefaultSyncPeriod: 777600, - UseMailservers: true, - LinkPreviewRequestEnabled: true, - SendStatusUpdates: true, - WalletRootAddress: types.HexToAddress("0x3B591fd819F86D0A6a2EF2Bcb94f77807a7De1a6")} + Address: types.HexToAddress("0xdC540f3745Ff2964AFC1171a5A0DD726d1F6B472"), + AnonMetricsShouldSend: false, + CurrentNetwork: "mainnet_rpc", + DappsAddress: types.HexToAddress("0xD1300f99fDF7346986CbC766903245087394ecd0"), + InstallationID: "d3efcff6-cffa-560e-a547-21d3858cbc51", + KeyUID: "0x4e8129f3edfc004875be17bf468a784098a9f69b53c095be1f52deff286935ab", + BackupEnabled: true, + LatestDerivedPath: 0, + Name: "Jittery Cornflowerblue Kingbird", + Networks: &networks, + PhotoPath: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAIAAACRXR/mAAAAjklEQVR4nOzXwQmFMBAAUZXUYh32ZB32ZB02sxYQQSZGsod55/91WFgSS0RM+SyjA56ZRZhFmEWYRRT6h+M6G16zrxv6fdJpmUWYRbxsYr13dKfanpN0WmYRZhGzXz6AWYRZRIfbaX26fT9Jk07LLMIsosPt9I/dTDotswizCG+nhFmEWYRZhFnEHQAA///z1CFkYamgfQAAAABJRU5ErkJggg==", + PreviewPrivacy: false, + PublicKey: "0x04211fe0f69772ecf7eb0b5bfc7678672508a9fb01f2d699096f0d59ef7fe1a0cb1e648a80190db1c0f5f088872444d846f2956d0bd84069f3f9f69335af852ac0", + SigningPhrase: "yurt joey vibe", + SendPushNotifications: true, + ProfilePicturesShowTo: ProfilePicturesShowToContactsOnly, + ProfilePicturesVisibility: ProfilePicturesVisibilityContactsOnly, + DefaultSyncPeriod: 777600, + UseMailservers: true, + LinkPreviewRequestEnabled: true, + SendStatusUpdates: true, + WalletRootAddress: types.HexToAddress("0x3B591fd819F86D0A6a2EF2Bcb94f77807a7De1a6"), + DisplayAssetsBelowBalanceThreshold: int64(100000000), + DisplayAssetsBelowBalance: false, + ShowCommunityAssetWhenSendingTokens: true} ) func setupTestDB(t *testing.T) (*Database, func()) {