From 195a4a993f219197100ab6393fd694552bdca604 Mon Sep 17 00:00:00 2001
From: bricefriha <contact@bricefriha.dev>
Date: Tue, 4 Aug 2026 20:59:34 +0100
Subject: [PATCH 1/8] deals | add search bar UI

---
 App/Views/DealsPage.xaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/App/Views/DealsPage.xaml b/App/Views/DealsPage.xaml
index c729bba5..42ce8736 100644
--- a/App/Views/DealsPage.xaml
+++ b/App/Views/DealsPage.xaml
@@ -60,6 +60,11 @@
                     ItemsSource="{Binding Deals}"
                     Margin="1,0"
                     >
+                    <CollectionView.Header>
+                        <Grid>
+                            <SearchBar Placeholder="Search deals..." />
+                        </Grid>
+                    </CollectionView.Header>
                     <CollectionView.EmptyView>
                         <Grid >
                             <StackLayout IsVisible="{Binding IsLoading}">

From 187cca4aea8f48c91cc46012f71ed319bcc203e5 Mon Sep 17 00:00:00 2001
From: bricefriha <contact@bricefriha.dev>
Date: Tue, 4 Aug 2026 22:06:39 +0100
Subject: [PATCH 2/8] search kinda working i guess

---
 App/ViewModels/DealsViewModel.cs | 26 +++++++++++++++++++++++++-
 App/Views/DealsPage.xaml         |  8 +++++++-
 App/Views/DealsPage.xaml.cs      |  7 +++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/App/ViewModels/DealsViewModel.cs b/App/ViewModels/DealsViewModel.cs
index 510d88d7..0e8561ff 100644
--- a/App/ViewModels/DealsViewModel.cs
+++ b/App/ViewModels/DealsViewModel.cs
@@ -10,6 +10,7 @@ public class DealsViewModel : BaseViewModel
 {
     public App CurrentApp { get; }
     private ObservableRangeCollection<Deal> _deals = new ();
+    private ObservableRangeCollection<Deal> _presearchDeals;
 
     public ObservableRangeCollection<Deal> Deals
     {
@@ -97,7 +98,7 @@ public DealsViewModel()
                 CurrentApp.DataFetcher.AllDeals.Where(deal => 
                 deal?.DRM != null && allowedDrms.Contains(deal.DRM)
                 ).OrderBy(d => d.Expires);
-                Deals = new ObservableRangeCollection<Deal>(
+                _presearchDeals = Deals = new ObservableRangeCollection<Deal>(
                     filtersList);
 
                 FiltersApplied = true;
@@ -140,6 +141,26 @@ public ObservableCollection<GamePlatform> Platforms
 
     }
 
+    public void DealsSearch(string textSearch)
+    {
+        if (string.IsNullOrEmpty(textSearch))
+        {
+
+            Deals = _presearchDeals;
+            return;
+        }
+
+        var filteredDeals = _presearchDeals.Where(deal => deal.Title.ToLower().Contains(textSearch.ToLower()))?.ToList();
+
+        if (filteredDeals is null)
+        {
+            Deals = _presearchDeals;
+            return;
+        }
+
+        Deals = new(filteredDeals);
+    }
+
     public async Task UpdateDeals()
     {
         if (!(Deals?.Count > 0))
@@ -196,6 +217,8 @@ await MainThread.InvokeOnMainThreadAsync(() =>
 
             IsLoading = false;
             _setup = true;
+
+            _presearchDeals = _deals;
             return;
         }
         IsLoading = false;
@@ -220,5 +243,6 @@ await MainThread.InvokeOnMainThreadAsync(() =>
             Deals.RemoveAt(i);
         }
 
+        _presearchDeals = _deals;
 }
 }
diff --git a/App/Views/DealsPage.xaml b/App/Views/DealsPage.xaml
index 42ce8736..afed573c 100644
--- a/App/Views/DealsPage.xaml
+++ b/App/Views/DealsPage.xaml
@@ -62,7 +62,13 @@
                     >
                     <CollectionView.Header>
                         <Grid>
-                            <SearchBar Placeholder="Search deals..." />
+                            <SearchBar Placeholder="Search deals..."
+                                       x:Name="search"
+                                       TextChanged="search_TextChanged"
+                                       IsTextPredictionEnabled="false"
+                                       IsSpellCheckEnabled="False"
+                                       SearchButtonPressed="search_SearchButtonPressed"
+                                       />
                         </Grid>
                     </CollectionView.Header>
                     <CollectionView.EmptyView>
diff --git a/App/Views/DealsPage.xaml.cs b/App/Views/DealsPage.xaml.cs
index 4b29df28..2d7f6a2a 100644
--- a/App/Views/DealsPage.xaml.cs
+++ b/App/Views/DealsPage.xaml.cs
@@ -40,4 +40,11 @@ public void Resume()
     {
         _vm.UpdateDeals().GetAwaiter();
     }
+
+    private void search_SearchButtonPressed(object sender, EventArgs e)
+    {
+        _vm.DealsSearch(search.Text);
+        search.Unfocus();
+
+    }
 }
