Merge pull request #125 from MXCzkEVM/big_upgrade

Big upgrade
MXCzkEVM · Dec 12, 2024 · fb5205f · fb5205f
2 parents 63fea9a + f6b87a7
commit fb5205f
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 126 deletions.
diff --git a/lib/common/bottom_sheets/base_bottom_sheet.dart b/lib/common/bottom_sheets/base_bottom_sheet.dart
diff --git a/lib/common/bottom_sheets/blueberry_rings_bottom_sheet.dart b/lib/common/bottom_sheets/blueberry_rings_bottom_sheet.dart
@@ -2,7 +2,6 @@ import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
 import 'package:moonchain_wallet/features/dapps/subfeatures/open_dapp/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
-import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
 Future<ScanResult?> showBlueberryRingsBottomSheet(

diff --git a/lib/common/bottom_sheets/bottom_sheets.dart b/lib/common/bottom_sheets/bottom_sheets.dart
@@ -1,2 +1 @@
 export 'blueberry_rings_bottom_sheet.dart';
-export 'base_bottom_sheet.dart';
diff --git a/lib/common/components/recent_transactions/widgets/cancel_bottom_sheet.dart b/lib/common/components/recent_transactions/widgets/cancel_bottom_sheet.dart
@@ -1,6 +1,5 @@
 import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
 import 'speed_up_cancel_bottom_sheet_info.dart';

diff --git a/lib/common/components/recent_transactions/widgets/speed_up_bottom_sheet.dart b/lib/common/components/recent_transactions/widgets/speed_up_bottom_sheet.dart
@@ -1,6 +1,5 @@
 import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
 import 'speed_up_cancel_bottom_sheet_info.dart';

diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/utils/js_channel_utils.dart b/lib/features/dapps/subfeatures/open_dapp/domain/utils/js_channel_utils.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 import '../../open_dapp.dart';

diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/add_asset_dialog.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/add_asset_dialog.dart
@@ -1,4 +1,3 @@
-import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
 import 'package:moonchain_wallet/features/dapps/subfeatures/open_dapp/widgets/add_asset_info.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';

diff --git a/...atures/portfolio/subfeatures/token/send_token/send_crypto/widgets/transaction_dialog.dart b/...atures/portfolio/subfeatures/token/send_token/send_crypto/widgets/transaction_dialog.dart
@@ -1,6 +1,7 @@
 import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
+import 'package:mxc_ui/mxc_ui.dart';
 
 import 'transaction_info.dart';
 

diff --git a/...features/portfolio/subfeatures/token/send_token/send_crypto/widgets/transaction_info.dart b/...features/portfolio/subfeatures/token/send_token/send_crypto/widgets/transaction_info.dart
@@ -57,46 +57,43 @@ class _TransactionInfoState extends State<TransactionInfo> {
             ),
           ),
         ),
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 6),
-          child: Column(
-            children: [
-              amountItem(context),
-              SingleLineInfoItem(
-                title: 'balance',
-                value: widget.balance,
-                hint: widget.token.symbol,
-              ),
-              SingleLineInfoItem(
-                title: 'network',
-                value: widget.network,
-              ),
+        Column(
+          children: [
+            amountItem(context),
+            SingleLineInfoItem(
+              title: 'balance',
+              value: widget.balance,
+              hint: widget.token.symbol,
+            ),
+            SingleLineInfoItem(
+              title: 'network',
+              value: widget.network,
+            ),
+            SingleLineInfoItem(
+              title: 'from',
+              value: widget.from,
+            ),
+            SingleLineInfoItem(
+              title: 'to',
+              value: widget.to,
+            ),
+            if (TransactionProcessType.confirm != processType) ...[
               SingleLineInfoItem(
-                title: 'from',
-                value: widget.from,
+                title: 'estimated_fee',
+                value: MXCFormatter.formatNumberForUI(
+                  widget.estimatedFee,
+                ),
+                hint: widget.networkSymbol,
               ),
               SingleLineInfoItem(
-                title: 'to',
-                value: widget.to,
-              ),
-              if (TransactionProcessType.confirm != processType) ...[
-                SingleLineInfoItem(
-                  title: 'estimated_fee',
-                  value: MXCFormatter.formatNumberForUI(
-                    widget.estimatedFee,
-                  ),
-                  hint: widget.networkSymbol,
-                ),
-                SingleLineInfoItem(
-                  title: 'max_fee',
-                  value: MXCFormatter.formatNumberForUI(
-                    widget.maxFee,
-                  ),
-                  hint: widget.networkSymbol,
+                title: 'max_fee',
+                value: MXCFormatter.formatNumberForUI(
+                  widget.maxFee,
                 ),
-              ]
-            ],
-          ),
+                hint: widget.networkSymbol,
+              ),
+            ]
+          ],
         ),
         const SizedBox(height: 8),
         transactionButton(context),

diff --git a/lib/features/portfolio/subfeatures/transaction_history/widgets/filter_and_sort_dialog.dart b/lib/features/portfolio/subfeatures/transaction_history/widgets/filter_and_sort_dialog.dart
@@ -1,8 +1,7 @@
 import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_i18n/flutter_i18n.dart';
-import 'package:mxc_ui/mxc_ui.dart';
 import 'package:mxc_logic/mxc_logic.dart';
+import 'package:mxc_ui/mxc_ui.dart';
 
 import 'filter_and_sort_items.dart';
 

diff --git a/lib/features/wallet/presentation/widgets/tweet_widget.dart b/lib/features/wallet/presentation/widgets/tweet_widget.dart
@@ -1,4 +1,3 @@
-import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';

diff --git a/packages/appinio_social_share/example/test/widget_test.dart b/packages/appinio_social_share/example/test/widget_test.dart
@@ -8,7 +8,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../lib/main.dart';
+import 'package:appinio_social_share_example/main.dart';
 
 void main() {
   testWidgets('Verify Platform version', (WidgetTester tester) async {

diff --git a/packages/shared b/packages/shared
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		export 'blueberry_rings_bottom_sheet.dart';
		export 'base_bottom_sheet.dart';
+0 −1		logic/lib/src/domain/repositories/wallet/token_contract.dart
+1 −0		ui/lib/mxc_ui.dart
+21 −19		ui/lib/src/bottom_sheets/base_bottom_sheet.dart
+2 −1		ui/lib/src/bottom_sheets/bottom_sheets.dart
+1 −1		ui/lib/src/buttons/circle_button.dart
+1 −1		ui/lib/src/buttons/mxc_rectangle_button.dart