Avoid scrolling of frame on Avatar Picker (#752)

Co-authored-by: Pinar Olguc <[email protected]>

Author: etoledom

Sources/GravatarUI/SwiftUI/AvatarPicker/AvatarPickerView.swift

@@ -131,7 +131,17 @@ struct AvatarPickerView<ImageEditor: ImageEditorView>: View {
                     Button(Localized.dismissButtonTitle, role: .cancel) {}
                 }
             }
-
+            // Display the frame outside of the scroll view around the content, but not around the loading or error states.
+            .if(!model.isAvatarsLoading && !model.grid.isEmpty) { content in
+                VStack(spacing: 0) {
+                    content
+                        .avatarPickerBorder(colorScheme: colorScheme)
+                        .padding(.horizontal, .DS.Padding.double)
+                    Spacer()
+                        .frame(height: .DS.Padding.double)
+                        .accumulateIntrinsicHeight()
+                }
+            }
             ToastContainerView(toastManager: model.toastManager)
                 .padding(.horizontal, Constants.horizontalPadding * 2)
         }
@@ -287,7 +297,6 @@ struct AvatarPickerView<ImageEditor: ImageEditorView>: View {
                 }
             )
             .padding(.horizontal, Constants.horizontalPadding)
-            .padding(.vertical, .DS.Padding.medium)
         } else {
             HorizontalAvatarGrid(
                 grid: model.grid,
@@ -308,7 +317,6 @@ struct AvatarPickerView<ImageEditor: ImageEditorView>: View {
                 CTAButtonView(Localized.buttonUploadImage)
             }
             .padding(.horizontal, Constants.horizontalPadding)
-            .padding(.bottom, .DS.Padding.medium)
         }
     }
 
@@ -361,8 +369,6 @@ struct AvatarPickerView<ImageEditor: ImageEditorView>: View {
             header()
             avatarGrid()
         }
-        .avatarPickerBorder(colorScheme: colorScheme)
-        .padding(.horizontal, Constants.horizontalPadding)
     }
 
     private func openProfileInSafari() {
@@ -509,7 +515,7 @@ enum AvatarPicker {
     ]
     let selectedImageID = "5"
 
-    AvatarPickerView<NoCustomEditor>(
+    return AvatarPickerView<NoCustomEditor>(
         avatarImageModels: avatarImageModels,
         selectedImageID: selectedImageID,
         profileModel: nil,