PE-4823: Release ArDrive App v2.20.0

android/fastlane/metadata/android/en-US/changelogs/68.txt

@@ -1 +1 @@
-- Fixes the dead link for the Feedback Survey Form
+- Updates user feedback survey link

android/fastlane/metadata/android/en-US/changelogs/70.txt

@@ -0,0 +1,2 @@
+- New Video Preview available when selecting video files
+- The currently selected wallet address is now displayed on the login page

assets/config/prod.json

@@ -7,7 +7,7 @@
   "allowedDataItemSizeForTurbo": 500000,
   "enableQuickSyncAuthoring": true,
   "enableMultipleFileDownload": true,
-  "enableVideoPreview": false,
+  "enableVideoPreview": true,
   "enableAudioPreview": true,
   "stripePublishableKey": "pk_live_51JUAtwC8apPOWkDLMQqNF9sPpfneNSPnwX8YZ8y1FNDl6v94hZIwzgFSYl27bWE4Oos8CLquunUswKrKcaDhDO6m002Yj9AeKj",
   "enablePins": true

assets/config/staging.json

@@ -7,7 +7,7 @@
   "allowedDataItemSizeForTurbo": 500000,
   "enableQuickSyncAuthoring": true,
   "enableMultipleFileDownload": true,
-  "enableVideoPreview": false,
+  "enableVideoPreview": true,
   "enableAudioPreview": true,
   "stripePublishableKey": "pk_live_51JUAtwC8apPOWkDLMQqNF9sPpfneNSPnwX8YZ8y1FNDl6v94hZIwzgFSYl27bWE4Oos8CLquunUswKrKcaDhDO6m002Yj9AeKj",
   "enablePins": true

lib/authentication/ardrive_auth.dart

@@ -12,6 +12,7 @@ import 'package:ardrive/utils/logger/logger.dart';
 import 'package:ardrive/utils/metadata_cache.dart';
 import 'package:ardrive/utils/secure_key_value_store.dart';
 import 'package:arweave/arweave.dart';
+import 'package:arweave/utils.dart';
 import 'package:cryptography/cryptography.dart';
 import 'package:flutter/foundation.dart';
 import 'package:stash_shared_preferences/stash_shared_preferences.dart';
