Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-03-21 22:58:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolved merge conflict

Browse source
This commit is contained in:
ryleedavis 2023-07-21 11:34:14 -06:00
parent 1adc5f23a4
commit 269f47d6f4
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/models/isar/stack_theme.dart
View file

@ -2386,15 +2386,14 @@ class ThemeAssetsV3 implements IThemeAssets {
Map<Coin, String>? _coinCardImages; Map<Coin, String>? _coinCardImages;
late final String? coinCardImagesString; late final String? coinCardImagesString;
@ignore @ignore
Map<Coin, String>? get coinCardFavoritesImages => Map<Coin, String>? get coinCardFavoritesImages =>
_coinCardFavoritesImages ??= coinCardFavoritesImagesString == null _coinCardFavoritesImages ??= coinCardFavoritesImagesString == null
? null ? null
: parseCoinAssetsString( : parseCoinAssetsString(
coinCardFavoritesImagesString!, coinCardFavoritesImagesString!,
placeHolder: coinPlaceholder, placeHolder: coinPlaceholder,
); );
@ignore @ignore
Map<Coin, String>? _coinCardFavoritesImages; Map<Coin, String>? _coinCardFavoritesImages;
@Name("otherStringParam1") @Name("otherStringParam1")
@ -2467,7 +2466,6 @@ class ThemeAssetsV3 implements IThemeAssets {
..backgroundRelative = json["background"] is String ..backgroundRelative = json["background"] is String
? "$themeId/assets/${json["background"] as String}" ? "$themeId/assets/${json["background"] as String}"
: null : null
..dummy1 = null
..dummy2 = null ..dummy2 = null
..dummy3 = null; ..dummy3 = null;
} }