android-apps-mirrors/CakeWallet
0
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-06-28 20:39:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix conflicts with main

Browse source 
bump https to fix build issue
relax store() call
This commit is contained in:
Czarek Nakamoto 2025-06-02 17:44:43 +02:00
parent 7bfa3ad54c
commit 923aa1a90b
4 changed files with 33 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cw_core/lib/solana_rpc_http_service.dart
View file

@ -10,14 +10,11 @@ class SolanaRPCHTTPService implements SolanaJSONRPCService {
final String url;
final Duration defaultRequestTimeout;
final client = ProxyWrapper().getHttpIOClient();
@override
Future<Map<String, dynamic>> call(SolanaRequestDetails params,
[Duration? timeout]) async {
final response = await client.post(
Uri.parse(url),
body: params.toRequestBody(),
final response = await ProxyWrapper().post(
clearnetUri: Uri.parse(url),
body: json.encode(params.toRequestBody()),
headers: {
'Content-Type': 'application/json',
},

2
cw_monero/lib/api/wallet.dart
View file

@ -245,7 +245,7 @@ void storeSync({bool force = false}) async {
return monero.Wallet_synchronized(Pointer.fromAddress(addr));
});
if (lastStorePointer == addr &&
lastStoreHeight + 5000 > currentWallet!.blockChainHeight() &&
lastStoreHeight + 75000 > currentWallet!.blockChainHeight() &&
!synchronized &&
!force) {
return;

1
cw_tron/lib/tron_http_provider.dart
View file

@ -1,6 +1,5 @@
import 'dart:convert';
import 'package:cw_core/utils/http_client.dart';
import 'package:cw_core/utils/proxy_wrapper.dart';
import 'package:on_chain/tron/tron.dart';
import '.secrets.g.dart' as secrets;

53
lib/main.dart
View file

@ -202,8 +202,8 @@ Future<void> initializeAppConfigs({bool loadWallet = true}) async {
final powNodes =
await CakeHive.openBox<Node>(Node.boxName + "pow"); // must be different from Node.boxName
final transactionDescriptions = await CakeHive.openBox<TransactionDescription>(
TransactionDescription.boxName,
encryptionKey: transactionDescriptionsBoxKey);
TransactionDescription.boxName,
encryptionKey: transactionDescriptionsBoxKey);
final trades = await CakeHive.openBox<Trade>(Trade.boxName, encryptionKey: tradesBoxKey);
final orders = await CakeHive.openBox<Order>(Order.boxName, encryptionKey: ordersBoxKey);
final walletInfoSource = await CakeHive.openBox<WalletInfo>(WalletInfo.boxName);
@ -306,25 +306,27 @@ class AppState extends State<App> with SingleTickerProviderStateMixin {
@override
Widget build(BuildContext context) {
return Observer(builder: (BuildContext context) {
final appStore = getIt.get<AppStore>();
final authService = getIt.get<AuthService>();
final linkViewModel = getIt.get<LinkViewModel>();
final tradeMonitor = getIt.get<TradeMonitor>();
final settingsStore = appStore.settingsStore;
final statusBarColor = Colors.transparent;
final authenticationStore = getIt.get<AuthenticationStore>();
final initialRoute = authenticationStore.state == AuthenticationState.uninitialized
? Routes.welcome
: settingsStore.currentBuiltinTor ? Routes.startTor : Routes.login;
final currentTheme = appStore.themeStore.currentTheme;
final statusBarBrightness =
currentTheme.type == ThemeType.dark ? Brightness.light : Brightness.dark;
final statusBarIconBrightness =
currentTheme.type == ThemeType.dark ? Brightness.light : Brightness.dark;
SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
statusBarColor: statusBarColor,
statusBarBrightness: statusBarBrightness,
statusBarIconBrightness: statusBarIconBrightness));
final appStore = getIt.get<AppStore>();
final authService = getIt.get<AuthService>();
final linkViewModel = getIt.get<LinkViewModel>();
final tradeMonitor = getIt.get<TradeMonitor>();
final settingsStore = appStore.settingsStore;
final statusBarColor = Colors.transparent;
final authenticationStore = getIt.get<AuthenticationStore>();
final initialRoute = authenticationStore.state == AuthenticationState.uninitialized
? Routes.welcome
: settingsStore.currentBuiltinTor ? Routes.startTor : Routes.login;
final currentTheme = appStore.themeStore.currentTheme;
final statusBarBrightness = currentTheme.type == currentTheme.isDark
? Brightness.light
: Brightness.dark;
final statusBarIconBrightness = currentTheme.type == currentTheme.isDark
? Brightness.light
: Brightness.dark;
SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
statusBarColor: statusBarColor,
statusBarBrightness: statusBarBrightness,
statusBarIconBrightness: statusBarIconBrightness));
return Root(
key: widget.key ?? rootKey,
@ -336,7 +338,8 @@ class AppState extends State<App> with SingleTickerProviderStateMixin {
tradeMonitor: tradeMonitor,
child: ThemeProvider(
themeStore: appStore.themeStore,
materialAppBuilder: (context, theme, darkTheme, themeMode) => MaterialApp(
materialAppBuilder: (context, theme, darkTheme, themeMode) =>
MaterialApp(
navigatorObservers: [routeObserver],
navigatorKey: navigatorKey,
debugShowCheckedModeBanner: false,
@ -379,8 +382,10 @@ class _HomeState extends State<_Home> {
SystemChrome.setPreferredOrientations(
[DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]);
} else {
SystemChrome.setPreferredOrientations(
[DeviceOrientation.landscapeLeft, DeviceOrientation.landscapeRight]);
SystemChrome.setPreferredOrientations([
DeviceOrientation.landscapeLeft,
DeviceOrientation.landscapeRight
]);
}
}
}