Skip to content

Commit eef3196

Browse files
authored
Fix legacy seeds not being displayed when polyseed is not supported (#1608)
* Fix legacy seeds not being displayed when polyseed is not supported * fallback to english on Japanese, it errors with empty errorString - probably some kind of normalization issue
1 parent ec8c404 commit eef3196

File tree

8 files changed

+47
-14
lines changed

8 files changed

+47
-14
lines changed

cw_monero/lib/api/wallet.dart

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,23 @@ String getSeed() {
4545

4646
String getSeedLegacy(String? language) {
4747
var legacy = monero.Wallet_seed(wptr!, seedOffset: '');
48+
switch (language) {
49+
case "Chinese (Traditional)": language = "Chinese (simplified)"; break;
50+
case "Chinese (Simplified)": language = "Chinese (simplified)"; break;
51+
case "Korean": language = "English"; break;
52+
case "Czech": language = "English"; break;
53+
case "Japanese": language = "English"; break;
54+
}
4855
if (monero.Wallet_status(wptr!) != 0) {
4956
monero.Wallet_setSeedLanguage(wptr!, language: language ?? "English");
5057
legacy = monero.Wallet_seed(wptr!, seedOffset: '');
5158
}
5259
if (monero.Wallet_status(wptr!) != 0) {
53-
return monero.Wallet_errorString(wptr!);
60+
final err = monero.Wallet_errorString(wptr!);
61+
if (legacy.isNotEmpty) {
62+
return "$err\n\n$legacy";
63+
}
64+
return err;
5465
}
5566
return legacy;
5667
}

cw_monero/pubspec.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -575,10 +575,11 @@ packages:
575575
polyseed:
576576
dependency: "direct main"
577577
description:
578-
name: polyseed
579-
sha256: edf28042e7b0b28f97a0469aa98e6e4015937cef6b9340cd6ad2822139c95217
580-
url: "https://pub.dev"
581-
source: hosted
578+
path: "."
579+
ref: f9adc68dbf879fefadeae8e86d1c2983f5a2cc3f
580+
resolved-ref: f9adc68dbf879fefadeae8e86d1c2983f5a2cc3f
581+
url: "https://github.com/mrcyjanek/polyseed_dart"
582+
source: git
582583
version: "0.0.5"
583584
pool:
584585
dependency: transitive

cw_monero/pubspec.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ dependencies:
1919
flutter_mobx: ^2.0.6+1
2020
intl: ^0.18.0
2121
encrypt: ^5.0.1
22-
polyseed: ^0.0.5
22+
polyseed:
23+
git:
24+
url: https://github.com/mrcyjanek/polyseed_dart
25+
ref: f9adc68dbf879fefadeae8e86d1c2983f5a2cc3f
2326
cw_core:
2427
path: ../cw_core
2528
monero:

cw_wownero/lib/api/wallet.dart

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,23 @@ String getSeed() {
4747

4848
String getSeedLegacy(String? language) {
4949
var legacy = wownero.Wallet_seed(wptr!, seedOffset: '');
50+
switch (language) {
51+
case "Chinese (Traditional)": language = "Chinese (simplified)"; break;
52+
case "Chinese (Simplified)": language = "Chinese (simplified)"; break;
53+
case "Korean": language = "English"; break;
54+
case "Czech": language = "English"; break;
55+
case "Japanese": language = "English"; break;
56+
}
5057
if (wownero.Wallet_status(wptr!) != 0) {
5158
wownero.Wallet_setSeedLanguage(wptr!, language: language ?? "English");
5259
legacy = wownero.Wallet_seed(wptr!, seedOffset: '');
5360
}
5461
if (wownero.Wallet_status(wptr!) != 0) {
55-
return wownero.Wallet_errorString(wptr!);
62+
final err = wownero.Wallet_errorString(wptr!);
63+
if (legacy.isNotEmpty) {
64+
return "$err\n\n$legacy";
65+
}
66+
return err;
5667
}
5768
return legacy;
5869
}

cw_wownero/pubspec.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -567,10 +567,11 @@ packages:
567567
polyseed:
568568
dependency: "direct main"
569569
description:
570-
name: polyseed
571-
sha256: edf28042e7b0b28f97a0469aa98e6e4015937cef6b9340cd6ad2822139c95217
572-
url: "https://pub.dev"
573-
source: hosted
570+
path: "."
571+
ref: f9adc68dbf879fefadeae8e86d1c2983f5a2cc3f
572+
resolved-ref: f9adc68dbf879fefadeae8e86d1c2983f5a2cc3f
573+
url: "https://github.com/mrcyjanek/polyseed_dart"
574+
source: git
574575
version: "0.0.5"
575576
pool:
576577
dependency: transitive

cw_wownero/pubspec.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ dependencies:
1919
flutter_mobx: ^2.0.6+1
2020
intl: ^0.18.0
2121
encrypt: ^5.0.1
22-
polyseed: ^0.0.5
22+
polyseed:
23+
git:
24+
url: https://github.com/mrcyjanek/polyseed_dart
25+
ref: f9adc68dbf879fefadeae8e86d1c2983f5a2cc3f
2326
cw_core:
2427
path: ../cw_core
2528
monero:

lib/src/widgets/seed_language_picker.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class SeedLanguagePickerOption {
1717
final List<SeedLanguagePickerOption> seedLanguages = [
1818
SeedLanguagePickerOption('English', S.current.seed_language_english,
1919
Image.asset('assets/images/flags/usa.png'), [SeedType.legacy, SeedType.polyseed]),
20-
SeedLanguagePickerOption('Chinese (simplified)', S.current.seed_language_chinese,
20+
SeedLanguagePickerOption('Chinese (Simplified)', S.current.seed_language_chinese,
2121
Image.asset('assets/images/flags/chn.png'), [SeedType.legacy, SeedType.polyseed]),
2222
SeedLanguagePickerOption('Chinese (Traditional)', S.current.seed_language_chinese_traditional,
2323
Image.asset('assets/images/flags/chn.png'), [SeedType.polyseed]),

pubspec_base.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ dependencies:
9494
# ref: main
9595
socks5_proxy: ^1.0.4
9696
flutter_svg: ^2.0.9
97-
polyseed: ^0.0.5
97+
polyseed:
98+
git:
99+
url: https://github.com/mrcyjanek/polyseed_dart
100+
ref: f9adc68dbf879fefadeae8e86d1c2983f5a2cc3f
98101
nostr_tools: ^1.0.9
99102
solana: ^0.30.1
100103
bitcoin_base:

0 commit comments

Comments
 (0)