Merge pull request #1421 from elliotsayes/PE-4727-meta-mask-login

[WIP] Fixes for PE-4727 meta mask login
ardriveapp · Oct 17, 2023 · 6f1f3ac · 6f1f3ac
2 parents 6e53031 + 79b54ac
commit 6f1f3ac
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/lib/authentication/login/blocs/login_bloc.dart b/lib/authentication/login/blocs/login_bloc.dart
@@ -324,10 +324,6 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
       await _arDriveAuth.logout();
     }
 
-    if (_isArConnectWallet()) {
-      await _arConnectService.disconnect();
-    }
-
     emit(LoginInitial(_arConnectService.isExtensionPresent(),
         _ethereumProviderService.isExtensionPresent()));
   }
@@ -477,8 +473,7 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
     final wallet = event.wallet;
 
     profileType = ProfileType.json;
-    // Wallet could be from Ethereum or Arweave wallet file
-    // profileSource = ProfileSource(type: ProfileSourceType.arweaveKey);
+    // Wallet could be from Ethereum or Arweave wallet file, so don't set profileSource
 
     try {
       if (await _arDriveAuth.userHasPassword(wallet)) {

diff --git a/lib/authentication/login/views/login_page.dart b/lib/authentication/login/views/login_page.dart
@@ -321,7 +321,7 @@ class _LoginPageScaffoldState extends State<LoginPageScaffold> {
           content = PromptWalletView(
             key: const Key('promptWalletView'),
             isArConnectAvailable: (state as LoginInitial).isArConnectAvailable,
-            isEthereumProviderAvailable: (state).isEthereumProviderAvailable,
+            isEthereumProviderAvailable: state.isEthereumProviderAvailable,
           );
         }
 

diff --git a/lib/blocs/profile/profile_cubit.dart b/lib/blocs/profile/profile_cubit.dart
@@ -158,7 +158,7 @@ class ProfileCubit extends Cubit<ProfileState> {
     }();
 
     final profileSource = ProfileSource(
-      type: ProfileSourceType.values[profile.details.profileSourceType ?? 0],
+      type: ProfileSourceType.values[profile.details.profileSourceType],
       address: profile.details.profileSourceAddress,
     );
 

diff --git a/lib/components/profile_card.dart b/lib/components/profile_card.dart
@@ -236,6 +236,7 @@ class _ProfileCardState extends State<ProfileCard> {
                 children: [
                   SizedBox(
                     child: Text(
+                      // TODO: localize?
                       'AR:',
                       style: ArDriveTypography.body.captionRegular().copyWith(
                             fontWeight: FontWeight.w600,

diff --git a/lib/models/tables/profiles.drift b/lib/models/tables/profiles.drift
@@ -10,6 +10,6 @@ CREATE TABLE profiles (
     profileType INTEGER NOT NULL,
 
     -- Added in schema v18
-    profileSourceType INTEGER,
+    profileSourceType INTEGER NOT NULL DEFAULT 0,
     profileSourceAddress TEXT
 );
diff --git a/lib/user/repositories/user_repository.dart b/lib/user/repositories/user_repository.dart
@@ -48,8 +48,8 @@ class _UserRepository implements UserRepository {
     final user = User(
       profileType: ProfileType.values[profileDetails.details.profileType],
       profileSource: ProfileSource(
-        type: ProfileSourceType
-            .values[profileDetails.details.profileSourceType ?? 0],
+        type:
+            ProfileSourceType.values[profileDetails.details.profileSourceType],
         address: profileDetails.details.walletPublicKey,
       ),
       wallet: profileDetails.wallet,

diff --git a/test/user/repositories/user_repository_test.dart b/test/user/repositories/user_repository_test.dart
@@ -47,6 +47,7 @@ void main() {
                 encryptedWallet: Uint8List.fromList([]),
                 keySalt: Uint8List.fromList([]),
                 profileType: 0, //json
+                profileSourceType: 0, //standalone
                 username: '',
                 walletPublicKey: '',
                 id: 'id',
@@ -61,6 +62,7 @@ void main() {
                 encryptedWallet: Uint8List.fromList([]),
                 keySalt: Uint8List.fromList([]),
                 profileType: 0, //json
+                profileSourceType: 0, //standalone
                 username: '',
                 walletPublicKey: '',
                 id: 'id',
@@ -113,6 +115,7 @@ void main() {
                 encryptedWallet: Uint8List.fromList([]),
                 keySalt: Uint8List.fromList([]),
                 profileType: 0, //json
+                profileSourceType: 0, //standalone
                 username: '',
                 walletPublicKey: '',
                 id: 'id',
@@ -176,6 +179,7 @@ void main() {
             encryptedWallet: Uint8List.fromList([]),
             keySalt: Uint8List.fromList([]),
             profileType: 0, //json
+            profileSourceType: 0, //standalone
             username: '',
             walletPublicKey: '',
             id: 'id',