af9b5ff10 · samitouri/QOSAMI-cakewallet-1

.github/workflows/pr_test_build.yml

+1

@@ -127,6 +127,7 @@ jobs:

127 echo "const fiatApiKey = '${{ secrets.FIAT_API_KEY }}';" >> lib/.secrets.g.dart

128 echo "const payfuraApiKey = '${{ secrets.PAYFURA_API_KEY }}';" >> lib/.secrets.g.dart

129 echo "const etherScanApiKey = '${{ secrets.ETHER_SCAN_API_KEY }}';" >> cw_ethereum/lib/.secrets.g.dart

130 + echo "const chatwootWebsiteToken = '${{ secrets.CHATWOOT_WEBSITE_TOKEN }}';" >> lib/.secrets.g.dart

131

132 - name: Rename app

133 run: echo -e "id=com.cakewallet.test\nname=$GITHUB_HEAD_REF" > /opt/android/cake_wallet/android/app.properties

assets/images/live_support.png

Binary files /dev/null and b/assets/images/live_support.png differ

assets/images/more_links.png

Binary files /dev/null and b/assets/images/more_links.png differ

assets/images/wallet_guides.png

Binary files /dev/null and b/assets/images/wallet_guides.png differ

cw_core/lib/cake_hive.dart new

+4

@@ -0,0 +1,4 @@

1 +import 'package:hive/hive.dart';

2 +import 'package:hive/src/hive_impl.dart';

3 +

4 +final HiveInterface CakeHive = HiveImpl();

cw_core/lib/erc20_token.dart

+2 -1

@@ -1,4 +1,5 @@

1 import 'package:cw_core/crypto_currency.dart';

2 +import 'package:cw_core/hive_type_ids.dart';

3 import 'package:hive/hive.dart';

4

5 part 'erc20_token.g.dart';

@@ -53,7 +54,7 @@ class Erc20Token extends CryptoCurrency with HiveObjectMixin {

54 iconPath: icon,

55 );

56

56 - static const typeId = 12;

57 + static const typeId = ERC20_TOKEN_TYPE_ID;

58 static const boxName = 'Erc20Tokens';

59

60 @override

cw_core/lib/hive_type_ids.dart new

+13

@@ -0,0 +1,13 @@

1 +const CONTACT_TYPE_ID = 0;

2 +const NODE_TYPE_ID = 1;

3 +const TRANSACTION_TYPE_ID = 2;

4 +const TRADE_TYPE_ID = 3;

5 +const WALLET_INFO_TYPE_ID = 4;

6 +const WALLET_TYPE_TYPE_ID = 5;

7 +const TEMPLATE_TYPE_ID = 6;

8 +const EXCHANGE_TEMPLATE_TYPE_ID = 7;

9 +const ORDER_TYPE_ID = 8;

10 +const UNSPENT_COINS_INFO_TYPE_ID = 9;

11 +const ANONPAY_INVOICE_INFO_TYPE_ID = 10;

12 +

13 +const ERC20_TOKEN_TYPE_ID = 12;

cw_core/lib/node.dart

+2 -1

@@ -3,6 +3,7 @@ import 'package:cw_core/keyable.dart';

3 import 'dart:convert';

4 import 'package:http/http.dart' as http;

5 import 'package:hive/hive.dart';

6 +import 'package:cw_core/hive_type_ids.dart';

7 import 'package:cw_core/wallet_type.dart';

8 import 'package:http/io_client.dart' as ioc;

9

@@ -37,7 +38,7 @@ class Node extends HiveObject with Keyable {

38 trusted = map['trusted'] as bool? ?? false,

39 socksProxyAddress = map['socksProxyPort'] as String?;

40

40 - static const typeId = 1;

41 + static const typeId = NODE_TYPE_ID;

42 static const boxName = 'Nodes';

43

44 @HiveField(0, defaultValue: '')

cw_core/lib/unspent_coins_info.dart

+3 -2

@@ -1,3 +1,4 @@

1 +import 'package:cw_core/hive_type_ids.dart';

2 import 'package:hive/hive.dart';

3

4 part 'unspent_coins_info.g.dart';

@@ -14,7 +15,7 @@ class UnspentCoinsInfo extends HiveObject {

15 required this.vout,

16 required this.value});

17

17 - static const typeId = 9;

18 + static const typeId = UNSPENT_COINS_INFO_TYPE_ID;

19 static const boxName = 'Unspent';

20 static const boxKey = 'unspentBoxKey';

21

@@ -45,4 +46,4 @@ class UnspentCoinsInfo extends HiveObject {

46 String get note => noteRaw ?? '';

47

48 set note(String value) => noteRaw = value;

48 -}

\ No newline at end of file

49 +}

cw_core/lib/wallet_info.dart

+4 -4

@@ -1,7 +1,7 @@

1 -import 'package:flutter/foundation.dart';

2 -import 'package:hive/hive.dart';

3 -import 'package:cw_core/wallet_type.dart';

1 import 'dart:async';

2 +import 'package:cw_core/hive_type_ids.dart';

3 +import 'package:cw_core/wallet_type.dart';

4 +import 'package:hive/hive.dart';

5

6 part 'wallet_info.g.dart';

7

@@ -30,7 +30,7 @@ class WalletInfo extends HiveObject {

30 yatEid, yatLastUsedAddressRaw, showIntroCakePayCard);

31 }

32

33 - static const typeId = 4;

33 + static const typeId = WALLET_INFO_TYPE_ID;

34 static const boxName = 'WalletInfo';

35

36 @HiveField(0, defaultValue: '')

cw_core/lib/wallet_type.dart

+2 -2

@@ -1,4 +1,5 @@

1 import 'package:cw_core/crypto_currency.dart';

2 +import 'package:cw_core/hive_type_ids.dart';

3 import 'package:hive/hive.dart';

4

5 part 'wallet_type.g.dart';

@@ -10,9 +11,8 @@ const walletTypes = [

11 WalletType.haven,

12 WalletType.ethereum,

13 ];

13 -const walletTypeTypeId = 5;

14

15 -@HiveType(typeId: walletTypeTypeId)

15 +@HiveType(typeId: WALLET_TYPE_TYPE_ID)

