Settings

lib/data/models/company_gateway_model.dart

@@ -100,11 +100,11 @@ abstract class CompanyGatewayEntity extends Object
 
   @nullable
   @BuiltValueField(wireName: 'min_limit')
-  int get minLimit;
+  double get minLimit;
 
   @nullable
   @BuiltValueField(wireName: 'max_limit')
-  int get maxLimit;
+  double get maxLimit;
 
   @nullable
   @BuiltValueField(wireName: 'fee_amount')

lib/data/models/company_gateway_model.g.dart

@@ -165,13 +165,13 @@ class _$CompanyGatewayEntitySerializer
       result
         ..add('min_limit')
         ..add(serializers.serialize(object.minLimit,
-            specifiedType: const FullType(int)));
+            specifiedType: const FullType(double)));
     }
     if (object.maxLimit != null) {
       result
         ..add('max_limit')
         ..add(serializers.serialize(object.maxLimit,
-            specifiedType: const FullType(int)));
+            specifiedType: const FullType(double)));
     }
     if (object.feeAmount != null) {
       result
@@ -318,11 +318,11 @@ class _$CompanyGatewayEntitySerializer
           break;
         case 'min_limit':
           result.minLimit = serializers.deserialize(value,
-              specifiedType: const FullType(int)) as int;
+              specifiedType: const FullType(double)) as double;
           break;
         case 'max_limit':
           result.maxLimit = serializers.deserialize(value,
-              specifiedType: const FullType(int)) as int;
+              specifiedType: const FullType(double)) as double;
           break;
         case 'fee_amount':
           result.feeAmount = serializers.deserialize(value,
@@ -609,9 +609,9 @@ class _$CompanyGatewayEntity extends CompanyGatewayEntity {
   @override
   final String customValue2;
   @override
-  final int minLimit;
+  final double minLimit;
   @override
-  final int maxLimit;
+  final double maxLimit;
   @override
   final double feeAmount;
   @override
@@ -863,13 +863,13 @@ class CompanyGatewayEntityBuilder
   String get customValue2 => _$this._customValue2;
   set customValue2(String customValue2) => _$this._customValue2 = customValue2;
 
-  int _minLimit;
-  int get minLimit => _$this._minLimit;
-  set minLimit(int minLimit) => _$this._minLimit = minLimit;
+  double _minLimit;
+  double get minLimit => _$this._minLimit;
+  set minLimit(double minLimit) => _$this._minLimit = minLimit;
 
-  int _maxLimit;
-  int get maxLimit => _$this._maxLimit;
-  set maxLimit(int maxLimit) => _$this._maxLimit = maxLimit;
+  double _maxLimit;
+  double get maxLimit => _$this._maxLimit;
+  set maxLimit(double maxLimit) => _$this._maxLimit = maxLimit;
 
   double _feeAmount;
   double get feeAmount => _$this._feeAmount;

lib/ui/company_gateway/company_gateway_list_vm.dart

@@ -63,6 +63,7 @@ class CompanyGatewayListVM {
     final state = store.state;
 
     return CompanyGatewayListVM(
+      state: state,
       userCompany: state.userCompany,
       listState: state.companyGatewayListState,
       companyGatewayList: memoizedFilteredCompanyGatewayList(

lib/ui/company_gateway/edit/company_gateway_edit.dart

@@ -40,7 +40,7 @@ class _CompanyGatewayEditState extends State<CompanyGatewayEdit>
   @override
   void initState() {
     super.initState();
-    _controller = TabController(vsync: this, length: 4);
+    _controller = TabController(vsync: this, length: 3);
   }
 
   @override
@@ -100,10 +100,7 @@ class _CompanyGatewayEditState extends State<CompanyGatewayEdit>
             text: localization.settings,
           ),
           Tab(
-            text: localization.limits,
-          ),
-          Tab(
-            text: localization.fees,
+            text: localization.limitsAndFees,
           ),
         ],
       ),
@@ -223,9 +220,6 @@ class _CompanyGatewayEditState extends State<CompanyGatewayEdit>
                   ),
                 ],
               ),
-              ListView(
-                children: <Widget>[],
-              ),
             ],
           ),
         ),
@@ -459,7 +453,16 @@ class _LimitEditorState extends State<LimitEditor> {
   }
 
   void _onChanged() {
-    //widget.onChanged(_textController.text.trim());
+    final viewModel = widget.viewModel;
+    final companyGateway = viewModel.companyGateway;
+
+    final updatedGateway = companyGateway.rebuild((b) => b
+      ..minLimit = _enableMin ? parseDouble(_minController.text.trim()) : null
+      ..maxLimit = _enableMax ? parseDouble(_maxController.text.trim()) : null);
+
+    if (companyGateway != updatedGateway) {
+      viewModel.onChanged(updatedGateway);
+    }
   }
 
   @override
@@ -506,6 +509,7 @@ class _LimitEditorState extends State<LimitEditor> {
                     onChanged: (value) {
                       setState(() {
                         _enableMin = value;
+                        _onChanged();
                         if (!value) {
                           _minController.text = '';
                         }
@@ -535,6 +539,7 @@ class _LimitEditorState extends State<LimitEditor> {
                     onChanged: (value) {
                       setState(() {
                         _enableMax = value;
+                        _onChanged();
                         if (!value) {
                           _maxController.text = '';
                         }

lib/utils/i18n.dart

@@ -14,6 +14,7 @@ abstract class LocaleCodeAware {
 mixin LocalizationsProvider on LocaleCodeAware {
   static final Map<String, Map<String, String>> _localizedValues = {
     'en': {
+      'limits_and_fees': 'Limits/Fees',
       'enable_min': 'Enable Min',
       'enable_max': 'Enable Max',
       'min_limit': 'Min Limit',
@@ -14984,6 +14985,9 @@ mixin LocalizationsProvider on LocaleCodeAware {
 
   String get enableMax => _localizedValues[localeCode]['enable_max'];
 
+  String get limitsAndFees => _localizedValues[localeCode]['limits_and_fees'];
+
+
   String lookup(String key) {
     final lookupKey = toSnakeCase(key);
     return _localizedValues[localeCode][lookupKey] ??