Skip to content

Commit f89abc0

Browse files
committed
Merge remote-tracking branch 'origin/staging' into docs
2 parents e4b09d2 + 82db664 commit f89abc0

File tree

21 files changed

+1268
-1319
lines changed

21 files changed

+1268
-1319
lines changed

docs/building.md

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ sudo apt-get install clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev
9090
pip3 install --upgrade meson==0.64.1 markdown==3.4.1 markupsafe==2.1.1 jinja2==3.1.2 pygments==2.13.0 toml==0.10.2 typogrify==2.0.7 tomli==2.0.1
9191
```
9292

93+
### Flutter
94+
Install Flutter 3.38.5 by [following their guide](https://docs.flutter.dev/install/manual).
95+
96+
Run `flutter doctor` in a terminal to confirm its installation.
97+
9398
### Clone the repository and initialize submodules
9499
After installing the prerequisites listed above, download the code and init the submodules
95100
```
@@ -229,7 +234,7 @@ rustup target add aarch64-apple-ios aarch64-apple-darwin
229234
Optionally download [Android Studio](https://developer.android.com/studio) as an IDE and activate its Dart and Flutter plugins. VS Code may work as an alternative, but this is not recommended.
230235

231236
### Flutter
232-
Install [Flutter](https://docs.flutter.dev/get-started/install) 3.29.2 on your Mac host by following [these instructions](https://docs.flutter.dev/get-started/install/macos). Run `flutter doctor` in a terminal to confirm its installation.
237+
Install 3.38.5 on your Mac host by [following their guide](https://docs.flutter.dev/install/manual). Run `flutter doctor` in a terminal to confirm its installation.
233238

234239
### Build plugins and configure
235240
#### Building plugins for iOS
@@ -295,16 +300,7 @@ If the DLLs were built on the WSL filesystem instead of on Windows, copy the res
295300
Frostdart will be built by the Windows host later.
296301

297302
### Install Flutter on Windows host
298-
Install Flutter 3.38.1 on your Windows host (not in WSL2) by [following their guide](https://docs.flutter.dev/get-started/install/windows/desktop?tab=download#install-the-flutter-sdk) or by cloning https://github.com/flutter/flutter, checking out the `3.38.1` tag, and adding its `flutter/bin` folder to your PATH as in
299-
```bat
300-
@echo off
301-
set "FLUTTER_DIR=%USERPROFILE%\development\flutter"
302-
git clone https://github.com/flutter/flutter.git "%FLUTTER_DIR%"
303-
cd /d "%FLUTTER_DIR%"
304-
git checkout 3.38.1
305-
setx PATH "%PATH%;%FLUTTER_DIR%\bin"
306-
echo Flutter setup completed. Please restart your command prompt.
307-
```
303+
Install Flutter 3.38.5 on your Windows host (not in WSL2) by [following their guide](https://docs.flutter.dev/install/manual).
308304

309305
Run `flutter doctor` in PowerShell to confirm its installation.
310306

lib/pages/send_view/send_view.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -520,10 +520,6 @@ class _SendViewState extends ConsumerState<SendView> {
520520
Map<Amount, String> cachedFiroPublicFees = {};
521521

522522
Future<String> calculateFees(Amount amount) async {
523-
if (amount <= Amount.zero) {
524-
return "0";
525-
}
526-
527523
if (isFiro) {
528524
switch (ref.read(publicPrivateBalanceStateProvider.state).state) {
529525
case BalanceType.public:

lib/pages/settings_views/wallet_settings_view/wallet_network_settings_view/wallet_network_settings_view.dart

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,13 @@ class _WalletNetworkSettingsViewState
154154
// pop rescanning dialog
155155
Navigator.of(context, rootNavigator: isDesktop).pop();
156156

157+
final String message;
158+
if (wallet is CryptonoteWallet || wallet is EpiccashWallet) {
159+
message = "Rescan started";
160+
} else {
161+
message = "Rescan completed";
162+
}
163+
157164
// show success
158165
await showDialog<dynamic>(
159166
context: context,
@@ -164,7 +171,7 @@ class _WalletNetworkSettingsViewState
164171
builder: (child) =>
165172
DesktopDialog(maxHeight: 150, maxWidth: 500, child: child),
166173
child: StackDialog(
167-
title: "Rescan completed",
174+
title: message,
168175
rightButton: TextButton(
169176
style: Theme.of(context)
170177
.extension<StackColors>()!
@@ -380,11 +387,8 @@ class _WalletNetworkSettingsViewState
380387
),
381388
title: Text("Network", style: STextStyles.navBarTitle(context)),
382389
actions: [
383-
if (ref.watch(pWalletCoin(widget.walletId)) is! Epiccash &&
384-
ref.watch(pWalletCoin(widget.walletId))
385-
is! Mimblewimblecoin ||
386-
ref.watch(pWalletCoin(widget.walletId))
387-
is! Mimblewimblecoin)
390+
if (ref.watch(pWalletCoin(widget.walletId))
391+
is! Mimblewimblecoin)
388392
Padding(
389393
padding: const EdgeInsets.only(
390394
top: 10,
@@ -984,7 +988,6 @@ class _WalletNetworkSettingsViewState
984988
),
985989
),
986990
if (isDesktop &&
987-
ref.watch(pWalletCoin(widget.walletId)) is! Epiccash &&
988991
ref.watch(pWalletCoin(widget.walletId)) is! Mimblewimblecoin)
989992
RoundedWhiteContainer(
990993
borderColor: isDesktop

lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/edit_refresh_height_view.dart

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ import '../../../../utilities/constants.dart';
1111
import '../../../../utilities/text_styles.dart';
1212
import '../../../../utilities/util.dart';
1313
import '../../../../wallets/isar/providers/wallet_info_provider.dart';
14+
import '../../../../wallets/wallet/impl/epiccash_wallet.dart';
1415
import '../../../../wallets/wallet/intermediate/cryptonote_wallet.dart';
16+
import '../../../../wallets/wallet/supporting/epiccash_wallet_info_extension.dart';
1517
import '../../../../widgets/background.dart';
1618
import '../../../../widgets/conditional_parent.dart';
1719
import '../../../../widgets/custom_buttons/app_bar_icon_button.dart';
@@ -48,13 +50,19 @@ class _EditRefreshHeightViewState extends ConsumerState<EditRefreshHeightView> {
4850
try {
4951
final newHeight = int.tryParse(_controller.text);
5052
if (newHeight != null && newHeight >= 0) {
51-
await ref
52-
.read(pWalletInfo(widget.walletId))
53-
.updateRestoreHeight(
54-
newRestoreHeight: newHeight,
55-
isar: ref.read(mainDBProvider).isar,
56-
);
5753
final wallet = ref.read(pWallets).getWallet(widget.walletId);
54+
55+
if (wallet is EpiccashWallet) {
56+
await wallet.updateRestoreHeight(newHeight);
57+
} else {
58+
await ref
59+
.read(pWalletInfo(widget.walletId))
60+
.updateRestoreHeight(
61+
newRestoreHeight: newHeight,
62+
isar: ref.read(mainDBProvider).isar,
63+
);
64+
}
65+
5866
if (wallet is CryptonoteWallet && wallet.wallet != null) {
5967
wallet.setRefreshFromBlockHeight(newHeight);
6068
}
@@ -95,7 +103,13 @@ class _EditRefreshHeightViewState extends ConsumerState<EditRefreshHeightView> {
95103
super.initState();
96104
_controller = TextEditingController();
97105
final wallet = ref.read(pWallets).getWallet(widget.walletId);
98-
if (wallet is CryptonoteWallet && wallet.wallet != null) {
106+
if (wallet is EpiccashWallet) {
107+
_controller.text = ref
108+
.read(pWalletInfo(widget.walletId))
109+
.epicData!
110+
.restoreHeight
111+
.toString();
112+
} else if (wallet is CryptonoteWallet && wallet.wallet != null) {
99113
_controller.text = wallet.getRefreshFromBlockHeight().toString();
100114
} else {
101115
_controller.text = ref

lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/wallet_settings_wallet_settings_view.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import '../../../../utilities/text_styles.dart';
2323
import '../../../../wallets/isar/models/wallet_info.dart';
2424
import '../../../../wallets/isar/providers/wallet_info_provider.dart';
2525
import '../../../../wallets/wallet/impl/bitcoin_wallet.dart';
26+
import '../../../../wallets/wallet/impl/epiccash_wallet.dart';
2627
import '../../../../wallets/wallet/intermediate/cryptonote_wallet.dart';
2728
import '../../../../wallets/wallet/wallet_mixin_interfaces/multi_address_interface.dart';
2829
import '../../../../wallets/wallet/wallet_mixin_interfaces/mweb_interface.dart';
@@ -591,8 +592,9 @@ class _WalletSettingsWalletSettingsViewState
591592
),
592593
),
593594
),
594-
if (wallet is CryptonoteWallet) const SizedBox(height: 8),
595-
if (wallet is CryptonoteWallet)
595+
if (wallet is CryptonoteWallet || wallet is EpiccashWallet)
596+
const SizedBox(height: 8),
597+
if (wallet is CryptonoteWallet || wallet is EpiccashWallet)
596598
RoundedWhiteContainer(
597599
padding: const EdgeInsets.all(0),
598600
child: RawMaterialButton(

0 commit comments

Comments
 (0)