16 enum WalletType {

17 @HiveField(0)

18 monero,

cw_ethereum/lib/ethereum_wallet.dart

+4 -3

@@ -4,6 +4,7 @@ import 'dart:io';

4 import 'dart:math';

5

6 import 'package:cw_core/crypto_currency.dart';

7 +import 'package:cw_core/cake_hive.dart';

8 import 'package:cw_core/node.dart';

9 import 'package:cw_core/pathForWallet.dart';

10 import 'package:cw_core/pending_transaction.dart';

@@ -58,8 +59,8 @@ abstract class EthereumWalletBase

59 this.walletInfo = walletInfo;

60 transactionHistory = EthereumTransactionHistory(walletInfo: walletInfo, password: password);

61

61 - if (!Hive.isAdapterRegistered(Erc20Token.typeId)) {

62 - Hive.registerAdapter(Erc20TokenAdapter());

62 + if (!CakeHive.isAdapterRegistered(Erc20Token.typeId)) {

63 + CakeHive.registerAdapter(Erc20TokenAdapter());

64 }

65

66 _sharedPrefs.complete(SharedPreferences.getInstance());

@@ -95,7 +96,7 @@ abstract class EthereumWalletBase

96 Completer<SharedPreferences> _sharedPrefs = Completer();

97

98 Future<void> init() async {

98 - erc20TokensBox = await Hive.openBox<Erc20Token>(Erc20Token.boxName);

99 + erc20TokensBox = await CakeHive.openBox<Erc20Token>(Erc20Token.boxName);

100 await walletAddresses.init();

101 await transactionHistory.init();

102 _privateKey = await getPrivateKey(_mnemonic, _password);

lib/anonpay/anonpay_invoice_info.dart

+2 -1

@@ -1,4 +1,5 @@

1 import 'package:cake_wallet/anonpay/anonpay_info_base.dart';

2 +import 'package:cw_core/hive_type_ids.dart';

3 import 'package:cw_core/keyable.dart';

4 import 'package:hive/hive.dart';

5

@@ -35,7 +36,7 @@ class AnonpayInvoiceInfo extends HiveObject with Keyable implements AnonpayInfoB

36 @HiveField(13)

37 final String provider;

38

38 - static const typeId = 10;

39 + static const typeId = ANONPAY_INVOICE_INFO_TYPE_ID;

40 static const boxName = 'AnonpayInvoiceInfo';

41

42 AnonpayInvoiceInfo({

lib/buy/order.dart

+4 -3

@@ -1,7 +1,8 @@

1 import 'package:cake_wallet/buy/buy_provider_description.dart';

2 -import 'package:hive/hive.dart';

2 import 'package:cake_wallet/exchange/trade_state.dart';

3 import 'package:cw_core/format_amount.dart';

4 +import 'package:cw_core/hive_type_ids.dart';

5 +import 'package:hive/hive.dart';

6

7 part 'order.g.dart';

8

@@ -26,7 +27,7 @@ class Order extends HiveObject {

27 }

28 }

29

29 - static const typeId = 8;

30 + static const typeId = ORDER_TYPE_ID;

31 static const boxName = 'Orders';

32 static const boxKey = 'ordersBoxKey';

33

@@ -66,4 +67,4 @@ class Order extends HiveObject {

67 BuyProviderDescription.deserialize(raw: providerRaw);

68

69 String amountFormatted() => formatAmount(amount);

69 -}

\ No newline at end of file

70 +}

lib/core/backup_service.dart

+7 -6

@@ -1,7 +1,6 @@

1 import 'dart:convert';

2 import 'dart:io';

3 import 'dart:typed_data';

4 -import 'package:cake_wallet/entities/cake_2fa_preset_options.dart';

4 import 'package:cw_core/wallet_type.dart';

5 import 'package:flutter/foundation.dart';

6 import 'package:hive/hive.dart';

@@ -10,6 +9,7 @@ import 'package:path_provider/path_provider.dart';

9 import 'package:cryptography/cryptography.dart';

10 import 'package:shared_preferences/shared_preferences.dart';

11 import 'package:archive/archive_io.dart';

12 +import 'package:cw_core/cake_hive.dart';

13 import 'package:cake_wallet/core/key_service.dart';

14 import 'package:cake_wallet/entities/encrypt.dart';

15 import 'package:cake_wallet/entities/preferences_key.dart';

@@ -17,6 +17,7 @@ import 'package:cake_wallet/entities/secret_store_key.dart';

17 import 'package:cw_core/wallet_info.dart';

18 import 'package:cake_wallet/.secrets.g.dart' as secrets;

19 import 'package:cake_wallet/wallet_types.g.dart';

20 +

21 import 'package:cake_backup/backup.dart' as cake_backup;

22

23 class BackupService {

@@ -170,14 +171,14 @@ class BackupService {

171

172 Future<Box<WalletInfo>> _reloadHiveWalletInfoBox() async {

173 final appDir = await getApplicationDocumentsDirectory();

173 - await Hive.close();

174 - Hive.init(appDir.path);

174 + await CakeHive.close();

175 + CakeHive.init(appDir.path);

176

176 - if (!Hive.isAdapterRegistered(WalletInfo.typeId)) {

177 - Hive.registerAdapter(WalletInfoAdapter());

177 + if (!CakeHive.isAdapterRegistered(WalletInfo.typeId)) {

178 + CakeHive.registerAdapter(WalletInfoAdapter());

179 }

180

180 - return await Hive.openBox<WalletInfo>(WalletInfo.boxName);

181 + return await CakeHive.openBox<WalletInfo>(WalletInfo.boxName);

182 }

183

184 Future<void> _importPreferencesDump() async {

lib/di.dart

+8

@@ -36,6 +36,8 @@ import 'package:cake_wallet/src/screens/setup_2fa/modify_2fa_page.dart';

36 import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_qr_page.dart';

37 import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa.dart';

38 import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_enter_code_page.dart';

39 +import 'package:cake_wallet/src/screens/support_chat/support_chat_page.dart';

40 +import 'package:cake_wallet/src/screens/support_other_links/support_other_links_page.dart';

41 import 'package:cake_wallet/src/screens/wallet/wallet_edit_page.dart';

42 import 'package:cake_wallet/themes/theme_list.dart';

43 import 'package:cake_wallet/utils/device_info.dart';

@@ -869,6 +871,12 @@ Future setup({

871

872 getIt.registerFactory(() => SupportPage(getIt.get<SupportViewModel>()));

873

874 + getIt.registerFactory(() =>

875 + SupportChatPage(

876 + getIt.get<SupportViewModel>(), secureStorage: getIt.get<FlutterSecureStorage>()));

877 +

878 + getIt.registerFactory(() => SupportOtherLinksPage(getIt.get<SupportViewModel>()));

879 +

880 getIt.registerFactory(() {

881 final wallet = getIt.get<AppStore>().wallet;

882

lib/entities/contact.dart

+3 -4

@@ -1,8 +1,7 @@

1 -import 'package:flutter/foundation.dart';

2 -import 'package:hive/hive.dart';

1 import 'package:cw_core/crypto_currency.dart';

4 -import 'package:cake_wallet/utils/mobx.dart';

2 +import 'package:cw_core/hive_type_ids.dart';

3 import 'package:cw_core/keyable.dart';

4 +import 'package:hive/hive.dart';

5

6 part 'contact.g.dart';

7

@@ -14,7 +13,7 @@ class Contact extends HiveObject with Keyable {

13 }

14 }

15

17 - static const typeId = 0;

16 + static const typeId = CONTACT_TYPE_ID;

17 static const boxName = 'Contacts';

18

19 @HiveField(0, defaultValue: '')

lib/entities/get_encryption_key.dart

+6 -11

@@ -1,23 +1,18 @@

1 import 'package:flutter_secure_storage/flutter_secure_storage.dart';

2 -import 'package:hive/hive.dart';

2 +import 'package:cw_core/cake_hive.dart';

3

4 Future<List<int>> getEncryptionKey(

5 {required String forKey, required FlutterSecureStorage secureStorage}) async {

6 - final stringifiedKey =

7 - await secureStorage.read(key: 'transactionDescriptionsBoxKey');

6 + final stringifiedKey = await secureStorage.read(key: 'transactionDescriptionsBoxKey');

7 List<int> key;

8

9 if (stringifiedKey == null) {

11 - key = Hive.generateSecureKey();

10 + key = CakeHive.generateSecureKey();

11 final keyStringified = key.join(',');

13 - await secureStorage.write(

14 - key: 'transactionDescriptionsBoxKey', value: keyStringified);

12 + await secureStorage.write(key: 'transactionDescriptionsBoxKey', value: keyStringified);

13 } else {

16 - key = stringifiedKey

17 - .split(',')

18 - .map((i) => int.parse(i))

19 - .toList();

14 + key = stringifiedKey.split(',').map((i) => int.parse(i)).toList();

15 }

16

17 return key;

23 -}

\ No newline at end of file

18 +}

lib/entities/template.dart

+2 -1

@@ -1,3 +1,4 @@

1 +import 'package:cw_core/hive_type_ids.dart';

2 import 'package:hive/hive.dart';

3

4 part 'template.g.dart';

@@ -14,7 +15,7 @@ class Template extends HiveObject {

15 required this.amountFiatRaw,

16 this.additionalRecipientsRaw});

17

17 - static const typeId = 6;

18 + static const typeId = TEMPLATE_TYPE_ID;

19 static const boxName = 'Template';

20

21 @HiveField(0)

lib/entities/transaction_description.dart

+2 -1

@@ -1,3 +1,4 @@

1 +import 'package:cw_core/hive_type_ids.dart';

2 import 'package:hive/hive.dart';

3

4 part 'transaction_description.g.dart';

@@ -6,7 +7,7 @@ part 'transaction_description.g.dart';

7 class TransactionDescription extends HiveObject {

8 TransactionDescription({required this.id, this.recipientAddress, this.transactionNote});

9

9 - static const typeId = 2;

10 + static const typeId = TRANSACTION_TYPE_ID;

11 static const boxName = 'TransactionDescriptions';

12 static const boxKey = 'transactionDescriptionsBoxKey';

13

lib/exchange/exchange_template.dart

+2 -1

@@ -1,3 +1,4 @@

1 +import 'package:cw_core/hive_type_ids.dart';

2 import 'package:hive/hive.dart';

3

4 part 'exchange_template.g.dart';

@@ -14,7 +15,7 @@ class ExchangeTemplate extends HiveObject {

15 required this.depositCurrencyTitleRaw,

16 required this.receiveCurrencyTitleRaw});

17

17 - static const typeId = 7;

18 + static const typeId = EXCHANGE_TEMPLATE_TYPE_ID;

19 static const boxName = 'ExchangeTemplate';

20

21 @HiveField(0)

lib/exchange/trade.dart

+3 -2

@@ -1,8 +1,9 @@

1 -import 'package:hive/hive.dart';

1 import 'package:cw_core/crypto_currency.dart';

2 import 'package:cake_wallet/exchange/exchange_provider_description.dart';

3 import 'package:cake_wallet/exchange/trade_state.dart';

4 import 'package:cw_core/format_amount.dart';

5 +import 'package:cw_core/hive_type_ids.dart';

6 +import 'package:hive/hive.dart';

7

8 part 'trade.g.dart';

9

@@ -41,7 +42,7 @@ class Trade extends HiveObject {

42 }

43 }

44

44 - static const typeId = 3;

45 + static const typeId = TRADE_TYPE_ID;

46 static const boxName = 'Trades';

47 static const boxKey = 'tradesBoxKey';

48

lib/main.dart

+36 -34

@@ -7,6 +7,7 @@ import 'package:cake_wallet/locales/locale.dart';

7 import 'package:cake_wallet/store/yat/yat_store.dart';

8 import 'package:cake_wallet/utils/exception_handler.dart';

9 import 'package:cake_wallet/utils/responsive_layout_util.dart';

10 +import 'package:cw_core/hive_type_ids.dart';

11 import 'package:flutter/foundation.dart';

12 import 'package:flutter/material.dart';

13 import 'package:flutter/services.dart';

@@ -38,6 +39,7 @@ import 'package:uni_links/uni_links.dart';

39 import 'package:cw_core/unspent_coins_info.dart';

40 import 'package:cake_wallet/monero/monero.dart';

41 import 'package:cake_wallet/wallet_type_utils.dart';

42 +import 'package:cw_core/cake_hive.dart';

43

44 final navigatorKey = GlobalKey<NavigatorState>();

45 final rootKey = GlobalKey<RootState>();

@@ -57,7 +59,7 @@ Future<void> main() async {

59 return true;

60 };

61

60 - await Hive.close();

62 + await CakeHive.close();

63

64 await initializeAppConfigs();

65

@@ -69,50 +71,50 @@ Future<void> main() async {

71

72 Future<void> initializeAppConfigs() async {

73 final appDir = await getApplicationDocumentsDirectory();

72 - Hive.init(appDir.path);

74 + CakeHive.init(appDir.path);

75

74 - if (!Hive.isAdapterRegistered(Contact.typeId)) {

75 - Hive.registerAdapter(ContactAdapter());

76 + if (!CakeHive.isAdapterRegistered(Contact.typeId)) {

77 + CakeHive.registerAdapter(ContactAdapter());

78 }

79

78 - if (!Hive.isAdapterRegistered(Node.typeId)) {

79 - Hive.registerAdapter(NodeAdapter());

80 + if (!CakeHive.isAdapterRegistered(Node.typeId)) {

81 + CakeHive.registerAdapter(NodeAdapter());

82 }

83

82 - if (!Hive.isAdapterRegistered(TransactionDescription.typeId)) {

83 - Hive.registerAdapter(TransactionDescriptionAdapter());

84 + if (!CakeHive.isAdapterRegistered(TransactionDescription.typeId)) {

85 + CakeHive.registerAdapter(TransactionDescriptionAdapter());

86 }

87

86 - if (!Hive.isAdapterRegistered(Trade.typeId)) {

87 - Hive.registerAdapter(TradeAdapter());

88 + if (!CakeHive.isAdapterRegistered(Trade.typeId)) {

89 + CakeHive.registerAdapter(TradeAdapter());

90 }

91

90 - if (!Hive.isAdapterRegistered(WalletInfo.typeId)) {

91 - Hive.registerAdapter(WalletInfoAdapter());

92 + if (!CakeHive.isAdapterRegistered(WalletInfo.typeId)) {

93 + CakeHive.registerAdapter(WalletInfoAdapter());

94 }

95

94 - if (!Hive.isAdapterRegistered(walletTypeTypeId)) {

95 - Hive.registerAdapter(WalletTypeAdapter());

96 + if (!CakeHive.isAdapterRegistered(WALLET_TYPE_TYPE_ID)) {

97 + CakeHive.registerAdapter(WalletTypeAdapter());

98 }

99

98 - if (!Hive.isAdapterRegistered(Template.typeId)) {

99 - Hive.registerAdapter(TemplateAdapter());

100 + if (!CakeHive.isAdapterRegistered(Template.typeId)) {

101 + CakeHive.registerAdapter(TemplateAdapter());

102 }

103

102 - if (!Hive.isAdapterRegistered(ExchangeTemplate.typeId)) {

103 - Hive.registerAdapter(ExchangeTemplateAdapter());

104 + if (!CakeHive.isAdapterRegistered(ExchangeTemplate.typeId)) {

105 + CakeHive.registerAdapter(ExchangeTemplateAdapter());

106 }

107

106 - if (!Hive.isAdapterRegistered(Order.typeId)) {

107 - Hive.registerAdapter(OrderAdapter());

108 + if (!CakeHive.isAdapterRegistered(Order.typeId)) {

109 + CakeHive.registerAdapter(OrderAdapter());

110 }

111

110 - if (!isMoneroOnly && !Hive.isAdapterRegistered(UnspentCoinsInfo.typeId)) {

111 - Hive.registerAdapter(UnspentCoinsInfoAdapter());

112 + if (!isMoneroOnly && !CakeHive.isAdapterRegistered(UnspentCoinsInfo.typeId)) {

113 + CakeHive.registerAdapter(UnspentCoinsInfoAdapter());

114 }

115

114 - if (!Hive.isAdapterRegistered(AnonpayInvoiceInfo.typeId)) {

115 - Hive.registerAdapter(AnonpayInvoiceInfoAdapter());

116 + if (!CakeHive.isAdapterRegistered(AnonpayInvoiceInfo.typeId)) {

117 + CakeHive.registerAdapter(AnonpayInvoiceInfoAdapter());

118 }

119

120 final secureStorage = FlutterSecureStorage();

@@ -120,21 +122,21 @@ Future<void> initializeAppConfigs() async {

122 await getEncryptionKey(secureStorage: secureStorage, forKey: TransactionDescription.boxKey);

123 final tradesBoxKey = await getEncryptionKey(secureStorage: secureStorage, forKey: Trade.boxKey);

124 final ordersBoxKey = await getEncryptionKey(secureStorage: secureStorage, forKey: Order.boxKey);

123 - final contacts = await Hive.openBox<Contact>(Contact.boxName);

124 - final nodes = await Hive.openBox<Node>(Node.boxName);

125 - final transactionDescriptions = await Hive.openBox<TransactionDescription>(

125 + final contacts = await CakeHive.openBox<Contact>(Contact.boxName);

126 + final nodes = await CakeHive.openBox<Node>(Node.boxName);

127 + final transactionDescriptions = await CakeHive.openBox<TransactionDescription>(

128 TransactionDescription.boxName,

129 encryptionKey: transactionDescriptionsBoxKey);

128 - final trades = await Hive.openBox<Trade>(Trade.boxName, encryptionKey: tradesBoxKey);

129 - final orders = await Hive.openBox<Order>(Order.boxName, encryptionKey: ordersBoxKey);

130 - final walletInfoSource = await Hive.openBox<WalletInfo>(WalletInfo.boxName);

131 - final templates = await Hive.openBox<Template>(Template.boxName);

132 - final exchangeTemplates = await Hive.openBox<ExchangeTemplate>(ExchangeTemplate.boxName);

133 - final anonpayInvoiceInfo = await Hive.openBox<AnonpayInvoiceInfo>(AnonpayInvoiceInfo.boxName);

130 + final trades = await CakeHive.openBox<Trade>(Trade.boxName, encryptionKey: tradesBoxKey);

131 + final orders = await CakeHive.openBox<Order>(Order.boxName, encryptionKey: ordersBoxKey);

132 + final walletInfoSource = await CakeHive.openBox<WalletInfo>(WalletInfo.boxName);

133 + final templates = await CakeHive.openBox<Template>(Template.boxName);

134 + final exchangeTemplates = await CakeHive.openBox<ExchangeTemplate>(ExchangeTemplate.boxName);

135 + final anonpayInvoiceInfo = await CakeHive.openBox<AnonpayInvoiceInfo>(AnonpayInvoiceInfo.boxName);

136 Box<UnspentCoinsInfo>? unspentCoinsInfoSource;

137

138 if (!isMoneroOnly) {

137 - unspentCoinsInfoSource = await Hive.openBox<UnspentCoinsInfo>(UnspentCoinsInfo.boxName);

139 + unspentCoinsInfoSource = await CakeHive.openBox<UnspentCoinsInfo>(UnspentCoinsInfo.boxName);

140 }

141

142 await initialSetup(

lib/router.dart

+11 -2

@@ -41,6 +41,8 @@ import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_qr_page.dart';

41 import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa.dart';

42 import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_enter_code_page.dart';

43 import 'package:cake_wallet/src/screens/support/support_page.dart';

44 +import 'package:cake_wallet/src/screens/support_chat/support_chat_page.dart';

45 +import 'package:cake_wallet/src/screens/support_other_links/support_other_links_page.dart';

46 import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_details_page.dart';

47 import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_list_page.dart';

48 import 'package:cake_wallet/utils/payment_request.dart';

@@ -48,7 +50,6 @@ import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';

50 import 'package:cake_wallet/view_model/monero_account_list/account_list_item.dart';

51 import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';

52 import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';

51 -import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';

53 import 'package:cake_wallet/wallet_type_utils.dart';

54 import 'package:flutter/cupertino.dart';

55 import 'package:flutter/material.dart';

@@ -442,9 +443,17 @@ Route<dynamic> createRoute(RouteSettings settings) {

443

444 case Routes.support:

445 return CupertinoPageRoute<void>(

445 - fullscreenDialog: true,

446 builder: (_) => getIt.get<SupportPage>());

447

448 + case Routes.supportLiveChat:

449 + return CupertinoPageRoute<void>(

450 + builder: (_) => getIt.get<SupportChatPage>());

451 +

452 + case Routes.supportOtherLinks:

453 + return CupertinoPageRoute<void>(

454 + fullscreenDialog: true,

455 + builder: (_) => getIt.get<SupportOtherLinksPage>());

456 +

457 case Routes.unspentCoinsList:

458 return MaterialPageRoute<void>(

459 builder: (_) => getIt.get<UnspentCoinsListPage>());

lib/routes.dart

+2

@@ -48,6 +48,8 @@ class Routes {

48 static const editBackupPassword = '/edit_backup_passowrd';

49 static const restoreFromBackup = '/restore_from_backup';

50 static const support = '/support';

51 + static const supportLiveChat = '/support/live_chat';

52 + static const supportOtherLinks = '/support/other';

53 static const orderDetails = '/order_details';

54 static const preOrder = '/pre_order';

55 static const buyWebView = '/buy_web_view';

lib/src/screens/restore/restore_options_page.dart

-2

@@ -2,12 +2,10 @@ import 'package:cake_wallet/core/execution_state.dart';

2 import 'package:cake_wallet/di.dart';

3 import 'package:cake_wallet/src/screens/pin_code/pin_code_widget.dart';

4 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';

5 -import 'package:cake_wallet/utils/language_list.dart';

5 import 'package:cake_wallet/utils/show_pop_up.dart';

6 import 'package:cake_wallet/view_model/restore/restore_from_qr_vm.dart';

7 import 'package:cake_wallet/view_model/restore/wallet_restore_from_qr_code.dart';

8 import 'package:cake_wallet/utils/responsive_layout_util.dart';

10 -import 'package:cake_wallet/wallet_type_utils.dart';

9 import 'package:flutter/material.dart';

10 import 'package:cake_wallet/routes.dart';

11 import 'package:flutter/cupertino.dart';

lib/src/screens/restore/widgets/restore_button.dart

+8 -12

@@ -1,12 +1,11 @@

1 -import 'package:flutter/cupertino.dart';

1 import 'package:flutter/material.dart';

2

3 class RestoreButton extends StatelessWidget {

5 - const RestoreButton({

6 - required this.onPressed,

7 - required this.image,

8 - required this.title,

9 - required this.description});

4 + const RestoreButton(

5 + {required this.onPressed,

6 + required this.image,

7 + required this.title,

8 + required this.description});

9

10 final VoidCallback onPressed;

11 final Image image;

@@ -24,10 +23,7 @@ class RestoreButton extends StatelessWidget {

23 alignment: Alignment.topLeft,

24 decoration: BoxDecoration(

25 borderRadius: BorderRadius.all(Radius.circular(12)),

27 - color: Theme.of(context)

28 - .accentTextTheme!

29 - .bodySmall!

30 - .color!,

26 + color: Theme.of(context).accentTextTheme.bodySmall!.color!,

27 ),

28 child: Row(

29 mainAxisSize: MainAxisSize.max,

@@ -49,7 +45,7 @@ class RestoreButton extends StatelessWidget {

45 fontSize: 16,

46 fontWeight: FontWeight.w500,

47 color: Theme.of(context)

52 - .primaryTextTheme!

48 + .primaryTextTheme

49 .titleLarge!

50 .color!),

51 ),

@@ -61,7 +57,7 @@ class RestoreButton extends StatelessWidget {

57 fontSize: 14,

58 fontWeight: FontWeight.normal,

59 color: Theme.of(context)

64 - .primaryTextTheme!

60 + .primaryTextTheme

61 .labelSmall!

62 .color!),

63 ),

lib/src/screens/settings/widgets/settings_cell_with_arrow.dart

+3 -4

@@ -6,7 +6,6 @@ class SettingsCellWithArrow extends StandardListRow {

6 : super(title: title, isSelected: false, onTap: handler);

7

8 @override

9 - Widget buildTrailing(BuildContext context) =>

10 - Image.asset('assets/images/select_arrow.png',

11 - color: Theme.of(context).primaryTextTheme!.labelSmall!.color!);

12 -}

\ No newline at end of file

9 + Widget buildTrailing(BuildContext context) => Image.asset('assets/images/select_arrow.png',

10 + color: Theme.of(context).primaryTextTheme.labelSmall!.color!);

11 +}

lib/src/screens/support/support_page.dart

+61 -38

@@ -1,55 +1,78 @@

1 -import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart';

2 -import 'package:cake_wallet/src/screens/settings/widgets/settings_link_provider_cell.dart';

3 -import 'package:cake_wallet/src/widgets/standard_list.dart';

4 -import 'package:cake_wallet/utils/responsive_layout_util.dart';

5 -import 'package:cake_wallet/view_model/settings/link_list_item.dart';

6 -import 'package:cake_wallet/view_model/settings/regular_list_item.dart';

1 +import 'package:cake_wallet/generated/i18n.dart';

2 +import 'package:cake_wallet/routes.dart';

3 +import 'package:cake_wallet/src/screens/support/widgets/support_tiles.dart';

4 +import 'package:cake_wallet/src/screens/base_page.dart';

5 +import 'package:cake_wallet/utils/device_info.dart';

6 import 'package:cake_wallet/view_model/support_view_model.dart';

7 import 'package:flutter/material.dart';

9 -import 'package:cake_wallet/src/screens/base_page.dart';

10 -import 'package:cake_wallet/generated/i18n.dart';

8 +import 'package:url_launcher/url_launcher.dart';

9

10 class SupportPage extends BasePage {

11 SupportPage(this.supportViewModel);

12

13 final SupportViewModel supportViewModel;

14

15 + final imageLiveSupport = Image.asset('assets/images/live_support.png');

16 + final imageWalletGuides = Image.asset('assets/images/wallet_guides.png');

17 + final imageMoreLinks = Image.asset('assets/images/more_links.png');

18 +

19 @override

20 String get title => S.current.settings_support;

21

22 @override

21 - Widget body(BuildContext context) {

22 - final iconColor = Theme.of(context)

23 - .accentTextTheme!

24 - .displayLarge!

25 - .backgroundColor!;

26 - // FIX-ME: Added `context` it was not used here before, maby bug ?

27 - return Center(

28 - child: ConstrainedBox(

29 - constraints: BoxConstraints(maxWidth: 500),

30 - child: SectionStandardList(

31 - context: context,

32 - sectionCount: 1,

33 - itemCounter: (int _) => supportViewModel.items.length,

34 - itemBuilder: (_, __, index) {

35 - final item = supportViewModel.items[index];

23 + AppBarStyle get appBarStyle => AppBarStyle.regular;

24

37 - if (item is RegularListItem) {

38 - return SettingsCellWithArrow(title: item.title, handler: item.handler);

39 - }

40 -

41 - if (item is LinkListItem) {

42 - return SettingsLinkProviderCell(

43 - title: item.title,

44 - icon: item.icon,

45 - iconColor: item.hasIconColor ? iconColor : null,

46 - link: item.link,

47 - linkTitle: item.linkTitle);

48 - }

49 -

50 - return Container();

51 - }),

25 + @override

26 + Widget body(BuildContext context) {

27 + return Container(

28 + child: Center(

29 + child: ConstrainedBox(

30 + constraints: BoxConstraints(maxWidth: 330),

31 + child: Column(

32 + children: [

33 + Padding(

34 + padding: EdgeInsets.only(top: 24),

35 + child: SupportTile(

36 + image: imageLiveSupport,

37 + title: S.of(context).support_title_live_chat,

38 + description: S.of(context).support_description_live_chat,

39 + onPressed: () {

40 + if (DeviceInfo.instance.isDesktop) {

41 + _launchUrl(supportViewModel.fetchUrl());

42 + } else {

43 + Navigator.pushNamed(context, Routes.supportLiveChat);

44 + }

45 + },

46 + ),

47 + ),

48 + Padding(

49 + padding: EdgeInsets.only(top: 24),

50 + child: SupportTile(

51 + image: imageWalletGuides,

52 + title: S.of(context).support_title_guides,

53 + description: S.of(context).support_description_guides,

54 + onPressed: () => _launchUrl(supportViewModel.guidesUrl),

55 + ),

56 + ),

57 + Padding(

58 + padding: EdgeInsets.only(top: 24),

59 + child: SupportTile(

60 + image: imageMoreLinks,

61 + title: S.of(context).support_title_other_links,

62 + description: S.of(context).support_description_other_links,

63 + onPressed: () => Navigator.pushNamed(context, Routes.supportOtherLinks),

64 + ),

65 + ),

66 + ],

67 + ),

68 + ),

69 ),

70 );

71 }

72 +

73 + void _launchUrl(String url) async {

74 + try {

75 + await launchUrl(Uri.parse(url), mode: LaunchMode.externalApplication);

76 + } catch (e) {}

77 + }

78 }

lib/src/screens/support/widgets/support_tiles.dart new

+69

@@ -0,0 +1,69 @@

1 +import 'package:flutter/material.dart';

2 +

3 +class SupportTile extends StatelessWidget {

4 + const SupportTile(

5 + {required this.onPressed,

6 + required this.image,

7 + required this.title,

8 + required this.description});

9 +

10 + final VoidCallback onPressed;

11 + final Image image;

12 + final String title;

13 + final String description;

14 +

15 + @override

16 + Widget build(BuildContext context) {

17 + return GestureDetector(

18 + onTap: onPressed,

19 + child: Container(

20 + width: double.infinity,

21 + padding: EdgeInsets.all(24),

22 + alignment: Alignment.center,

23 + decoration: BoxDecoration(

24 + borderRadius: BorderRadius.all(Radius.circular(12)),

25 + color: Theme.of(context).accentTextTheme.bodySmall!.color!,

26 + ),

27 + child: Row(

28 + mainAxisSize: MainAxisSize.max,

29 + mainAxisAlignment: MainAxisAlignment.center,

30 + crossAxisAlignment: CrossAxisAlignment.start,

31 + children: <Widget>[

32 + image,

33 + Expanded(

34 + child: Padding(

35 + padding: EdgeInsets.only(left: 16),

36 + child: Column(

37 + mainAxisSize: MainAxisSize.max,

38 + mainAxisAlignment: MainAxisAlignment.start,

39 + crossAxisAlignment: CrossAxisAlignment.start,

40 + children: <Widget>[

41 + Text(

42 + title,

43 + style: TextStyle(

44 + fontSize: 20,

45 + fontWeight: FontWeight.w500,

46 + color: Theme.of(context).primaryTextTheme.titleLarge!.color!,

47 + ),

48 + ),

49 + Padding(

50 + padding: EdgeInsets.only(top: 5),

51 + child: Text(

52 + description,

53 + style: TextStyle(

54 + fontSize: 16,

55 + fontWeight: FontWeight.normal,

56 + color: Theme.of(context).primaryTextTheme.labelSmall!.color!,

57 + ),

58 + ),

59 + )

60 + ],

61 + ),

62 + ),

63 + )

64 + ],

65 + ),

66 + ),

67 + );

68 + }

69 +}

lib/src/screens/support_chat/support_chat_page.dart new

+38

@@ -0,0 +1,38 @@

1 +import 'package:cake_wallet/generated/i18n.dart';

2 +import 'package:cake_wallet/src/screens/base_page.dart';

3 +import 'package:cake_wallet/src/screens/support_chat/widgets/chatwoot_widget.dart';

4 +import 'package:cake_wallet/view_model/support_view_model.dart';

5 +import 'package:flutter/material.dart';

6 +import 'package:flutter_secure_storage/flutter_secure_storage.dart';

7 +

8 +

9 +class SupportChatPage extends BasePage {

10 + SupportChatPage(this.supportViewModel, {required this.secureStorage});

11 +

12 + final SupportViewModel supportViewModel;

13 + final FlutterSecureStorage secureStorage;

14 +

15 + @override

16 + String get title => S.current.settings_support;

17 +

18 + @override

19 + AppBarStyle get appBarStyle => AppBarStyle.regular;

20 +

21 + @override

22 + Widget body(BuildContext context) => FutureBuilder<String>(

23 + future: getCookie(),

24 + builder: (BuildContext context, AsyncSnapshot<String> snapshot) {

25 + print(snapshot.data);

26 + if (snapshot.hasData)

27 + return ChatwootWidget(

28 + secureStorage,

29 + supportUrl: supportViewModel.fetchUrl(authToken: snapshot.data!)

30 + );

31 + return Container();

32 + },

33 + );

34 +

35 + Future<String> getCookie() async {

36 + return await secureStorage.read(key: COOKIE_KEY) ?? "";

37 + }

38 +}

lib/src/screens/support_chat/widgets/chatwoot_widget.dart new

+62

@@ -0,0 +1,62 @@

1 +import 'dart:convert';

2 +

3 +import 'package:flutter/material.dart';

4 +import 'package:flutter_inappwebview/flutter_inappwebview.dart';

5 +import 'package:flutter_secure_storage/flutter_secure_storage.dart';

6 +

7 +const COOKIE_KEY = 'chatwootCookie';

8 +

9 +class ChatwootWidget extends StatefulWidget {

10 + ChatwootWidget(this.secureStorage, {required this.supportUrl});

11 +

12 + final FlutterSecureStorage secureStorage;

13 + final String supportUrl;

14 +

15 + @override

16 + ChatwootWidgetState createState() => ChatwootWidgetState();

17 +}

18 +

19 +class ChatwootWidgetState extends State<ChatwootWidget> {

20 + final GlobalKey _webViewkey = GlobalKey();

21 +

22 + @override

23 + Widget build(BuildContext context) => InAppWebView(

24 + key: _webViewkey,

25 + initialOptions: InAppWebViewGroupOptions(

26 + crossPlatform: InAppWebViewOptions(transparentBackground: true),

27 + ),

28 + initialUrlRequest: URLRequest(url: Uri.tryParse(widget.supportUrl)),

29 + onWebViewCreated: (InAppWebViewController controller) {

30 + controller.addWebMessageListener(

31 + WebMessageListener(

32 + jsObjectName: 'ReactNativeWebView',

33 + onPostMessage: (String? message, Uri? sourceOrigin, bool isMainFrame,

34 + JavaScriptReplyProxy replyProxy) {

35 + final shortenedMessage = message?.substring(16);

36 + if (shortenedMessage != null && isJsonString(shortenedMessage)) {

37 + final parsedMessage = jsonDecode(shortenedMessage);

38 + final eventType = parsedMessage["event"];

39 + if (eventType == 'loaded') {

40 + final authToken = parsedMessage["config"]["authToken"];

41 + print(authToken);

42 + storeCookie(authToken as String);

43 + }

44 + }

45 + },

46 + ),

47 + );

48 + },

49 + );

50 +

51 + bool isJsonString(String str) {

52 + try {

53 + jsonDecode(str);

54 + } catch (e) {

55 + return false;

56 + }

57 + return true;

58 + }

59 +

60 + Future<void> storeCookie(String value) async =>

61 + await widget.secureStorage.write(key: COOKIE_KEY, value: value);

62 +}

lib/src/screens/support_other_links/support_other_links_page.dart new

+58

@@ -0,0 +1,58 @@

1 +import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart';

2 +import 'package:cake_wallet/src/screens/settings/widgets/settings_link_provider_cell.dart';

3 +import 'package:cake_wallet/src/widgets/standard_list.dart';

4 +import 'package:cake_wallet/view_model/settings/link_list_item.dart';

5 +import 'package:cake_wallet/view_model/settings/regular_list_item.dart';

6 +import 'package:cake_wallet/view_model/support_view_model.dart';

7 +import 'package:flutter/material.dart';

8 +import 'package:cake_wallet/src/screens/base_page.dart';

9 +import 'package:cake_wallet/generated/i18n.dart';

10 +

11 +class SupportOtherLinksPage extends BasePage {

12 + SupportOtherLinksPage(this.supportViewModel);

13 +

14 + final SupportViewModel supportViewModel;

15 +

16 + @override

17 + String get title => S.current.settings_support;

18 +

19 + @override

20 + AppBarStyle get appBarStyle => AppBarStyle.transparent;

21 +

22 + @override

23 + Widget body(BuildContext context) {

24 + final iconColor =

25 + Theme.of(context).accentTextTheme.displayLarge!.backgroundColor!;

26 +

27 + return Container(

28 + child: Center(

29 + child: ConstrainedBox(

30 + constraints: BoxConstraints(maxWidth: 500),

31 + child: SectionStandardList(

32 + context: context,

33 + sectionCount: 1,

34 + itemCounter: (int _) => supportViewModel.items.length,

35 + itemBuilder: (_, __, index) {

36 + final item = supportViewModel.items[index];

37 +

38 + if (item is RegularListItem) {

39 + return SettingsCellWithArrow(

40 + title: item.title, handler: item.handler);

41 + }

42 +

43 + if (item is LinkListItem) {

44 + return SettingsLinkProviderCell(

45 + title: item.title,

46 + icon: item.icon,

47 + iconColor: item.hasIconColor ? iconColor : null,

48 + link: item.link,

49 + linkTitle: item.linkTitle);

50 + }

51 +

52 + return Container();

53 + }),

54 + ),

55 + ),

56 + );

57 + }

58 +}

lib/view_model/support_view_model.dart

+14 -15

@@ -1,12 +1,9 @@

1 import 'package:cake_wallet/generated/i18n.dart';

2 import 'package:cake_wallet/view_model/settings/link_list_item.dart';

3 -import 'package:cake_wallet/view_model/settings/regular_list_item.dart';

3 import 'package:cake_wallet/view_model/settings/settings_list_item.dart';

5 -import 'package:flutter/cupertino.dart';

6 -import 'package:flutter/material.dart';

7 -import 'package:mobx/mobx.dart';

8 -import 'package:url_launcher/url_launcher.dart';

4 import 'package:cake_wallet/wallet_type_utils.dart';

5 +import 'package:mobx/mobx.dart';

6 +import 'package:cake_wallet/.secrets.g.dart' as secrets;

7

8 part 'support_view_model.g.dart';

9

@@ -15,14 +12,6 @@ class SupportViewModel = SupportViewModelBase with _$SupportViewModel;

12 abstract class SupportViewModelBase with Store {

13 SupportViewModelBase()

14 : items = [

18 - RegularListItem(

19 - title: S.current.faq,

20 - handler: (BuildContext context) async {

21 - try {

22 - await launch(url);

23 - } catch (e) {}

24 - },

25 - ),

15 LinkListItem(

16 title: 'Email',

17 linkTitle: 'support@cakewallet.com',

@@ -85,7 +74,17 @@ abstract class SupportViewModelBase with Store {

74 // link: 'mailto:support@y.at')

75 ];

76

88 - static const url = 'https://guides.cakewallet.com';

77 + final guidesUrl = 'https://guides.cakewallet.com';

78 +

79 + String fetchUrl({String locale = "en", String authToken = ""}) {

80 + var supportUrl =

81 + "https://support.cakewallet.com/widget?website_token=${secrets.chatwootWebsiteToken}&locale=${locale}";

82 +

83 + if (authToken.isNotEmpty)

84 + supportUrl += "&cw_conversation=$authToken";

85 +

86 + return supportUrl;

87 + }

88

89 List<SettingsListItem> items;

91 -}

\ No newline at end of file

90 +}

pubspec_base.yaml

+1

@@ -100,6 +100,7 @@ dev_dependencies:

100 # check flutter_launcher_icons for usage

101 pedantic: ^1.8.0

102 # replace https://github.com/dart-lang/lints#migrating-from-packagepedantic

103 + translator: ^0.1.7

104

105 flutter_icons:

106 image_path: "assets/images/app_logo.png"

res/values/strings_ar.arb

+16 -10

@@ -630,18 +630,18 @@

630 "setup_totp_recommended": "إعداد TOTP (موصى به)",

631 "disable_buy": "تعطيل إجراء الشراء",

632 "disable_sell": "قم بتعطيل إجراء البيع",

633 - "cake_2fa_preset" : " كعكة 2FA مسبقا",

633 + "cake_2fa_preset": " كعكة 2FA مسبقا",

634 "narrow": "ضيق",

635 "normal": "طبيعي",

636 "aggressive": "عنيف",

637 "require_for_assessing_wallet": "تتطلب الوصول إلى المحفظة",

638 - "require_for_sends_to_non_contacts" : "تتطلب لارسال لغير جهات الاتصال",

639 - "require_for_sends_to_contacts" : "تتطلب لارسال جهات الاتصال",

640 - "require_for_sends_to_internal_wallets" : "تتطلب عمليات الإرسال إلى المحافظ الداخلية",

641 - "require_for_exchanges_to_internal_wallets" : "تتطلب عمليات التبادل إلى المحافظ الداخلية",

642 - "require_for_adding_contacts" : "تتطلب إضافة جهات اتصال",

643 - "require_for_creating_new_wallets" : "تتطلب إنشاء محافظ جديدة",

644 - "require_for_all_security_and_backup_settings" : "مطلوب لجميع إعدادات الأمان والنسخ الاحتياطي",

638 + "require_for_sends_to_non_contacts": "تتطلب لارسال لغير جهات الاتصال",

639 + "require_for_sends_to_contacts": "تتطلب لارسال جهات الاتصال",

640 + "require_for_sends_to_internal_wallets": "تتطلب عمليات الإرسال إلى المحافظ الداخلية",

641 + "require_for_exchanges_to_internal_wallets": "تتطلب عمليات التبادل إلى المحافظ الداخلية",

642 + "require_for_adding_contacts": "تتطلب إضافة جهات اتصال",

643 + "require_for_creating_new_wallets": "تتطلب إنشاء محافظ جديدة",

644 + "require_for_all_security_and_backup_settings": "مطلوب لجميع إعدادات الأمان والنسخ الاحتياطي",

645 "available_balance_description": "الرصيد المتاح هو الرصيد الذي يمكنك إنفاقه أو تحويله إلى محفظة أخرى. يتم تجميد الرصيد المتاح للمعاملات الصادرة والمعاملات الواردة غير المؤكدة.",

646 "syncing_wallet_alert_title": "محفظتك تتم مزامنتها",

647 "syncing_wallet_alert_content": "قد لا يكتمل رصيدك وقائمة المعاملات الخاصة بك حتى تظهر عبارة “SYNCHRONIZED“ في الأعلى. انقر / اضغط لمعرفة المزيد.",

@@ -668,5 +668,11 @@

668 "slidable": "قابل للانزلاق",

669 "etherscan_history": "Etherscan تاريخ",

670 "manage_nodes": "ﺪﻘﻌﻟﺍ ﺓﺭﺍﺩﺇ",

671 - "template_name": "اسم القالب"

672 -}

671 + "template_name": "اسم القالب",

672 + "support_title_live_chat": "الدعم المباشر",

673 + "support_description_live_chat": "حرة وسريعة! ممثلو الدعم المدربين متاحون للمساعدة",

674 + "support_title_guides": "أدلة محفظة كعكة",

675 + "support_description_guides": "توثيق ودعم القضايا المشتركة",

676 + "support_title_other_links": "روابط دعم أخرى",

677 + "support_description_other_links": "انضم إلى مجتمعاتنا أو تصل إلينا شركائنا من خلال أساليب أخرى"

678 +}

\ No newline at end of file

res/values/strings_bg.arb

+7 -1

@@ -664,5 +664,11 @@

664 "slidable": "Плъзгащ се",

665 "etherscan_history": "История на Etherscan",

666 "manage_nodes": "Управление на възли",

667 - "template_name": "Име на шаблон"

667 + "template_name": "Име на шаблон",

668 + "support_title_live_chat": "Подкрепа на живо",

669 + "support_description_live_chat": "Безплатно и бързо! Обучени представители на подкрепата са на разположение за подпомагане",

670 + "support_title_guides": "Ръководства за портфейл за торта",

671 + "support_description_guides": "Документация и подкрепа за общи проблеми",

672 + "support_title_other_links": "Други връзки за поддръжка",

673 + "support_description_other_links": "Присъединете се към нашите общности или се свържете с нас нашите партньори чрез други методи"

674 }

res/values/strings_cs.arb

+7 -1

@@ -664,5 +664,11 @@

664 "slidable": "Posuvné",

665 "manage_nodes": "Spravovat uzly",

666 "etherscan_history": "Historie Etherscanu",

667 - "template_name": "Název šablony"

667 + "template_name": "Název šablony",

668 + "support_title_live_chat": "Živá podpora",

669 + "support_description_live_chat": "Zdarma a rychle! K dispozici jsou zástupci vyškolených podpůrných podpory",

670 + "support_title_guides": "Průvodce peněženkami dortu",

671 + "support_description_guides": "Dokumentace a podpora běžných otázek",

672 + "support_title_other_links": "Další odkazy na podporu",

673 + "support_description_other_links": "Připojte se k našim komunitám nebo se k nám oslovte další metody"

674 }

res/values/strings_de.arb

+8 -2

@@ -211,7 +211,7 @@

211 "settings_only_trades": "Nur Handel",

212 "settings_only_transactions": "Nur Transaktionen",

213 "settings_none": "Keiner",

214 - "settings_support": "Unterstützen",

214 + "settings_support": "Hilfe",

215 "settings_terms_and_conditions": "Geschäftsbedingungen",

216 "pin_is_incorrect": "PIN ist falsch",

217 "setup_pin": "PIN einrichten",

@@ -672,5 +672,11 @@

672 "slidable": "Verschiebbar",

673 "manage_nodes": "Knoten verwalten",

674 "etherscan_history": "Etherscan-Geschichte",

675 - "template_name": "Vorlagenname"

675 + "template_name": "Vorlagenname",

676 + "support_title_live_chat": "Live Support",

677 + "support_description_live_chat": "Kostenlos und schnell! Ausgebildete Mitarbeiter stehen zur Unterstützung bereit, um zu helfen",

678 + "support_title_guides": "Cake Wallet Guides",

679 + "support_description_guides": "Dokumentation und Hilfe für bekannte Probleme",

680 + "support_title_other_links": "Andere Support-Links",

681 + "support_description_other_links": "Treten Sie unseren Communities bei oder erreichen Sie uns oder unsere Partner über andere Methoden"

682 }

res/values/strings_en.arb

+7 -1

@@ -672,5 +672,11 @@

672 "slidable": "Slidable",

673 "manage_nodes": "Manage nodes",

674 "etherscan_history": "Etherscan history",

675 - "template_name": "Template Name"

675 + "template_name": "Template Name",

676 + "support_title_live_chat": "Live support",

677 + "support_description_live_chat": "Free and fast! Trained support representatives are available to assist",

678 + "support_title_guides": "Cake Wallet guides",

679 + "support_description_guides": "Documentation and support for common issues",

680 + "support_title_other_links": "Other support links",

681 + "support_description_other_links": "Join our communities or reach us our our partners through other methods"

682 }

res/values/strings_es.arb

+7 -1

@@ -672,5 +672,11 @@

672 "slidable": "deslizable",

673 "manage_nodes": "Administrar nodos",

674 "etherscan_history": "historia de etherscan",

675 - "template_name": "Nombre de la plantilla"

675 + "template_name": "Nombre de la plantilla",

676 + "support_title_live_chat": "Soporte vital",

677 + "support_description_live_chat": "¡GRATIS y RÁPIDO! Los representantes de apoyo capacitado están disponibles para ayudar",

678 + "support_title_guides": "Guías de billetera para pastel",

679 + "support_description_guides": "Documentación y apoyo para problemas comunes",

680 + "support_title_other_links": "Otros enlaces de soporte",

681 + "support_description_other_links": "Únase a nuestras comunidades o comuníquese con nosotros nuestros socios a través de otros métodos"

682 }

res/values/strings_fr.arb

+7 -1

@@ -672,5 +672,11 @@

672 "slidable": "Glissable",

673 "manage_nodes": "Gérer les nœuds",

674 "etherscan_history": "Historique d'Etherscan",

675 - "template_name": "Nom du modèle"

675 + "template_name": "Nom du modèle",

676 + "support_title_live_chat": "Support en direct",

677 + "support_description_live_chat": "GRATUIT ET RAPIDE! Des représentants de soutien formé sont disponibles pour aider",

678 + "support_title_guides": "Guides de portefeuille à gâteau",

679 + "support_description_guides": "Documentation et soutien aux problèmes communs",

680 + "support_title_other_links": "Autres liens d'assistance",

681 + "support_description_other_links": "Rejoignez nos communautés ou contactez-nous nos partenaires à travers d'autres méthodes"

682 }

res/values/strings_ha.arb

+7 -1

@@ -650,5 +650,11 @@

650 "slidable": "Mai iya zamewa",

651 "etherscan_history": "Etherscan tarihin kowane zamani",

652 "manage_nodes": "Sarrafa nodes",

653 - "template_name": "Sunan Samfura"

653 + "template_name": "Sunan Samfura",

654 + "support_title_live_chat": "Tallafi na Live",

655 + "support_description_live_chat": "Kyauta da sauri! An horar da wakilan tallafi na tallafi don taimakawa",

656 + "support_title_guides": "Jagorar Cake",

657 + "support_description_guides": "Tallafi da tallafi don batutuwa na yau da kullun",

658 + "support_title_other_links": "Sauran hanyoyin tallafi",

659 + "support_description_other_links": "Kasance tare da al'ummominmu ko kuma ka kai mu abokanmu ta hanyar wasu hanyoyi"

660 }

res/values/strings_hi.arb

+7 -1

@@ -672,5 +672,11 @@

672 "slidable": "फिसलने लायक",

673 "manage_nodes": "नोड्स प्रबंधित करें",

674 "etherscan_history": "इथरस्कैन इतिहास",

675 - "template_name": "टेम्पलेट नाम"

675 + "template_name": "टेम्पलेट नाम",

676 + "support_title_live_chat": "लाइव सहायता",

677 + "support_description_live_chat": "मुक्त और तेजी से! प्रशिक्षित सहायता प्रतिनिधि सहायता के लिए उपलब्ध हैं",

678 + "support_title_guides": "केक वॉलेट गाइड",

679 + "support_description_guides": "सामान्य मुद्दों के लिए प्रलेखन और समर्थन",

680 + "support_title_other_links": "अन्य समर्थन लिंक",

681 + "support_description_other_links": "हमारे समुदायों में शामिल हों या अन्य तरीकों के माध्यम से हमारे साथी तक पहुंचें"

682 }

res/values/strings_hr.arb

+7 -1

@@ -672,5 +672,11 @@

672 "slidable": "Klizna",

673 "manage_nodes": "Upravljanje čvorovima",

674 "etherscan_history": "Etherscan povijest",

675 - "template_name": "Naziv predloška"

675 + "template_name": "Naziv predloška",

676 + "support_title_live_chat": "Podrška uživo",

677 + "support_description_live_chat": "Besplatno i brzo! Obučeni predstavnici podrške dostupni su za pomoć",

678 + "support_title_guides": "Vodiči za torte",

679 + "support_description_guides": "Dokumentacija i podrška za uobičajena pitanja",

680 + "support_title_other_links": "Ostale veze za podršku",

681 + "support_description_other_links": "Pridružite se našim zajednicama ili nam dosegnu naše partnere drugim metodama"

682 }

res/values/strings_id.arb

+7 -1

@@ -660,5 +660,11 @@

660 "slidable": "Dapat digeser",

661 "manage_nodes": "Kelola node",

662 "etherscan_history": "Sejarah Etherscan",

663 - "template_name": "Nama Templat"

663 + "template_name": "Nama Templat",

664 + "support_title_live_chat": "Dukungan langsung",

665 + "support_description_live_chat": "Gratis dan Cepat! Perwakilan dukungan terlatih tersedia untuk membantu",

666 + "support_title_guides": "Panduan Dompet Kue",

667 + "support_description_guides": "Dokumentasi dan dukungan untuk masalah umum",

668 + "support_title_other_links": "Tautan dukungan lainnya",

669 + "support_description_other_links": "Bergabunglah dengan komunitas kami atau hubungi kami mitra kami melalui metode lain"

670 }

res/values/strings_it.arb

+7 -1

@@ -672,5 +672,11 @@

672 "slidable": "Scorrevole",

673 "manage_nodes": "Gestisci i nodi",

674 "etherscan_history": "Storia Etherscan",

675 - "template_name": "Nome modello"

675 + "template_name": "Nome modello",

676 + "support_title_live_chat": "Supporto dal vivo",

677 + "support_description_live_chat": "Gratuito e veloce! I rappresentanti di supporto qualificati sono disponibili per assistere",

678 + "support_title_guides": "Guide del portafoglio per torte",

679 + "support_description_guides": "Documentazione e supporto per problemi comuni",

680 + "support_title_other_links": "Altri collegamenti di supporto",

681 + "support_description_other_links": "Unisciti alle nostre comunità o raggiungici i nostri partner attraverso altri metodi"

682 }

res/values/strings_ja.arb

+16 -10

@@ -634,18 +634,18 @@

634 "setup_totp_recommended": "TOTP を設定する (推奨)",

635 "disable_buy": "購入アクションを無効にする",

636 "disable_sell": "販売アクションを無効にする",

637 - "cake_2fa_preset" : "ケーキ 2FA プリセット",

637 + "cake_2fa_preset": "ケーキ 2FA プリセット",

638 "narrow": "狭い",

639 "normal": "普通",

640 "aggressive": "熱心すぎる",

641 "require_for_assessing_wallet": "ウォレットにアクセスするために必要です",

642 - "require_for_sends_to_non_contacts" : "非連絡先への送信に必須",

643 - "require_for_sends_to_contacts" : "連絡先に送信する場合に必須",

644 - "require_for_sends_to_internal_wallets" : "内部ウォレットへの送信に必須",

645 - "require_for_exchanges_to_internal_wallets" : "内部ウォレットへの交換に必要",

646 - "require_for_adding_contacts" : "連絡先の追加に必要",

647 - "require_for_creating_new_wallets" : "新しいウォレットを作成するために必要です",

648 - "require_for_all_security_and_backup_settings" : "すべてのセキュリティおよびバックアップ設定に必須",

642 + "require_for_sends_to_non_contacts": "非連絡先への送信に必須",

643 + "require_for_sends_to_contacts": "連絡先に送信する場合に必須",

644 + "require_for_sends_to_internal_wallets": "内部ウォレットへの送信に必須",

645 + "require_for_exchanges_to_internal_wallets": "内部ウォレットへの交換に必要",

646 + "require_for_adding_contacts": "連絡先の追加に必要",

647 + "require_for_creating_new_wallets": "新しいウォレットを作成するために必要です",

648 + "require_for_all_security_and_backup_settings": "すべてのセキュリティおよびバックアップ設定に必須",

649 "available_balance_description": "利用可能な残高は、ウォレットの残高から冷凍残高を差し引いたものです。",

650 "syncing_wallet_alert_title": "ウォレットは同期中です",

651 "syncing_wallet_alert_content": "上部に「同期済み」と表示されるまで、残高と取引リストが完了していない可能性があります。詳細については、クリック/タップしてください。",

@@ -672,5 +672,11 @@

672 "slidable": "スライド可能",

673 "manage_nodes": "ノードの管理",

674 "etherscan_history": "イーサスキャンの歴史",

675 - "template_name": "テンプレート名"

676 -}

675 + "template_name": "テンプレート名",

676 + "support_title_live_chat": "ライブサポート",

677 + "support_description_live_chat": "無料で速い！訓練されたサポート担当者が支援することができます",

678 + "support_title_guides": "ケーキウォレットガイド",

679 + "support_description_guides": "一般的な問題のドキュメントとサポート",

680 + "support_title_other_links": "その他のサポートリンク",

681 + "support_description_other_links": "私たちのコミュニティに参加するか、他の方法を通して私たちのパートナーに連絡してください"

682 +}

\ No newline at end of file

res/values/strings_ko.arb

+16 -10

@@ -634,18 +634,18 @@

634 "setup_totp_recommended": "TOTP 설정(권장)",

635 "disable_buy": "구매 행동 비활성화",

636 "disable_sell": "판매 조치 비활성화",

637 - "cake_2fa_preset" : "케이크 2FA 프리셋",

637 + "cake_2fa_preset": "케이크 2FA 프리셋",

638 "narrow": "좁은",

639 "normal": "정상",

640 "aggressive": "지나치게 열심인",

641 "require_for_assessing_wallet": "지갑 접근을 위해 필요",

642 - "require_for_sends_to_non_contacts" : "비접촉자에게 보내는 데 필요",

643 - "require_for_sends_to_contacts" : "연락처로 보내기에 필요",

644 - "require_for_sends_to_internal_wallets" : "내부 지갑으로 보내는 데 필요",

645 - "require_for_exchanges_to_internal_wallets" : "내부 지갑으로의 교환에 필요",

646 - "require_for_adding_contacts" : "연락처 추가에 필요",

647 - "require_for_creating_new_wallets" : "새 지갑 생성에 필요",

648 - "require_for_all_security_and_backup_settings" : "모든 보안 및 백업 설정에 필요",

642 + "require_for_sends_to_non_contacts": "비접촉자에게 보내는 데 필요",

643 + "require_for_sends_to_contacts": "연락처로 보내기에 필요",

644 + "require_for_sends_to_internal_wallets": "내부 지갑으로 보내는 데 필요",

645 + "require_for_exchanges_to_internal_wallets": "내부 지갑으로의 교환에 필요",

646 + "require_for_adding_contacts": "연락처 추가에 필요",

647 + "require_for_creating_new_wallets": "새 지갑 생성에 필요",

648 + "require_for_all_security_and_backup_settings": "모든 보안 및 백업 설정에 필요",

649 "available_balance_description": "이 지갑에서 사용할 수 있는 잔액입니다. 이 잔액은 블록체인에서 가져온 것이며, Cake Wallet이 사용할 수 없습니다.",

650 "syncing_wallet_alert_title": "지갑 동기화 중",

651 "syncing_wallet_alert_content": "상단에 \"동기화됨\"이라고 표시될 때까지 잔액 및 거래 목록이 완전하지 않을 수 있습니다. 자세히 알아보려면 클릭/탭하세요.",

@@ -672,5 +672,11 @@

672 "slidable": "슬라이딩 가능",

673 "manage_nodes": "노드 관리",

674 "etherscan_history": "이더스캔 역사",

675 - "template_name": "템플릿 이름"

676 -}

675 + "template_name": "템플릿 이름",

676 + "support_title_live_chat": "실시간 지원",

677 + "support_description_live_chat": "자유롭고 빠릅니다! 훈련 된 지원 담당자가 지원할 수 있습니다",

678 + "support_title_guides": "케이크 지갑 가이드",

679 + "support_description_guides": "일반적인 문제에 대한 문서화 및 지원",

680 + "support_title_other_links": "다른 지원 링크",

681 + "support_description_other_links": "다른 방법을 통해 커뮤니티에 가입하거나 파트너에게 연락하십시오."

682 +}

\ No newline at end of file

res/values/strings_my.arb

+16 -10

@@ -632,18 +632,18 @@

632 "setup_totp_recommended": "TOTP ကို စနစ်ထည့်သွင်းပါ (အကြံပြုထားသည်)",

633 "disable_buy": "ဝယ်ယူမှု လုပ်ဆောင်ချက်ကို ပိတ်ပါ။",

634 "disable_sell": "ရောင်းချခြင်းလုပ်ဆောင်ချက်ကို ပိတ်ပါ။",

635 - "cake_2fa_preset" : "ကိတ်မုန့် 2FA ကြိုတင်သတ်မှတ်",

635 + "cake_2fa_preset": "ကိတ်မုန့် 2FA ကြိုတင်သတ်မှတ်",

636 "narrow": "ကျဉ်းသော",

637 "normal": "ပုံမှန်",

638 "aggressive": "စိတ်အားထက်သန်ခြင်း။",

639 "require_for_assessing_wallet": "ပိုက်ဆံအိတ်ကို ဝင်သုံးရန် လိုအပ်သည်။",

640 - "require_for_sends_to_non_contacts" : "အဆက်အသွယ်မရှိသူများထံ ပေးပို့ရန် လိုအပ်သည်။",

641 - "require_for_sends_to_contacts" : "အဆက်အသွယ်များထံ ပေးပို့ရန် လိုအပ်သည်။",

642 - "require_for_sends_to_internal_wallets" : "အတွင်းပိုင်း ပိုက်ဆံအိတ်များသို့ ပေးပို့ရန် လိုအပ်သည်။",

643 - "require_for_exchanges_to_internal_wallets" : "အတွင်းပိုင်းပိုက်ဆံအိတ်များသို့ လဲလှယ်ရန် လိုအပ်သည်။",

644 - "require_for_adding_contacts" : "အဆက်အသွယ်များထည့်ရန် လိုအပ်သည်။",

645 - "require_for_creating_new_wallets" : "ပိုက်ဆံအိတ်အသစ်များ ဖန်တီးရန် လိုအပ်သည်။",

646 - "require_for_all_security_and_backup_settings" : "လုံခြုံရေးနှင့် အရန်ဆက်တင်များအားလုံးအတွက် လိုအပ်ပါသည်။",

640 + "require_for_sends_to_non_contacts": "အဆက်အသွယ်မရှိသူများထံ ပေးပို့ရန် လိုအပ်သည်။",

641 + "require_for_sends_to_contacts": "အဆက်အသွယ်များထံ ပေးပို့ရန် လိုအပ်သည်။",

642 + "require_for_sends_to_internal_wallets": "အတွင်းပိုင်း ပိုက်ဆံအိတ်များသို့ ပေးပို့ရန် လိုအပ်သည်။",

643 + "require_for_exchanges_to_internal_wallets": "အတွင်းပိုင်းပိုက်ဆံအိတ်များသို့ လဲလှယ်ရန် လိုအပ်သည်။",

644 + "require_for_adding_contacts": "အဆက်အသွယ်များထည့်ရန် လိုအပ်သည်။",

645 + "require_for_creating_new_wallets": "ပိုက်ဆံအိတ်အသစ်များ ဖန်တီးရန် လိုအပ်သည်။",

646 + "require_for_all_security_and_backup_settings": "လုံခြုံရေးနှင့် အရန်ဆက်တင်များအားလုံးအတွက် လိုအပ်ပါသည်။",

647 "available_balance_description": "သင့်ရဲ့ အကောင့်တွင် ရရှိနိုင်သော ငွေကျန်ငွေကို ပြန်လည်ပေးသွင်းပါ။",

648 "syncing_wallet_alert_title": "သင့်ပိုက်ဆံအိတ်ကို စင့်ခ်လုပ်နေပါသည်။",

649 "syncing_wallet_alert_content": "သင်၏လက်ကျန်နှင့် ငွေပေးငွေယူစာရင်းသည် ထိပ်တွင် \"Synchronizeed\" ဟုပြောသည်အထိ မပြီးမြောက်နိုင်ပါ။ ပိုမိုလေ့လာရန် နှိပ်/နှိပ်ပါ။",

@@ -670,5 +670,11 @@

670 "slidable": "လျှောချနိုင်သည်။",

671 "manage_nodes": "ဆုံမှတ်များကို စီမံပါ။",

672 "etherscan_history": "Etherscan သမိုင်း",

673 - "template_name": "နမူနာပုံစံ"

674 -}

673 + "template_name": "နမူနာပုံစံ",

674 + "support_title_live_chat": "တိုက်ရိုက်ပံ့ပိုးမှု",

675 + "support_description_live_chat": "အခမဲ့နှင့်အစာရှောင်ခြင်း! လေ့ကျင့်ထားသောထောက်ခံသူကိုယ်စားလှယ်များသည်ကူညီနိုင်သည်",

676 + "support_title_guides": "ကိတ်မုန့်ပိုက်ဆံအိတ်လမ်းညွှန်များ",

677 + "support_description_guides": "ဘုံပြ issues နာများအတွက်စာရွက်စာတမ်းများနှင့်ထောက်ခံမှု",

678 + "support_title_other_links": "အခြားအထောက်အပံ့လင့်များ",

679 + "support_description_other_links": "ကျွန်ုပ်တို့၏လူမှုအသိုင်းအဝိုင်းများသို့ 0 င်ရောက်ပါ"

680 +}

\ No newline at end of file

res/values/strings_nl.arb

+7 -1

@@ -672,5 +672,11 @@

672 "slidable": "Verschuifbaar",

673 "manage_nodes": "Beheer knooppunten",

674 "etherscan_history": "Etherscan-geschiedenis",

675 - "template_name": "Sjabloonnaam"

675 + "template_name": "Sjabloonnaam",

676 + "support_title_live_chat": "Live ondersteuning",

677 + "support_description_live_chat": "Gratis en snel! Getrainde ondersteuningsvertegenwoordigers zijn beschikbaar om te helpen",

678 + "support_title_guides": "Cake -portemonnee gidsen",

679 + "support_description_guides": "Documentatie en ondersteuning voor gemeenschappelijke problemen",

680 + "support_title_other_links": "Andere ondersteuningslinks",

681 + "support_description_other_links": "Word lid van onze gemeenschappen of bereik ons onze partners via andere methoden"

682 }

res/values/strings_pl.arb

+7 -1

@@ -672,5 +672,11 @@

672 "slidable": "Przesuwne",

673 "manage_nodes": "Zarządzaj węzłami",

674 "etherscan_history": "Historia Etherscanu",

675 - "template_name": "Nazwa szablonu"

675 + "template_name": "Nazwa szablonu",

676 + "support_title_live_chat": "Wsparcie na żywo",

677 + "support_description_live_chat": "Darmowe i szybkie! Do pomocy są dostępni przeszkoleni przedstawiciele wsparcia",

678 + "support_title_guides": "Przewodniki portfela ciasta",

679 + "support_description_guides": "Dokumentacja i wsparcie dla typowych problemów",

680 + "support_title_other_links": "Inne linki wsparcia",

681 + "support_description_other_links": "Dołącz do naszych społeczności lub skontaktuj się z nami naszymi partnerami za pomocą innych metod"

682 }

res/values/strings_pt.arb

+7 -1

@@ -671,5 +671,11 @@

671 "slidable": "Deslizável",

672 "manage_nodes": "Gerenciar nós",

673 "etherscan_history": "história Etherscan",

674 - "template_name": "Nome do modelo"

674 + "template_name": "Nome do modelo",

675 + "support_title_live_chat": "Apoio ao vivo",

676 + "support_description_live_chat": "Livre e rápido! Representantes de suporte treinado estão disponíveis para ajudar",

677 + "support_title_guides": "Guias da carteira de bolo",

678 + "support_description_guides": "Documentação e suporte para problemas comuns",

679 + "support_title_other_links": "Outros links de suporte",

680 + "support_description_other_links": "Junte -se às nossas comunidades ou chegue a nós nossos parceiros por meio de outros métodos"

681 }

res/values/strings_ru.arb

+16 -11

@@ -270,7 +270,6 @@

270 "error_text_node_address": "Пожалуйста, введите iPv4 адрес",

271 "error_text_node_port": "Порт ноды может содержать только цифры от 0 до 65535",

272 "error_text_node_proxy_address": "Введите <IPv4-адрес>:<порт>, например 127.0.0.1:9050.",

273 -

273 "error_text_payment_id": "Идентификатор платежа может содержать от 16 до 64 символов в hex",

274 "error_text_xmr": "Значение XMR не может превышать доступный баланс.\nКоличество цифр после запятой должно быть меньше или равно 12",

275 "error_text_fiat": "Значение суммы не может превышать доступный баланс.\nКоличество цифр после запятой должно быть меньше или равно 2",

@@ -635,18 +634,18 @@

634 "setup_totp_recommended": "Настроить TOTP (рекомендуется)",

635 "disable_buy": "Отключить действие покупки",

636 "disable_sell": "Отключить действие продажи",

638 - "cake_2fa_preset" : "Торт 2FA Preset",

637 + "cake_2fa_preset": "Торт 2FA Preset",

638 "narrow": "Узкий",

639 "normal": "Нормальный",

640 "aggressive": "чрезмерно усердный",

641 "require_for_assessing_wallet": "Требовать для доступа к кошельку",

643 - "require_for_sends_to_non_contacts" : "Требовать для отправки не контактам",

644 - "require_for_sends_to_contacts" : "Требовать для отправки контактам",

645 - "require_for_sends_to_internal_wallets" : "Требовать отправки на внутренние кошельки",

646 - "require_for_exchanges_to_internal_wallets" : "Требовать для обмена на внутренние кошельки",

647 - "require_for_adding_contacts" : "Требовать добавления контактов",

648 - "require_for_creating_new_wallets" : "Требовать для создания новых кошельков",

649 - "require_for_all_security_and_backup_settings" : "Требовать все настройки безопасности и резервного копирования",

642 + "require_for_sends_to_non_contacts": "Требовать для отправки не контактам",

643 + "require_for_sends_to_contacts": "Требовать для отправки контактам",

644 + "require_for_sends_to_internal_wallets": "Требовать отправки на внутренние кошельки",

645 + "require_for_exchanges_to_internal_wallets": "Требовать для обмена на внутренние кошельки",

646 + "require_for_adding_contacts": "Требовать добавления контактов",

647 + "require_for_creating_new_wallets": "Требовать для создания новых кошельков",

648 + "require_for_all_security_and_backup_settings": "Требовать все настройки безопасности и резервного копирования",

649 "available_balance_description": "Доступный баланс - это средства, которые вы можете использовать для покупки или продажи криптовалюты.",

650 "syncing_wallet_alert_title": "Ваш кошелек синхронизируется",

651 "syncing_wallet_alert_content": "Ваш баланс и список транзакций могут быть неполными, пока вверху не будет написано «СИНХРОНИЗИРОВАНО». Щелкните/коснитесь, чтобы узнать больше.",

@@ -673,5 +672,11 @@

672 "slidable": "Скользящий",

673 "manage_nodes": "Управление узлами",

674 "etherscan_history": "История Эфириума",

676 - "template_name": "Имя Шаблона"

677 -}

675 + "template_name": "Имя Шаблона",

676 + "support_title_live_chat": "Живая поддержка",

677 + "support_description_live_chat": "Бесплатно и быстро! Обученные представители поддержки доступны для оказания помощи",

678 + "support_title_guides": "Корт -гиды",

679 + "support_description_guides": "Документация и поддержка общих вопросов",

680 + "support_title_other_links": "Другие ссылки на поддержку",

681 + "support_description_other_links": "Присоединяйтесь к нашим сообществам или охватите нас наших партнеров с помощью других методов"

682 +}

\ No newline at end of file

res/values/strings_th.arb

+16 -10

@@ -632,18 +632,18 @@

632 "setup_totp_recommended": "ตั้งค่า TOTP (แนะนำ)",

633 "disable_buy": "ปิดการใช้งานการซื้อ",

634 "disable_sell": "ปิดการใช้งานการขาย",

635 - "cake_2fa_preset" : "เค้ก 2FA ที่ตั้งไว้ล่วงหน้า",

635 + "cake_2fa_preset": "เค้ก 2FA ที่ตั้งไว้ล่วงหน้า",

636 "narrow": "แคบ",

637 "normal": "ปกติ",

638 "aggressive": "กระตือรือร้นมากเกินไป",

639 "require_for_assessing_wallet": "จำเป็นสำหรับการเข้าถึงกระเป๋าเงิน",

640 - "require_for_sends_to_non_contacts" : "จำเป็นต้องส่งไปยังผู้ที่ไม่ได้ติดต่อ",

641 - "require_for_sends_to_contacts" : "จำเป็นต้องส่งไปยังผู้ติดต่อ",

642 - "require_for_sends_to_internal_wallets" : "จำเป็นต้องส่งไปยังกระเป๋าเงินภายใน",

643 - "require_for_exchanges_to_internal_wallets" : "ต้องการการแลกเปลี่ยนไปยังกระเป๋าเงินภายใน",

644 - "require_for_adding_contacts" : "ต้องการสำหรับการเพิ่มผู้ติดต่อ",

645 - "require_for_creating_new_wallets" : "จำเป็นสำหรับการสร้างกระเป๋าเงินใหม่",

646 - "require_for_all_security_and_backup_settings" : "จำเป็นสำหรับการตั้งค่าความปลอดภัยและการสำรองข้อมูลทั้งหมด",

640 + "require_for_sends_to_non_contacts": "จำเป็นต้องส่งไปยังผู้ที่ไม่ได้ติดต่อ",

641 + "require_for_sends_to_contacts": "จำเป็นต้องส่งไปยังผู้ติดต่อ",

642 + "require_for_sends_to_internal_wallets": "จำเป็นต้องส่งไปยังกระเป๋าเงินภายใน",

643 + "require_for_exchanges_to_internal_wallets": "ต้องการการแลกเปลี่ยนไปยังกระเป๋าเงินภายใน",

644 + "require_for_adding_contacts": "ต้องการสำหรับการเพิ่มผู้ติดต่อ",

645 + "require_for_creating_new_wallets": "จำเป็นสำหรับการสร้างกระเป๋าเงินใหม่",

646 + "require_for_all_security_and_backup_settings": "จำเป็นสำหรับการตั้งค่าความปลอดภัยและการสำรองข้อมูลทั้งหมด",

647 "available_balance_description": "จำนวนเงินที่คุณสามารถใช้ได้ในการซื้อหรือขาย",

648 "syncing_wallet_alert_title": "กระเป๋าสตางค์ของคุณกำลังซิงค์",

649 "syncing_wallet_alert_content": "รายการยอดเงินและธุรกรรมของคุณอาจไม่สมบูรณ์จนกว่าจะมีข้อความว่า “ซิงโครไนซ์” ที่ด้านบน คลิก/แตะเพื่อเรียนรู้เพิ่มเติม่",

@@ -670,5 +670,11 @@

670 "slidable": "เลื่อนได้",

671 "manage_nodes": "จัดการโหนด",

672 "etherscan_history": "ประวัติอีเธอร์สแกน",

673 - "template_name": "ชื่อแม่แบบ"

674 -}

673 + "template_name": "ชื่อแม่แบบ",

674 + "support_title_live_chat": "การสนับสนุนสด",

675 + "support_description_live_chat": "ฟรีและรวดเร็ว! ตัวแทนฝ่ายสนับสนุนที่ผ่านการฝึกอบรมพร้อมให้ความช่วยเหลือ",

676 + "support_title_guides": "คู่มือกระเป๋าเงินเค้ก",

677 + "support_description_guides": "เอกสารและการสนับสนุนสำหรับปัญหาทั่วไป",

678 + "support_title_other_links": "ลิงค์สนับสนุนอื่น ๆ",

679 + "support_description_other_links": "เข้าร่วมชุมชนของเราหรือเข้าถึงเราพันธมิตรของเราผ่านวิธีการอื่น ๆ"

680 +}

\ No newline at end of file

res/values/strings_tr.arb

+7 -1

@@ -671,5 +671,11 @@

671 "slidable": "kaydırılabilir",

672 "manage_nodes": "Düğümleri yönet",

673 "etherscan_history": "Etherscan geçmişi",

674 - "template_name": "şablon adı"

674 + "template_name": "şablon adı",

675 + "support_title_live_chat": "Canlı destek",

676 + "support_description_live_chat": "Ücretsiz ve hızlı! Eğitimli destek temsilcileri yardımcı olmak için mevcuttur",

677 + "support_title_guides": "Kek Cüzdan Kılavuzları",

678 + "support_description_guides": "Ortak sorunlara belge ve destek",

679 + "support_title_other_links": "Diğer destek bağlantıları",

680 + "support_description_other_links": "Topluluklarımıza katılın veya ortaklarımıza diğer yöntemlerle bize ulaşın"

681 }

res/values/strings_uk.arb

+7 -1

@@ -672,5 +672,11 @@

672 "slidable": "Розсувний",

673 "manage_nodes": "Керуйте вузлами",

674 "etherscan_history": "Історія Etherscan",

675 - "template_name": "Назва шаблону"

675 + "template_name": "Назва шаблону",

676 + "support_title_live_chat": "Жива підтримка",

677 + "support_description_live_chat": "Безкоштовно і швидко! Навчені представники підтримки доступні для надання допомоги",

678 + "support_title_guides": "Поклики для гаманців тортів",

679 + "support_description_guides": "Документація та підтримка загальних питань",

680 + "support_title_other_links": "Інші посилання на підтримку",

681 + "support_description_other_links": "Приєднуйтесь до наших спільнот або досягайте нас нашими партнерами іншими методами"

682 }

res/values/strings_ur.arb

+16 -10

@@ -626,18 +626,18 @@

626 "setup_totp_recommended": "TOTP ترتیب دیں (تجویز کردہ)",

627 "disable_buy": "خرید ایکشن کو غیر فعال کریں۔",

628 "disable_sell": "فروخت کی کارروائی کو غیر فعال کریں۔",

629 - "cake_2fa_preset" : "کیک 2FA پیش سیٹ",

629 + "cake_2fa_preset": "کیک 2FA پیش سیٹ",

630 "narrow": "تنگ",

631 "normal": "نارمل",

632 "aggressive": "حد سے زیادہ پرجوش",

633 "require_for_assessing_wallet": "بٹوے تک رسائی کے لیے درکار ہے۔",

634 - "require_for_sends_to_non_contacts" : "غیر رابطوں کو بھیجنے کی ضرورت ہے۔",

635 - "require_for_sends_to_contacts" : "رابطوں کو بھیجنے کی ضرورت ہے۔",

636 - "require_for_sends_to_internal_wallets" : "اندرونی بٹوے پر بھیجنے کے لیے درکار ہے۔",

637 - "require_for_exchanges_to_internal_wallets" : "اندرونی بٹوے میں تبادلے کی ضرورت ہے۔",

638 - "require_for_adding_contacts" : "رابطوں کو شامل کرنے کی ضرورت ہے۔",

639 - "require_for_creating_new_wallets" : "نئے بٹوے بنانے کی ضرورت ہے۔",

640 - "require_for_all_security_and_backup_settings" : "تمام سیکورٹی اور بیک اپ کی ترتیبات کے لیے درکار ہے۔",

634 + "require_for_sends_to_non_contacts": "غیر رابطوں کو بھیجنے کی ضرورت ہے۔",

635 + "require_for_sends_to_contacts": "رابطوں کو بھیجنے کی ضرورت ہے۔",

636 + "require_for_sends_to_internal_wallets": "اندرونی بٹوے پر بھیجنے کے لیے درکار ہے۔",

637 + "require_for_exchanges_to_internal_wallets": "اندرونی بٹوے میں تبادلے کی ضرورت ہے۔",

638 + "require_for_adding_contacts": "رابطوں کو شامل کرنے کی ضرورت ہے۔",

639 + "require_for_creating_new_wallets": "نئے بٹوے بنانے کی ضرورت ہے۔",

640 + "require_for_all_security_and_backup_settings": "تمام سیکورٹی اور بیک اپ کی ترتیبات کے لیے درکار ہے۔",

641 "available_balance_description": "”دستیاب بیلنس” یا ”تصدیق شدہ بیلنس” وہ فنڈز ہیں جو فوری طور پر خرچ کیے جا سکتے ہیں۔ اگر فنڈز کم بیلنس میں ظاہر ہوتے ہیں لیکن اوپر کے بیلنس میں نہیں، تو آپ کو مزید نیٹ ورک کی تصدیقات حاصل کرنے کے لیے آنے والے فنڈز کے لیے چند منٹ انتظار کرنا چاہیے۔ مزید تصدیق حاصل کرنے کے بعد، وہ قابل خرچ ہوں گے۔",

642 "syncing_wallet_alert_title": "آپ کا بٹوہ مطابقت پذیر ہو رہا ہے۔",

643 "syncing_wallet_alert_content": "آپ کے بیلنس اور لین دین کی فہرست اس وقت تک مکمل نہیں ہو سکتی جب تک کہ یہ سب سے اوپر \"SYNCRONIZED\" نہ کہے۔ مزید جاننے کے لیے کلک/تھپتھپائیں۔",

@@ -664,5 +664,11 @@

664 "slidable": "سلائیڈ ایبل",

665 "manage_nodes": "۔ﮟﯾﺮﮐ ﻢﻈﻧ ﺎﮐ ﺱﮈﻮﻧ",

666 "etherscan_history": "ﺦﯾﺭﺎﺗ ﯽﮐ ﻦﯿﮑﺳﺍ ﺮﮭﺘﯾﺍ",

667 - "template_name": "ٹیمپلیٹ کا نام"

668 -}

