diff --git a/cw_monero/lib/api/wallet.dart b/cw_monero/lib/api/wallet.dart index 973a38535..1a6e5315d 100644 --- a/cw_monero/lib/api/wallet.dart +++ b/cw_monero/lib/api/wallet.dart @@ -45,12 +45,23 @@ String getSeed() { String getSeedLegacy(String? language) { var legacy = monero.Wallet_seed(wptr!, seedOffset: ''); + switch (language) { + case "Chinese (Traditional)": language = "Chinese (simplified)"; break; + case "Chinese (Simplified)": language = "Chinese (simplified)"; break; + case "Korean": language = "English"; break; + case "Czech": language = "English"; break; + case "Japanese": language = "English"; break; + } if (monero.Wallet_status(wptr!) != 0) { monero.Wallet_setSeedLanguage(wptr!, language: language ?? "English"); legacy = monero.Wallet_seed(wptr!, seedOffset: ''); } if (monero.Wallet_status(wptr!) != 0) { - return monero.Wallet_errorString(wptr!); + final err = monero.Wallet_errorString(wptr!); + if (legacy.isNotEmpty) { + return "$err\n\n$legacy"; + } + return err; } return legacy; } diff --git a/cw_monero/pubspec.lock b/cw_monero/pubspec.lock index 07c3b8876..51efd4076 100644 --- a/cw_monero/pubspec.lock +++ b/cw_monero/pubspec.lock @@ -575,10 +575,11 @@ packages: polyseed: dependency: "direct main" description: - name: polyseed - sha256: edf28042e7b0b28f97a0469aa98e6e4015937cef6b9340cd6ad2822139c95217 - url: "https://pub.dev" - source: hosted + path: "." + ref: f9adc68dbf879fefadeae8e86d1c2983f5a2cc3f + resolved-ref: f9adc68dbf879fefadeae8e86d1c2983f5a2cc3f + url: "https://github.com/mrcyjanek/polyseed_dart" + source: git version: "0.0.5" pool: dependency: transitive diff --git a/cw_monero/pubspec.yaml b/cw_monero/pubspec.yaml index b5a13a126..7f5da2621 100644 --- a/cw_monero/pubspec.yaml +++ b/cw_monero/pubspec.yaml @@ -19,7 +19,10 @@ dependencies: flutter_mobx: ^2.0.6+1 intl: ^0.18.0 encrypt: ^5.0.1 - polyseed: ^0.0.5 + polyseed: + git: + url: https://github.com/mrcyjanek/polyseed_dart + ref: f9adc68dbf879fefadeae8e86d1c2983f5a2cc3f cw_core: path: ../cw_core monero: diff --git a/cw_wownero/lib/api/wallet.dart b/cw_wownero/lib/api/wallet.dart index 2ccd560ed..0a06a9950 100644 --- a/cw_wownero/lib/api/wallet.dart +++ b/cw_wownero/lib/api/wallet.dart @@ -47,12 +47,23 @@ String getSeed() { String getSeedLegacy(String? language) { var legacy = wownero.Wallet_seed(wptr!, seedOffset: ''); + switch (language) { + case "Chinese (Traditional)": language = "Chinese (simplified)"; break; + case "Chinese (Simplified)": language = "Chinese (simplified)"; break; + case "Korean": language = "English"; break; + case "Czech": language = "English"; break; + case "Japanese": language = "English"; break; + } if (wownero.Wallet_status(wptr!) != 0) { wownero.Wallet_setSeedLanguage(wptr!, language: language ?? "English"); legacy = wownero.Wallet_seed(wptr!, seedOffset: ''); } if (wownero.Wallet_status(wptr!) != 0) { - return wownero.Wallet_errorString(wptr!); + final err = wownero.Wallet_errorString(wptr!); + if (legacy.isNotEmpty) { + return "$err\n\n$legacy"; + } + return err; } return legacy; } diff --git a/cw_wownero/pubspec.lock b/cw_wownero/pubspec.lock index 85d856b35..f164b3086 100644 --- a/cw_wownero/pubspec.lock +++ b/cw_wownero/pubspec.lock @@ -567,10 +567,11 @@ packages: polyseed: dependency: "direct main" description: - name: polyseed - sha256: edf28042e7b0b28f97a0469aa98e6e4015937cef6b9340cd6ad2822139c95217 - url: "https://pub.dev" - source: hosted + path: "." + ref: f9adc68dbf879fefadeae8e86d1c2983f5a2cc3f + resolved-ref: f9adc68dbf879fefadeae8e86d1c2983f5a2cc3f + url: "https://github.com/mrcyjanek/polyseed_dart" + source: git version: "0.0.5" pool: dependency: transitive diff --git a/cw_wownero/pubspec.yaml b/cw_wownero/pubspec.yaml index 7a45eb628..eb14286a9 100644 --- a/cw_wownero/pubspec.yaml +++ b/cw_wownero/pubspec.yaml @@ -19,7 +19,10 @@ dependencies: flutter_mobx: ^2.0.6+1 intl: ^0.18.0 encrypt: ^5.0.1 - polyseed: ^0.0.5 + polyseed: + git: + url: https://github.com/mrcyjanek/polyseed_dart + ref: f9adc68dbf879fefadeae8e86d1c2983f5a2cc3f cw_core: path: ../cw_core monero: diff --git a/lib/src/widgets/seed_language_picker.dart b/lib/src/widgets/seed_language_picker.dart index 3bb0376b1..5cb8f2fd3 100644 --- a/lib/src/widgets/seed_language_picker.dart +++ b/lib/src/widgets/seed_language_picker.dart @@ -17,7 +17,7 @@ class SeedLanguagePickerOption { final List seedLanguages = [ SeedLanguagePickerOption('English', S.current.seed_language_english, Image.asset('assets/images/flags/usa.png'), [SeedType.legacy, SeedType.polyseed]), - SeedLanguagePickerOption('Chinese (simplified)', S.current.seed_language_chinese, + SeedLanguagePickerOption('Chinese (Simplified)', S.current.seed_language_chinese, Image.asset('assets/images/flags/chn.png'), [SeedType.legacy, SeedType.polyseed]), SeedLanguagePickerOption('Chinese (Traditional)', S.current.seed_language_chinese_traditional, Image.asset('assets/images/flags/chn.png'), [SeedType.polyseed]), diff --git a/pubspec_base.yaml b/pubspec_base.yaml index 567d1b210..a2f346bae 100644 --- a/pubspec_base.yaml +++ b/pubspec_base.yaml @@ -94,7 +94,10 @@ dependencies: # ref: main socks5_proxy: ^1.0.4 flutter_svg: ^2.0.9 - polyseed: ^0.0.5 + polyseed: + git: + url: https://github.com/mrcyjanek/polyseed_dart + ref: f9adc68dbf879fefadeae8e86d1c2983f5a2cc3f nostr_tools: ^1.0.9 solana: ^0.30.1 bitcoin_base: