Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-477-add-ens

lib/src/screens/dashboard/widgets/trade_row.dart

@@ -94,6 +94,9 @@ class TradeRow extends StatelessWidget {
             borderRadius: BorderRadius.circular(50),
             child: Image.asset('assets/images/trocador.png', width: 36, height: 36));
         break;
+      case ExchangeProviderDescription.exolix:
+        image = Image.asset('assets/images/exolix.png', width: 36, height: 36);
+        break;
       default:
         image = null;
     }

lib/src/screens/setup_2fa/setup_2fa.dart

@@ -53,8 +53,10 @@ class Setup2FAPage extends BasePage {
           SizedBox(height: 86),
           SettingsCellWithArrow(
             title: S.current.setup_totp_recommended,
-            handler: (_) => Navigator.of(context)
-                .pushReplacementNamed(Routes.setup_2faQRPage),
+            handler: (_) {
+              setup2FAViewModel.generateSecretKey();
+              return Navigator.of(context).pushReplacementNamed(Routes.setup_2faQRPage);
+            },
           ),
           StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
         ],

lib/src/screens/setup_2fa/setup_2fa_qr_page.dart

@@ -89,7 +89,7 @@ class Setup2FAQRPage extends BasePage {
                     ),
                     SizedBox(height: 8),
                     Text(
-                      '${setup2FAViewModel.secretKey}',
+                      '${setup2FAViewModel.totpSecretKey}',
                       style: TextStyle(
                         fontSize: 16,
                         fontWeight: FontWeight.w700,
@@ -108,7 +108,7 @@ class Setup2FAQRPage extends BasePage {
                 child: InkWell(
                   onTap: () {
                     ClipboardUtil.setSensitiveDataToClipboard(
-                        ClipboardData(text: '${setup2FAViewModel.secretKey}'));
+                        ClipboardData(text: '${setup2FAViewModel.totpSecretKey}'));
                     showBar<void>(context, S.of(context).copied_to_clipboard);
                   },
                   child: Container(

lib/src/screens/trade_details/trade_details_page.dart

@@ -51,10 +51,11 @@ class TradeDetailsPageBodyState extends State<TradeDetailsPageBody> {
   @override
   Widget build(BuildContext context) {
     return Observer(builder: (_) {
-      // FIX-ME: Added `context` it was not used here before, maby bug ?
+      int itemsCount = tradeDetailsViewModel.items.length;
+
       return SectionStandardList(
           sectionCount: 1,
-          itemCounter: (int _) => tradeDetailsViewModel.items.length,
+          itemCounter: (int _) => itemsCount,
           itemBuilder: (__, index) {
             final item = tradeDetailsViewModel.items[index];