667 + "template_name": "ٹیمپلیٹ کا نام",

668 + "support_title_live_chat": "براہ راست مدد",

669 + "support_description_live_chat": "مفت اور تیز! تربیت یافتہ معاون نمائندے مدد کے لئے دستیاب ہیں",

670 + "support_title_guides": "کیک پرس گائڈز",

671 + "support_description_guides": "عام مسائل کے لئے دستاویزات اور مدد",

672 + "support_title_other_links": "دوسرے سپورٹ لنکس",

673 + "support_description_other_links": "ہماری برادریوں میں شامل ہوں یا دوسرے طریقوں سے ہمارے شراکت داروں تک پہنچیں"

674 +}

\ No newline at end of file

res/values/strings_yo.arb

+16 -10

@@ -628,18 +628,18 @@

628 "setup_totp_recommended": "Sọ TOTP (Kẹṣọdọ)",

629 "disable_buy": "Ko iṣọrọ ọja",

630 "disable_sell": "Ko iṣọrọ iṣọrọ",

631 - "cake_2fa_preset" : "Cake 2FA Tito",

631 + "cake_2fa_preset": "Cake 2FA Tito",

632 "narrow": "Taara",

633 "normal": "Deede",

634 "aggressive": "Onítara",

635 "require_for_assessing_wallet": "Beere fun wiwọle si apamọwọ",