@@ -29,6 +30,7 @@ abstract class ArDriveAuth {
   User get currentUser;
   Stream<User?> onAuthStateChanged();
   Future<bool> isBiometricsEnabled();
+  Future<String?> getWalletAddress();
 
   factory ArDriveAuth({
     required ArweaveService arweave,
@@ -326,6 +328,15 @@ class ArDriveAuthImpl implements ArDriveAuth {
 
     return firstPrivateDriveTxId;
   }
+
+  @override
+  Future<String?> getWalletAddress() async {
+    final owner = await _userRepository.getOwnerOfDefaultProfile();
+    if (owner == null) {
+      return null;
+    }
+    return ownerToAddress(owner);
+  }
 }
 
 class AuthenticationFailedException implements Exception {

lib/authentication/login/blocs/login_bloc.dart

@@ -5,6 +5,7 @@ import 'package:ardrive/authentication/ardrive_auth.dart';
 import 'package:ardrive/entities/profile_types.dart';
 import 'package:ardrive/services/arconnect/arconnect.dart';
 import 'package:ardrive/services/arconnect/arconnect_wallet.dart';
+import 'package:ardrive/user/repositories/user_repository.dart';
 import 'package:ardrive/user/user.dart';
 import 'package:ardrive/utils/html/html_util.dart';
 import 'package:ardrive/utils/logger/logger.dart';
@@ -37,6 +38,7 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
   LoginBloc({
     required ArDriveAuth arDriveAuth,
     required ArConnectService arConnectService,
+    required UserRepository userRepository,
   })  : _arDriveAuth = arDriveAuth,
         _arConnectService = arConnectService,
         super(LoginLoading()) {

lib/authentication/login/views/login_page.dart

@@ -9,12 +9,14 @@ import 'package:ardrive/authentication/login/blocs/stub_web_wallet.dart' // stub
     if (dart.library.html) 'package:ardrive/authentication/login/blocs/web_wallet.dart';
 import 'package:ardrive/blocs/profile/profile_cubit.dart';
 import 'package:ardrive/components/app_version_widget.dart';
+import 'package:ardrive/components/truncated_address.dart';
 import 'package:ardrive/misc/resources.dart';
 import 'package:ardrive/pages/drive_detail/components/hover_widget.dart';
 import 'package:ardrive/services/arconnect/arconnect.dart';
 import 'package:ardrive/services/authentication/biometric_authentication.dart';
 import 'package:ardrive/services/authentication/biometric_permission_dialog.dart';
 import 'package:ardrive/services/config/config_service.dart';
+import 'package:ardrive/user/repositories/user_repository.dart';
 import 'package:ardrive/utils/app_localizations_wrapper.dart';
 import 'package:ardrive/utils/app_platform.dart';
 import 'package:ardrive/utils/io_utils.dart';
@@ -48,6 +50,7 @@ class _LoginPageState extends State<LoginPage> {
       create: (context) => LoginBloc(
         arConnectService: ArConnectService(),
         arDriveAuth: context.read<ArDriveAuth>(),
+        userRepository: context.read<UserRepository>(),
       )..add(const CheckIfUserIsLoggedIn()),
       child: BlocConsumer<LoginBloc, LoginState>(
         listener: (context, state) {
@@ -314,7 +317,9 @@ class _LoginPageScaffoldState extends State<LoginPageScaffold> {
         } else if (enableSeedPhraseLogin &&
             state is LoginDownloadGeneratedWallet) {
           content = DownloadWalletView(
-              mnemonic: state.mnemonic, wallet: state.walletFile);
+            mnemonic: state.mnemonic,
+            wallet: state.walletFile,
+          );
         } else {
           content = PromptWalletView(
             key: const Key('promptWalletView'),
@@ -684,6 +689,10 @@ class _PromptPasswordViewState extends State<PromptPasswordView> {
                 textAlign: TextAlign.center,
                 style: ArDriveTypography.headline.headline4Bold(),
               ),
+              _buildAddressPreview(
+                context,
+                maybeWallet: widget.wallet,
+              ),
               Column(
                 children: [
                   ArDriveTextField(
@@ -2243,7 +2252,7 @@ class CreateNewWalletViewState extends State<CreateNewWalletView> {
                                           color: colors.themeErrorMuted,
                                         )
                                         .copyWith(fontSize: 14)))
-                          ]), 
+                          ]),
                           shape: RoundedRectangleBorder(
                             side: BorderSide(
                                 color: colors.themeErrorMuted, width: 1),
@@ -2637,3 +2646,42 @@ class _LoginCopyButtonState extends State<LoginCopyButton> {
     }
   }
 }
+
+Widget _buildAddressPreview(
+  BuildContext context, {
+  required Wallet? maybeWallet,
+}) {
+  Future<String?> getWalletAddress() async {
+    if (maybeWallet == null) {
+      return context.read<ArDriveAuth>().getWalletAddress();
+    }
+    return maybeWallet.getAddress();
+  }
+
+  return FutureBuilder(
+    future: getWalletAddress(),
+    builder: (BuildContext context, AsyncSnapshot<String?> snapshot) {
+      if (snapshot.hasData) {
+        return Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            Text(
+              appLocalizationsOf(context).walletAddress,
+              style: ArDriveTypography.body
+                  .captionRegular()
+                  .copyWith(fontSize: 18),
+            ),
+            const SizedBox(width: 8),
+            TruncatedAddress(
+              walletAddress: snapshot.data!,
+              fontSize: 18,
+            ),
+          ],
+        );
+      } else {
+        return const SizedBox.shrink();
+      }
+    },
+  );
+}

lib/blocs/fs_entry_preview/fs_entry_preview_cubit.dart

@@ -339,8 +339,7 @@ class FsEntryPreviewCubit extends Cubit<FsEntryPreviewState> {
         return audioContentTypes
             .any((element) => element.contains(fileExtension));
       case 'video':
-        return videoContentTypes
-            .any((element) => element.contains(fileExtension));
+        return true;
       default:
         return false;
     }

lib/l10n/app_en.arb

@@ -833,6 +833,10 @@
   "@fileType": {
     "description": "The MIME type of the file"
   },
+  "fileTypeUnsupported": "File type unsupported by browser or operating system",
+  "@fileTypeUnsupported": {
+    "description": "Message shown when unable to load media file due to unsupported file format"
+  },
   "fileWasCreatedWithName": "This file was created with the name {fileName}.",
   "@fileWasCreatedWithName": {
     "description": "File activity (journal): created",
@@ -1970,6 +1974,10 @@
   "@waitForDownload": {
     "description": "User must to wait this download"
   },
+  "walletAddress": "Wallet address:",
+  "@walletAddress": {
+    "description": "E.g. \"The wallet address is… ABCDEFGH\""
+  },
   "walletChangedDuringManifestCreation": "Provided wallet has unexpectedly changed during manifest creation...",
   "@walletChangedDuringManifestCreation": {
     "description": "The wallet has been changed while the creation of the manifest was in process"
@@ -2078,4 +2086,4 @@
   "@zippingYourFiles": {
     "description": "Download failure message when a file is too big"
   }
-}
+}