Merge branch 'dev' into PE-6751

ardriveapp · Oct 15, 2024 · 0662e4b · 0662e4b
2 parents e65623d + 1c7037b
commit 0662e4b
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 21 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,7 +3,7 @@ on:
 
 jobs:
   test-and-lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       # Checkout
       - uses: actions/checkout@v3
@@ -34,4 +34,4 @@ jobs:
         run: flutter analyze
 
       - name: Test app
-        run: scr test
+        run: scr test
diff --git a/android/fastlane/metadata/android/en-US/changelogs/157.txt b/android/fastlane/metadata/android/en-US/changelogs/157.txt
@@ -0,0 +1 @@
+- Fixes an issue that mistakenly redirects the user to the Drive Explorer instead of Tutorials Page when creating a wallet from ArDrive
diff --git a/lib/authentication/login/views/modals/enter_your_password_modal.dart b/lib/authentication/login/views/modals/enter_your_password_modal.dart
@@ -236,7 +236,7 @@ class _EnterYourPasswordWidgetState extends State<EnterYourPasswordWidget> {
                 child: ArDriveButtonNew(
                   variant: ButtonVariant.outline,
                   text: 'Advanced Settings',
-                  maxHeight: 32,
+                  maxHeight: 40,
                   typography: typography,
                   onPressed: () {
                     showGatewaySwitcherModal(context);

diff --git a/lib/authentication/login/views/wallet_created_view.dart b/lib/authentication/login/views/wallet_created_view.dart
@@ -385,11 +385,10 @@ class _WalletCreatedViewState extends State<WalletCreatedView> {
                 color: colorTokens.textMid, fontWeight: ArFontWeight.book)));
 
     return isBlurred
-        ? ClipRect(
-            child: ImageFiltered(
+        ? ImageFiltered(
             imageFilter: ImageFilter.blur(sigmaX: 5, sigmaY: 5),
             child: text,
-          ))
+          )
         : text;
   }
 

diff --git a/lib/blocs/profile/profile_cubit.dart b/lib/blocs/profile/profile_cubit.dart
@@ -36,13 +36,6 @@ class ProfileCubit extends Cubit<ProfileState> {
         _arDriveAuth = arDriveAuth,
         super(ProfileCheckingAvailability()) {
     promptToAuthenticate();
-
-    _arDriveAuth.onAuthStateChanged().listen((user) {
-      if (user != null) {
-        emit(ProfileLoggedIn(
-            user: user, useTurbo: _turboUploadService.useTurboUpload));
-      }
-    });
   }
 
   Future<bool> isCurrentProfileArConnect() async {

diff --git a/lib/components/side_bar.dart b/lib/components/side_bar.dart
@@ -273,6 +273,7 @@ class _AppSideBarState extends State<AppSideBar> {
 
   Widget _buildAccordion(DrivesLoadSuccess state, bool isMobile) {
     final typography = ArDriveTypographyNew.of(context);
+    final colorTokens = ArDriveTheme.of(context).themeData.colorTokens;
 
     return ArDriveAccordion(
       contentPadding: isMobile ? const EdgeInsets.all(4) : null,
@@ -283,9 +284,10 @@ class _AppSideBarState extends State<AppSideBar> {
           ArDriveAccordionItem(
             isExpanded: true,
             Text(
-              appLocalizationsOf(context).publicDrives,
+              appLocalizationsOf(context).publicDrives.toUpperCase(),
               style: typography.paragraphNormal(
-                fontWeight: ArFontWeight.bold,
+                fontWeight: ArFontWeight.semiBold,
+                color: colorTokens.textHigh,
               ),
             ),
             state.userDrives
@@ -311,9 +313,10 @@ class _AppSideBarState extends State<AppSideBar> {
           ArDriveAccordionItem(
             isExpanded: true,
             Text(
-              appLocalizationsOf(context).privateDrives,
+              appLocalizationsOf(context).privateDrives.toUpperCase(),
               style: typography.paragraphNormal(
-                fontWeight: ArFontWeight.bold,
+                fontWeight: ArFontWeight.semiBold,
+                color: colorTokens.textHigh,
               ),
             ),
             state.userDrives
@@ -334,9 +337,9 @@ class _AppSideBarState extends State<AppSideBar> {
           ArDriveAccordionItem(
             isExpanded: true,
             Text(
-              appLocalizationsOf(context).sharedDrives,
+              appLocalizationsOf(context).sharedDrives.toUpperCase(),
               style: typography.paragraphNormal(
-                fontWeight: ArFontWeight.bold,
+                fontWeight: ArFontWeight.semiBold,
               ),
             ),
             state.sharedDrives
@@ -538,7 +541,7 @@ class DriveListTile extends StatelessWidget {
       onTap: onTap,
       child: Padding(
         padding: const EdgeInsets.only(
-          left: 32.0,
+          left: 10.0,
           right: 8.0,
         ),
         child: Row(

diff --git a/packages/ardrive_ui/lib/src/components/scroll_bar.dart b/packages/ardrive_ui/lib/src/components/scroll_bar.dart
@@ -27,13 +27,15 @@ class ArDriveScrollBar extends StatelessWidget {
               trackColor: MaterialStateProperty.all<Color>(
                 isVisible ? grey.shade400 : Colors.transparent,
               ), // set the color of the track
+              thickness: MaterialStateProperty.all<double>(2.0),
             ),
           ),
       child: isVisible
           ? Scrollbar(
               interactive: true,
               thumbVisibility: alwaysVisible,
               controller: controller,
+              thickness: 2.0,
               child: child,
             )
           : child,

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Secure, permanent storage
 
 publish_to: 'none'
 
-version: 2.55.0
+version: 2.55.1
 
 environment:
   sdk: '>=3.2.0 <4.0.0'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Fixes an issue that mistakenly redirects the user to the Drive Explorer instead of Tutorials Page when creating a wallet from ArDrive