636 - "require_for_sends_to_non_contacts" : "Beere fun fifiranṣẹ si awọn ti kii ṣe awọn olubasọrọ",

637 - "require_for_sends_to_contacts" : "Beere fun fifiranṣẹ si awọn olubasọrọ",

638 - "require_for_sends_to_internal_wallets" : "Beere fun fifiranṣẹ si awọn apamọwọ inu",

639 - "require_for_exchanges_to_internal_wallets" : "Beere fun awọn paṣipaarọ si awọn apamọwọ inu",

640 - "require_for_adding_contacts" : "Beere fun fifi awọn olubasọrọ kun",

641 - "require_for_creating_new_wallets" : "Beere fun ṣiṣẹda titun Woleti",

642 - "require_for_all_security_and_backup_settings" : "Beere fun gbogbo aabo ati awọn eto afẹyinti",

636 + "require_for_sends_to_non_contacts": "Beere fun fifiranṣẹ si awọn ti kii ṣe awọn olubasọrọ",

637 + "require_for_sends_to_contacts": "Beere fun fifiranṣẹ si awọn olubasọrọ",

638 + "require_for_sends_to_internal_wallets": "Beere fun fifiranṣẹ si awọn apamọwọ inu",

639 + "require_for_exchanges_to_internal_wallets": "Beere fun awọn paṣipaarọ si awọn apamọwọ inu",