\ No newline at end of file

From cf30ef2b4ac1b14d3ebcad23726c8d50a929af9d Mon Sep 17 00:00:00 2001
From: bricefriha <contact@bricefriha.dev>
Date: Sun, 23 Aug 2026 14:34:11 +0100
Subject: [PATCH 3/8] Create a deal preview controller

---
 App/Controls/DealPreview.xaml    | 206 +++++++++++++++++++++++++++++++
 App/Controls/DealPreview.xaml.cs |  22 ++++
 App/Views/DealsPage.xaml         |   2 +-
 3 files changed, 229 insertions(+), 1 deletion(-)
 create mode 100644 App/Controls/DealPreview.xaml
 create mode 100644 App/Controls/DealPreview.xaml.cs

diff --git a/App/Controls/DealPreview.xaml b/App/Controls/DealPreview.xaml
new file mode 100644
index 00000000..11d29acf
--- /dev/null
+++ b/App/Controls/DealPreview.xaml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+             xmlns:stroked="https://vapolia.eu/Vapolia.StrokedLabel"
+             xmlns:ctrl="clr-namespace:GamHubApp.Controls"
+             x:DataType="ctrl:DealPreview"
+             x:Name="preview"
+             x:Class="GamHubApp.Controls.DealPreview">
+    <Grid RowDefinitions="220,50"
+          x:Name="DealBlock"
+          Padding="10">
+        <Border Grid.Row="0"
+                StrokeShape="RoundRectangle 8"
+                x:Name="thumbnail">
+            <Image Source="{Binding Deal.Image, Source={x:Reference preview}}"
+                   HorizontalOptions="Fill"
+                   VerticalOptions="Fill"
+                   Aspect="Fill"/>
+
+            <Border.Behaviors>
+                <mct:TouchBehavior Command="{Binding Deal.Navigate}"
+                       BindingContext="{Binding BindingContext, 
+                                                Source={x:Reference thumbnail},
+                                                x:DataType=Border}"/>
+            </Border.Behaviors>
+        </Border>
+
+        <Border Grid.Row="0"
+                IsVisible="{Binding Deal.ExpirationDisplayed, Source={x:Reference preview}}"
+                StrokeShape="RoundRectangle 10"
+                HorizontalOptions="Start"
+                VerticalOptions="Start"
+                HeightRequest="30"
+                BackgroundColor="{StaticResource BackgroundColor}"
+                StrokeThickness="1"
+                Stroke="{Binding Deal.Expires, 
+                                Source={x:Reference preview}, 
+                                Converter={StaticResource TimeUntilColourConverter}}"
+                Margin="2,5"
+                Padding="5,2"
+                x:Name="timestampCard">
+            <Label TextColor="{StaticResource FontColor}"
+                   VerticalTextAlignment="Center">
+                <Label.FormattedText>
+                    <FormattedString>
+                        <Span FontFamily="P-Medium" Text="Ends in "/>
+                        <Span FontFamily="P-Bold" 
+                              Text="{Binding Deal.Expires, 
+                                            Source={x:Reference preview}, Converter={StaticResource TimeUntilConverter}}"
+                              TextColor="{Binding Deal.Expires, Converter={StaticResource TimeUntilColourConverter}}"/>
+                    </FormattedString>
+                </Label.FormattedText>
+            </Label>
+            <Border.Behaviors>
+                <mct:TouchBehavior Command="{Binding Deal.Navigate,
+                                                     Source={x:Reference preview}}"
+                            BindingContext="{Binding BindingContext, 
+                                                     Source={x:Reference timestampCard},
+                                                     x:DataType=Border}"/>
+            </Border.Behaviors>
+        </Border>
+        <Label Grid.Row="1"
+               HorizontalOptions="Center"
+               HorizontalTextAlignment="Center"
+               Text="{Binding Deal.Title,
+                              Source={x:Reference preview}}"
+               TextColor="{StaticResource FontColor}"
+               FontFamily="P-Bold"
+               x:Name="label"
+               FontSize="20">
+            <Label.Behaviors>
+                <mct:TouchBehavior Command="{Binding Deal.Navigate,
+                                            Source={x:Reference preview}}"
+                           BindingContext="{Binding BindingContext, 
+                                                    Source={x:Reference label},
+                                                    x:DataType=Label}"/>
+
+            </Label.Behaviors>
+        </Label>
+        <Grid RowDefinitions="*,30,40"
+              Grid.Row="0"
+              RowSpacing="5">
+            <Border Grid.Row="1"
+                    StrokeShape="RoundRectangle 8"
+                    HorizontalOptions="Start"
+                    VerticalOptions="End"
+                    HeightRequest="30"
+                    Margin="5,0"
+                    Stroke="{DynamicResource BackgroundColor}"
+                    StrokeThickness="2"
+                    IsVisible="{Binding Deal.GemRewards,
+                                        Source={x:Reference preview}, Converter={StaticResource NotNullOrEmptyStringConverter}}"
+                    BackgroundColor="{StaticResource Dark}">
+
+                <Border.Behaviors>
+                    <mct:TouchBehavior Command="{Binding Deal.Navigate,
+                                                    Source={x:Reference preview}}"
+                       BindingContext="{Binding BindingContext, 
+                                                Source={x:Reference discountCard},
+                                                x:DataType=Border}"/>
+                </Border.Behaviors>
+                <Label Margin="5"
+                       FontSize="15"
+                       Padding="0"
+                       HorizontalOptions="End"
+                       VerticalOptions="Center">
+                    <Label.FormattedText>
+                        <FormattedString>
+                            <Span Text="Earn"
+                                  FontFamily="P-Regular"
+                                  TextColor="{DynamicResource FontColor}"/>
+                            <Span Text=" "/>
+                            <Span 
+                                    Text="&#xf3a5;" 
+                                    FontFamily="FaSolid"
+                                    TextColor="{DynamicResource DiscountColor}"/>
+                            <Span Text=" "/>
+                            <Span Text="{Binding Deal.GemRewards,
+                                                 Source={x:Reference preview}}"
+                                  FontFamily="P-Bold"
+                                  TextColor="{DynamicResource FontColor}"/>
+                        </FormattedString>
+                    </Label.FormattedText>
+                </Label>
+            </Border>
+            <Border Grid.Row="2"
+                    StrokeShape="RoundRectangle 0,20,8,0"
+                    HorizontalOptions="Start"
+                    VerticalOptions="End"
+                    HeightRequest="40"
+                    WidthRequest="100"
+                    x:Name="discountCard"
+                    IsVisible="{Binding Deal.Discount,
+                                        Source={x:Reference preview}, 
+                                        Converter={StaticResource NotNullOrEmptyStringConverter}}"
+                    BackgroundColor="{StaticResource DiscountColor}">
+
+                <Border.Behaviors>
+                    <mct:TouchBehavior Command="{Binding Deal.Navigate,
+                                                    Source={x:Reference preview}}"
+                       BindingContext="{Binding BindingContext, 
+                                                Source={x:Reference discountCard},
+                                                x:DataType=Border}"/>
+                </Border.Behaviors>
+                <Label 
+                       Text="{Binding Deal.Discount,
+                                      Source={x:Reference preview}}"
+                       TextColor="{StaticResource FontColor}"
+                       FontFamily="P-Bold"
+                       stroked:StrokedLabel.StrokeColor="{StaticResource Dark}"
+                       stroked:StrokedLabel.StrokeWidth="2"
+                       HorizontalOptions="Center"
+                       VerticalOptions="Center"
+                       FontSize="20"
+                       />
+            </Border>
+
+        </Grid>
+        <Grid Grid.Row="0"
+              RowDefinitions="50,*">
+            <Border Grid.Row="0"
+                    StrokeShape="RoundRectangle 0,8,20,0"
+                    HorizontalOptions="End"
+                    VerticalOptions="Start"
+                    HeightRequest="50"
+                    WidthRequest="100"
+                    x:Name="partner"
+                    BackgroundColor="White">
+                <Image Source="{Binding Deal.Partner.Logo,
+                                        Source={x:Reference preview}}"
+                       HorizontalOptions="Fill"
+                       VerticalOptions="Fill"/>
+            </Border>
+            <Button Grid.Row="0"
+                    Grid.RowSpan="2"
+                    BackgroundColor="Transparent"
+                    Command="{Binding Deal.Navigate,
+                                      Source={x:Reference preview}}"/>
+
+            <!-- Share button-->
+            <Border Grid.Row="1"
+                    Style="{StaticResource ButtonBorder}" 
+                    WidthRequest="60"
+                    StrokeShape="RoundRectangle 20,0,0,8"
+                    VerticalOptions="End"
+                    HorizontalOptions="End"
+                    Margin="0"
+                    x:Name="share"
+                    BackgroundColor="{StaticResource BackgroundColor}">
+                <Border.Behaviors>
+                    <mct:TouchBehavior Command="{Binding Deal.ShareDeal,
+                                                    Source={x:Reference preview}}"
+                                       BindingContext="{Binding BindingContext, 
+                                                         Source={x:Reference share}, 
+                                                         x:DataType=Border}"/>
+                </Border.Behaviors>
+                <Label Style="{StaticResource LabelButtonStyle}"
+                       TextColor="{StaticResource VeryLightDark }"
+                       Text="&#xf14d;"
+           />
+            </Border>
+
+        </Grid>
+    </Grid>
+</ContentView>
diff --git a/App/Controls/DealPreview.xaml.cs b/App/Controls/DealPreview.xaml.cs
new file mode 100644
index 00000000..d928ba6f
--- /dev/null
+++ b/App/Controls/DealPreview.xaml.cs
@@ -0,0 +1,22 @@
+using GamHubApp.Models;
+
+namespace GamHubApp.Controls;
+
+public partial class DealPreview : ContentView
+{
+    public static readonly BindableProperty DealProperty = BindableProperty.Create(propertyName: nameof(Deal),
+                                                                                       returnType: typeof(Deal),
+                                                                                       declaringType: typeof(DealPreview),
+                                                                                       defaultBindingMode: BindingMode.OneWay);
+    public Deal Deal
+    {
+        get => (Deal)GetValue(DealProperty);
+        set => SetValue(DealProperty, value);
+    }
+
+    public DealPreview()
+	{
+		InitializeComponent();
+        BindingContext = this;
+	}
+}
\ No newline at end of file
diff --git a/App/Views/DealsPage.xaml b/App/Views/DealsPage.xaml
index afed573c..55c8578f 100644
--- a/App/Views/DealsPage.xaml
+++ b/App/Views/DealsPage.xaml
@@ -134,7 +134,7 @@
                     </CollectionView.EmptyView>
                     <CollectionView.ItemTemplate>
                         <DataTemplate x:DataType="models:Deal">
-                            <Grid RowDefinitions="220,50"
+                            <ctrl:DealPreview Deal="{Binding .}"/>
                               x:Name="DealBlock"
                               Padding="10">
                                 <Border Grid.Row="0"

From cde6d49f732821fb40c8c04b8d86158d0bffe0cc Mon Sep 17 00:00:00 2001
From: bricefriha <contact@bricefriha.dev>
Date: Sun, 23 Aug 2026 14:37:45 +0100
Subject: [PATCH 4/8] correct typo

---
 App/Models/Deal.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/App/Models/Deal.cs b/App/Models/Deal.cs
index 9683b911..0459d305 100644
--- a/App/Models/Deal.cs
+++ b/App/Models/Deal.cs
@@ -68,5 +68,5 @@ public Command ShareDeal
         }
     }
     [JsonIgnore, Ignore]
-    public bool EpirationDisplayed { get => (Expires - DateTime.Now).TotalDays < 30; }
+    public bool ExpirationDisplayed { get => (Expires - DateTime.Now).TotalDays < 30; }
 }

From 97991982258cd7367f9e1ae0e51230dd75b75799 Mon Sep 17 00:00:00 2001
From: bricefriha <contact@bricefriha.dev>
Date: Sun, 23 Aug 2026 14:45:06 +0100
Subject: [PATCH 5/8] Include popular deals

