Skip to content

Commit f28e8b5

Browse files
willyfromtheblockweblate
willyfromtheblock
and
weblate
authored
1.2.2 (#242)
* Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: Peercoin Flutter/Translations Translate-URL: https://weblate.ppc.lol/projects/peercoin-flutter/translations/ * version bump * implement changes proposed by sandakersmann * hide purchase options for PPC on iOS * move 2do * improve e2e test stability --------- Co-authored-by: Weblate <[email protected]>
1 parent 475d434 commit f28e8b5

21 files changed

+79
-89
lines changed

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### **1.2.2** (2023-09-27)
2+
* Change the options for purchasing Peercoin on some devices
3+
14
### **1.2.1** (2023-09-24)
25
* Minor improvements and bug hunting
36

‎assets/translations/ar.json

-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,6 @@
477477
"currency_TMT": "مانات تركمانستاني",
478478
"currency_TOP": "بانجا تونغا",
479479
"currency_UZS": "سوم أوزبكستاني",
480-
"currency_VEF": "بوليفار فنزويلي",
481480
"currency_WST": "تالا ساموا",
482481
"currency_XCD": "دولار شرق الكاريبي",
483482
"currency_FJD": "دولار فيجي",

‎assets/translations/da.json

-1
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,6 @@
493493
"currency_TMT": "Turkmenistansk manat",
494494
"currency_TOP": "Tongansk pa'anga",
495495
"currency_UZS": "Usbekisk som",
496-
"currency_VEF": "Venezuelansk bolívar",
497496
"currency_VUV": "Vanuatu vatu",
498497
"currency_WST": "Samoansk tala",
499498
"currency_XCD": "Østcaribisk dollar",

‎assets/translations/en.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@
297297
"paperwallet_step_3": "Step 3",
298298
"paperwallet_step_3_text": "Check balance",
299299
"paperwallet_step_4": "Step 4",
300-
"paperwallet_step_4_text": "Sweep Paper Wallet",
300+
"paperwallet_step_4_text": "Sweep paper wallet",
301301
"paperwallet_success": "Paper Wallet imported successfully.\nTransaction will appear very soon.",
302302
"periodic_reminder_donate_title": "Donation Reminder",
303303
"periodic_reminder_donate_body": "This app is developed by the Peercoin Foundation.\nPlease consider donating to support the development of Peercoin and this app.",
@@ -492,8 +492,8 @@
492492
"wallet_scanner_message_newAddressFound": "new address found",
493493
"wallet_scanner_message_new_wallet_found": "new wallet found for $coinName at $accountNumber",
494494
"wallet_scanner_message_scan_finished": "scan finished for $coinName at $accountNumber",
495-
"wallet_scanner_message_scan_failed": "scan failed for $coinName at $accountNumber ($e))",
496-
"wallet_scanner_message_scan_connection_failed": "scan failed for $coinName at $accountNumber (Connection failed)",
495+
"wallet_scanner_message_scan_failed": "scan failed for $coinName at $accountNumber ($e)",
496+
"wallet_scanner_message_scan_connection_failed": "scan failed for $coinName at $accountNumber (connection failed)",
497497
"scan_modal_title": "Scanning this Wallet",
498498
"reset_modal_title": "Resetting this Wallet",
499499
"reset_modal_description": "This will reset the wallet balance and will check all addresses for UTXOs.\nNon-broadcasted transactions will be removed."

‎assets/translations/es.json

-1
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,6 @@
448448
"currency_GIP": "Libra de Gibraltar",
449449
"currency_NPR": "Rupia nepalesa",
450450
"currency_SSP": "Libra sursudanesa",
451-
"currency_VEF": "Bolívar venezolano",
452451
"currency_VUV": "Vatu de Vanuatu",
453452
"app_settings_language_search": "Idioma de búsqueda",
454453
"currency_AED": "Dírham de los Emiratos Árabes Unidos",

‎assets/translations/hi.json

-1
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,6 @@
483483
"currency_SYP": "सीरियन पाउंड",
484484
"currency_TMT": "तुर्कमेनिस्तानी मानत",
485485
"currency_TOP": "टोंगन पा'आंगा",
486-
"currency_VEF": "वेनेज़ुएलाई बोलिवार",
487486
"currency_VUV": "नी-वानुआटु वातू",
488487
"currency_WST": "सामोआन ताला",
489488
"currency_FJD": "फ़िजियन डॉलर",

‎assets/translations/is.json

-1
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,6 @@
434434
"currency_TMT": "Túrkmenskur manat",
435435
"currency_TOP": "Tongversk pa'anga",
436436
"currency_UZS": "Úsbekskt som",
437-
"currency_VEF": "Venesúelskur bólivíanó",
438437
"currency_VUV": "Vanúatú vatu",
439438
"currency_WST": "Samóska tala",
440439
"currency_FJD": "Fídjeyskur dalur",

‎assets/translations/ja.json

-1
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,6 @@
472472
"currency_SBD": "ソロモン諸島 ドル",
473473
"currency_SVC": "エルサルバドル コロン",
474474
"currency_TWD": "ニュー台湾ドル",
475-
"currency_VEF": "ベネズエラ ボリバル",
476475
"currency_UYU": "ウルグアイ ペソ",
477476
"currency_XPF": "CFPフラン",
478477
"currency_CLF": "ウニダード・デ・フォメント",

‎assets/translations/ko.json

-1
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,6 @@
492492
"currency_TMT": "투르크메니스탄 마나트",
493493
"currency_TOP": "통가 파앙가",
494494
"currency_UZS": "우즈베키스탄 솀",
495-
"currency_VEF": "베네수엘라 볼리바르",
496495
"currency_VUV": "니바두 바투",
497496
"currency_WST": "사모아 탈라",
498497
"currency_XCD": "동카리브 달러",

‎assets/translations/nb_NO.json

-1
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,6 @@
493493
"currency_TMT": "Turkmensk manat",
494494
"currency_TOP": "Tongansk pa'anga",
495495
"currency_UZS": "Usbekisk sum",
496-
"currency_VEF": "Venezuelansk bolívar",
497496
"currency_VUV": "Vanuatisk vatu",
498497
"currency_WST": "Samoansk tala",
499498
"currency_XCD": "Østkaribisk dollar",

‎assets/translations/pt.json

-1
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,6 @@
480480
"currency_TMT": "Manat Turquemenistano",
481481
"currency_TOP": "Pa'anga Tonganês",
482482
"currency_UZS": "Som Uzbeque",
483-
"currency_VEF": "Bolívar Venezuelano",
484483
"currency_VUV": "Vatu de Vanuatu",
485484
"currency_WST": "Tala Samoano",
486485
"currency_FJD": "Dólar Fijiano",

‎assets/translations/sv.json

-1
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,6 @@
488488
"currency_TMT": "Turkmenistanska manat",
489489
"currency_TOP": "Tonganska pa'anga",
490490
"currency_UZS": "Uzbekistanska som",
491-
"currency_VEF": "Venezuelanska bolívar",
492491
"currency_VUV": "Vanuatu vatu",
493492
"currency_WST": "Samoanska tala",
494493
"currency_FJD": "Fijianska dollar",

‎assets/translations/vi.json

-1
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,6 @@
444444
"currency_SYP": "Bảng Syria",
445445
"currency_TOP": "Pa'anga Tonga",
446446
"currency_UZS": "Som Uzbekistan",
447-
"currency_VEF": "Bolívar Venezuela",
448447
"currency_VUV": "Vatu Vanuatu",
449448
"currency_WST": "Tala Samoa",
450449
"currency_XCD": "Đô la Đông Caribê",

‎assets/translations/zh.json

-1
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,6 @@
487487
"currency_TMT": "土库曼斯坦马纳特",
488488
"currency_TOP": "汤加潘加",
489489
"currency_UZS": "乌兹别克斯坦苏姆",
490-
"currency_VEF": "委内瑞拉玻利瓦尔",
491490
"currency_VUV": "瓦努阿图瓦图",
492491
"currency_XCD": "东加勒比元",
493492
"currency_FJD": "斐济元",

‎assets/translations/zh_Hant.json

-1
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,6 @@
490490
"currency_TMT": "土庫曼馬納特",
491491
"currency_TOP": "東加潘加",
492492
"currency_UZS": "烏茲別克索姆",
493-
"currency_VEF": "委內瑞拉玻利瓦",
494493
"currency_VUV": "瓦努阿圖瓦圖",
495494
"currency_WST": "薩摩亞塔拉",
496495
"currency_XCD": "東加勒比元",

‎ios/Podfile.lock

+1-7
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ PODS:
99
- connectivity_plus (0.0.1):
1010
- Flutter
1111
- ReachabilitySwift
12-
- cryptography_flutter (0.2.0):
13-
- Flutter
1412
- DKImagePickerController/Core (4.3.4):
1513
- DKImagePickerController/ImageDataManager
1614
- DKImagePickerController/Resource
@@ -89,7 +87,6 @@ DEPENDENCIES:
8987
- camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
9088
- coinlib_flutter (from `.symlinks/plugins/coinlib_flutter/darwin`)
9189
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
92-
- cryptography_flutter (from `.symlinks/plugins/cryptography_flutter/ios`)
9390
- file_picker (from `.symlinks/plugins/file_picker/ios`)
9491
- Flutter (from `Flutter`)
9592
- flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
@@ -125,8 +122,6 @@ EXTERNAL SOURCES:
125122
:path: ".symlinks/plugins/coinlib_flutter/darwin"
126123
connectivity_plus:
127124
:path: ".symlinks/plugins/connectivity_plus/ios"
128-
cryptography_flutter:
129-
:path: ".symlinks/plugins/cryptography_flutter/ios"
130125
file_picker:
131126
:path: ".symlinks/plugins/file_picker/ios"
132127
Flutter:
@@ -163,7 +158,6 @@ SPEC CHECKSUMS:
163158
camera_avfoundation: 3125e8cd1a4387f6f31c6c63abb8a55892a9eeeb
164159
coinlib_flutter: 6abec900d67762a6e7ccfd567a3cd3ae00bbee35
165160
connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
166-
cryptography_flutter: 381bdacc984abcfbe3ca45ef7c76566ff061614c
167161
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
168162
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
169163
file_picker: ce3938a0df3cc1ef404671531facef740d03f920
@@ -176,7 +170,7 @@ SPEC CHECKSUMS:
176170
integration_test: 13825b8a9334a850581300559b8839134b124670
177171
local_auth_ios: c6cf091ded637a88f24f86a8875d8b0f526e2605
178172
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
179-
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
173+
package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
180174
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
181175
qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
182176
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825

‎lib/screens/settings/wallet_scan/app_settings_wallet_scanner.dart

+1
Original file line numberDiff line numberDiff line change
@@ -276,4 +276,5 @@ class _AppSettingsWalletScannerState extends State<AppSettingsWalletScanner> {
276276
});
277277
context.loaderOverlay.hide();
278278
}
279+
//TODO won't find new wallets if one in the gap has not been used
279280
}