640 + "require_for_adding_contacts": "Beere fun fifi awọn olubasọrọ kun",

641 + "require_for_creating_new_wallets": "Beere fun ṣiṣẹda titun Woleti",

642 + "require_for_all_security_and_backup_settings": "Beere fun gbogbo aabo ati awọn eto afẹyinti",

643 "available_balance_description": "“Iwọntunwọnsi Wa” tabi “Iwọntunwọnsi Ijẹrisi” jẹ awọn owo ti o le ṣee lo lẹsẹkẹsẹ. Ti awọn owo ba han ni iwọntunwọnsi kekere ṣugbọn kii ṣe iwọntunwọnsi oke, lẹhinna o gbọdọ duro iṣẹju diẹ fun awọn owo ti nwọle lati gba awọn ijẹrisi nẹtiwọọki diẹ sii. Lẹhin ti wọn gba awọn ijẹrisi diẹ sii, wọn yoo jẹ inawo.",

644 "syncing_wallet_alert_title": "Apamọwọ rẹ n muṣiṣẹpọ",

645 "syncing_wallet_alert_content": "Iwontunws.funfun rẹ ati atokọ idunadura le ma pari titi ti yoo fi sọ “SYNCHRONIZED” ni oke. Tẹ/tẹ ni kia kia lati ni imọ siwaju sii.",