---
 App/GamHubApp.csproj             |   3 +
 App/ViewModels/DealsViewModel.cs |  53 +++-----
 App/Views/DealsPage.xaml         | 218 ++++++-------------------------
 3 files changed, 58 insertions(+), 216 deletions(-)

diff --git a/App/GamHubApp.csproj b/App/GamHubApp.csproj
index 1347e113..bbdcfc43 100644
--- a/App/GamHubApp.csproj
+++ b/App/GamHubApp.csproj
@@ -140,6 +140,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <MauiXaml Update="Controls\DealPreview.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </MauiXaml>
     <MauiXaml Update="Resources\Styles\Colors.xaml">
       <Generator>MSBuild:Compile</Generator>
     </MauiXaml>
diff --git a/App/ViewModels/DealsViewModel.cs b/App/ViewModels/DealsViewModel.cs
index 0e8561ff..4ad26051 100644
--- a/App/ViewModels/DealsViewModel.cs
+++ b/App/ViewModels/DealsViewModel.cs
@@ -40,6 +40,21 @@ public bool IsLoading
         }
     }
 
+    private ObservableRangeCollection<Deal> _popularDeals = new();
+
+    public ObservableRangeCollection<Deal> PopularDeals
+    {
+        get
+        {
+            return _popularDeals;
+        }
+        set
+        {
+            _popularDeals = value;
+            OnPropertyChanged(nameof(PopularDeals));
+        }
+    }
+
     private bool _filtersApplied = false;
     public bool FiltersApplied
     {
@@ -178,42 +193,10 @@ public async Task UpdateDeals()
 
             var getTendingTask = CurrentApp.DataFetcher.GetTrendingDeals();
             var getDealTask = CurrentApp.DataFetcher.GetDeals();
+            await Task.WhenAll(getTendingTask, getDealTask);
 
-            await foreach (var task in Task.WhenEach(getTendingTask,
-                getDealTask)) 
-            {
-
-                await MainThread.InvokeOnMainThreadAsync(() =>
-                {
-                    if (task == getTendingTask ) 
-                    {
-                        var res = getTendingTask.Result
-                                    .Where(d => d != null)
-                                    .OrderBy(d => d?.Expires).ToList();
-                        if (Deals.Count > 0)
-                        {
-                            var tendingDeals = new ObservableRangeCollection<Deal>(res);
-                            for (int i = 0; i < tendingDeals.Count; i++)
-                            {
-
-                                Deals.Insert(i, tendingDeals[i]);
-                            }
-
-                        }
-                        else
-                        {
-                            Deals.AddRange(new ObservableRangeCollection<Deal>(res));
-                        }
-                    }
-                    if (task == getDealTask)
-                    {
-                        var res = getDealTask.Result;
-                        if (res != null)
-                            Deals.AddRange(new ObservableRangeCollection<Deal>(getDealTask.Result.OrderBy(d => d.Expires)));
-                    }
-
-                });
-            }
+            Deals = new (getDealTask?.Result);
+            PopularDeals = new (getTendingTask?.Result);
 
             IsLoading = false;
             _setup = true;
diff --git a/App/Views/DealsPage.xaml b/App/Views/DealsPage.xaml
index 55c8578f..c5fdb881 100644
--- a/App/Views/DealsPage.xaml
+++ b/App/Views/DealsPage.xaml
@@ -6,8 +6,8 @@
              xmlns:models="clr-namespace:GamHubApp.Models"
              xmlns:local="clr-namespace:GamHubApp.Models.Animations"
              xmlns:viewmodels="clr-namespace:GamHubApp.ViewModels"
+             xmlns:ctrl="clr-namespace:GamHubApp.Controls"
              x:DataType="viewmodels:DealsViewModel"
-             xmlns:stroked="https://vapolia.eu/Vapolia.StrokedLabel"
              Shell.ForegroundColor="{DynamicResource PrimaryAccent}"
              Shell.BackgroundColor="{DynamicResource LightDark}"
              x:Name="page">
@@ -61,9 +61,44 @@
                     Margin="1,0"
                     >
                     <CollectionView.Header>
-                        <Grid>
+                        <Grid RowDefinitions="50,300,40,*">
+                            <BoxView Grid.Row="0"
+                                     Grid.RowSpan="2"
+                                     BackgroundColor="{StaticResource LightDark}"
+                                     Opacity="0.8"/>
+
+                               <Label Text="🔥 Popular"
+                                       Grid.Row="0"
+                                       VerticalOptions="Center"
+                                       FontFamily="P-Medium"
+                                       Margin="8,8,8,0"
+                                       TextColor="{StaticResource FontColor}"
+                                       FontSize="18"
+                                       />
+                                <CollectionView Grid.Row="1"
+                                            ItemsSource="{Binding PopularDeals}"
+                                            ItemsLayout="HorizontalList"
+                                            >
+                                <CollectionView.ItemTemplate>
+                                    <DataTemplate x:DataType="models:Deal">
+                                        <ctrl:DealPreview Deal="{Binding .}"
+                                                         WidthRequest="350"
+                                                         Margin="20,5,0,15"/>
+                                    </DataTemplate>
+
+                                </CollectionView.ItemTemplate>
+                            </CollectionView>
+                            <Label Text="♾️ All"
+                                       Grid.Row="2"
+                                     VerticalOptions="Center"
+                                     FontFamily="P-Medium"
+                                     Margin="8,8,8,0"
+                                     TextColor="{StaticResource FontColor}"
+                                     FontSize="18"
+                                     />
                             <SearchBar Placeholder="Search deals..."
                                        x:Name="search"
+                                       Grid.Row="3"
                                        TextChanged="search_TextChanged"
                                        IsTextPredictionEnabled="false"
                                        IsSpellCheckEnabled="False"
@@ -135,185 +170,6 @@
                     <CollectionView.ItemTemplate>
                         <DataTemplate x:DataType="models:Deal">
                             <ctrl:DealPreview Deal="{Binding .}"/>
-                              x:Name="DealBlock"
-                              Padding="10">
-                                <Border Grid.Row="0"
-                                    StrokeShape="RoundRectangle 8"
-                                    x:Name="thumbnail">
-                                    <Image Source="{Binding Image}"
-                                       HorizontalOptions="Fill"
-                                       VerticalOptions="Fill"
-                                       Aspect="Fill"/>
-
-                                    <Border.Behaviors>
-                                        <mct:TouchBehavior Command="{Binding Navigate}"
-                                                   BindingContext="{Binding BindingContext, 
-                                                                            Source={x:Reference thumbnail},
-                                                                            x:DataType=Border}"/>
-                                    </Border.Behaviors>
-                                </Border>
-
-                                <Border Grid.Row="0"
-                                    IsVisible="{Binding EpirationDisplayed}"
-                                    StrokeShape="RoundRectangle 10"
-                                    HorizontalOptions="Start"
-                                    VerticalOptions="Start"
-                                    HeightRequest="30"
-                                    BackgroundColor="{StaticResource BackgroundColor}"
-                                    StrokeThickness="1"
-                                    Stroke="{Binding Expires, Converter={StaticResource TimeUntilColourConverter}}"
-                                    Margin="2,5"
-                                    Padding="5,2"
-                                    x:Name="timestampCard">
-                                    <Label TextColor="{StaticResource FontColor}"
-                                       VerticalTextAlignment="Center">
-                                        <Label.FormattedText>
-                                            <FormattedString>
-                                                <Span FontFamily="P-Medium" Text="Ends in "/>
-                                                <Span FontFamily="P-Bold" 
-                                                  Text="{Binding Expires, Converter={StaticResource TimeUntilConverter}}"
-                                                  TextColor="{Binding Expires, Converter={StaticResource TimeUntilColourConverter}}"/>
-                                            </FormattedString>
-                                        </Label.FormattedText>
-                                    </Label>
-                                    <Border.Behaviors>
-                                        <mct:TouchBehavior Command="{Binding Navigate}"
-                                                        BindingContext="{Binding BindingContext, 
-                                                                                 Source={x:Reference timestampCard},
-                                                                                 x:DataType=Border}"/>
-                                    </Border.Behaviors>
-                                </Border>
-                                <Label Grid.Row="1"
-                                   HorizontalOptions="Center"
-                                   HorizontalTextAlignment="Center"
-                                   Text="{Binding Title}"
-                                   TextColor="{StaticResource FontColor}"
-                                   FontFamily="P-Bold"
-                                   x:Name="label"
-                                   FontSize="20">
-                                    <Label.Behaviors>
-                                        <mct:TouchBehavior Command="{Binding Navigate}"
-                                                       BindingContext="{Binding BindingContext, 
-                                                                                Source={x:Reference label},
-                                                                                x:DataType=Label}"/>
-
-                                    </Label.Behaviors>
-                                </Label>
-                                <Grid RowDefinitions="*,30,40"
-                                  Grid.Row="0"
-                                  RowSpacing="5">
-                                    <Border Grid.Row="1"
-                                        StrokeShape="RoundRectangle 8"
-                                        HorizontalOptions="Start"
-                                        VerticalOptions="End"
-                                        HeightRequest="30"
-                                        Margin="5,0"
-                                        Stroke="{DynamicResource BackgroundColor}"
-                                        StrokeThickness="2"
-                                        IsVisible="{Binding GemRewards, Converter={StaticResource NotNullOrEmptyStringConverter}}"
-                                        BackgroundColor="{StaticResource Dark}">
-
-                                        <Border.Behaviors>
-                                            <mct:TouchBehavior Command="{Binding Navigate}"
-                                                   BindingContext="{Binding BindingContext, 
-                                                                            Source={x:Reference discountCard},
-                                                                            x:DataType=Border}"/>
-                                        </Border.Behaviors>
-                                        <Label Margin="5"
-                                            FontSize="15"
-                                           Padding="0"
-                                            HorizontalOptions="End"
-                                           VerticalOptions="Center">
-                                            <Label.FormattedText>
-                                                <FormattedString>
-                                                    <Span Text="Earn"
-                                                      FontFamily="P-Regular"
-                                                      TextColor="{DynamicResource FontColor}"/>
-                                                    <Span Text=" "/>
-                                                    <Span 
-                                                        Text="&#xf3a5;" 
-                                                        FontFamily="FaSolid"
-                                                        TextColor="{DynamicResource DiscountColor}"/>
-                                                    <Span Text=" "/>
-                                                    <Span Text="{Binding GemRewards}"
-                                                      FontFamily="P-Bold"
-                                                      TextColor="{DynamicResource FontColor}"/>
-                                                </FormattedString>
-                                            </Label.FormattedText>
-                                        </Label>
-                                    </Border>
-                                    <Border Grid.Row="2"
-                                    StrokeShape="RoundRectangle 0,20,8,0"
-                                    HorizontalOptions="Start"
-                                    VerticalOptions="End"
-                                    HeightRequest="40"
-                                    WidthRequest="100"
-                                    x:Name="discountCard"
-                                    IsVisible="{Binding Discount, Converter={StaticResource NotNullOrEmptyStringConverter}}"
-                                    BackgroundColor="{StaticResource DiscountColor}">
-
-                                        <Border.Behaviors>
-                                            <mct:TouchBehavior Command="{Binding Navigate}"
-                                                   BindingContext="{Binding BindingContext, 
-                                                                            Source={x:Reference discountCard},
-                                                                            x:DataType=Border}"/>
-                                        </Border.Behaviors>
-                                        <Label 
-                                       Text="{Binding Discount}"
-                                       TextColor="{StaticResource FontColor}"
-                                       FontFamily="P-Bold"
-                                       stroked:StrokedLabel.StrokeColor="{StaticResource Dark}"
-                                       stroked:StrokedLabel.StrokeWidth="2"
-                                       HorizontalOptions="Center"
-                                       VerticalOptions="Center"
-                                       FontSize="20"
-                                       />
-                                    </Border>
-
-                                </Grid>
-                                <Grid Grid.Row="0"
-                                  RowDefinitions="50,*">
-                                    <Border Grid.Row="0"
-                                        StrokeShape="RoundRectangle 0,8,20,0"
-                                        HorizontalOptions="End"
-                                        VerticalOptions="Start"
-                                        HeightRequest="50"
-                                        WidthRequest="100"
-                                        x:Name="partner"
-                                        BackgroundColor="White">
-                                        <Image Source="{Binding Partner.Logo}"
-                                           HorizontalOptions="Fill"
-                                           VerticalOptions="Fill"/>
-                                    </Border>
-                                    <Button Grid.Row="0"
-                                    Grid.RowSpan="2"
-                                    BackgroundColor="Transparent"
-                                    Command="{Binding Navigate}"/>
-
-                                    <!-- Share button-->
-                                    <Border Grid.Row="1"
-                                        Style="{StaticResource ButtonBorder}" 
-                                        WidthRequest="60"
-                                        StrokeShape="RoundRectangle 20,0,0,8"
-                                        VerticalOptions="End"
-                                        HorizontalOptions="End"
-                                        Margin="0"
-                                        x:Name="share"
-                                        BackgroundColor="{StaticResource BackgroundColor}">
-                                        <Border.Behaviors>
-                                            <mct:TouchBehavior Command="{Binding ShareDeal}"
-                                                           BindingContext="{Binding BindingContext, 
-                                                                             Source={x:Reference share}, 
-                                                                             x:DataType=Border}"/>
-                                        </Border.Behaviors>
-                                        <Label Style="{StaticResource LabelButtonStyle}"
-                                           TextColor="{StaticResource VeryLightDark }"
-                                           Text="&#xf14d;"
-                                       />
-                                    </Border>
-
-                                </Grid>
-                            </Grid>
                         </DataTemplate>
                     </CollectionView.ItemTemplate>
                 </CollectionView>

