Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mobile-app/lib/app_initializer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:async';

import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:resonance_network_wallet/providers/feature_flags_provider.dart';
import 'package:resonance_network_wallet/providers/remote_config_provider.dart';
import 'package:resonance_network_wallet/services/history_polling_manager.dart';
import 'package:resonance_network_wallet/services/local_notifications_service.dart';

Expand All @@ -28,7 +28,7 @@ class _AppInitializerState extends ConsumerState<AppInitializer> {

Future<void> _initialize() async {
try {
ref.read(featureFlagsProvider.notifier).registerRemoteRefreshListener(ref);
ref.read(remoteConfigProvider.notifier).registerRemoteRefreshListener(ref);

final notificationService = ref.read(localNotificationsServiceProvider);
await notificationService.init();
Expand Down
6 changes: 3 additions & 3 deletions mobile-app/lib/app_lifecycle_manager.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:quantus_sdk/quantus_sdk.dart';
import 'package:resonance_network_wallet/providers/connectivity_provider.dart';
import 'package:resonance_network_wallet/providers/feature_flags_provider.dart';
import 'package:resonance_network_wallet/providers/remote_config_provider.dart';
import 'package:resonance_network_wallet/providers/local_auth_provider.dart';
import 'package:resonance_network_wallet/services/history_polling_manager.dart';

Expand Down Expand Up @@ -103,8 +103,8 @@ class _AppLifecycleManagerState extends ConsumerState<AppLifecycleManager> with
// Initialize Taskmaster login if wallet exists
_initializeTaskmasterLogin();

// Sync feature flags on background resume
unawaited(ref.read(featureFlagsProvider.notifier).syncFlags());
// Sync remote config on background resume
unawaited(ref.read(remoteConfigProvider.notifier).syncConfig());
}
} else {
// Handle background states (inactive, paused, hidden, detached)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,44 +4,43 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'dart:async';
import 'package:quantus_sdk/quantus_sdk.dart';
import 'package:resonance_network_wallet/firebase_options.dart';
import 'package:resonance_network_wallet/services/feature_flags_service.dart';
import 'package:resonance_network_wallet/services/remote_config_service.dart';
import 'package:resonance_network_wallet/services/firebase_messaging_service.dart';
import 'package:resonance_network_wallet/shared/global_navigator_key.dart';

final featureFlagsServiceProvider = Provider<FeatureFlagsService>((ref) {
return FeatureFlagsService();
final remoteConfigServiceProvider = Provider<RemoteConfigService>((ref) {
return RemoteConfigService();
});

final featureFlagsProvider = StateNotifierProvider<FeatureFlagsNotifier, FeatureFlagsModel>((ref) {
return FeatureFlagsNotifier(ref.read(featureFlagsServiceProvider));
final remoteConfigProvider = StateNotifierProvider<RemoteConfigNotifier, RemoteConfigModel>((ref) {
return RemoteConfigNotifier(ref.read(remoteConfigServiceProvider));
});

class FeatureFlagsNotifier extends StateNotifier<FeatureFlagsModel> {
final FeatureFlagsService _service;
class RemoteConfigNotifier extends StateNotifier<RemoteConfigModel> {
final RemoteConfigService _service;
bool _isRefreshingRemote = false;
bool _isEnablingRemoteNotifications = false;

FeatureFlagsNotifier(this._service) : super(_service.readLocalFlags()) {
syncFlags();
RemoteConfigNotifier(this._service) : super(_service.readLocalConfig()) {
syncConfig();
}

Future<void> syncFlags() async {
Future<void> syncConfig() async {
// Fetch remote in the background. This should not block startup feel.
if (_isRefreshingRemote) return;
_isRefreshingRemote = true;

unawaited(() async {
try {
final remote = await _service.readRemoteFlags();
final remote = await _service.readRemoteConfig();
if (remote == null) return;

if (remote != state) {
_service.cacheFlags(remote.toCacheJson());
_service.cacheConfig(remote.toCacheJson());
state = remote;
}
} catch (e) {
// Keep using cached flags on failure.
print('Feature flags remote refresh failed: $e');
print('Remote config remote refresh failed: $e');
} finally {
_isRefreshingRemote = false;
}
Expand All @@ -51,7 +50,7 @@ class FeatureFlagsNotifier extends StateNotifier<FeatureFlagsModel> {
void registerRemoteRefreshListener(WidgetRef ref) {
// using `listenManual` allows
// setting up the side-effect listener from `initState`/async code.
ref.listenManual<FeatureFlagsModel>(featureFlagsProvider, (previous, next) {
ref.listenManual<RemoteConfigModel>(remoteConfigProvider, (previous, next) {
if (!next.enableRemoteNotifications) return;
unawaited(_enableRemoteNotificationsIfNeeded(ref));
});
Expand Down
40 changes: 0 additions & 40 deletions mobile-app/lib/services/feature_flags_service.dart

This file was deleted.

40 changes: 40 additions & 0 deletions mobile-app/lib/services/remote_config_service.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import 'dart:convert';

import 'package:quantus_sdk/quantus_sdk.dart';

const String remoteConfigCacheKey = 'remote_config_cache_v1';

class RemoteConfigService {
final TaskmasterService _taskmasterService = TaskmasterService();
final SettingsService _settingsService = SettingsService();

Future<RemoteConfigModel?> readRemoteConfig() async {
try {
final remoteData = await _taskmasterService.getRemoteConfig();
return remoteData;
} catch (error) {
print('Remote config remote read failed: $error');
return null;
}
}

RemoteConfigModel readLocalConfig() {
final jsonString = _settingsService.getString(remoteConfigCacheKey);

if (jsonString == null || jsonString.isEmpty) {
cacheConfig(RemoteConfigModel.defaults.toCacheJson());
return RemoteConfigModel.defaults;
}

final decoded = jsonDecode(jsonString);
return RemoteConfigModel.fromJson(decoded);
}

Future<void> cacheConfig(Object json) async {
try {
await _settingsService.setString(remoteConfigCacheKey, jsonEncode(json));
} catch (error) {
print('Remote config local save failed: $error');
}
}
}
4 changes: 2 additions & 2 deletions mobile-app/lib/v2/screens/create/wallet_ready_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:quantus_sdk/quantus_sdk.dart';
import 'package:resonance_network_wallet/providers/account_providers.dart';
import 'package:resonance_network_wallet/providers/feature_flags_provider.dart';
import 'package:resonance_network_wallet/providers/remote_config_provider.dart';
import 'package:resonance_network_wallet/services/firebase_messaging_service.dart';
import 'package:resonance_network_wallet/services/referral_service.dart';
import 'package:resonance_network_wallet/shared/extensions/clipboard_extensions.dart';
Expand Down Expand Up @@ -91,7 +91,7 @@ class _WalletReadyScreenV2State extends ConsumerState<WalletReadyScreenV2> {
ref.invalidate(accountsProvider);
ref.invalidate(activeAccountProvider);

if (ref.read(featureFlagsProvider).enableRemoteNotifications) {
if (ref.read(remoteConfigProvider).enableRemoteNotifications) {
ref.read(firebaseMessagingServiceProvider).registerDeviceIfPossible();
}

Expand Down
4 changes: 2 additions & 2 deletions mobile-app/lib/v2/screens/home/home_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:quantus_sdk/quantus_sdk.dart';
import 'package:resonance_network_wallet/features/components/button.dart';
import 'package:resonance_network_wallet/features/components/shared_address_action_sheet.dart';
import 'package:resonance_network_wallet/features/components/skeleton.dart';
import 'package:resonance_network_wallet/providers/feature_flags_provider.dart';
import 'package:resonance_network_wallet/providers/remote_config_provider.dart';
import 'package:resonance_network_wallet/v2/components/glass_button.dart' hide ButtonVariant;
import 'package:resonance_network_wallet/v2/components/glass_icon_button.dart';
import 'package:resonance_network_wallet/v2/screens/accounts/accounts_sheet.dart';
Expand Down Expand Up @@ -226,7 +226,7 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
}

Widget _buildActionButtons() {
final enableSwap = ref.watch(featureFlagsProvider).enableSwap;
final enableSwap = ref.watch(remoteConfigProvider).enableSwap;

final receiveCard = _actionCard(
iconAsset: 'assets/v2/action_receive.svg',
Expand Down
4 changes: 2 additions & 2 deletions mobile-app/lib/v2/screens/import/import_wallet_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:quantus_sdk/quantus_sdk.dart';
import 'package:resonance_network_wallet/providers/account_providers.dart';
import 'package:resonance_network_wallet/providers/feature_flags_provider.dart';
import 'package:resonance_network_wallet/providers/remote_config_provider.dart';
import 'package:resonance_network_wallet/services/firebase_messaging_service.dart';
import 'package:resonance_network_wallet/v2/components/glass_button.dart';
import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
Expand Down Expand Up @@ -55,7 +55,7 @@ class _ImportWalletScreenV2State extends ConsumerState<ImportWalletScreenV2> {
_settingsService.setReferralCheckCompleted();
_settingsService.setExistingUserSeenPromoVideo();

if (ref.read(featureFlagsProvider).enableRemoteNotifications) {
if (ref.read(remoteConfigProvider).enableRemoteNotifications) {
ref.read(firebaseMessagingServiceProvider).registerDeviceIfPossible();
}

Expand Down
4 changes: 2 additions & 2 deletions mobile-app/lib/v2/screens/settings/settings_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:quantus_sdk/quantus_sdk.dart';
import 'package:resonance_network_wallet/providers/feature_flags_provider.dart';
import 'package:resonance_network_wallet/providers/remote_config_provider.dart';
import 'package:resonance_network_wallet/services/firebase_messaging_service.dart';
import 'package:resonance_network_wallet/v2/components/glass_button.dart';
import 'package:resonance_network_wallet/v2/screens/settings/recovery_phrase_screen.dart';
Expand Down Expand Up @@ -66,7 +66,7 @@ class _SettingsScreenV2State extends ConsumerState<SettingsScreenV2> {
}

Future<void> _resetAndClearData() async {
if (ref.read(featureFlagsProvider).enableRemoteNotifications) {
if (ref.read(remoteConfigProvider).enableRemoteNotifications) {
ref.read(firebaseMessagingServiceProvider).unregisterDevice();
}

Expand Down
2 changes: 1 addition & 1 deletion quantus_sdk/lib/quantus_sdk.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export 'src/models/event_type.dart';
export 'src/models/extrinsic_data.dart';
export 'src/models/extrinsic_fee_data.dart';
export 'src/models/unsigned_transaction_data.dart';
export 'src/models/feature_flags_model.dart';
export 'src/models/remote_config_model.dart';
export 'src/models/miner_reward_event.dart';
export 'src/models/miner_stats.dart';
export 'src/models/opted_in_position.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
class FeatureFlagsModel {
class RemoteConfigModel {
final bool enableTestButtons;
final bool enableKeystoneHardwareWallet;
final bool enableHighSecurity;
final bool enableRemoteNotifications;
final bool enableSwap;

const FeatureFlagsModel({
const RemoteConfigModel({
required this.enableTestButtons,
required this.enableKeystoneHardwareWallet,
required this.enableHighSecurity,
Expand All @@ -32,7 +32,7 @@ class FeatureFlagsModel {
);
}

static const FeatureFlagsModel defaults = FeatureFlagsModel(
static const RemoteConfigModel defaults = RemoteConfigModel(
enableTestButtons: false,
enableKeystoneHardwareWallet: false,
enableHighSecurity: true,
Expand All @@ -52,8 +52,8 @@ class FeatureFlagsModel {
);
}

factory FeatureFlagsModel.fromJson(Map<String, dynamic> json) {
return FeatureFlagsModel(
factory RemoteConfigModel.fromJson(Map<String, dynamic> json) {
return RemoteConfigModel(
enableTestButtons: json['enableTestButtons'] ?? defaults.enableTestButtons,
enableKeystoneHardwareWallet: json['enableKeystoneHardwareWallet'] ?? defaults.enableKeystoneHardwareWallet,
enableHighSecurity: json['enableHighSecurity'] ?? defaults.enableHighSecurity,
Expand All @@ -62,7 +62,7 @@ class FeatureFlagsModel {
);
}

bool compare(FeatureFlagsModel other) {
bool compare(RemoteConfigModel other) {
return match(
fn: (enableTestButtons, enableKeystoneHardwareWallet, enableHighSecurity, enableRemoteNotifications, enableSwap) {
return other.match(
Expand Down
4 changes: 2 additions & 2 deletions quantus_sdk/lib/src/services/taskmaster_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ class TaskmasterService {
await ensureIsLoggedIn();
}

Future<FeatureFlagsModel> getWalletFeatureFlags() async {
Future<RemoteConfigModel> getRemoteConfig() async {
final Uri uri = Uri.parse('${AppConstants.taskMasterEndpoint}/feature-flags/wallet');

final http.Response response = await http.get(uri, headers: {'Content-Type': 'application/json'});
Expand All @@ -507,7 +507,7 @@ class TaskmasterService {
throw Exception('Feature flags request failed with status: ${response.statusCode}. Body: ${response.body}');
}

return FeatureFlagsModel.fromJson(data);
return RemoteConfigModel.fromJson(data);
}

Future<MinerStats> getMinerStats() async {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:http/http.dart' as http;

void main() {
group('API Contract Tests', () {
test('Remote Feature Flags API exactly matches FeatureFlagsModel properties', () async {
test('Remote Feature Flags API exactly matches RemoteConfigModel properties', () async {
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You forgot to change this one :)

final Uri uri = Uri.parse('${AppConstants.taskMasterEndpoint}/feature-flags/wallet');
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will update the endpoint later, so it's safe to leave for now

final http.Response response = await http.get(uri, headers: {'Content-Type': 'application/json'});

Expand Down Expand Up @@ -39,7 +39,7 @@ void main() {
expect(newKeys, isEmpty, reason: 'WARNING: The API sent new properties not handled in your app: $newKeys');

try {
FeatureFlagsModel.fromJson(data);
RemoteConfigModel.fromJson(data);
} catch (e) {
fail('Failed to parse feature flags model: $e');
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also this one :)

}
Expand Down
Loading