‎lib/tools/scanner/wallet_scanner.dart

-1
Original file line numberDiff line numberDiff line change
@@ -177,5 +177,4 @@ class WalletScanner {
177177

178178
return knownAddresses;
179179
}
180-
//TODO won't find new wallets if one in the gap has not been used
181180
}

‎lib/widgets/wallet/receive_tab.dart

+68-63
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import 'dart:io';
2+
13
import 'package:flutter/material.dart';
24
import 'package:flutter/services.dart';
35
import 'package:provider/provider.dart';
@@ -135,6 +137,71 @@ class _ReceiveTabState extends State<ReceiveTab> {
135137
);
136138
}
137139

140+
Widget renderPurchaseButtons() {
141+
if (widget.wallet.letterCode == 'tPPC') {
142+
return Align(
143+
child: PeerContainer(
144+
child: Column(
145+
crossAxisAlignment: CrossAxisAlignment.center,
146+
children: <Widget>[
147+
PeerServiceTitle(
148+
title: AppLocalizations.instance.translate('receive_obtain'),
149+
),
150+
const SizedBox(height: 20),
151+
Text(
152+
AppLocalizations.instance.translate('receive_website_faucet'),
153+
textAlign: TextAlign.center,
154+
),
155+
const SizedBox(height: 20),
156+
PeerButton(
157+
text: AppLocalizations.instance.translate('receive_faucet'),
158+
action: () {
159+
launchURL('https://ppc.lol/faucet/');
160+
},
161+
),
162+
],
163+
),
164+
),
165+
);
166+
} else if (widget.wallet.letterCode == 'PPC' && Platform.isIOS == false) {
167+
return Align(
168+
child: PeerContainer(
169+
child: Column(
170+
crossAxisAlignment: CrossAxisAlignment.center,
171+
children: <Widget>[
172+
PeerServiceTitle(
173+
title: AppLocalizations.instance.translate('buy_peercoin'),
174+
),
175+
const SizedBox(height: 20),
176+
Text(
177+
AppLocalizations.instance
178+
.translate('receive_website_description'),
179+
textAlign: TextAlign.center,
180+
),
181+
const SizedBox(height: 20),
182+
PeerButton(
183+
text: AppLocalizations.instance
184+
.translate('receive_website_credit'),
185+
action: () {
186+
launchURL('https://ppc.lol/buy');
187+
},
188+
),
189+
const SizedBox(height: 20),
190+
PeerButton(
191+
text: AppLocalizations.instance
192+
.translate('receive_website_exchandes'),
193+
action: () {
194+
launchURL('https://ppc.lol/exchanges');
195+
},
196+
),
197+
],
198+
),
199+
),
200+
);
201+
}
202+
return const SizedBox();
203+
}
204+
138205
@override
139206
Widget build(BuildContext context) {
140207
return Stack(
@@ -293,69 +360,7 @@ class _ReceiveTabState extends State<ReceiveTab> {
293360
),
294361
),
295362
),
296-
widget.wallet.letterCode == 'tPPC'
297-
? Align(
298-
child: PeerContainer(
299-
child: Column(
300-
crossAxisAlignment: CrossAxisAlignment.center,
301-
children: <Widget>[
302-
PeerServiceTitle(
303-
title: AppLocalizations.instance
304-
.translate('receive_obtain'),
305-
),
306-
const SizedBox(height: 20),
307-
Text(
308-
AppLocalizations.instance
309-
.translate('receive_website_faucet'),
310-
textAlign: TextAlign.center,
311-
),
312-
const SizedBox(height: 20),
313-
PeerButton(
314-
text: AppLocalizations.instance
315-
.translate('receive_faucet'),
316-
action: () {
317-
launchURL('https://ppc.lol/faucet/');
318-
},
319-
),
320-
],
321-
),
322-
),
323-
)
324-
: Align(
325-
child: PeerContainer(
326-
child: Column(
327-
crossAxisAlignment: CrossAxisAlignment.center,
328-
children: <Widget>[
329-
PeerServiceTitle(
330-
title: AppLocalizations.instance
331-
.translate('buy_peercoin'),
332-
),
333-
const SizedBox(height: 20),
334-
Text(
335-
AppLocalizations.instance
336-
.translate('receive_website_description'),
337-
textAlign: TextAlign.center,
338-
),
339-
const SizedBox(height: 20),
340-
PeerButton(
341-
text: AppLocalizations.instance
342-
.translate('receive_website_credit'),
343-
action: () {
344-
launchURL('https://ppc.lol/buy');
345-
},
346-
),
347-
const SizedBox(height: 20),
348-
PeerButton(
349-
text: AppLocalizations.instance
350-
.translate('receive_website_exchandes'),
351-
action: () {
352-
launchURL('https://ppc.lol/exchanges');
353-
},
354-
),
355-
],
356-
),
357-
),
358-
),
363+
renderPurchaseButtons(),
359364
],
360365
),
361366
],

‎pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: peercoin
22
description: A new Peercoin wallet.
33

4-
version: 1.2.1+133
4+
version: 1.2.2+134
55

66
environment:
77
sdk: '>=3.0.0 <4.0.0'

‎test_driver/key_new.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,10 @@ void main() {
136136
test(
137137
'tap into new peercoin mainnet wallet',
138138
() async {
139+
await driver.tap(find.pageBack());
140+
await Future.delayed(const Duration(seconds: 1));
139141
await driver.runUnsynchronized(
140142
() async {
141-
await driver.tap(find.pageBack());
142143
await driver.tap(find.byValueKey('newWalletIconButton'));
143144
await driver.tap(find.text('Peercoin'));
144145
await driver.tap(find.text('Peercoin')); //tap into wallet

0 commit comments

Comments
 (0)