From c02785cff712ec9c7e77d9f1c52f04cd74319fcd Mon Sep 17 00:00:00 2001
From: bricefriha <contact@bricefriha.dev>
Date: Sun, 23 Aug 2026 15:07:22 +0100
Subject: [PATCH 6/8] Refactor DealsPage header layout and update labels

---
 App/Views/DealsPage.xaml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/App/Views/DealsPage.xaml b/App/Views/DealsPage.xaml
index c5fdb881..0fa8bd24 100644
--- a/App/Views/DealsPage.xaml
+++ b/App/Views/DealsPage.xaml
@@ -61,8 +61,19 @@
                     Margin="1,0"
                     >
                     <CollectionView.Header>
-                        <Grid RowDefinitions="50,300,40,*">
-                            <BoxView Grid.Row="0"
+                        <Grid RowDefinitions="auto,*">
+                            <Grid RowDefinitions="50,280,40"
+                                  Grid.Row="0"
+                                  >
+                                <Grid.Triggers>
+                                    <DataTrigger TargetType="Grid"
+                                                 Binding="{Binding PopularDeals.Count}"
+                                                 Value="0">
+                                        <Setter Property="IsVisible" Value="True" />
+
+                                    </DataTrigger>
+                                </Grid.Triggers>
+                                <BoxView Grid.Row="0"
                                      Grid.RowSpan="2"
                                      BackgroundColor="{StaticResource LightDark}"
                                      Opacity="0.8"/>
