Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert KYC from farms #871

Merged
merged 4 commits into from
Feb 2, 2025
Merged

Revert KYC from farms #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0642a7c
WIP: revert KYC from farms
AlaaElattar Jan 30, 2025
565a745
update farms screen to require email verification
AlaaElattar Jan 30, 2025
aa58fcc
remove unused imports
AlaaElattar Jan 30, 2025
43c2114
remove unused async
AlaaElattar Feb 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/lib/apps/farmers/farmers.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Farmers implements App {

@override
bool emailVerificationRequired() {
return false;
return true;
}

@override
Expand Down
28 changes: 0 additions & 28 deletions app/lib/widgets/add_farm.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:threebotlogin/helpers/globals.dart';
import 'package:threebotlogin/helpers/logger.dart';
import 'package:threebotlogin/models/farm.dart';
import 'package:threebotlogin/models/idenfy.dart';
import 'package:threebotlogin/models/wallet.dart';
import 'package:threebotlogin/services/gridproxy_service.dart';
import 'package:threebotlogin/services/idenfy_service.dart';
import 'package:threebotlogin/services/tfchain_service.dart';
import 'package:threebotlogin/widgets/custom_dialog.dart';

Expand Down Expand Up @@ -75,10 +72,6 @@ class _NewFarmState extends State<NewFarm> {
_add(String farmName) async {
Farm? farm;
try {
final idenfyServiceUrl = Globals().idenfyServiceUrl;
final kycVerified =
await getVerificationStatus(address: _selectedWallet!.tfchainAddress, idenfyServiceUrl: idenfyServiceUrl);
if (kycVerified.status == VerificationState.VERIFIED) {
final f = await createFarm(farmName, _selectedWallet!.tfchainSecret,
_selectedWallet!.stellarAddress);
farm = Farm(
Expand All @@ -94,27 +87,6 @@ class _NewFarmState extends State<NewFarm> {
'Farm $farmName has been added successfully',
Icons.check,
DialogType.Info);
} else {
saveLoading = false;
showDialog(
context: context,
builder: (BuildContext context) => CustomDialog(
type: DialogType.Warning,
image: Icons.warning,
title: 'Unauthorized',
description:
'KYC verification is required for the selected wallet',
actions: <Widget>[
TextButton(
child: const Text('Close'),
onPressed: () {
Navigator.pop(context);
},
),
],
));
return;
}
} catch (e) {
logger.e(e);
_showDialog('Error', 'Failed to create farm. Please try again.',
Expand Down
36 changes: 1 addition & 35 deletions app/lib/widgets/farm_item.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:threebotlogin/helpers/globals.dart';
import 'package:threebotlogin/helpers/logger.dart';
import 'package:threebotlogin/models/farm.dart';
import 'package:threebotlogin/models/idenfy.dart';
import 'package:threebotlogin/models/wallet.dart';
import 'package:threebotlogin/screens/wallets/contacts.dart';
import 'package:threebotlogin/services/idenfy_service.dart';
import 'package:threebotlogin/services/stellar_service.dart';
import 'package:threebotlogin/services/tfchain_service.dart';
import 'package:threebotlogin/widgets/custom_dialog.dart';
import 'package:threebotlogin/widgets/farm_node_item.dart';

class FarmItemWidget extends StatefulWidget {
Expand All @@ -34,17 +30,12 @@ class _FarmItemWidgetState extends State<FarmItemWidget> {
ChainType chainType = ChainType.Stellar;
String? addressError;
String? currentAddress;
String? tfchainAddress;

@override
void initState() {
super.initState();
currentAddress = widget.farm.walletAddress;
walletAddressController.text = currentAddress!;
tfchainAddress = widget.wallets
.where((w) => w.name == widget.farm.walletName)
.first
.tfchainAddress;
}

@override
Expand Down Expand Up @@ -237,32 +228,7 @@ class _FarmItemWidgetState extends State<FarmItemWidget> {
mainAxisAlignment: MainAxisAlignment.end,
children: [
IconButton(
onPressed: () async {
final idenfyServiceUrl = Globals().idenfyServiceUrl;
final kycVerified = await getVerificationStatus(
address: tfchainAddress!, idenfyServiceUrl: idenfyServiceUrl);
if (kycVerified.status !=
VerificationState.VERIFIED) {
showDialog(
context: context,
builder: (BuildContext context) =>
CustomDialog(
type: DialogType.Warning,
image: Icons.warning,
title: 'Unauthorized',
description:
'KYC verification is required for the selected wallet',
actions: <Widget>[
TextButton(
child: const Text('Close'),
onPressed: () {
Navigator.pop(context);
},
),
],
));
return;
}
onPressed: () {
setState(() {
edit = !edit;
});
Expand Down