chore: improve eligiblity check

d-reader-organization · Apr 29, 2024 · dda34de · dda34de
1 parent fc1bd53
commit dda34de
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 31 deletions.
diff --git a/lib/features/nft/presentation/providers/nft_providers.dart b/lib/features/nft/presentation/providers/nft_providers.dart
@@ -1,4 +1,4 @@
-import 'dart:async' show Timer;
+import 'dart:async' show TimeoutException, Timer;
 
 import 'package:d_reader_flutter/config/config.dart';
 import 'package:d_reader_flutter/features/nft/domain/models/nft.dart';
@@ -74,9 +74,18 @@ final transactionChainStatusProvider = StateProvider.family<void, String>(
             isLoading: false,
             newMessage: TransactionStatusMessage.success.getString(),
           );
-    }).onError((error, stackTrace) {
-      Sentry.captureException(error,
-          stackTrace: 'Signature status provider $signature');
+    }).onError((exception, stackTrace) {
+      if (exception is TimeoutException || exception is RpcTimeoutException) {
+        ref.read(globalNotifierProvider.notifier).update(
+              isLoading: false,
+              newMessage: TransactionStatusMessage.timeout.getString(),
+            );
+        return;
+      }
+      Sentry.captureException(
+        exception,
+        stackTrace: 'Signature status provider $signature',
+      );
       ref.read(globalNotifierProvider.notifier).update(
             isLoading: false,
             newMessage: TransactionStatusMessage.fail.getString(),

diff --git a/lib/features/nft/presentation/screens/nft_details.dart b/lib/features/nft/presentation/screens/nft_details.dart
@@ -311,7 +311,7 @@ class NftDetails extends ConsumerWidget {
                                           ),
                                           Text(
                                             'royalty',
-                                            style: textTheme.bodyMedium,
+                                            style: textTheme.bodySmall,
                                           ),
                                         ],
                                       ),
@@ -394,7 +394,7 @@ class NftDetails extends ConsumerWidget {
                           height: 16,
                         ),
                         const Text(
-                          'NFT Address',
+                          'Token Address',
                           style: sectionHeadingStyle,
                         ),
                         const SizedBox(

diff --git a/lib/features/settings/presentation/widgets/referrals/body.dart b/lib/features/settings/presentation/widgets/referrals/body.dart
@@ -34,7 +34,7 @@ class ReferralBody extends ConsumerWidget {
                 height: 12,
               ),
               Text(
-                user.hasBetaAccess ? 'Invite your friends' : 'Join the beta',
+                user.hasBetaAccess ? 'Invite your friends' : 'Claim referral',
                 textAlign: TextAlign.center,
                 style: const TextStyle(
                   fontSize: 32,
@@ -46,7 +46,7 @@ class ReferralBody extends ConsumerWidget {
               ),
               if (!user.hasBetaAccess) ...[
                 const Text(
-                  'Type in the username or the wallet address from your referrer to claim beta access',
+                  'Onboarding people to the platform will make you eligible for rewards in the future',
                   style: TextStyle(
                     fontSize: 14,
                     fontWeight: FontWeight.w500,
@@ -85,17 +85,6 @@ class ReferralBody extends ConsumerWidget {
                 const SizedBox(
                   height: 16,
                 ),
-                const Text(
-                  'Fully onboarding 2 people to the platform will make you eligible for a free comic mint! \'Fully\' means that the users have verified their email and connected a wallet.',
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    fontSize: 16,
-                    fontWeight: FontWeight.w500,
-                  ),
-                ),
-                const SizedBox(
-                  height: 16,
-                ),
                 GestureDetector(
                   onTap: () {
                     Clipboard.setData(

diff --git a/lib/shared/domain/providers/solana/solana_notifier.dart b/lib/shared/domain/providers/solana/solana_notifier.dart
@@ -219,6 +219,17 @@ class SolanaNotifier extends _$SolanaNotifier {
       shouldSignMessage: isConnectOnly,
     );
 
+    // Invalidate candy machine to refetch eligibility
+    if (ref.read(selectedCandyMachineGroup) != null) {
+      final signerAddress = ref.read(environmentProvider).publicKey?.toBase58();
+      final currentCMAddress = ref.read(candyMachineStateProvider)?.address;
+      ref.invalidate(candyMachineProvider);
+      await ref.read(candyMachineProvider(
+              query:
+                  'candyMachineAddress=$currentCMAddress${'&walletAddress=$signerAddress'}')
+          .future);
+    }
+
     if (result != successResult) {
       await session.close();
       return Left(
@@ -325,15 +336,6 @@ class SolanaNotifier extends _$SolanaNotifier {
       }, (message) async {
         ref.invalidate(registerWalletToSocketEvents);
         ref.read(registerWalletToSocketEvents);
-        if (ref.read(selectedCandyMachineGroup) != null) {
-          final currentCMAddress = ref.read(candyMachineStateProvider)?.address;
-          ref.invalidate(candyMachineProvider);
-          await ref.read(candyMachineProvider(
-                  query:
-                      'candyMachineAddress=$currentCMAddress${'&walletAddress=${signer.toBase58()}'}')
-              .future);
-        }
-
         return message;
       });
     });

diff --git a/lib/shared/domain/providers/solana/solana_transaction_notifier.dart b/lib/shared/domain/providers/solana/solana_transaction_notifier.dart
@@ -180,11 +180,13 @@ class SolanaTransactionNotifier extends _$SolanaTransactionNotifier {
           );
           if (!hasEligibility) {
             await session.close();
+            final isUser = ref.read(selectedCandyMachineGroup)?.user != null;
             return Left(
               AppException(
                 identifier: 'SolanaTransactionNotifier.mint',
-                message:
-                    'Wallet address ${Formatter.formatAddress(walletAddress, 3)} is not eligible for minting',
+                message: isUser
+                    ? 'User ${ref.read(environmentProvider).user?.email} is not eligible for minting'
+                    : 'Wallet address ${Formatter.formatAddress(walletAddress, 3)} is not eligible for minting',
                 statusCode: 403,
               ),
             );

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: dReader Flutter app.
 
 publish_to: 'none'
 
-version: 1.3.1+44 # dappStore: 1.3.1+44 (next release: 1.3.2+45) google play: 1.3.1+70 (next release: 1.3.2+71)
+version: 1.3.2+71 # dappStore: 1.3.1+44 (next release: 1.3.2+45) google play: 1.3.1+70 (next release: 1.3.2+71)
 
 environment:
   sdk: '>=3.0.0 <4.0.0'