@@ -88,7 +99,7 @@
 
                                 </CollectionView.ItemTemplate>
                             </CollectionView>
-                            <Label Text="♾️ All"
+                            <Label Text="Latest"
                                        Grid.Row="2"
                                      VerticalOptions="Center"
                                      FontFamily="P-Medium"
@@ -96,10 +107,11 @@
                                      TextColor="{StaticResource FontColor}"
                                      FontSize="18"
                                      />
+                            </Grid>
+                            
                             <SearchBar Placeholder="Search deals..."
                                        x:Name="search"
                                        Grid.Row="3"
-                                       TextChanged="search_TextChanged"
                                        IsTextPredictionEnabled="false"
                                        IsSpellCheckEnabled="False"
                                        SearchButtonPressed="search_SearchButtonPressed"

From e89d22ca4ab201cc503f0293911ff0bbaa7676f7 Mon Sep 17 00:00:00 2001
From: bricefriha <contact@bricefriha.dev>
Date: Mon, 24 Aug 2026 20:31:50 +0100
Subject: [PATCH 7/8] Fix search for the most part

---
 App/ViewModels/DealsViewModel.cs | 18 +++++++++++++++---
 App/Views/DealsPage.xaml         |  1 +
 App/Views/DealsPage.xaml.cs      | 10 ++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/App/ViewModels/DealsViewModel.cs b/App/ViewModels/DealsViewModel.cs
