Merge branch 'main' into CAKE-278-implement-fixed-rate-flow-for-changenow

PRIVACY.md

@@ -1,74 +1,113 @@
 Privacy Policy
-Last modified: January 28, 2021
-Introduction
-Cake Technologies Inc. ("Company" or "We") respect your privacy and are committed to protecting it through our compliance with this policy.
-This policy describes the types of information we may collect from you or that you may provide when you use the App (our "App") and our practices for collecting, using, maintaining, protecting, and disclosing that information.
-This policy applies to information we collect:
-On this App.
-In email, text, and other electronic messages between you and this App.
-It does not apply to information collected by:
-Us offline or through any other means, including on any other App operated by Company or any third party (including our affiliates and subsidiaries)]; or 
-Any third party (including our affiliates and subsidiaries), including through any application or content (including advertising) that may link to or be accessible from or on the App.
-Please read this policy carefully to understand our policies and practices regarding your information and how we will treat it. If you do not agree with our policies and practices, you have the choice to not use the App. By accessing or using this App, you agree to this privacy policy. This policy may change from time to time. Your continued use of this App after we make changes is deemed to be acceptance of those changes, so please check the policy periodically for updates. 
-Definitions
-"App" means the software program provided by the Company, downloaded by You on any electronic device, named Cake Wallet.
-"Device" means any device that can access the App, such as a cell phone or tablet device.
-"Node" means a full Monero or Bitcoin Node, which transmits data to your App for processing and synchronization, and to which your Device transmits transactions which you would like to submit to the Monero or Bitcoin networks.
-"Cake Wallet Nodes" refers to the set of cryptocurrency nodes operated and maintained by Cake Technologies.
-"Service" refers to the App.
-"Third-party Service" refers to any service integrated into the Cake Wallet Application. This includes ChangeNow and XMR.to.
 
-"Usage Data" refers to data collected automatically about your usage of an Application.
+Last modified: February 23, 2021
-"You" means the individual, group, corporation, or any other entity accessing or using the Service.
+
+Introduction
+============
+
+	Cake Technologies Inc. ("Company" or "We") respect your privacy and are committed to protecting it through our compliance with this policy.
+
+	This policy describes the types of information we may collect from you or that you may provide when you use the App (our "App") and our practices for collecting, using, maintaining, protecting, and disclosing that information.
+
+	This policy applies to information we collect:
+		- On this App.
+		- In email, text, and other electronic messages between you and this App.
+	It does not apply to information collected by:
+		- Us offline or through any other means, including on any other App operated by Company or any third party (including our affiliates and subsidiaries)]; or 
+		- Any third party (including our affiliates and subsidiaries), including through any application or content (including advertising) that may link to or be accessible from or on the App.
+	Please read this policy carefully to understand our policies and practices regarding your information and how we will treat it. If you do not agree with our policies and practices, you have the choice to not use the App. By accessing or using this App, you agree to this privacy policy. This policy may change from time to time. Your continued use of this App after we make changes is deemed to be acceptance of those changes, so please check the policy periodically for updates.
+
+Definitions
+-----------
+
+	- "App" means the software program provided by the Company, downloaded by You on any electronic device, named Cake Wallet.
+	- "Device" means any device that can access the App, such as a cell phone or tablet device.
+	- "Node" means a full Monero or Bitcoin Node, which transmits data to your App for processing and synchronization, and to which your Device transmits transactions which you would like to submit to the Monero or Bitcoin networks.
+	- "Cake Wallet Nodes" refers to the set of cryptocurrency nodes operated and maintained by Cake Technologies.
+	- "Service" refers to the App.
+	- "Third-party Service" refers to any service integrated into the Cake Wallet Application. This includes ChangeNow.
+	- "Usage Data" refers to data collected automatically about your usage of an Application.
+	- "You" means the individual, group, corporation, or any other entity accessing or using the Service.
 
 Information We Collect About You and How We Collect It