@@ -666,5 +666,11 @@

666 "slidable": "Slidable",

667 "manage_nodes": "Ṣakoso awọn apa",

668 "etherscan_history": "Etherscan itan",

669 - "template_name": "Orukọ Awoṣe"

670 -}

669 + "template_name": "Orukọ Awoṣe",

670 + "support_title_live_chat": "Atilẹyin ifiwe",

671 + "support_description_live_chat": "Free ati sare! Ti oṣiṣẹ awọn aṣoju wa lati ṣe iranlọwọ",

672 + "support_title_guides": "Akara oyinbo Awọn Itọsọna Awọki oyinbo",

673 + "support_description_guides": "Iwe ati atilẹyin fun awọn ọran ti o wọpọ",

674 + "support_title_other_links": "Awọn ọna asopọ atilẹyin miiran",

675 + "support_description_other_links": "Darapọ mọ awọn agbegbe wa tabi de wa awọn alabaṣepọ wa nipasẹ awọn ọna miiran"

676 +}

\ No newline at end of file

res/values/strings_zh.arb

+16 -10

@@ -633,18 +633,18 @@

633 "setup_totp_recommended": "设置 TOTP（推荐）",

634 "disable_buy": "禁用购买操作",

635 "disable_sell": "禁用卖出操作",

