From 58364a6c8818ec066621f164105574d9687bbe9c Mon Sep 17 00:00:00 2001 From: likho Date: Wed, 26 Jul 2023 16:19:40 +0200 Subject: [PATCH] Update themes, use PUBNET instead of testnet --- assets/default_themes/dark.zip | Bin 659920 -> 659195 bytes assets/default_themes/light.zip | Bin 607924 -> 607086 bytes lib/models/isar/stack_theme.dart | 756 +++++------------- .../coins/stellar/stellar_wallet.dart | 26 +- lib/utilities/default_nodes.dart | 2 +- 5 files changed, 219 insertions(+), 565 deletions(-) diff --git a/assets/default_themes/dark.zip b/assets/default_themes/dark.zip index 9f4e888ef9d1050ec9485dd9c0276f44fa129d1b..2d8b4528620fd78008303fc5e513c3bfa475aa83 100644 GIT binary patch delta 6748 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 P%)tNCT>An(xuX6LV5v%q delta 7535 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 diff --git a/assets/default_themes/light.zip b/assets/default_themes/light.zip index 75f61b69262ba09089de62b29970a3a2d818b857..be20673a962761be17027b9a16c06716d44bc5a7 100644 GIT binary patch delta 4934 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 _accentColorBlue ??= Color( - accentColorBlueInt, - ); + accentColorBlueInt, + ); @ignore Color? _accentColorBlue; late final int accentColorBlueInt; @@ -141,8 +141,8 @@ class StackTheme { @ignore Color get accentColorGreen => _accentColorGreen ??= Color( - accentColorGreenInt, - ); + accentColorGreenInt, + ); @ignore Color? _accentColorGreen; late final int accentColorGreenInt; @@ -151,8 +151,8 @@ class StackTheme { @ignore Color get accentColorYellow => _accentColorYellow ??= Color( - accentColorYellowInt, - ); + accentColorYellowInt, + ); @ignore Color? _accentColorYellow; late final int accentColorYellowInt; @@ -161,8 +161,8 @@ class StackTheme { @ignore Color get accentColorRed => _accentColorRed ??= Color( - accentColorRedInt, - ); + accentColorRedInt, + ); @ignore Color? _accentColorRed; late final int accentColorRedInt; @@ -171,8 +171,8 @@ class StackTheme { @ignore Color get accentColorOrange => _accentColorOrange ??= Color( - accentColorOrangeInt, - ); + accentColorOrangeInt, + ); @ignore Color? _accentColorOrange; late final int accentColorOrangeInt; @@ -181,8 +181,8 @@ class StackTheme { @ignore Color get accentColorDark => _accentColorDark ??= Color( - accentColorDarkInt, - ); + accentColorDarkInt, + ); @ignore Color? _accentColorDark; late final int accentColorDarkInt; @@ -191,8 +191,8 @@ class StackTheme { @ignore Color get shadow => _shadow ??= Color( - shadowInt, - ); + shadowInt, + ); @ignore Color? _shadow; late final int shadowInt; @@ -201,8 +201,8 @@ class StackTheme { @ignore Color get textDark => _textDark ??= Color( - textDarkInt, - ); + textDarkInt, + ); @ignore Color? _textDark; late final int textDarkInt; @@ -211,8 +211,8 @@ class StackTheme { @ignore Color get textDark2 => _textDark2 ??= Color( - textDark2Int, - ); + textDark2Int, + ); @ignore Color? _textDark2; late final int textDark2Int; @@ -221,8 +221,8 @@ class StackTheme { @ignore Color get textDark3 => _textDark3 ??= Color( - textDark3Int, - ); + textDark3Int, + ); @ignore Color? _textDark3; late final int textDark3Int; @@ -231,8 +231,8 @@ class StackTheme { @ignore Color get textSubtitle1 => _textSubtitle1 ??= Color( - textSubtitle1Int, - ); + textSubtitle1Int, + ); @ignore Color? _textSubtitle1; late final int textSubtitle1Int; @@ -241,8 +241,8 @@ class StackTheme { @ignore Color get textSubtitle2 => _textSubtitle2 ??= Color( - textSubtitle2Int, - ); + textSubtitle2Int, + ); @ignore Color? _textSubtitle2; late final int textSubtitle2Int; @@ -251,8 +251,8 @@ class StackTheme { @ignore Color get textSubtitle3 => _textSubtitle3 ??= Color( - textSubtitle3Int, - ); + textSubtitle3Int, + ); @ignore Color? _textSubtitle3; late final int textSubtitle3Int; @@ -261,8 +261,8 @@ class StackTheme { @ignore Color get textSubtitle4 => _textSubtitle4 ??= Color( - textSubtitle4Int, - ); + textSubtitle4Int, + ); @ignore Color? _textSubtitle4; late final int textSubtitle4Int; @@ -271,8 +271,8 @@ class StackTheme { @ignore Color get textSubtitle5 => _textSubtitle5 ??= Color( - textSubtitle5Int, - ); + textSubtitle5Int, + ); @ignore Color? _textSubtitle5; late final int textSubtitle5Int; @@ -281,8 +281,8 @@ class StackTheme { @ignore Color get textSubtitle6 => _textSubtitle6 ??= Color( - textSubtitle6Int, - ); + textSubtitle6Int, + ); @ignore Color? _textSubtitle6; late final int textSubtitle6Int; @@ -291,8 +291,8 @@ class StackTheme { @ignore Color get textWhite => _textWhite ??= Color( - textWhiteInt, - ); + textWhiteInt, + ); @ignore Color? _textWhite; late final int textWhiteInt; @@ -301,8 +301,8 @@ class StackTheme { @ignore Color get textFavoriteCard => _textFavoriteCard ??= Color( - textFavoriteCardInt, - ); + textFavoriteCardInt, + ); @ignore Color? _textFavoriteCard; late final int textFavoriteCardInt; @@ -311,8 +311,8 @@ class StackTheme { @ignore Color get textError => _textError ??= Color( - textErrorInt, - ); + textErrorInt, + ); @ignore Color? _textError; late final int textErrorInt; @@ -321,8 +321,8 @@ class StackTheme { @ignore Color get textRestore => _textRestore ??= Color( - textRestoreInt, - ); + textRestoreInt, + ); @ignore Color? _textRestore; late final int textRestoreInt; @@ -331,8 +331,8 @@ class StackTheme { @ignore Color get buttonBackPrimary => _buttonBackPrimary ??= Color( - buttonBackPrimaryInt, - ); + buttonBackPrimaryInt, + ); @ignore Color? _buttonBackPrimary; late final int buttonBackPrimaryInt; @@ -341,8 +341,8 @@ class StackTheme { @ignore Color get buttonBackSecondary => _buttonBackSecondary ??= Color( - buttonBackSecondaryInt, - ); + buttonBackSecondaryInt, + ); @ignore Color? _buttonBackSecondary; late final int buttonBackSecondaryInt; @@ -351,8 +351,8 @@ class StackTheme { @ignore Color get buttonBackPrimaryDisabled => _buttonBackPrimaryDisabled ??= Color( - buttonBackPrimaryDisabledInt, - ); + buttonBackPrimaryDisabledInt, + ); @ignore Color? _buttonBackPrimaryDisabled; late final int buttonBackPrimaryDisabledInt; @@ -372,8 +372,8 @@ class StackTheme { @ignore Color get buttonBackBorder => _buttonBackBorder ??= Color( - buttonBackBorderInt, - ); + buttonBackBorderInt, + ); @ignore Color? _buttonBackBorder; late final int buttonBackBorderInt; @@ -382,8 +382,8 @@ class StackTheme { @ignore Color get buttonBackBorderDisabled => _buttonBackBorderDisabled ??= Color( - buttonBackBorderDisabledInt, - ); + buttonBackBorderDisabledInt, + ); @ignore Color? _buttonBackBorderDisabled; late final int buttonBackBorderDisabledInt; @@ -392,8 +392,8 @@ class StackTheme { @ignore Color get buttonBackBorderSecondary => _buttonBackBorderSecondary ??= Color( - buttonBackBorderSecondaryInt, - ); + buttonBackBorderSecondaryInt, + ); @ignore Color? _buttonBackBorderSecondary; late final int buttonBackBorderSecondaryInt; @@ -413,8 +413,8 @@ class StackTheme { @ignore Color get numberBackDefault => _numberBackDefault ??= Color( - numberBackDefaultInt, - ); + numberBackDefaultInt, + ); @ignore Color? _numberBackDefault; late final int numberBackDefaultInt; @@ -423,8 +423,8 @@ class StackTheme { @ignore Color get numpadBackDefault => _numpadBackDefault ??= Color( - numpadBackDefaultInt, - ); + numpadBackDefaultInt, + ); @ignore Color? _numpadBackDefault; late final int numpadBackDefaultInt; @@ -433,8 +433,8 @@ class StackTheme { @ignore Color get bottomNavBack => _bottomNavBack ??= Color( - bottomNavBackInt, - ); + bottomNavBackInt, + ); @ignore Color? _bottomNavBack; late final int bottomNavBackInt; @@ -443,8 +443,8 @@ class StackTheme { @ignore Color get buttonTextPrimary => _buttonTextPrimary ??= Color( - buttonTextPrimaryInt, - ); + buttonTextPrimaryInt, + ); @ignore Color? _buttonTextPrimary; late final int buttonTextPrimaryInt; @@ -453,8 +453,8 @@ class StackTheme { @ignore Color get buttonTextSecondary => _buttonTextSecondary ??= Color( - buttonTextSecondaryInt, - ); + buttonTextSecondaryInt, + ); @ignore Color? _buttonTextSecondary; late final int buttonTextSecondaryInt; @@ -463,8 +463,8 @@ class StackTheme { @ignore Color get buttonTextPrimaryDisabled => _buttonTextPrimaryDisabled ??= Color( - buttonTextPrimaryDisabledInt, - ); + buttonTextPrimaryDisabledInt, + ); @ignore Color? _buttonTextPrimaryDisabled; late final int buttonTextPrimaryDisabledInt; @@ -1498,8 +1498,6 @@ class StackTheme { // cheat build runner into adding this at end of property id list in isar @Name("zAssetsV3") late final ThemeAssetsV3? assetsV3; - @Name("zAssetsV4") - late final ThemeAssetsV4? assetsV4; @ignore IThemeAssets get assets => assetsV3 ?? assetsV2 ?? assetsV1!; @@ -1519,24 +1517,18 @@ class StackTheme { ..version = version ..assetsV1 = version == 1 ? ThemeAssets.fromJson( - json: Map.from(json["assets"] as Map), - themeId: json["id"] as String, - ) + json: Map.from(json["assets"] as Map), + themeId: json["id"] as String, + ) : null ..assetsV2 = version == 2 ? ThemeAssetsV2.fromJson( - json: Map.from(json["assets"] as Map), - themeId: json["id"] as String, - ) + json: Map.from(json["assets"] as Map), + themeId: json["id"] as String, + ) : null ..assetsV3 = version >= 3 ? ThemeAssetsV3.fromJson( - json: Map.from(json["assets"] as Map), - themeId: json["id"] as String, - ) - : null - ..assetsV4 = version >= 4 - ? ThemeAssetsV4.fromJson( json: Map.from(json["assets"] as Map), themeId: json["id"] as String, ) @@ -1546,96 +1538,96 @@ class StackTheme { ..brightnessString = json["brightness"] as String ..backgroundInt = parseColor(json["colors"]["background"] as String) ..backgroundAppBarInt = - parseColor(json["colors"]["background_app_bar"] as String) + parseColor(json["colors"]["background_app_bar"] as String) ..gradientBackgroundString = json["colors"]["gradients"] != null ? jsonEncode(json["colors"]["gradients"]) : null ..standardBoxShadowString = - jsonEncode(json["colors"]["box_shadows"]["standard"] as Map) + jsonEncode(json["colors"]["box_shadows"]["standard"] as Map) ..homeViewButtonBarBoxShadowString = - json["colors"]["box_shadows"]["home_view_button_bar"] == null - ? null - : jsonEncode( - json["colors"]["box_shadows"]["home_view_button_bar"] as Map) + json["colors"]["box_shadows"]["home_view_button_bar"] == null + ? null + : jsonEncode( + json["colors"]["box_shadows"]["home_view_button_bar"] as Map) ..coinColorsJsonString = jsonEncode(json["colors"]['coin'] as Map) ..overlayInt = parseColor(json["colors"]["overlay"] as String) ..accentColorBlueInt = - parseColor(json["colors"]["accent_color_blue"] as String) + parseColor(json["colors"]["accent_color_blue"] as String) ..accentColorGreenInt = - parseColor(json["colors"]["accent_color_green"] as String) + parseColor(json["colors"]["accent_color_green"] as String) ..accentColorYellowInt = - parseColor(json["colors"]["accent_color_yellow"] as String) + parseColor(json["colors"]["accent_color_yellow"] as String) ..accentColorRedInt = - parseColor(json["colors"]["accent_color_red"] as String) + parseColor(json["colors"]["accent_color_red"] as String) ..accentColorOrangeInt = - parseColor(json["colors"]["accent_color_orange"] as String) + parseColor(json["colors"]["accent_color_orange"] as String) ..accentColorDarkInt = - parseColor(json["colors"]["accent_color_dark"] as String) + parseColor(json["colors"]["accent_color_dark"] as String) ..shadowInt = parseColor(json["colors"]["shadow"] as String) ..textDarkInt = parseColor(json["colors"]["text_dark_one"] as String) ..textDark2Int = parseColor(json["colors"]["text_dark_two"] as String) ..textDark3Int = parseColor(json["colors"]["text_dark_three"] as String) ..textWhiteInt = parseColor(json["colors"]["text_white"] as String) ..textFavoriteCardInt = - parseColor(json["colors"]["text_favorite"] as String) + parseColor(json["colors"]["text_favorite"] as String) ..textErrorInt = parseColor(json["colors"]["text_error"] as String) ..textRestoreInt = parseColor(json["colors"]["text_restore"] as String) ..buttonBackPrimaryInt = - parseColor(json["colors"]["button_back_primary"] as String) + parseColor(json["colors"]["button_back_primary"] as String) ..buttonBackSecondaryInt = - parseColor(json["colors"]["button_back_secondary"] as String) + parseColor(json["colors"]["button_back_secondary"] as String) ..buttonBackPrimaryDisabledInt = - parseColor(json["colors"]["button_back_primary_disabled"] as String) + parseColor(json["colors"]["button_back_primary_disabled"] as String) ..buttonBackSecondaryDisabledInt = - parseColor(json["colors"]["button_back_secondary_disabled"] as String) + parseColor(json["colors"]["button_back_secondary_disabled"] as String) ..buttonBackBorderInt = - parseColor(json["colors"]["button_back_border"] as String) + parseColor(json["colors"]["button_back_border"] as String) ..buttonBackBorderDisabledInt = - parseColor(json["colors"]["button_back_border_disabled"] as String) + parseColor(json["colors"]["button_back_border_disabled"] as String) ..buttonBackBorderSecondaryInt = - parseColor(json["colors"]["button_back_border_secondary"] as String) + parseColor(json["colors"]["button_back_border_secondary"] as String) ..buttonBackBorderSecondaryDisabledInt = parseColor( json["colors"]["button_back_border_secondary_disabled"] as String) ..numberBackDefaultInt = - parseColor(json["colors"]["number_back_default"] as String) + parseColor(json["colors"]["number_back_default"] as String) ..numpadBackDefaultInt = - parseColor(json["colors"]["numpad_back_default"] as String) + parseColor(json["colors"]["numpad_back_default"] as String) ..bottomNavBackInt = - parseColor(json["colors"]["bottom_nav_back"] as String) + parseColor(json["colors"]["bottom_nav_back"] as String) ..textSubtitle1Int = - parseColor(json["colors"]["text_subtitle_one"] as String) + parseColor(json["colors"]["text_subtitle_one"] as String) ..textSubtitle2Int = - parseColor(json["colors"]["text_subtitle_two"] as String) + parseColor(json["colors"]["text_subtitle_two"] as String) ..textSubtitle3Int = - parseColor(json["colors"]["text_subtitle_three"] as String) + parseColor(json["colors"]["text_subtitle_three"] as String) ..textSubtitle4Int = - parseColor(json["colors"]["text_subtitle_four"] as String) + parseColor(json["colors"]["text_subtitle_four"] as String) ..textSubtitle5Int = - parseColor(json["colors"]["text_subtitle_five"] as String) + parseColor(json["colors"]["text_subtitle_five"] as String) ..textSubtitle6Int = - parseColor(json["colors"]["text_subtitle_six"] as String) + parseColor(json["colors"]["text_subtitle_six"] as String) ..buttonTextPrimaryInt = - parseColor(json["colors"]["button_text_primary"] as String) + parseColor(json["colors"]["button_text_primary"] as String) ..buttonTextSecondaryInt = - parseColor(json["colors"]["button_text_secondary"] as String) + parseColor(json["colors"]["button_text_secondary"] as String) ..buttonTextPrimaryDisabledInt = - parseColor(json["colors"]["button_text_primary_disabled"] as String) + parseColor(json["colors"]["button_text_primary_disabled"] as String) ..buttonTextSecondaryDisabledInt = - parseColor(json["colors"]["button_text_secondary_disabled"] as String) + parseColor(json["colors"]["button_text_secondary_disabled"] as String) ..buttonTextBorderInt = - parseColor(json["colors"]["button_text_border"] as String) + parseColor(json["colors"]["button_text_border"] as String) ..buttonTextDisabledInt = - parseColor(json["colors"]["button_text_disabled"] as String) + parseColor(json["colors"]["button_text_disabled"] as String) ..buttonTextBorderlessInt = - parseColor(json["colors"]["button_text_borderless"] as String) + parseColor(json["colors"]["button_text_borderless"] as String) ..buttonTextBorderlessDisabledInt = parseColor( json["colors"]["button_text_borderless_disabled"] as String) ..numberTextDefaultInt = - parseColor(json["colors"]["number_text_default"] as String) + parseColor(json["colors"]["number_text_default"] as String) ..numpadTextDefaultInt = - parseColor(json["colors"]["numpad_text_default"] as String) + parseColor(json["colors"]["numpad_text_default"] as String) ..bottomNavTextInt = - parseColor(json["colors"]["bottom_nav_text"] as String) + parseColor(json["colors"]["bottom_nav_text"] as String) ..customTextButtonEnabledTextInt = parseColor( json["colors"]["custom_text_button_enabled_text"] as String) ..customTextButtonDisabledTextInt = parseColor( @@ -1643,87 +1635,87 @@ class StackTheme { ..switchBGOnInt = parseColor(json["colors"]["switch_bg_on"] as String) ..switchBGOffInt = parseColor(json["colors"]["switch_bg_off"] as String) ..switchBGDisabledInt = - parseColor(json["colors"]["switch_bg_disabled"] as String) + parseColor(json["colors"]["switch_bg_disabled"] as String) ..switchCircleOnInt = - parseColor(json["colors"]["switch_circle_on"] as String) + parseColor(json["colors"]["switch_circle_on"] as String) ..switchCircleOffInt = - parseColor(json["colors"]["switch_circle_off"] as String) + parseColor(json["colors"]["switch_circle_off"] as String) ..switchCircleDisabledInt = - parseColor(json["colors"]["switch_circle_disabled"] as String) + parseColor(json["colors"]["switch_circle_disabled"] as String) ..stepIndicatorBGCheckInt = - parseColor(json["colors"]["step_indicator_bg_check"] as String) + parseColor(json["colors"]["step_indicator_bg_check"] as String) ..stepIndicatorBGNumberInt = - parseColor(json["colors"]["step_indicator_bg_number"] as String) + parseColor(json["colors"]["step_indicator_bg_number"] as String) ..stepIndicatorBGInactiveInt = - parseColor(json["colors"]["step_indicator_bg_inactive"] as String) + parseColor(json["colors"]["step_indicator_bg_inactive"] as String) ..stepIndicatorBGLinesInt = - parseColor(json["colors"]["step_indicator_bg_lines"] as String) + parseColor(json["colors"]["step_indicator_bg_lines"] as String) ..stepIndicatorBGLinesInactiveInt = parseColor( json["colors"]["step_indicator_bg_lines_inactive"] as String) ..stepIndicatorIconTextInt = - parseColor(json["colors"]["step_indicator_icon_text"] as String) + parseColor(json["colors"]["step_indicator_icon_text"] as String) ..stepIndicatorIconNumberInt = - parseColor(json["colors"]["step_indicator_icon_number"] as String) + parseColor(json["colors"]["step_indicator_icon_number"] as String) ..stepIndicatorIconInactiveInt = - parseColor(json["colors"]["step_indicator_icon_inactive"] as String) + parseColor(json["colors"]["step_indicator_icon_inactive"] as String) ..checkboxBGCheckedInt = - parseColor(json["colors"]["checkbox_bg_checked"] as String) + parseColor(json["colors"]["checkbox_bg_checked"] as String) ..checkboxBorderEmptyInt = - parseColor(json["colors"]["checkbox_border_empty"] as String) + parseColor(json["colors"]["checkbox_border_empty"] as String) ..checkboxBGDisabledInt = - parseColor(json["colors"]["checkbox_bg_disabled"] as String) + parseColor(json["colors"]["checkbox_bg_disabled"] as String) ..checkboxIconCheckedInt = - parseColor(json["colors"]["checkbox_icon_checked"] as String) + parseColor(json["colors"]["checkbox_icon_checked"] as String) ..checkboxIconDisabledInt = - parseColor(json["colors"]["checkbox_icon_disabled"] as String) + parseColor(json["colors"]["checkbox_icon_disabled"] as String) ..checkboxTextLabelInt = - parseColor(json["colors"]["checkbox_text_label"] as String) + parseColor(json["colors"]["checkbox_text_label"] as String) ..snackBarBackSuccessInt = - parseColor(json["colors"]["snack_bar_back_success"] as String) + parseColor(json["colors"]["snack_bar_back_success"] as String) ..snackBarBackErrorInt = - parseColor(json["colors"]["snack_bar_back_error"] as String) + parseColor(json["colors"]["snack_bar_back_error"] as String) ..snackBarBackInfoInt = - parseColor(json["colors"]["snack_bar_back_info"] as String) + parseColor(json["colors"]["snack_bar_back_info"] as String) ..snackBarTextSuccessInt = - parseColor(json["colors"]["snack_bar_text_success"] as String) + parseColor(json["colors"]["snack_bar_text_success"] as String) ..snackBarTextErrorInt = - parseColor(json["colors"]["snack_bar_text_error"] as String) + parseColor(json["colors"]["snack_bar_text_error"] as String) ..snackBarTextInfoInt = - parseColor(json["colors"]["snack_bar_text_info"] as String) + parseColor(json["colors"]["snack_bar_text_info"] as String) ..bottomNavIconBackInt = - parseColor(json["colors"]["bottom_nav_icon_back"] as String) + parseColor(json["colors"]["bottom_nav_icon_back"] as String) ..bottomNavIconIconInt = - parseColor(json["colors"]["bottom_nav_icon_icon"] as String) + parseColor(json["colors"]["bottom_nav_icon_icon"] as String) ..bottomNavIconIconHighlightedInt = parseColor( json["colors"]["bottom_nav_icon_icon_highlighted"] as String) ..topNavIconPrimaryInt = - parseColor(json["colors"]["top_nav_icon_primary"] as String) + parseColor(json["colors"]["top_nav_icon_primary"] as String) ..topNavIconGreenInt = - parseColor(json["colors"]["top_nav_icon_green"] as String) + parseColor(json["colors"]["top_nav_icon_green"] as String) ..topNavIconYellowInt = - parseColor(json["colors"]["top_nav_icon_yellow"] as String) + parseColor(json["colors"]["top_nav_icon_yellow"] as String) ..topNavIconRedInt = - parseColor(json["colors"]["top_nav_icon_red"] as String) + parseColor(json["colors"]["top_nav_icon_red"] as String) ..settingsIconBackInt = - parseColor(json["colors"]["settings_icon_back"] as String) + parseColor(json["colors"]["settings_icon_back"] as String) ..settingsIconIconInt = - parseColor(json["colors"]["settings_icon_icon"] as String) + parseColor(json["colors"]["settings_icon_icon"] as String) ..settingsIconBack2Int = - parseColor(json["colors"]["settings_icon_back_two"] as String) + parseColor(json["colors"]["settings_icon_back_two"] as String) ..settingsIconElementInt = - parseColor(json["colors"]["settings_icon_element"] as String) + parseColor(json["colors"]["settings_icon_element"] as String) ..textFieldActiveBGInt = - parseColor(json["colors"]["text_field_active_bg"] as String) + parseColor(json["colors"]["text_field_active_bg"] as String) ..textFieldDefaultBGInt = - parseColor(json["colors"]["text_field_default_bg"] as String) + parseColor(json["colors"]["text_field_default_bg"] as String) ..textFieldErrorBGInt = - parseColor(json["colors"]["text_field_error_bg"] as String) + parseColor(json["colors"]["text_field_error_bg"] as String) ..textFieldSuccessBGInt = - parseColor(json["colors"]["text_field_success_bg"] as String) + parseColor(json["colors"]["text_field_success_bg"] as String) ..textFieldErrorBorderInt = - parseColor(json["colors"]["text_field_error_border"] as String) + parseColor(json["colors"]["text_field_error_border"] as String) ..textFieldSuccessBorderInt = - parseColor(json["colors"]["text_field_success_border"] as String) + parseColor(json["colors"]["text_field_success_border"] as String) ..textFieldActiveSearchIconLeftInt = parseColor( json["colors"]["text_field_active_search_icon_left"] as String) ..textFieldDefaultSearchIconLeftInt = parseColor( @@ -1733,19 +1725,19 @@ class StackTheme { ..textFieldSuccessSearchIconLeftInt = parseColor( json["colors"]["text_field_success_search_icon_left"] as String) ..textFieldActiveTextInt = - parseColor(json["colors"]["text_field_active_text"] as String) + parseColor(json["colors"]["text_field_active_text"] as String) ..textFieldDefaultTextInt = - parseColor(json["colors"]["text_field_default_text"] as String) + parseColor(json["colors"]["text_field_default_text"] as String) ..textFieldErrorTextInt = - parseColor(json["colors"]["text_field_error_text"] as String) + parseColor(json["colors"]["text_field_error_text"] as String) ..textFieldSuccessTextInt = - parseColor(json["colors"]["text_field_success_text"] as String) + parseColor(json["colors"]["text_field_success_text"] as String) ..textFieldActiveLabelInt = - parseColor(json["colors"]["text_field_active_label"] as String) + parseColor(json["colors"]["text_field_active_label"] as String) ..textFieldErrorLabelInt = - parseColor(json["colors"]["text_field_error_label"] as String) + parseColor(json["colors"]["text_field_error_label"] as String) ..textFieldSuccessLabelInt = - parseColor(json["colors"]["text_field_success_label"] as String) + parseColor(json["colors"]["text_field_success_label"] as String) ..textFieldActiveSearchIconRightInt = parseColor( json["colors"]["text_field_active_search_icon_right"] as String) ..textFieldDefaultSearchIconRightInt = parseColor( @@ -1761,61 +1753,61 @@ class StackTheme { ..settingsItem2ActiveSubInt = parseColor( json["colors"]["settings_item_level_two_active_sub"] as String) ..radioButtonIconBorderInt = - parseColor(json["colors"]["radio_button_icon_border"] as String) + parseColor(json["colors"]["radio_button_icon_border"] as String) ..radioButtonIconBorderDisabledInt = parseColor( json["colors"]["radio_button_icon_border_disabled"] as String) ..radioButtonBorderEnabledInt = - parseColor(json["colors"]["radio_button_border_enabled"] as String) + parseColor(json["colors"]["radio_button_border_enabled"] as String) ..radioButtonBorderDisabledInt = - parseColor(json["colors"]["radio_button_border_disabled"] as String) + parseColor(json["colors"]["radio_button_border_disabled"] as String) ..radioButtonIconCircleInt = - parseColor(json["colors"]["radio_button_icon_circle"] as String) + parseColor(json["colors"]["radio_button_icon_circle"] as String) ..radioButtonIconEnabledInt = - parseColor(json["colors"]["radio_button_icon_enabled"] as String) + parseColor(json["colors"]["radio_button_icon_enabled"] as String) ..radioButtonTextEnabledInt = - parseColor(json["colors"]["radio_button_text_enabled"] as String) + parseColor(json["colors"]["radio_button_text_enabled"] as String) ..radioButtonTextDisabledInt = - parseColor(json["colors"]["radio_button_text_disabled"] as String) + parseColor(json["colors"]["radio_button_text_disabled"] as String) ..radioButtonLabelEnabledInt = - parseColor(json["colors"]["radio_button_label_enabled"] as String) + parseColor(json["colors"]["radio_button_label_enabled"] as String) ..radioButtonLabelDisabledInt = - parseColor(json["colors"]["radio_button_label_disabled"] as String) + parseColor(json["colors"]["radio_button_label_disabled"] as String) ..infoItemBGInt = parseColor(json["colors"]["info_item_bg"] as String) ..infoItemLabelInt = - parseColor(json["colors"]["info_item_label"] as String) + parseColor(json["colors"]["info_item_label"] as String) ..infoItemTextInt = parseColor(json["colors"]["info_item_text"] as String) ..infoItemIconsInt = - parseColor(json["colors"]["info_item_icons"] as String) + parseColor(json["colors"]["info_item_icons"] as String) ..popupBGInt = parseColor(json["colors"]["popup_bg"] as String) ..currencyListItemBGInt = - parseColor(json["colors"]["currency_list_item_bg"] as String) + parseColor(json["colors"]["currency_list_item_bg"] as String) ..stackWalletBGInt = parseColor(json["colors"]["sw_bg"] as String) ..stackWalletMidInt = parseColor(json["colors"]["sw_mid"] as String) ..stackWalletBottomInt = parseColor(json["colors"]["sw_bottom"] as String) ..bottomNavShadowInt = - parseColor(json["colors"]["bottom_nav_shadow"] as String) + parseColor(json["colors"]["bottom_nav_shadow"] as String) ..splashInt = parseColor(json["colors"]["splash"] as String) ..highlightInt = parseColor(json["colors"]["highlight"] as String) ..warningForegroundInt = - parseColor(json["colors"]["warning_foreground"] as String) + parseColor(json["colors"]["warning_foreground"] as String) ..warningBackgroundInt = - parseColor(json["colors"]["warning_background"] as String) + parseColor(json["colors"]["warning_background"] as String) ..loadingOverlayTextColorInt = - parseColor(json["colors"]["loading_overlay_text_color"] as String) + parseColor(json["colors"]["loading_overlay_text_color"] as String) ..myStackContactIconBGInt = - parseColor(json["colors"]["my_stack_contact_icon_bg"] as String) + parseColor(json["colors"]["my_stack_contact_icon_bg"] as String) ..textConfirmTotalAmountInt = - parseColor(json["colors"]["text_confirm_total_amount"] as String) + parseColor(json["colors"]["text_confirm_total_amount"] as String) ..textSelectedWordTableItemInt = - parseColor(json["colors"]["text_selected_word_table_iterm"] as String) + parseColor(json["colors"]["text_selected_word_table_iterm"] as String) ..favoriteStarActiveInt = - parseColor(json["colors"]["favorite_star_active"] as String) + parseColor(json["colors"]["favorite_star_active"] as String) ..favoriteStarInactiveInt = - parseColor(json["colors"]["favorite_star_inactive"] as String) + parseColor(json["colors"]["favorite_star_inactive"] as String) ..rateTypeToggleColorOnInt = - parseColor(json["colors"]["rate_type_toggle_color_on"] as String) + parseColor(json["colors"]["rate_type_toggle_color_on"] as String) ..rateTypeToggleColorOffInt = - parseColor(json["colors"]["rate_type_toggle_color_off"] as String) + parseColor(json["colors"]["rate_type_toggle_color_off"] as String) ..rateTypeToggleDesktopColorOnInt = parseColor( json["colors"]["rate_type_toggle_desktop_color_on"] as String) ..rateTypeToggleDesktopColorOffInt = parseColor( @@ -1823,19 +1815,19 @@ class StackTheme { ..ethTagTextInt = parseColor(json["colors"]["eth_tag_text"] as String) ..ethTagBGInt = parseColor(json["colors"]["eth_tag_bg"] as String) ..ethWalletTagTextInt = - parseColor(json["colors"]["eth_wallet_tag_text"] as String) + parseColor(json["colors"]["eth_wallet_tag_text"] as String) ..ethWalletTagBGInt = - parseColor(json["colors"]["eth_wallet_tag_bg"] as String) + parseColor(json["colors"]["eth_wallet_tag_bg"] as String) ..tokenSummaryTextPrimaryInt = - parseColor(json["colors"]["token_summary_text_primary"] as String) + parseColor(json["colors"]["token_summary_text_primary"] as String) ..tokenSummaryTextSecondaryInt = - parseColor(json["colors"]["token_summary_text_secondary"] as String) + parseColor(json["colors"]["token_summary_text_secondary"] as String) ..tokenSummaryBGInt = - parseColor(json["colors"]["token_summary_bg"] as String) + parseColor(json["colors"]["token_summary_bg"] as String) ..tokenSummaryButtonBGInt = - parseColor(json["colors"]["token_summary_button_bg"] as String) + parseColor(json["colors"]["token_summary_button_bg"] as String) ..tokenSummaryIconInt = - parseColor(json["colors"]["token_summary_icon"] as String); + parseColor(json["colors"]["token_summary_icon"] as String); } /// Grab the int value of the hex color string. @@ -1848,7 +1840,7 @@ class StackTheme { } else { throw ArgumentError( '"$colorHex" and corresponding int ' - 'value "$colorValue" is not a valid color.', + 'value "$colorValue" is not a valid color.', ); } } catch (_) { @@ -1929,7 +1921,6 @@ class ThemeAssets implements IThemeAssets { late final String wownero; late final String namecoin; late final String particl; - late final String stellar; late final String bitcoinImage; late final String bitcoincashImage; late final String dogecoinImage; @@ -1941,7 +1932,6 @@ class ThemeAssets implements IThemeAssets { late final String wowneroImage; late final String namecoinImage; late final String particlImage; - late final String stellarImage; late final String bitcoinImageSecondary; late final String bitcoincashImageSecondary; late final String dogecoinImageSecondary; @@ -1953,7 +1943,6 @@ class ThemeAssets implements IThemeAssets { late final String wowneroImageSecondary; late final String namecoinImageSecondary; late final String particlImageSecondary; - late final String stellarImageSecondary; @override late final String? loadingGif; @override @@ -1999,7 +1988,6 @@ class ThemeAssets implements IThemeAssets { ..wownero = "$themeId/assets/${json["wownero"] as String}" ..namecoin = "$themeId/assets/${json["namecoin"] as String}" ..particl = "$themeId/assets/${json["particl"] as String}" - ..stellar = "$themeId/assets/${json["stellar"] as String}" ..bitcoinImage = "$themeId/assets/${json["bitcoin_image"] as String}" ..bitcoincashImage = "$themeId/assets/${json["bitcoincash_image"] as String}" @@ -2012,7 +2000,6 @@ class ThemeAssets implements IThemeAssets { ..wowneroImage = "$themeId/assets/${json["wownero_image"] as String}" ..namecoinImage = "$themeId/assets/${json["namecoin_image"] as String}" ..particlImage = "$themeId/assets/${json["particl_image"] as String}" - ..stellarImage = "$themeId/assets/${json["stellar_image"] as String}" ..bitcoinImageSecondary = "$themeId/assets/${json["bitcoin_image_secondary"] as String}" ..bitcoincashImageSecondary = @@ -2035,8 +2022,6 @@ class ThemeAssets implements IThemeAssets { "$themeId/assets/${json["namecoin_image_secondary"] as String}" ..particlImageSecondary = "$themeId/assets/${json["particl_image_secondary"] as String}" - ..stellarImageSecondary = - "$themeId/assets/${json["stellar_image_secondary"] as String}" ..loadingGif = json["loading_gif"] is String ? "$themeId/assets/${json["loading_gif"] as String}" : null @@ -2093,18 +2078,18 @@ class ThemeAssetsV2 implements IThemeAssets { @ignore Map get coinIcons => _coinIcons ??= parseCoinAssetsString( - coinIconsString, - placeHolder: coinPlaceholder, - ); + coinIconsString, + placeHolder: coinPlaceholder, + ); @ignore Map? _coinIcons; late final String coinIconsString; @ignore Map get coinImages => _coinImages ??= parseCoinAssetsString( - coinImagesString, - placeHolder: coinPlaceholder, - ); + coinImagesString, + placeHolder: coinPlaceholder, + ); @ignore Map? _coinImages; late final String coinImagesString; @@ -2179,9 +2164,9 @@ class ThemeAssetsV2 implements IThemeAssets { } static Map parseCoinAssetsString( - String jsonString, { - required String placeHolder, - }) { + String jsonString, { + required String placeHolder, + }) { final json = jsonDecode(jsonString) as Map; final map = Map.from(json); @@ -2361,345 +2346,6 @@ class ThemeAssetsV3 implements IThemeAssets { @Name("otherStringParam3") late final String? dummy3; - @ignore - Map get coinIcons => _coinIcons ??= parseCoinAssetsString( - coinIconsString, - placeHolder: coinPlaceholder, - ); - @ignore - Map? _coinIcons; - late final String coinIconsString; - - @ignore - Map get coinImages => _coinImages ??= parseCoinAssetsString( - coinImagesString, - placeHolder: coinPlaceholder, - ); - @ignore - Map? _coinImages; - late final String coinImagesString; - - @ignore - Map get coinSecondaryImages => - _coinSecondaryImages ??= parseCoinAssetsString( - coinSecondaryImagesString, - placeHolder: coinPlaceholder, - ); - @ignore - Map? _coinSecondaryImages; - late final String coinSecondaryImagesString; - - @ignore - Map? get coinCardImages => - _coinCardImages ??= coinCardImagesString == null - ? null - : parseCoinAssetsString( - coinCardImagesString!, - placeHolder: coinPlaceholder, - ); - @ignore - Map? _coinCardImages; - late final String? coinCardImagesString; - - @ignore - Map? get coinCardFavoritesImages => - _coinCardFavoritesImages ??= coinCardFavoritesImagesString == null - ? null - : parseCoinAssetsString( - coinCardFavoritesImagesString!, - placeHolder: coinPlaceholder, - ); - @ignore - Map? _coinCardFavoritesImages; - @Name("otherStringParam1") - late final String? coinCardFavoritesImagesString; - - ThemeAssetsV3(); - - factory ThemeAssetsV3.fromJson({ - required Map json, - required String themeId, - }) { - return ThemeAssetsV3() - ..bellNewRelative = "$themeId/assets/${json["bell_new"] as String}" - ..buyRelative = "$themeId/assets/${json["buy"] as String}" - ..exchangeRelative = "$themeId/assets/${json["exchange"] as String}" - ..personaIncognitoRelative = - "$themeId/assets/${json["persona_incognito"] as String}" - ..personaEasyRelative = - "$themeId/assets/${json["persona_easy"] as String}" - ..stackRelative = "$themeId/assets/${json["stack"] as String}" - ..stackIconRelative = "$themeId/assets/${json["stack_icon"] as String}" - ..receiveRelative = "$themeId/assets/${json["receive"] as String}" - ..receivePendingRelative = - "$themeId/assets/${json["receive_pending"] as String}" - ..receiveCancelledRelative = - "$themeId/assets/${json["receive_cancelled"] as String}" - ..sendRelative = "$themeId/assets/${json["send"] as String}" - ..sendPendingRelative = - "$themeId/assets/${json["send_pending"] as String}" - ..sendCancelledRelative = - "$themeId/assets/${json["send_cancelled"] as String}" - ..themeSelectorRelative = - "$themeId/assets/${json["theme_selector"] as String}" - ..themePreviewRelative = - "$themeId/assets/${json["theme_preview"] as String}" - ..txExchangeRelative = "$themeId/assets/${json["tx_exchange"] as String}" - ..txExchangePendingRelative = - "$themeId/assets/${json["tx_exchange_pending"] as String}" - ..txExchangeFailedRelative = - "$themeId/assets/${json["tx_exchange_failed"] as String}" - ..coinPlaceholderRelative = - "$themeId/assets/${json["coin_placeholder"] as String}" - ..coinIconsString = createCoinAssetsString( - "$themeId/assets", - Map.from(json["coins"]["icons"] as Map), - ) - ..coinImagesString = createCoinAssetsString( - "$themeId/assets", - Map.from(json["coins"]["images"] as Map), - ) - ..coinSecondaryImagesString = createCoinAssetsString( - "$themeId/assets", - Map.from(json["coins"]["secondaries"] as Map), - ) - ..coinCardImagesString = json["coins"]["cards"] is Map - ? createCoinAssetsString( - "$themeId/assets", - Map.from(json["coins"]["cards"] as Map), - ) - : null - ..coinCardFavoritesImagesString = json["coins"]["favoriteCards"] is Map - ? createCoinAssetsString( - "$themeId/assets", - Map.from(json["coins"]["favoriteCards"] as Map), - ) - : null - ..loadingGifRelative = json["loading_gif"] is String - ? "$themeId/assets/${json["loading_gif"] as String}" - : null - ..backgroundRelative = json["background"] is String - ? "$themeId/assets/${json["background"] as String}" - : null - ..dummy2 = null - ..dummy3 = null; - } - - static String prependIfNeeded(String relativePath) { - final path = StackFileSystem.themesDir!.path; - - if (relativePath.startsWith(path)) { - return relativePath; - } else { - if (Platform.isIOS) { - const pattern = "/var/mobile/Containers/Data/Application/"; - if (relativePath.startsWith(pattern)) { - final parts = relativePath.split("/Library/themes/"); - if (parts.isNotEmpty) { - return "$path/${parts.last}"; - } - } - } - - return "$path/$relativePath"; - } - } - - static String createCoinAssetsString(String path, Map json) { - final Map map = {}; - for (final entry in json.entries) { - map[entry.key] = "$path/${entry.value as String}"; - } - return jsonEncode(map); - } - - static Map parseCoinAssetsString( - String jsonString, { - required String placeHolder, - }) { - final json = jsonDecode(jsonString) as Map; - final map = Map.from(json); - - final Map result = {}; - - for (final coin in Coin.values) { - result[coin] = map[coin.name] as String? ?? placeHolder; - - result[coin] = prependIfNeeded(result[coin]!); - } - - return result; - } - - @override - String toString() { - return 'ThemeAssetsV3(' - 'bellNew: $bellNew, ' - 'buy: $buy, ' - 'exchange: $exchange, ' - 'personaIncognito: $personaIncognito, ' - 'personaEasy: $personaEasy, ' - 'stack: $stack, ' - 'stackIcon: $stackIcon, ' - 'receive: $receive, ' - 'receivePending: $receivePending, ' - 'receiveCancelled: $receiveCancelled, ' - 'send: $send, ' - 'sendPending: $sendPending, ' - 'sendCancelled: $sendCancelled, ' - 'themeSelector: $themeSelector, ' - 'themePreview: $themePreview, ' - 'txExchange: $txExchange, ' - 'txExchangePending: $txExchangePending, ' - 'txExchangeFailed: $txExchangeFailed, ' - 'loadingGif: $loadingGif, ' - 'background: $background, ' - 'coinPlaceholder: $coinPlaceholder, ' - 'coinIcons: $coinIcons, ' - 'coinImages: $coinImages, ' - 'coinSecondaryImages: $coinSecondaryImages, ' - 'coinCardImages: $coinCardImages' - 'coinCardFavoritesImages: $coinCardFavoritesImages' - ')'; - } -} - -@Embedded(inheritance: false) -class ThemeAssetsV4 implements IThemeAssets { - @Name("bellNew") - late final String bellNewRelative; - @override - @ignore - String get bellNew => prependIfNeeded(bellNewRelative); - - @Name("buy") - late final String buyRelative; - @override - @ignore - String get buy => prependIfNeeded(buyRelative); - - @Name("exchange") - late final String exchangeRelative; - @override - @ignore - String get exchange => prependIfNeeded(exchangeRelative); - - @Name("personaIncognito") - late final String personaIncognitoRelative; - @override - @ignore - String get personaIncognito => prependIfNeeded(personaIncognitoRelative); - - @Name("personaEasy") - late final String personaEasyRelative; - @override - @ignore - String get personaEasy => prependIfNeeded(personaEasyRelative); - - @Name("stack") - late final String stackRelative; - @override - @ignore - String get stack => prependIfNeeded(stackRelative); - - @Name("stackIcon") - late final String stackIconRelative; - @override - @ignore - String get stackIcon => prependIfNeeded(stackIconRelative); - - @Name("receive") - late final String receiveRelative; - @override - @ignore - String get receive => prependIfNeeded(receiveRelative); - - @Name("receivePending") - late final String receivePendingRelative; - @override - @ignore - String get receivePending => prependIfNeeded(receivePendingRelative); - - @Name("receiveCancelled") - late final String receiveCancelledRelative; - @override - @ignore - String get receiveCancelled => prependIfNeeded(receiveCancelledRelative); - - @Name("send") - late final String sendRelative; - @override - @ignore - String get send => prependIfNeeded(sendRelative); - - @Name("sendPending") - late final String sendPendingRelative; - @override - @ignore - String get sendPending => prependIfNeeded(sendPendingRelative); - - @Name("sendCancelled") - late final String sendCancelledRelative; - @override - @ignore - String get sendCancelled => prependIfNeeded(sendCancelledRelative); - - @Name("themeSelector") - late final String themeSelectorRelative; - @override - @ignore - String get themeSelector => prependIfNeeded(themeSelectorRelative); - - @Name("themePreview") - late final String themePreviewRelative; - @override - @ignore - String get themePreview => prependIfNeeded(themePreviewRelative); - - @Name("txExchange") - late final String txExchangeRelative; - @override - @ignore - String get txExchange => prependIfNeeded(txExchangeRelative); - - @Name("txExchangePending") - late final String txExchangePendingRelative; - @override - @ignore - String get txExchangePending => prependIfNeeded(txExchangePendingRelative); - - @Name("txExchangeFailed") - late final String txExchangeFailedRelative; - @override - @ignore - String get txExchangeFailed => prependIfNeeded(txExchangeFailedRelative); - - @Name("loadingGif") - late final String? loadingGifRelative; - @override - @ignore - String? get loadingGif => - loadingGifRelative != null ? prependIfNeeded(loadingGifRelative!) : null; - - @Name("background") - late final String? backgroundRelative; - @override - @ignore - String? get background => - backgroundRelative != null ? prependIfNeeded(backgroundRelative!) : null; - - @Name("coinPlaceholder") - late final String coinPlaceholderRelative; - @ignore - String get coinPlaceholder => prependIfNeeded(coinPlaceholderRelative); - - // Added some future proof params in case we want to add anything else - // This should provide some buffer in stead of creating assetsV4 etc - @Name("otherStringParam2") - late final String? dummy2; - @Name("otherStringParam3") - late final String? dummy3; - @ignore Map get coinIcons => _coinIcons ??= parseCoinAssetsString( coinIconsString, @@ -2753,13 +2399,13 @@ class ThemeAssetsV4 implements IThemeAssets { @Name("otherStringParam1") late final String? coinCardFavoritesImagesString; - ThemeAssetsV4(); + ThemeAssetsV3(); - factory ThemeAssetsV4.fromJson({ + factory ThemeAssetsV3.fromJson({ required Map json, required String themeId, }) { - return ThemeAssetsV4() + return ThemeAssetsV3() ..bellNewRelative = "$themeId/assets/${json["bell_new"] as String}" ..buyRelative = "$themeId/assets/${json["buy"] as String}" ..exchangeRelative = "$themeId/assets/${json["exchange"] as String}" @@ -2872,7 +2518,7 @@ class ThemeAssetsV4 implements IThemeAssets { @override String toString() { - return 'ThemeAssetsV4(' + return 'ThemeAssetsV3(' 'bellNew: $bellNew, ' 'buy: $buy, ' 'exchange: $exchange, ' @@ -2925,4 +2571,4 @@ abstract class IThemeAssets { String? get loadingGif; String? get background; -} +} \ No newline at end of file diff --git a/lib/services/coins/stellar/stellar_wallet.dart b/lib/services/coins/stellar/stellar_wallet.dart index c9fce27b3..c1fe652b6 100644 --- a/lib/services/coins/stellar/stellar_wallet.dart +++ b/lib/services/coins/stellar/stellar_wallet.dart @@ -61,7 +61,7 @@ class StellarWallet extends CoinServiceAPI late final TransactionNotificationTracker txTracker; late SecureStorageInterface _secureStore; - final StellarSDK stellarSdk = StellarSDK.TESTNET; + final StellarSDK stellarSdk = StellarSDK.PUBLIC; @override bool get isFavorite => _isFavorite ??= getCachedIsFavorite(); @@ -199,7 +199,7 @@ class StellarWallet extends CoinServiceAPI .build() ).build(); } - transaction.sign(senderKeyPair, Network.TESTNET); + transaction.sign(senderKeyPair, Network.PUBLIC); try { SubmitTransactionResponse response = await stellarSdk.submitTransaction(transaction); @@ -256,9 +256,11 @@ class StellarWallet extends CoinServiceAPI } @override - Future exit() { - // TODO: implement exit - throw UnimplementedError(); + Future exit() async { + _hasCalledExit = true; + timer?.cancel(); + timer = null; + stopNetworkAlivePinging(); } NodeModel? _xlmNode; @@ -427,7 +429,13 @@ class StellarWallet extends CoinServiceAPI } @override - Future recoverFromMnemonic({required String mnemonic, String? mnemonicPassphrase, required int maxUnusedAddressGap, required int maxNumberOfIndexesToCheck, required int height}) async { + Future recoverFromMnemonic({ + required String mnemonic, + String? mnemonicPassphrase, + required int maxUnusedAddressGap, + required int maxNumberOfIndexesToCheck, + required int height + }) async { if ((await mnemonicString) != null || (await this.mnemonicPassphrase) != null) { throw Exception("Attempted to overwrite mnemonic on restore!"); @@ -472,7 +480,8 @@ class StellarWallet extends CoinServiceAPI .order(RequestBuilderOrder.DESC) .limit(1) .execute() - .then((value) => value.records!.first.sequence); + .then((value) => value.records!.first.sequence).onError((error, stackTrace) => + throw("Error getting chain height")); await updateCachedChainHeight(height); } @@ -484,8 +493,7 @@ class StellarWallet extends CoinServiceAPI Page payments = await stellarSdk.payments .forAccount(await getAddressSW()).order(RequestBuilderOrder.DESC) .execute().onError((error, stackTrace) => - throw("Could not fetch transactions") - ); + throw("Could not fetch transactions")); for (OperationResponse response in payments.records!) { // PaymentOperationResponse por; diff --git a/lib/utilities/default_nodes.dart b/lib/utilities/default_nodes.dart index 02bb4ff29..6c8bf08e3 100644 --- a/lib/utilities/default_nodes.dart +++ b/lib/utilities/default_nodes.dart @@ -182,7 +182,7 @@ abstract class DefaultNodes { isDown: false); static NodeModel get stellar => NodeModel( - host: "https://horizon-testnet.stellar.org", + host: "https://horizon.stellar.org", port: 443, name: defaultName, id: _nodeId(Coin.stellar),