@@ -75,17 +75,33 @@ void SetupUIArgs(ArgsManager& argsman)
7575 argsman.AddArg (" -splash" , strprintf (" Show splash screen on startup (default: %u)" , DEFAULT_SPLASHSCREEN), ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
7676}
7777
78+ AppMode SetupAppMode ()
79+ {
80+ bool wallet_enabled;
81+ AppMode::Mode mode;
82+ #ifdef __ANDROID__
83+ mode = AppMode::MOBILE;
84+ #else
85+ mode = AppMode::DESKTOP;
86+ #endif // __ANDROID__
87+
88+ #ifdef ENABLE_WALLET
89+ wallet_enabled = true ;
90+ #else
91+ wallet_enabled = false ;
92+ #endif // ENABLE_WALLET
93+
94+ return AppMode (mode, wallet_enabled);
95+ }
96+
7897bool InitErrorMessageBox (
7998 const bilingual_str& message,
8099 [[maybe_unused]] const std::string& caption,
81100 [[maybe_unused]] unsigned int style)
82101{
83102 QQmlApplicationEngine engine;
84- #ifdef __ANDROID__
85- AppMode app_mode (AppMode::MOBILE);
86- #else
87- AppMode app_mode (AppMode::DESKTOP);
88- #endif // __ANDROID__
103+
104+ AppMode app_mode = SetupAppMode ();
89105
90106 qmlRegisterSingletonInstance<AppMode>(" org.bitcoincore.qt" , 1 , 0 , " AppMode" , &app_mode);
91107 engine.rootContext ()->setContextProperty (" message" , QString::fromStdString (message.translated ));
@@ -284,11 +300,8 @@ int QmlGuiMain(int argc, char* argv[])
284300 engine.rootContext ()->setContextProperty (" optionsModel" , &options_model);
285301
286302 engine.rootContext ()->setContextProperty (" needOnboarding" , need_onboarding);
287- #ifdef __ANDROID__
288- AppMode app_mode (AppMode::MOBILE);
289- #else
290- AppMode app_mode (AppMode::DESKTOP);
291- #endif // __ANDROID__
303+
304+ AppMode app_mode = SetupAppMode ();
292305
293306 qmlRegisterSingletonInstance<AppMode>(" org.bitcoincore.qt" , 1 , 0 , " AppMode" , &app_mode);
294307 qmlRegisterType<BlockClockDial>(" org.bitcoincore.qt" , 1 , 0 , " BlockClockDial" );
0 commit comments