-We collect several types of information from and about users of our App, including information:
+------------------------------------------------------
-By which you may be personally identified, such as name, e-mail address, or and a/any other identifier by which you may be contacted online or offline ("personal information" or "Personal Data”), ONLY when you provide it to us;
+
-Device IP address, the block height to which your wallet is synchronized, and any transactions which you use our Node to submit to the Monero or Bitcoin networks.
+	We collect several types of information from and about users of our App, including information:
-We collect this information:
+		- By which you may be personally identified, such as name, e-mail address, or and a/any other identifier by which you may be contacted online or offline ("personal information" or "Personal Data”), ONLY when you provide it to us;
-Directly from you when you provide it to us.
+		- Device IP address, the block height to which your wallet is synchronized, and any transactions which you use our Node to submit to the Monero or Bitcoin networks.
-Automatically as you use the App, if you use one of the Cake Wallet Nodes. Information collected automatically may include IP address and block height.
+	We collect this information:
-Usage Data (including the date and time at which you use an application, the duration of using it, and other ‘metadata’) is NOT collected by Cake Technologies through the usage of the App. Cake Technologies has no reason to care about any aspect of your continued usage of our App. We believe that this data is your own property and that we have no right to collect it.
+		- Directly from you when you provide it to us.
-Personal information is received by Cake Technologies ONLY in the event that you choose to provide it to us. This is provided either by synchronizing your wallet using the Nodes maintained by Cake Technologies, or by voluntarily contacting Cake Technologies regarding support, questions or suggestions. You also have the right to choose not to provide data to Cake Technologies, by choosing a different Node. The option to do so is provided by default with a list of Nodes, but Cake Wallet also provides the ability to add another Node not listed, or use your own Node.
+		- Automatically as you use the App, if you use one of the Cake Wallet Nodes. Information collected automatically may include IP address and block height.
-Data relating to your funds, and their security and privacy, remains on your device at ALL times. Your private keys, seeds, backup files, and wallet passcode are your own responsibility. This data is not received, collected, or stored by Cake Technologies at any time, for any reason.
+
-Personal Data collected through the Cake Wallet Nodes is limited to your device's IP address, the block height to which your wallet is synchronized, and any transactions which you use our Node to submit to the Monero or Bitcoin networks.
+	Usage Data (including the date and time at which you use an application, the duration of using it, and other ‘metadata’) is NOT collected by Cake Technologies through the usage of the App. Cake Technologies has no reason to care about any aspect of your continued usage of our App. We believe that this data is your own property and that we have no right to collect it.
-Personal Data received by Cake Technologies in this manner is not stored for any length of time, and thus Cake Technologies is both unwilling to and incapable of sharing this data, or using it for any purpose beyond ensuring your appropriate connection to our Nodes.
+
-If you decide to use a Node offered by any third party, some of which we offer by default in the Cake Wallet Application, said third party will receive this Personal Data instead of Cake Technologies. We take no responsibility for the actions of any third-party Node offered within the Application.
+	Personal information is received by Cake Technologies ONLY in the event that you choose to provide it to us. This is provided either by synchronizing your wallet using the Nodes maintained by Cake Technologies, or by voluntarily contacting Cake Technologies regarding support, questions or suggestions. You also have the right to choose not to provide data to Cake Technologies, by choosing a different Node. The option to do so is provided by default with a list of Nodes, but Cake Wallet also provides the ability to add another Node not listed, or use your own Node.
+
+	Data relating to your funds, and their security and privacy, remains on your device at ALL times. Your private keys, seeds, backup files, and wallet passcode are your own responsibility. This data is not received, collected, or stored by Cake Technologies at any time, for any reason.
+
+	Personal Data collected through the Cake Wallet Nodes is limited to your device's IP address, the block height to which your wallet is synchronized, and any transactions which you use our Node to submit to the Monero or Bitcoin networks. Personal Data received by Cake Technologies in this manner is not stored for any length of time, and thus Cake Technologies is both unwilling to and incapable of sharing this data, or using it for any purpose beyond ensuring your appropriate connection to our Nodes.
+
+	If you decide to use a Node offered by any third party, some of which we offer by default in the Cake Wallet Application, said third party will receive this Personal Data instead of Cake Technologies. We take no responsibility for the actions of any third-party Node offered within the Application. If you decide to synchronize your Wallet using your own Node, neither Cake Technologies nor any third party will have access to this Personal Data.
+
+	In any of these situations, Cake Technologies takes no responsibility for interception of this data by any outside individual, group, corporation, or institution. You should understand this and take any and all appropriate actions to secure your own data.
 
-If you decide to synchronize your Wallet using your own Node, neither Cake Technologies nor any third party will have access to this Personal Data.
-In any of these situations, Cake Technologies takes no responsibility for interception of this data by any outside individual, group, corporation, or institution. You should understand this and take any and all appropriate actions to secure your own data.
 How We Use Your Information
-We use information that we collect about you or that you provide to us, including any personal information:
+---------------------------
-To present our App and its contents to you.
+
-To allow you to sync using the closest geographical Node: In the event that you choose to synchronize your wallet using the Node maintained by Cake Technologies, we determine your location using your IP address to redirect your Wallet to the fastest possible Node.
+	We use information that we collect about you or that you provide to us, including any personal information:
-To contact you: In the event that you contact Cake Technologies first, we will use the Personal Data with which you provide us, to contact you by email, Telegram, Reddit, or any other means.
+		- To present our App and its contents to you.
-To manage your requests: To attend and manage your requests to us. 
+		- To allow you to sync using the closest geographical Node: In the event that you choose to synchronize your wallet using the Node maintained by Cake Technologies, we determine your location using your IP address to redirect your Wallet to the fastest possible Node.
-For any other purpose with your consent.
+		- To contact you: In the event that you contact Cake Technologies first, we will use the Personal Data with which you provide us, to contact you by email, Telegram, Reddit, or any other means.
+		- To manage your requests: To attend and manage your requests to us. 
+		- For any other purpose with your consent.
+
 Transfer of Your Personal Data
-Personal Data received by the Cake Wallet Nodes, or voluntarily submitted to Cake Technologies through e-mail, Telegram, Reddit, or any other method, may be transferred to computers located outside of your governmental jurisdiction, where the data protection laws may differ from yours.
+------------------------------
-Your consent to this Privacy Policy, and your submission of such information, represents your agreement to this transfer.
+
-Cake Technologies will take all necessary steps to ensure that your data is treated securely and in accordance with this Privacy Policy. No transfer of your Personal Data will take place to an organization or a country, unless there are adequate controls in place to protect the security of your data.
+	Personal Data received by the Cake Wallet Nodes, or voluntarily submitted to Cake Technologies through e-mail, Telegram, Reddit, or any other method, may be transferred to computers located outside of your governmental jurisdiction, where the data protection laws may differ from yours. Your consent to this Privacy Policy, and your submission of such information, represents your agreement to this transfer.
+
+	Cake Technologies will take all necessary steps to ensure that your data is treated securely and in accordance with this Privacy Policy. No transfer of your Personal Data will take place to an organization or a country, unless there are adequate controls in place to protect the security of your data.
+
 Disclosure of Your Information
-We may disclose aggregated information about our users, and information that does not identify any individual, without restriction. For example, we may, from time to time, disclose the number of users who have downloaded our Application.
+------------------------------
-We may disclose personal information that we collect or you provide as described in this privacy policy:
+
-To our subsidiaries and affiliates.
+	We may disclose aggregated information about our users, and information that does not identify any individual, without restriction. For example, we may, from time to time, disclose the number of users who have downloaded our Application.
-To contractors, service providers, and other third parties we use to support our business and who are bound by contractual obligations to keep personal information confidential and use it only for the purposes for which we disclose it to them.
+	
-To a buyer or other successor in the event of a merger, divestiture, restructuring, reorganization, dissolution, or other sale or transfer of some or all of Cake Technology's assets, whether as a going concern or as part of bankruptcy, liquidation, or similar proceeding, in which personal information held by Cake Technology about our App users is among the assets transferred. However, we will provide notice before this Personal Data is transferred and becomes subject to a different Privacy Policy.
+	We may disclose personal information that we collect or you provide as described in this privacy policy:
-To fulfill the purpose for which you provide it. 
+		- To our subsidiaries and affiliates.
-For any other purpose disclosed by us when you provide the information.
+		- To contractors, service providers, and other third parties we use to support our business and who are bound by contractual obligations to keep personal information confidential and use it only for the purposes for which we disclose it to them.
-With your consent.
+		- To a buyer or other successor in the event of a merger, divestiture, restructuring, reorganization, dissolution, or other sale or transfer of some or all of Cake Technology's assets, whether as a going concern or as part of bankruptcy, liquidation, or similar proceeding, in which personal information held by Cake Technology about our App users is among the assets transferred. However, we will provide notice before this Personal Data is transferred and becomes subject to a different Privacy Policy.
-We may also disclose your personal information:
+		- To fulfill the purpose for which you provide it. 
-To comply with any court order, law, or legal process, including to respond to any government or regulatory request.
+		- For any other purpose disclosed by us when you provide the information.
-To enforce or apply our terms of use and other agreements, including for billing and collection purposes.
+		- With your consent.
-If we believe disclosure is necessary or appropriate to protect the rights, property, or safety of Cake Technologies, our customers, or others.
+
-Cake Technologies is incapable of providing any authority or government agency with data received by the Cake Wallet Nodes, because we do not store this data.
+	We may also disclose your personal information:
-Under certain circumstances, Cake Technologies may be required by authorities to disclose Personal Data which you voluntarily provide us, including your e-mail address, Telegram username, or Reddit username. WE STRONGLY RECOMMEND THAT YOU DO NOT TRANSMIT ANY PERSONALLY IDENTIFIABLE INFORMATION TO US VIA THESE OR ANY OTHER METHODS. 
+		- To comply with any court order, law, or legal process, including to respond to any government or regulatory request.
+		- To enforce or apply our terms of use and other agreements, including for billing and collection purposes.
+		- If we believe disclosure is necessary or appropriate to protect the rights, property, or safety of Cake Technologies, our customers, or others.
+
+	Cake Technologies is incapable of providing any authority or government agency with data received by the Cake Wallet Nodes, because we do not store this data.
+
+	Under certain circumstances, Cake Technologies may be required by authorities to disclose Personal Data which you voluntarily provide us, including your e-mail address, Telegram username, or Reddit username. WE STRONGLY RECOMMEND THAT YOU DO NOT TRANSMIT ANY PERSONALLY IDENTIFIABLE INFORMATION TO US VIA THESE OR ANY OTHER METHODS.
+
 Data Security
-You are responsible for your personal data, including all data related to the safety of your funds. You should take all appropriate action to protect this data. Cake Technologies cannot recover any data related to your funds in the event that you lose or give away this data. Cake Technologies strongly recommends that you take action to secure your funds, by writing down your seeds or keys, storing encrypted backups, and never sharing this information.
+-------------
-Cake Technologies undertakes any and all reasonable steps possible to secure any data that you voluntarily transmit to us. However, we cannot guarantee that any outside system used to transmit this data is entirely secure and, as such, we recommend that you exercise caution when voluntarily transmitting data to us.
+
+	You are responsible for your personal data, including all data related to the safety of your funds. You should take all appropriate action to protect this data. Cake Technologies cannot recover any data related to your funds in the event that you lose or give away this data. Cake Technologies strongly recommends that you take action to secure your funds, by writing down your seeds or keys, storing encrypted backups, and never sharing this information.
+
+	Cake Technologies undertakes any and all reasonable steps possible to secure any data that you voluntarily transmit to us. However, we cannot guarantee that any outside system used to transmit this data is entirely secure and, as such, we recommend that you exercise caution when voluntarily transmitting data to us.
+
 Links to Other Websites
-The App may contain links to other websites that are not operated by us. If you click on a third-party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit. We have no control over and assume no responsibility for the content, privacy policies or practices of any third-party sites or services.
+-----------------------
+
+	The App may contain links to other websites that are not operated by us. If you click on a third-party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit. We have no control over and assume no responsibility for the content, privacy policies or practices of any third-party sites or services.
+
 Changes to Our Privacy Policy
-It is our policy to post any changes we make to our privacy policy on this page. If we make material changes to how we treat our users' personal information, we will notify you through a notice on the App. The date the privacy policy was last revised is identified at the top of this document. You are responsible for periodically visiting our App and this privacy policy to check for any changes to our Privacy Policy.
+-----------------------------
-Contact Us  
+
+	It is our policy to post any changes we make to our privacy policy on this page. If we make material changes to how we treat our users' personal information, we will notify you through a notice on the App. The date the privacy policy was last revised is identified at the top of this document. You are responsible for periodically visiting our App and this privacy policy to check for any changes to our Privacy Policy.
+
+Contact Us
+----------
+
 If you have any questions about this Privacy Policy, you are encouraged to contact us by email at info@cakewallet.com.

lib/core/address_validator.dart

@@ -15,7 +15,8 @@ class AddressValidator extends TextValidator {
       case CryptoCurrency.xmr:
         return '[0-9a-zA-Z]';
       case CryptoCurrency.ada:
-        return '[0-9a-zA-Z]';
+        return '^[0-9a-zA-Z]{59}\$|^[0-9a-zA-Z]{92}\$|^[0-9a-zA-Z]{104}\$'
+            '|^[0-9a-zA-Z]{105}\$|^addr1[0-9a-zA-Z]{98}\$';
       case CryptoCurrency.bch:
         return '[0-9a-zA-Z]';
       case CryptoCurrency.bnb:
@@ -54,7 +55,7 @@ class AddressValidator extends TextValidator {
       case CryptoCurrency.xmr:
         return [95, 106];
       case CryptoCurrency.ada:
-        return [59, 92, 104, 105];
+        return null;
       case CryptoCurrency.bch:
         return [42];
       case CryptoCurrency.bnb:

lib/generated/i18n.dart

@@ -397,6 +397,8 @@ class S implements WidgetsLocalizations {
   String get displayable => 'Displayable';
   String get fixed_rate => 'Fixed rate';
   String get fixed_rate_alert => 'You will be able to enter receive amount when fixed rate mode is checked. Do you want to switch to fixed rate mode?';
+  String get xlm_extra_info => 'Please don’t forget to specify the Memo ID while sending the XLM transaction for the exchange';
+  String get xrp_extra_info => 'Please don’t forget to specify the Destination Tag while sending the XRP transaction for the exchange';
 }
 
 class $de extends S {
@@ -1157,6 +1159,10 @@ class $de extends S {
   String get fixed_rate => 'Fester Zinssatz';
   @override
   String get fixed_rate_alert => 'Sie können den Empfangsbetrag eingeben, wenn der Festpreismodus aktiviert ist. Möchten Sie in den Festpreismodus wechseln?';
+  @override
+  String get xlm_extra_info => 'Bitte vergessen Sie nicht, die Memo-ID anzugeben, während Sie die XLM-Transaktion für den Austausch senden';
+  @override
+  String get xrp_extra_info => 'Bitte vergessen Sie nicht, das Ziel-Tag anzugeben, während Sie die XRP-Transaktion für den Austausch senden';
 }
 
 class $hi extends S {
@@ -1917,6 +1923,10 @@ class $hi extends S {
   String get fixed_rate => 'निर्धारित दर';
   @override
   String get fixed_rate_alert => 'फिक्स्ड रेट मोड की जांच करने पर आप प्राप्त राशि दर्ज कर पाएंगे। क्या आप निश्चित दर मोड पर स्विच करना चाहते हैं?';
+  @override
+  String get xlm_extra_info => 'एक्सचेंज के लिए XLM ट्रांजेक्शन भेजते समय मेमो आईडी निर्दिष्ट करना न भूलें';
+  @override
+  String get xrp_extra_info => 'एक्सचेंज के लिए एक्सआरपी लेनदेन भेजते समय कृपया गंतव्य टैग निर्दिष्ट करना न भूलें';
 }
 
 class $ru extends S {
@@ -2677,6 +2687,10 @@ class $ru extends S {
   String get fixed_rate => 'Фиксированная ставка';
   @override
   String get fixed_rate_alert => 'Вы сможете ввести сумму получения тогда, когда будет установлен режим фиксированной ставки. Вы хотите перейти в режим фиксированной ставки?';
+  @override
+  String get xlm_extra_info => 'Не забудьте указать Memo ID (памятка) при отправке транзакции XLM для обмена';
+  @override
+  String get xrp_extra_info => 'Не забудьте указать целевой тег при отправке транзакции XRP для обмена';
 }
 
 class $ko extends S {
@@ -3437,6 +3451,10 @@ class $ko extends S {
   String get fixed_rate => '고정 비율';
   @override
   String get fixed_rate_alert => '고정 금리 모드 체크시 수취 금액 입력이 가능합니다. 고정 속도 모드로 전환 하시겠습니까?';
+  @override
+  String get xlm_extra_info => '교환을 위해 XLM 거래를 보낼 때 메모 ID를 지정하는 것을 잊지 마십시오';
+  @override
+  String get xrp_extra_info => '교환을 위해 XRP 트랜잭션을 보내는 동안 대상 태그를 지정하는 것을 잊지 마십시오';
 }
 
 class $pt extends S {
@@ -4197,6 +4215,10 @@ class $pt extends S {
   String get fixed_rate => 'Taxa fixa';
   @override
   String get fixed_rate_alert => 'Você poderá inserir a quantia recebida quando o modo de taxa fixa estiver marcado. Quer mudar para o modo de taxa fixa?';
+  @override
+  String get xlm_extra_info => 'Não se esqueça de especificar o Memo ID ao enviar a transação XLM para a troca';
+  @override
+  String get xrp_extra_info => 'Não se esqueça de especificar a etiqueta de destino ao enviar a transação XRP para a troca';
 }
 
 class $uk extends S {
@@ -4957,6 +4979,10 @@ class $uk extends S {
   String get fixed_rate => 'Фіксована ставка';
   @override
   String get fixed_rate_alert => 'Ви зможете ввести суму отримання тоді, коли буде встановлений режим фіксованої ставки. Ви хочете перейти в режим фіксованої ставки?';
+  @override
+  String get xlm_extra_info => "Будь ласка, не забудьте вказати ідентифікатор пам'ятки під час надсилання транзакції XLM для обміну";
+  @override
+  String get xrp_extra_info => 'Будь ласка, не забудьте вказати тег призначення під час надсилання XRP-транзакції для обміну';
 }
 
 class $ja extends S {
@@ -5717,6 +5743,10 @@ class $ja extends S {
   String get fixed_rate => '固定金利';
   @override
   String get fixed_rate_alert => '固定金利モードにチェックを入れると、受取額を入力できるようになります。 固定金利モードに切り替えますか？';
+  @override
+  String get xlm_extra_info => '交換用のXLMトランザクションを送信するときに、メモIDを指定することを忘れないでください';
+  @override
+  String get xrp_extra_info => '取引所のXRPトランザクションを送信するときに、宛先タグを指定することを忘れないでください';
 }
 
 class $en extends S {
@@ -6481,6 +6511,10 @@ class $pl extends S {
   String get fixed_rate => 'Stała stawka';
   @override
   String get fixed_rate_alert => 'Będziesz mógł wprowadzić kwotę otrzymaną, gdy zaznaczony jest tryb stałej stawki. Czy chcesz przejść do trybu stałej stawki?';
+  @override
+  String get xlm_extra_info => 'Nie zapomnij podać identyfikatora notatki podczas wysyłania transakcji XLM do wymiany';
+  @override
+  String get xrp_extra_info => 'Nie zapomnij podać tagu docelowego podczas wysyłania transakcji XRP do wymiany';
 }
 
 class $es extends S {
@@ -7241,6 +7275,10 @@ class $es extends S {
   String get fixed_rate => 'Tipo de interés fijo';
   @override
   String get fixed_rate_alert => 'Podrá ingresar la cantidad recibida cuando el modo de tarifa fija esté marcado. ¿Quieres cambiar al modo de tarifa fija?';
+  @override
+  String get xlm_extra_info => 'No olvide especificar el ID de nota al enviar la transacción XLM para el intercambio';
+  @override
+  String get xrp_extra_info => 'No olvide especificar la etiqueta de destino al enviar la transacción XRP para el intercambio';
 }
 
 class $nl extends S {
@@ -8001,6 +8039,10 @@ class $nl extends S {
   String get fixed_rate => 'Vast tarief';
   @override
   String get fixed_rate_alert => 'U kunt het ontvangen bedrag invoeren wanneer de modus voor vaste tarieven is aangevinkt. Wilt u overschakelen naar de vaste-tariefmodus?';
+  @override
+  String get xlm_extra_info => 'Vergeet niet om de Memo-ID op te geven tijdens het verzenden van de XLM-transactie voor de uitwisseling';
+  @override
+  String get xrp_extra_info => 'Vergeet niet om de Destination Tag op te geven tijdens het verzenden van de XRP-transactie voor de uitwisseling';
 }
 
 class $zh extends S {
@@ -8761,6 +8803,10 @@ class $zh extends S {
   String get fixed_rate => '固定利率';
   @override
   String get fixed_rate_alert => '選中固定費率模式後，您將可以輸入接收金額。 您要切換到固定速率模式嗎？';
+  @override
+  String get xlm_extra_info => '發送用於交換的XLM交易時，請不要忘記指定備忘錄ID';
+  @override
+  String get xrp_extra_info => '發送用於交換的XRP交易時，請不要忘記指定目標標記';
 }
 
 class GeneratedLocalizationsDelegate extends LocalizationsDelegate<S> {

lib/src/screens/exchange_trade/exchange_trade_page.dart

@@ -28,9 +28,11 @@ void showInformation(
 
   final information = exchangeTradeViewModel.isSendable
       ? S.current.exchange_result_confirm(
-          trade.amount ?? fetchingLabel, trade.from.toString(), walletName)
+          trade.amount ?? fetchingLabel, trade.from.toString(), walletName) +
+        exchangeTradeViewModel.extraInfo
       : S.current.exchange_result_description(
-          trade.amount ?? fetchingLabel, trade.from.toString());
+          trade.amount ?? fetchingLabel, trade.from.toString()) +
+        exchangeTradeViewModel.extraInfo;
 
   showPopUp<void>(
       context: context,
@@ -148,6 +150,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                                   padding: EdgeInsets.all(5),
                                   decoration: BoxDecoration(
                                       border: Border.all(
+                                          width: 3,
                                           color: Theme.of(context)
                                               .accentTextTheme
                                               .subtitle

lib/src/screens/receive/widgets/qr_widget.dart

@@ -48,6 +48,7 @@ class QRWidget extends StatelessWidget {
                             padding: EdgeInsets.all(5),
                             decoration: BoxDecoration(
                                 border: Border.all(
+                                    width: 3,
                                     color: Theme.of(context).accentTextTheme.
                                     display3.backgroundColor
                                 )

lib/view_model/exchange/exchange_trade_view_model.dart

@@ -59,6 +59,13 @@ abstract class ExchangeTradeViewModelBase with Store {
   @observable
   bool isSendable;
 
+  @computed
+  String get extraInfo => trade.from == CryptoCurrency.xlm
+  ? '\n\n' + S.current.xlm_extra_info
+  : trade.from == CryptoCurrency.xrp
+    ? '\n\n' + S.current.xrp_extra_info
+    : '';
+
   @observable
   ObservableList<ExchangeTradeItem> items;
 

lib/view_model/settings/settings_view_model.dart

@@ -26,6 +26,7 @@ import 'package:cake_wallet/view_model/settings/regular_list_item.dart';
 import 'package:cake_wallet/view_model/settings/settings_list_item.dart';
 import 'package:cake_wallet/view_model/settings/switcher_list_item.dart';
 import 'package:cake_wallet/src/screens/auth/auth_page.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 part 'settings_view_model.g.dart';
 
@@ -173,14 +174,17 @@ abstract class SettingsViewModelBase with Store {
         ),
         RegularListItem(
           title: S.current.faq,
-          handler: (BuildContext context) =>
+          handler: (BuildContext context) async {
-              Navigator.pushNamed(context, Routes.faq),
+            if (await canLaunch(url)) await launch(url);
+          },
         )
       ],
       [VersionListItem(title: currentVersion)]
     ];
   }
 
+  static const url = 'https://cakewallet.com/guide/';
+
   @observable
   String currentVersion;
 

res/values/strings_de.arb

@@ -459,5 +459,8 @@
   "please_select_backup_file" : "Bitte wählen Sie die Sicherungsdatei und geben Sie das Sicherungskennwort ein.",
 
   "fixed_rate" : "Fester Zinssatz",
-  "fixed_rate_alert" : "Sie können den Empfangsbetrag eingeben, wenn der Festpreismodus aktiviert ist. Möchten Sie in den Festpreismodus wechseln?"
+  "fixed_rate_alert" : "Sie können den Empfangsbetrag eingeben, wenn der Festpreismodus aktiviert ist. Möchten Sie in den Festpreismodus wechseln?",
+  
+  "xlm_extra_info" : "Bitte vergessen Sie nicht, die Memo-ID anzugeben, während Sie die XLM-Transaktion für den Austausch senden",
+  "xrp_extra_info" : "Bitte vergessen Sie nicht, das Ziel-Tag anzugeben, während Sie die XRP-Transaktion für den Austausch senden"
 }

res/values/strings_en.arb

@@ -459,5 +459,8 @@
   "please_select_backup_file" : "Please select backup file and enter backup password.",
 
   "fixed_rate" : "Fixed rate",
-  "fixed_rate_alert" : "You will be able to enter receive amount when fixed rate mode is checked. Do you want to switch to fixed rate mode?"
+  "fixed_rate_alert" : "You will be able to enter receive amount when fixed rate mode is checked. Do you want to switch to fixed rate mode?",
+
+  "xlm_extra_info" : "Please don’t forget to specify the Memo ID while sending the XLM transaction for the exchange",
+  "xrp_extra_info" : "Please don’t forget to specify the Destination Tag while sending the XRP transaction for the exchange"
 }

res/values/strings_es.arb

@@ -459,5 +459,8 @@
   "please_select_backup_file" : "Seleccione el archivo de respaldo e ingrese la contraseña de respaldo.",
 
   "fixed_rate" : "Tipo de interés fijo",
-  "fixed_rate_alert" : "Podrá ingresar la cantidad recibida cuando el modo de tarifa fija esté marcado. ¿Quieres cambiar al modo de tarifa fija?"
+  "fixed_rate_alert" : "Podrá ingresar la cantidad recibida cuando el modo de tarifa fija esté marcado. ¿Quieres cambiar al modo de tarifa fija?",
+
+  "xlm_extra_info" : "No olvide especificar el ID de nota al enviar la transacción XLM para el intercambio",
+  "xrp_extra_info" : "No olvide especificar la etiqueta de destino al enviar la transacción XRP para el intercambio"
 }

res/values/strings_hi.arb

@@ -459,5 +459,8 @@
   "please_select_backup_file" : "कृपया बैकअप फ़ाइल चुनें और बैकअप पासवर्ड डालें।",
 
   "fixed_rate" : "निर्धारित दर",
-  "fixed_rate_alert" : "फिक्स्ड रेट मोड की जांच करने पर आप प्राप्त राशि दर्ज कर पाएंगे। क्या आप निश्चित दर मोड पर स्विच करना चाहते हैं?"
+  "fixed_rate_alert" : "फिक्स्ड रेट मोड की जांच करने पर आप प्राप्त राशि दर्ज कर पाएंगे। क्या आप निश्चित दर मोड पर स्विच करना चाहते हैं?",
+
+  "xlm_extra_info" : "एक्सचेंज के लिए XLM ट्रांजेक्शन भेजते समय मेमो आईडी निर्दिष्ट करना न भूलें",
+  "xrp_extra_info" : "एक्सचेंज के लिए एक्सआरपी लेनदेन भेजते समय कृपया गंतव्य टैग निर्दिष्ट करना न भूलें"
 }

res/values/strings_ja.arb

@@ -459,5 +459,8 @@
   "please_select_backup_file" : "バックアップファイルを選択し、バックアップパスワードを入力してください。",
 
   "fixed_rate" : "固定金利",
-  "fixed_rate_alert" : "固定金利モードにチェックを入れると、受取額を入力できるようになります。 固定金利モードに切り替えますか？"
+  "fixed_rate_alert" : "固定金利モードにチェックを入れると、受取額を入力できるようになります。 固定金利モードに切り替えますか？",
+
+  "xlm_extra_info" : "交換用のXLMトランザクションを送信するときに、メモIDを指定することを忘れないでください",
+  "xrp_extra_info" : "取引所のXRPトランザクションを送信するときに、宛先タグを指定することを忘れないでください"
 }

res/values/strings_ko.arb

@@ -459,5 +459,8 @@
   "please_select_backup_file" : "백업 파일을 선택하고 백업 암호를 입력하십시오.",
 
   "fixed_rate" : "고정 비율",
-  "fixed_rate_alert" : "고정 금리 모드 체크시 수취 금액 입력이 가능합니다. 고정 속도 모드로 전환 하시겠습니까?"
+  "fixed_rate_alert" : "고정 금리 모드 체크시 수취 금액 입력이 가능합니다. 고정 속도 모드로 전환 하시겠습니까?",
+
+  "xlm_extra_info" : "교환을 위해 XLM 거래를 보낼 때 메모 ID를 지정하는 것을 잊지 마십시오",
+  "xrp_extra_info" : "교환을 위해 XRP 트랜잭션을 보내는 동안 대상 태그를 지정하는 것을 잊지 마십시오"
 }

res/values/strings_nl.arb

@@ -459,5 +459,8 @@
   "please_select_backup_file" : "Selecteer een back-upbestand en voer een back-upwachtwoord in.",
 
   "fixed_rate" : "Vast tarief",
-  "fixed_rate_alert" : "U kunt het ontvangen bedrag invoeren wanneer de modus voor vaste tarieven is aangevinkt. Wilt u overschakelen naar de vaste-tariefmodus?"
+  "fixed_rate_alert" : "U kunt het ontvangen bedrag invoeren wanneer de modus voor vaste tarieven is aangevinkt. Wilt u overschakelen naar de vaste-tariefmodus?",
+
+  "xlm_extra_info" : "Vergeet niet om de Memo-ID op te geven tijdens het verzenden van de XLM-transactie voor de uitwisseling",
+  "xrp_extra_info" : "Vergeet niet om de Destination Tag op te geven tijdens het verzenden van de XRP-transactie voor de uitwisseling"
 }

res/values/strings_pl.arb

@@ -459,5 +459,8 @@
   "please_select_backup_file" : "Wybierz plik kopii zapasowej i wprowadź hasło zapasowe.",
 
   "fixed_rate" : "Stała stawka",
-  "fixed_rate_alert" : "Będziesz mógł wprowadzić kwotę otrzymaną, gdy zaznaczony jest tryb stałej stawki. Czy chcesz przejść do trybu stałej stawki?"
+  "fixed_rate_alert" : "Będziesz mógł wprowadzić kwotę otrzymaną, gdy zaznaczony jest tryb stałej stawki. Czy chcesz przejść do trybu stałej stawki?",
+
+  "xlm_extra_info" : "Nie zapomnij podać identyfikatora notatki podczas wysyłania transakcji XLM do wymiany",
+  "xrp_extra_info" : "Nie zapomnij podać tagu docelowego podczas wysyłania transakcji XRP do wymiany"
 }

res/values/strings_pt.arb

@@ -459,5 +459,8 @@
   "please_select_backup_file" : "Selecione o arquivo de backup e insira a senha de backup.",
 
   "fixed_rate" : "Taxa fixa",
-  "fixed_rate_alert" : "Você poderá inserir a quantia recebida quando o modo de taxa fixa estiver marcado. Quer mudar para o modo de taxa fixa?"
+  "fixed_rate_alert" : "Você poderá inserir a quantia recebida quando o modo de taxa fixa estiver marcado. Quer mudar para o modo de taxa fixa?",
+
+  "xlm_extra_info" : "Não se esqueça de especificar o Memo ID ao enviar a transação XLM para a troca",
+  "xrp_extra_info" : "Não se esqueça de especificar a etiqueta de destino ao enviar a transação XRP para a troca"
 }

res/values/strings_ru.arb

@@ -459,5 +459,8 @@
   "please_select_backup_file" : "Выберите файл резервной копии и введите пароль резервной копии.",
 
   "fixed_rate" : "Фиксированная ставка",
-  "fixed_rate_alert" : "Вы сможете ввести сумму получения тогда, когда будет установлен режим фиксированной ставки. Вы хотите перейти в режим фиксированной ставки?"
+  "fixed_rate_alert" : "Вы сможете ввести сумму получения тогда, когда будет установлен режим фиксированной ставки. Вы хотите перейти в режим фиксированной ставки?",
+
+  "xlm_extra_info" : "Не забудьте указать Memo ID (памятка) при отправке транзакции XLM для обмена",
+  "xrp_extra_info" : "Не забудьте указать целевой тег при отправке транзакции XRP для обмена"
 }

res/values/strings_uk.arb

@@ -459,5 +459,8 @@
   "please_select_backup_file" : "Виберіть файл резервної копії та введіть пароль резервної копії.",
 
   "fixed_rate" : "Фіксована ставка",
-  "fixed_rate_alert" : "Ви зможете ввести суму отримання тоді, коли буде встановлений режим фіксованої ставки. Ви хочете перейти в режим фіксованої ставки?"
+  "fixed_rate_alert" : "Ви зможете ввести суму отримання тоді, коли буде встановлений режим фіксованої ставки. Ви хочете перейти в режим фіксованої ставки?",
+
+  "xlm_extra_info" : "Будь ласка, не забудьте вказати ідентифікатор пам'ятки під час надсилання транзакції XLM для обміну",
+  "xrp_extra_info" : "Будь ласка, не забудьте вказати тег призначення під час надсилання XRP-транзакції для обміну"
 }

res/values/strings_zh.arb

@@ -459,5 +459,8 @@
   "please_select_backup_file" : "請選擇備份文件，然後輸入備份密碼。",
 
   "fixed_rate" : "固定利率",
-  "fixed_rate_alert" : "選中固定費率模式後，您將可以輸入接收金額。 您要切換到固定速率模式嗎？"
+  "fixed_rate_alert" : "選中固定費率模式後，您將可以輸入接收金額。 您要切換到固定速率模式嗎？",
+
+  "xlm_extra_info" : "發送用於交換的XLM交易時，請不要忘記指定備忘錄ID",
+  "xrp_extra_info" : "發送用於交換的XRP交易時，請不要忘記指定目標標記"
 }