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

Pe 4727 meta mask login migration
ardriveapp · Oct 13, 2023 · 79b54ac · 79b54ac
2 parents 60a47a2 + 2c506d4
commit 79b54ac
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
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/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',