636 - "cake_2fa_preset" : "蛋糕 2FA 预设",

636 + "cake_2fa_preset": "蛋糕 2FA 预设",

637 "narrow": "狭窄的",

638 "normal": "普通的",

639 "aggressive": "过分热心",

640 "require_for_assessing_wallet": "需要访问钱包",

641 - "require_for_sends_to_non_contacts" : "需要发送给非联系人",

642 - "require_for_sends_to_contacts" : "需要发送给联系人",

643 - "require_for_sends_to_internal_wallets" : "需要发送到内部钱包",

644 - "require_for_exchanges_to_internal_wallets" : "需要兑换到内部钱包",

645 - "require_for_adding_contacts" : "需要添加联系人",

646 - "require_for_creating_new_wallets" : "创建新钱包的要求",

647 - "require_for_all_security_and_backup_settings" : "需要所有安全和备份设置",

641 + "require_for_sends_to_non_contacts": "需要发送给非联系人",

642 + "require_for_sends_to_contacts": "需要发送给联系人",

643 + "require_for_sends_to_internal_wallets": "需要发送到内部钱包",

644 + "require_for_exchanges_to_internal_wallets": "需要兑换到内部钱包",

645 + "require_for_adding_contacts": "需要添加联系人",

646 + "require_for_creating_new_wallets": "创建新钱包的要求",