index 4ad26051..9840c59c 100644
--- a/App/ViewModels/DealsViewModel.cs
+++ b/App/ViewModels/DealsViewModel.cs
@@ -156,16 +156,27 @@ public ObservableCollection<GamePlatform> Platforms
 
     }
 
+    /// <summary>
+    /// Reset the search to what it was initially
+    /// </summary>
+    public void ResetSearch()
+    {
+        Deals = _presearchDeals;
+    }
+
+    /// <summary>
+    /// Process a search
+    /// </summary>
+    /// <param name="textSearch">input of the search</param>
     public void DealsSearch(string textSearch)
     {
         if (string.IsNullOrEmpty(textSearch))
         {
-
-            Deals = _presearchDeals;
+            ResetSearch();
             return;
         }
 
-        var filteredDeals = _presearchDeals.Where(deal => deal.Title.ToLower().Contains(textSearch.ToLower()))?.ToList();
+        var filteredDeals = _presearchDeals.Where(deal => deal?.Title?.ToLower().Contains(textSearch.ToLower()) ?? false)?.ToList();
 
         if (filteredDeals is null)
         {
@@ -188,6 +199,7 @@ public async Task UpdateDeals()
                 IsLoading = false;
                 FiltersApplied = true;
                 _setup = true;
+                _presearchDeals = _deals;
                 return;
             }
 
diff --git a/App/Views/DealsPage.xaml b/App/Views/DealsPage.xaml
index 0fa8bd24..92015a00 100644
--- a/App/Views/DealsPage.xaml
+++ b/App/Views/DealsPage.xaml
@@ -115,6 +115,7 @@
                                        IsTextPredictionEnabled="false"
                                        IsSpellCheckEnabled="False"
                                        SearchButtonPressed="search_SearchButtonPressed"
+                                       TextChanged="search_TextChanged"
                                        />
                         </Grid>
                     </CollectionView.Header>
diff --git a/App/Views/DealsPage.xaml.cs b/App/Views/DealsPage.xaml.cs
index 2d7f6a2a..4e7aa63f 100644
--- a/App/Views/DealsPage.xaml.cs
+++ b/App/Views/DealsPage.xaml.cs
@@ -45,6 +45,16 @@ private void search_SearchButtonPressed(object sender, EventArgs e)
     {
         _vm.DealsSearch(search.Text);
         search.Unfocus();
+        Dispatcher.Dispatch(async () => 
+            await search.HideSoftInputAsync(System.Threading.CancellationToken.None));
 
     }
+
+    private void search_TextChanged(object sender, TextChangedEventArgs e)
+    {
+        if (string.IsNullOrEmpty(search.Text))
+        {
+            _vm.ResetSearch();
+        }
+    }
 }
