From 5d4073bd3b7777c1086563f96b7913b1e0b4d4af Mon Sep 17 00:00:00 2001
From: Andriy Sheredko <sheredko.andriy@gmail.com>
Date: Mon, 15 Dec 2025 17:11:34 +0200
Subject: [PATCH 1/2] fix(google-file-picker): fix google-file-picker issue

---
 .../storage-item-selector.component.html          |  8 ++++++++
 .../google-file-picker.component.ts               | 15 ++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html
index 0d860844d..bf2d6bfa8 100644
--- a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html
+++ b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.html
@@ -44,6 +44,14 @@ <h3 class="mt-4 mb-2">
       [handleFolderSelection]="handleFolderSelection"
       [rootFolder]="selectedStorageItem()"
     ></osf-google-file-picker>
+    @if (selectedStorageItem() !== null) {
+      <osf-google-file-picker
+        [isFolderPicker]="false"
+        [accountId]="accountId()"
+        [currentAddonType]="currentAddonType()"
+        [rootFolder]="selectedStorageItem()"
+      ></osf-google-file-picker>
+    }
   } @else {
     <div class="folders-table flex flex-column">
       <div class="folders-table-heading flex justify-content-between">
diff --git a/src/app/shared/components/google-file-picker/google-file-picker.component.ts b/src/app/shared/components/google-file-picker/google-file-picker.component.ts
index 5ba8e6825..a358b00d2 100644
--- a/src/app/shared/components/google-file-picker/google-file-picker.component.ts
+++ b/src/app/shared/components/google-file-picker/google-file-picker.component.ts
@@ -4,7 +4,7 @@ import { TranslatePipe, TranslateService } from '@ngx-translate/core';
 
 import { Button } from 'primeng/button';
 
-import { ChangeDetectionStrategy, Component, inject, input, OnInit, signal } from '@angular/core';
+import { ChangeDetectionStrategy, Component, effect, inject, input, OnInit, signal } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { SENTRY_TOKEN } from '@core/provider/sentry.provider';
@@ -48,6 +48,19 @@ export class GoogleFilePickerComponent implements OnInit {
     return !!this.apiKey && !!this.appId;
   }
 
+  constructor() {
+    // Automatically open file picker when ready (for non-folder pickers)
+    effect(() => {
+      const isReady = !this.isGFPDisabled();
+      const hasRootFolder = !!this.rootFolder();
+      const isFilePicker = !this.isFolderPicker();
+
+      if (isReady && hasRootFolder && isFilePicker) {
+        this.createPicker();
+      }
+    });
+  }
+
   ngOnInit(): void {
     if (!this.isPickerConfigured) {
       this.isGFPDisabled.set(true);

From 075b84b53a474c13f2be4a809f20d0e2ce39ab24 Mon Sep 17 00:00:00 2001
From: Andriy Sheredko <sheredko.andriy@gmail.com>
Date: Mon, 15 Dec 2025 17:28:15 +0200
Subject: [PATCH 2/2] fix(google-file-picker): fix google-file-picker issue

---
 .../google-file-picker/google-file-picker.component.ts           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/shared/components/google-file-picker/google-file-picker.component.ts b/src/app/shared/components/google-file-picker/google-file-picker.component.ts
index a358b00d2..98c284b82 100644
--- a/src/app/shared/components/google-file-picker/google-file-picker.component.ts
+++ b/src/app/shared/components/google-file-picker/google-file-picker.component.ts
@@ -49,7 +49,6 @@ export class GoogleFilePickerComponent implements OnInit {
   }
 
   constructor() {
-    // Automatically open file picker when ready (for non-folder pickers)
     effect(() => {
       const isReady = !this.isGFPDisabled();
       const hasRootFolder = !!this.rootFolder();