647 + "require_for_all_security_and_backup_settings": "需要所有安全和备份设置",

648 "available_balance_description": "可用余额是您可以使用的金额。冻结余额是您当前正在等待确认的金额。",

649 "syncing_wallet_alert_title": "您的钱包正在同步",

650 "syncing_wallet_alert_content": "您的余额和交易列表可能不完整，直到顶部显示“已同步”。单击/点击以了解更多信息。",

@@ -671,5 +671,11 @@

671 "slidable": "可滑动",

672 "manage_nodes": "管理节点",

673 "etherscan_history": "以太扫描历史",

674 - "template_name": "模板名称"

675 -}

674 + "template_name": "模板名称",

675 + "support_title_live_chat": "实时支持",

676 + "support_description_live_chat": "免费快速！训练有素的支持代表可以协助",

677 + "support_title_guides": "蛋糕钱包指南",

678 + "support_description_guides": "对常见问题的文档和支持",

679 + "support_title_other_links": "其他支持链接",

680 + "support_description_other_links": "加入我们的社区或通过其他方法与我们联系我们的合作伙伴"

681 +}

\ No newline at end of file

tool/append_translation.dart new

+66

@@ -0,0 +1,66 @@

1 +import 'dart:convert';

2 +import 'dart:io';

3 +

4 +import 'package:translator/translator.dart';

5 +

6 +const defaultLang = "en";

7 +const langs = [

8 + "ar", "bg", "cs", "de", "en", "es", "fr", "ha", "hi", "hr", "id", "it",

9 + "ja", "ko", "my", "nl", "pl", "pt", "ru", "th", "tr", "uk", "ur", "yo",

10 + "zh-cn" // zh, but Google Translate uses zh-cn for Chinese (Simplified)

11 +];

12 +final translator = GoogleTranslator();

13 +

14 +void main(List<String> args) async {

15 + if (args.length != 2) {

16 + throw Exception(

17 + 'Insufficient arguments!\n\nTry to run `./append_translation.dart greetings "Hello World!"`');

18 + }

19 +

20 + final name = args.first;

21 + final text = args.last;

22 +

23 + print('Appending "$name": "$text"');

24 +

25 + for (var lang in langs) {

26 + final fileName = getFileName(lang);

27 + final translation = await getTranslation(text, lang);

28 +

29 + appendArbFile(fileName, name, translation);

30 + }

31 +}

32 +

33 +void appendArbFile(String fileName, String name, String text) {

34 + final file = File(fileName);

35 + final inputContent = file.readAsStringSync();

36 + final arbObj = json.decode(inputContent) as Map<String, dynamic>;

37 +

38 + if (arbObj.containsKey(name)) {

39 + print("String $name already exists in $fileName!");

40 + return;

41 + }

42 +

43 + arbObj.addAll({name: text});

44 +

45 + final outputContent = json

46 + .encode(arbObj)

47 + .replaceAll('","', '",\n "')

48 + .replaceAll('{"', '{\n "')

49 + .replaceAll('"}', '"\n}')

50 + .replaceAll('":"', '": "');

51 +

52 + file.writeAsStringSync(outputContent);

53 +}

54 +

55 +

56 +Future<String> getTranslation(String text, String lang) async {

57 + if (lang == defaultLang) return text;

58 + return (await translator.translate(text, from: defaultLang, to: lang)).text;

59 +}

60 +

61 +String getFileName(String lang) {

62 + final shortLang = lang

63 + .split("-")

64 + .first;

65 + return "./res/values/strings_$shortLang.arb";

66 +}

tool/update_secrets.dart

+1 -2

@@ -33,8 +33,7 @@ Future<void> updateSecretsConfig(List<String> args) async {

33 });

34

35 final fileConfig =

36 - json.decode(configFile.readAsStringSync()) as Map<String, dynamic> ??

37 - <String, dynamic>{};

36 + json.decode(configFile.readAsStringSync()) as Map<String, dynamic>;

37 fileConfig.forEach((key, dynamic value) {

38 if (secrets[key] == null) {

39 secrets[key] = value;

tool/utils/secret_key.dart

+1

@@ -31,6 +31,7 @@ class SecretKey {

31 SecretKey('anonPayReferralCode', () => ''),

32 SecretKey('fiatApiKey', () => ''),

33 SecretKey('payfuraApiKey', () => ''),

34 + SecretKey('chatwootWebsiteToken', () => ''),

35 ];

36

37 static final ethereumSecrets = [

Cw 397 chatwoot live support (#1011)