\ No newline at end of file

From 1c16167ebce07fb8df70fdbb6bf3746cb0e9e7a0 Mon Sep 17 00:00:00 2001
From: bricefriha <contact@bricefriha.dev>
Date: Mon, 24 Aug 2026 21:16:56 +0100
Subject: [PATCH 8/8] fix filter issue and co

---
 App/Services/Fetcher.cs          |  4 ++--
 App/ViewModels/DealsViewModel.cs | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/App/Services/Fetcher.cs b/App/Services/Fetcher.cs
index 97d02a8a..0a8af0c2 100644
--- a/App/Services/Fetcher.cs
+++ b/App/Services/Fetcher.cs
@@ -536,14 +536,14 @@ public async Task<Collection<Partner>> GetPartners()
     /// Get all the deals
     /// </summary>
     /// <returns>all the deals</returns>
-    public async Task<Collection<Deal>> GetDeals()
+    public async Task<Collection<Deal>> GetDeals(string filterCode = null)
     {
         if (!Fetcher.CheckFeasability())
             return [];
         ResetHandler();
         try
         {
-            string filterCode = Preferences.Get(PreferencesKeys.DealFilterCode, null);
+            filterCode ??= Preferences.Get(PreferencesKeys.DealFilterCode, null);
 
             using var cts = new CancellationTokenSource();
             cts.CancelAfter(TimeSpan.FromSeconds(5));
diff --git a/App/ViewModels/DealsViewModel.cs b/App/ViewModels/DealsViewModel.cs
index 9840c59c..06eb0dde 100644
--- a/App/ViewModels/DealsViewModel.cs
+++ b/App/ViewModels/DealsViewModel.cs
@@ -191,23 +191,25 @@ public async Task UpdateDeals()
     {
         if (!(Deals?.Count > 0))
         {
-            if (Preferences.Get(PreferencesKeys.DealFilterCode, null) != null)
+            string filterCode = Preferences.Get(PreferencesKeys.DealFilterCode, null);
+
+            var getTendingTask = CurrentApp.DataFetcher.GetTrendingDeals();
+            var getDealTask = CurrentApp.DataFetcher.GetDeals(filterCode);
+            await Task.WhenAll(getTendingTask, getDealTask);
+            if (filterCode != null)
             {
-                Deals.AddRange(new ObservableRangeCollection<Deal>(
-                    (await CurrentApp.DataFetcher.GetDeals())
-                    .OrderBy(d => d.Expires)));
+
+                Deals = new(getDealTask?.Result?.OrderBy(d => d.Expires));
                 IsLoading = false;
                 FiltersApplied = true;
                 _setup = true;
+                PopularDeals = new((getTendingTask?.Result?.Where(dt => filterCode.Contains(dt.DRM))));
                 _presearchDeals = _deals;
                 return;
             }
 
-            var getTendingTask = CurrentApp.DataFetcher.GetTrendingDeals();
-            var getDealTask = CurrentApp.DataFetcher.GetDeals();
-            await Task.WhenAll(getTendingTask, getDealTask);
 
-            Deals = new (getDealTask?.Result);
+            Deals = new (getDealTask?.Result?.OrderBy(d=> d.Expires));
             PopularDeals = new (getTendingTask?.Result);
 
             IsLoading = false;