Merge branch 'develop' into feature/walletconnect

zenon-network · Feb 9, 2024 · 41b6020 · 41b6020
2 parents b20a5ca + 781bc5f
commit 41b6020
Show file tree

Hide file tree

Showing 12 changed files with 152 additions and 119 deletions.
diff --git a/lib/screens/node_management_screen.dart b/lib/screens/node_management_screen.dart
@@ -35,6 +35,12 @@ class _NodeManagementScreenState extends State<NodeManagementScreen> {
 
   late String _selectedNodeConfirmed;
 
+  @override
+  void initState() {
+    super.initState();
+    kDefaultCommunityNodes.shuffle();
+  }
+
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
@@ -231,9 +237,11 @@ class _NodeManagementScreenState extends State<NodeManagementScreen> {
       InputValidators.node(_newNodeController.text) == null;
 
   void _onAddNodePressed() async {
-    if ([...kDbNodes, ...kDefaultNodes].contains(_newNodeController.text)) {
+    if ([...kDbNodes, ...kDefaultCommunityNodes, ...kDefaultNodes]
+        .contains(_newNodeController.text)) {
       NotificationUtils.sendNotificationError(
-          'Node already exists', 'Node already exists');
+          'Node ${_newNodeController.text} already exists',
+          'Node already exists');
     } else {
       _addNodeToDb();
     }
@@ -261,8 +269,11 @@ class _NodeManagementScreenState extends State<NodeManagementScreen> {
 
   Widget _getNodeTiles() {
     return Column(
-      children:
-          [...kDefaultNodes, ...kDbNodes].map((e) => _getNodeTile(e)).toList(),
+      children: <String>{
+        ...kDefaultNodes,
+        ...kDefaultCommunityNodes,
+        ...kDbNodes
+      }.toList().map((e) => _getNodeTile(e)).toList(),
     );
   }
 

diff --git a/lib/services/wallet_connect_service.dart b/lib/services/wallet_connect_service.dart
@@ -328,7 +328,7 @@ class WalletConnectService {
             final wasActionAccepted = await showDialogWithNoAndYesOptions(
               context: _context,
               isBarrierDismissible: false,
-              title: '${dAppMetadata.name} - Send Payment',
+              title: '${dAppMetadata.name} - Send',
               content: Column(
                 mainAxisSize: MainAxisSize.min,
                 crossAxisAlignment: CrossAxisAlignment.center,

diff --git a/lib/utils/constants.dart b/lib/utils/constants.dart
@@ -108,12 +108,12 @@ const int kAmountInputMaxCharacterLength = 21;
 const int kSecondsPerMomentum = 10;
 const int kMaxP2pSwapsToStore = 500;
 
-final List<int> kNormalUsersPlasmaRequirements = [
+const List<int> kNormalUsersPlasmaRequirements = [
   kStakePlasmaAmountNeeded,
   kDelegatePlasmaAmountNeeded,
 ];
 
-final List<int> kPowerUsersPlasmaRequirements = [
+const List<int> kPowerUsersPlasmaRequirements = [
   kPillarPlasmaAmountNeeded,
   kSentinelPlasmaAmountNeeded,
   kIssueTokenPlasmaAmountNeeded,
@@ -122,11 +122,6 @@ final List<int> kPowerUsersPlasmaRequirements = [
 const String kLocalhostDefaultNodeUrl = 'ws://127.0.0.1:$kDefaultPort';
 const int kDefaultPort = 35998;
 
-List<String> kDefaultNodes = [
-  'Embedded Node',
-  kLocalhostDefaultNodeUrl,
-];
-
 const List<String> kWalletActions = [
   'pillar',
   'sentinel',

diff --git a/lib/utils/global.dart b/lib/utils/global.dart
@@ -55,3 +55,14 @@ final List<Tabs> kTabsWithIconTitles = [
 final List<Tabs> kDisabledTabs = [
   Tabs.resyncWallet,
 ];
+
+List<String> kDefaultNodes = [
+  'Embedded Node',
+  kLocalhostDefaultNodeUrl,
+];
+
+// Community supplied public full nodes
+List<String> kDefaultCommunityNodes = [
+  'wss://my.hc1node.com:35998',
+  'wss://node.zenonhub.io:35998'
+];
diff --git a/lib/widgets/modular_widgets/pillars_widgets/pillars_list_widget.dart b/lib/widgets/modular_widgets/pillars_widgets/pillars_list_widget.dart
@@ -401,7 +401,7 @@ class _PillarsListWidgetState extends State<PillarsListWidget> {
               width: 5.0,
             ),
           ),
-          Expanded(
+          SizedBox( 
             child: pillarItem.isRevocable
                 ? CancelTimer(
                     Duration(

diff --git a/lib/widgets/modular_widgets/plasma_widgets/plasma_options/plasma_options.dart b/lib/widgets/modular_widgets/plasma_widgets/plasma_options/plasma_options.dart
@@ -132,7 +132,7 @@ class _PlasmaOptionsState extends State<PlasmaOptions> {
     _beneficiaryAddressController.text =
         _plasmaBeneficiaryAddress!.getBeneficiaryAddress()!;
     // Notify internal state has changed.
-    setState(() { });
+    setState(() {});
   }
 
   Widget _getWidgetBody(AccountInfo? accountInfo) {
@@ -240,11 +240,13 @@ class _PlasmaOptionsState extends State<PlasmaOptions> {
       PlasmaInfo.fromJson(
         {
           'currentPlasma': ((_qsrAmountController.text.isNotEmpty
-                  ? int.parse((zenon!.embedded.plasma.getPlasmaByQsr(
-                      _qsrAmountController.text.extractDecimals(coinDecimals),
-                    )).addDecimals(coinDecimals))
-                  : 0) +
-              _getPlasmaForCurrentBeneficiary()),
+                      ? BigInt.parse(zenon!.embedded.plasma
+                          .getPlasmaByQsr(_qsrAmountController.text
+                              .extractDecimals(coinDecimals))
+                          .addDecimals(coinDecimals))
+                      : BigInt.zero) +
+                  BigInt.from(_getPlasmaForCurrentBeneficiary()))
+              .toInt(),
           'maxPlasma': 0,
           'qsrAmount': '0',
         },

diff --git a/lib/widgets/modular_widgets/settings_widgets/node_management.dart b/lib/widgets/modular_widgets/settings_widgets/node_management.dart
@@ -44,6 +44,12 @@ class _NodeManagementState extends State<NodeManagement> {
 
   int get _newChainId => int.parse(_newChainIdController.text);
 
+  @override
+  void initState() {
+    super.initState();
+    kDefaultCommunityNodes.shuffle();
+  }
+
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
@@ -210,9 +216,11 @@ class _NodeManagementState extends State<NodeManagement> {
       InputValidators.node(_newNodeController.text) == null;
 
   void _onAddNodePressed() async {
-    if ([...kDbNodes, ...kDefaultNodes].contains(_newNodeController.text)) {
+    if ([...kDbNodes, ...kDefaultCommunityNodes, ...kDefaultNodes]
+        .contains(_newNodeController.text)) {
       NotificationUtils.sendNotificationError(
-          'Node already exists', 'Node already exists');
+          'Node ${_newNodeController.text} already exists',
+          'Node already exists');
     } else {
       _addNodeToDb();
     }
@@ -238,8 +246,11 @@ class _NodeManagementState extends State<NodeManagement> {
 
   Widget _getNodeTiles() {
     return Column(
-      children:
-          [...kDefaultNodes, ...kDbNodes].map((e) => _getNodeTile(e)).toList(),
+      children: <String>{
+        ...kDefaultNodes,
+        ...kDefaultCommunityNodes,
+        ...kDbNodes
+      }.toList().map((e) => _getNodeTile(e)).toList(),
     );
   }
 

diff --git a/lib/widgets/modular_widgets/transfer_widgets/send/send_large.dart b/lib/widgets/modular_widgets/transfer_widgets/send/send_large.dart
@@ -226,7 +226,7 @@ class _SendLargeCardState extends State<SendLargeCard> {
       showDialogWithNoAndYesOptions(
         isBarrierDismissible: false,
         context: context,
-        title: 'Send Payment',
+        title: 'Send',
         description: 'Are you sure you want to transfer '
             '${_amountController.text} ${_selectedToken.symbol} to '
             '${ZenonAddressUtils.getLabel(_recipientController.text)} ?',

diff --git a/lib/widgets/modular_widgets/transfer_widgets/send/send_medium.dart b/lib/widgets/modular_widgets/transfer_widgets/send/send_medium.dart
@@ -180,7 +180,7 @@ class _SendMediumCardState extends State<SendMediumCard> {
       showDialogWithNoAndYesOptions(
         context: context,
         isBarrierDismissible: true,
-        title: 'Send Payment',
+        title: 'Send',
         description: 'Are you sure you want to transfer '
             '${_amountController.text} ${_selectedToken.symbol} to '
             '${ZenonAddressUtils.getLabel(_recipientController.text)} ?',

diff --git a/lib/widgets/reusable_widgets/buttons/send_payment_button.dart b/lib/widgets/reusable_widgets/buttons/send_payment_button.dart
@@ -6,9 +6,9 @@ class SendPaymentButton extends LoadingButton {
   const SendPaymentButton({
     required VoidCallback? onPressed,
     required Key key,
-    String text = 'Send payment',
+    String text = 'Send',
     Color? outlineColor,
-    Size minimumSize = const Size(150.0, 40.0),
+    Size minimumSize = const Size(100.0, 40.0),
   }) : super(
           onPressed: onPressed,
           text: text,