Merge branch 'newdesign' into CWA-205-update-restore-wallet-screens

# Conflicts: # lib/src/screens/exchange/exchange_page.dart # lib/src/screens/new_wallet/new_wallet_page.dart # lib/src/screens/new_wallet/widgets/select_button.dart # lib/src/screens/rescan/rescan_page.dart # lib/src/screens/restore/restore_wallet_from_keys_page.dart # lib/src/screens/restore/restore_wallet_from_seed_details.dart # lib/src/screens/seed_language/widgets/seed_language_picker.dart # lib/src/widgets/primary_button.dart
2026-10-22 06:28:39 +02:00 · 2020-05-01 22:51:27 +03:00
parent 4215ac2425 83f9c034d9
commit 1dff5148ff
74 changed files with 864 additions and 465 deletions
@@ -185,34 +185,6 @@ class PrimaryImageButton extends StatelessWidget {
              ],
            ),
          )
-          /*Row(
-            children: <Widget>[
-              Container(
-                width: 28.0,
-                height: 56.0,
-                decoration: BoxDecoration(
-                    shape: BoxShape.circle, color: Colors.transparent),
-                child: image,
-              ),
-              Expanded(
-                  child: Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: <Widget>[
-                    Container(
-                      height: 56.0,
-                      child: Center(
-                        child: Text(text,
-                            style: TextStyle(
-                                fontSize: 18.0,
-                                color: Theme.of(context)
-                                    .primaryTextTheme
-                                    .button
-                                    .color)),
-                      ),
-                    )
-                  ]))
-            ],
-          ),*/
        ));
  }
 }