Sources/AllInApp/AllIn/Assets.xcassets/blueFlameIcon.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "blueFlame.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

Sources/AllInApp/AllIn/Assets.xcassets/pinkFlameIcon.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "pinkFlame.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

Sources/AllInApp/AllIn/Components/BetLineLoading.swift

@@ -11,12 +11,12 @@ import Model
 struct BetLineLoading: View {
     
     @State var showInfos: Bool = false
-    var bet: BetDetail
+    var participations: [Participation]
     
     var value: CGFloat {
-        let totalParticipations = bet.participations.count
+        let totalParticipations = participations.count
-        let numberOfYes = bet.participations.filter { $0.answer.uppercased() == "YES" }.count
+        let numberOfYes = participations.filter { $0.answer.uppercased() == "YES" }.count
-        let numberOfNo = bet.participations.filter { $0.answer.uppercased() == "NO" }.count
+        let numberOfNo = participations.filter { $0.answer.uppercased() == "NO" }.count
         if(numberOfNo == 0 && numberOfYes == 0){
             return 0.5
         }
@@ -25,22 +25,144 @@ struct BetLineLoading: View {
     }
     
     var yesParticipations: [Participation] {
-        bet.participations.filter { $0.answer.uppercased() == "YES" }
+        participations.filter { $0.answer.uppercased() == "YES" }
     }
     
     var noParticipations: [Participation] {
-        bet.participations.filter { $0.answer.uppercased() == "NO" }
+        participations.filter { $0.answer.uppercased() == "NO" }
     }
     
     var body: some View {
-        switch bet.bet {
+        VStack(alignment: .leading, spacing: 0) {
-            case is BinaryBet:
+            HStack(spacing: 5) {
-                BinaryBetLine(bet: bet)
+                Text("OUI")
-            case is CustomBet:
+                    .font(.system(size: 25))
-                CustomBetLine(bet: bet)
+                    .fontWeight(.bold)
-            default:
+                    .foregroundColor(AllInColors.blue200)
-                BinaryBetLine(bet: bet)
+                Spacer()
+                Text("NON")
+                    .font(.system(size: 25))
+                    .fontWeight(.bold)
+                    .foregroundColor(AllInColors.pink100)
             }
+            
+            GeometryReader { geometry in
+                ZStack(alignment: .leading) {
+                    HStack{
+                        Spacer()
+                        Rectangle()
+                            .frame(width: min(CGFloat(1-self.value) * geometry.size.width, geometry.size.width), height: 17)
+                            .foregroundStyle(AllInColors.PinkBetGradiant).cornerRadius(999)
+                    }
+                    
+                    HStack(spacing: 0) {
+                        Rectangle()
+                            .frame(width: min(CGFloat(self.value) * geometry.size.width, geometry.size.width), height: 17)
+                            .foregroundStyle(AllInColors.BlueBetGradiant)
+                            .cornerRadius(999)
+                        Image("loadingHeartIcon")
+                            .resizable()
+                            .frame(width: 29, height: 32)
+                            .padding(.leading, -10)
+                    }
+                    
+                }
+                .padding(.bottom, 5)
+            }
+            .frame(height: 40)
+
+            HStack {
+                Spacer()
+                Text("bet_status_details_drawer")
+                    .textStyle(weight: .medium, color: AllInColors.primaryTextColor, size: 10)
+                Image(showInfos ? "chevronUpIcon" : "chevronDownIcon")
+                    .resizable()
+                    .frame(width: 10, height: 7)
+                    .scaledToFill()
+            }
+            .onTapGesture {
+                withAnimation {
+                    showInfos.toggle()
+                }
+            }
+            .padding(.bottom, 5)
+            .padding(.trailing, 5)
+            
+            if showInfos {
+                VStack(spacing: 1) {
+                    HStack(spacing: 5) {
+                        Image("blueAllCoinIcon")
+                            .resizable()
+                            .frame(width:12, height: 12)
+                        Text(yesParticipations.reduce(0, {x,y in x + y.stake}).description)
+                            .font(.system(size: 15))
+                            .fontWeight(.bold)
+                            .foregroundColor(AllInColors.blue200)
+                        Spacer()
+                        Text(noParticipations.reduce(0, {x,y in x + y.stake}).description)
+                            .font(.system(size: 15))
+                            .fontWeight(.bold)
+                            .foregroundColor(AllInColors.pink100)
+                        Image("pinkAllCoinIcon")
+                            .resizable()
+                            .frame(width: 12, height: 12)
+                    }
+                    HStack(spacing: 5){
+                        Image("bluePersonIcon")
+                            .resizable()
+                            .frame(width: 12, height: 12)
+                        Text(yesParticipations.count.description)
+                            .font(.system(size: 15))
+                            .fontWeight(.bold)
+                            .foregroundColor(AllInColors.blue200)
+                        Spacer()
+                        Text(noParticipations.count.description)
+                            .font(.system(size: 15))
+                            .fontWeight(.bold)
+                            .foregroundColor(AllInColors.pink100)
+                        Image("pinkPersonIcon")
+                            .resizable()
+                            .frame(width: 12, height: 12)
+                        
+                    }
+                    HStack(spacing: 5){
+                        Image("blueBadgeIcon")
+                            .resizable()
+                            .frame(width: 12, height: 12)
+                        Text(yesParticipations.max(by: { $0.stake < $1.stake })?.stake.description ?? "0")
+                            .font(.system(size: 15))
+                            .fontWeight(.bold)
+                            .foregroundColor(AllInColors.blue200)
+                        Spacer()
+                        Text(noParticipations.max(by: { $0.stake < $1.stake })?.stake.description ?? "0")
+                            .font(.system(size: 15))
+                            .fontWeight(.bold)
+                            .foregroundColor(AllInColors.pink100)
+                        Image("pinkBadgeIcon")
+                            .resizable()
+                            .frame(width: 12, height: 12)
+                        
+                    }
+                    HStack(spacing: 5){
+                        Image("blueTrophyIcon")
+                            .resizable()
+                            .frame(width: 12, height: 12)
+                        Text("1.2")
+                            .font(.system(size: 15))
+                            .fontWeight(.bold)
+                            .foregroundColor(AllInColors.blue200)
+                        Spacer()
+                        Text("1.2")
+                            .font(.system(size: 15))
+                            .fontWeight(.bold)
+                            .foregroundColor(AllInColors.pink100)
+                        Image("pinkTrophyIcon")
+                            .resizable()
+                            .frame(width:12, height: 12)
+                    }
+                }
+            }
+        }
     }
 }
 

Sources/AllInApp/AllIn/Components/BinaryBetLine.swift

@@ -1,168 +0,0 @@
-//
-//  BinaryBetLine.swift
-//  AllIn
-//
-//  Created by Lucas Delanier on 10/06/2024.
-//
-
-
-import SwiftUI
-import Model
-
-struct BinaryBetLine: View {
-    
-    @State var showInfos: Bool = false
-    var bet: BetDetail
-    
-    var value: CGFloat {
-        let totalParticipations = bet.participations.count
-        let numberOfYes = bet.participations.filter { $0.answer.uppercased() == "YES" }.count
-        let numberOfNo = bet.participations.filter { $0.answer.uppercased() == "NO" }.count
-        if(numberOfNo == 0 && numberOfYes == 0){
-            return 0.5
-        }
-        
-        return totalParticipations > 0 ? CGFloat(numberOfYes) / CGFloat(totalParticipations) : 0.0
-    }
-    
-    var yesParticipations: [Participation] {
-        bet.participations.filter { $0.answer.uppercased() == "YES" }
-    }
-    
-    var noParticipations: [Participation] {
-        bet.participations.filter { $0.answer.uppercased() == "NO" }
-    }
-    
-    var body: some View {
-        VStack(alignment: .leading, spacing: 0) {
-            HStack(spacing: 5) {
-                Text("OUI")
-                    .font(.system(size: 25))
-                    .fontWeight(.bold)
-                    .foregroundColor(AllInColors.blue200)
-                Spacer()
-                Text("NON")
-                    .font(.system(size: 25))
-                    .fontWeight(.bold)
-                    .foregroundColor(AllInColors.pink100)
-            }
-            
-            GeometryReader { geometry in
-                ZStack(alignment: .leading) {
-                    HStack{
-                        Spacer()
-                        Rectangle()
-                            .frame(width: min(CGFloat(1-self.value) * geometry.size.width, geometry.size.width-20), height: 17)
-                            .foregroundStyle(AllInColors.PinkBetGradiant).cornerRadius(999)
-                    }
-                    
-                    HStack(spacing: 0) {
-                        Rectangle()
-                            .frame(width: min(CGFloat(self.value) * geometry.size.width, geometry.size.width-20), height: 17)
-                            .foregroundStyle(AllInColors.BlueBetGradiant)
-                            .cornerRadius(999)
-                        Image("loadingHeartIcon")
-                            .resizable()
-                            .frame(width: 29, height: 32)
-                            .padding(.leading, -10)
-                    }
-                    
-                }
-                .padding(.bottom, 5)
-            }
-            .frame(height: 40)
-
-            HStack {
-                Spacer()
-                Text("bet_status_details_drawer")
-                    .textStyle(weight: .medium, color: AllInColors.primaryTextColor, size: 10)
-                Image(showInfos ? "chevronUpIcon" : "chevronDownIcon")
-                    .resizable()
-                    .frame(width: 10, height: 7)
-                    .scaledToFill()
-            }
-            .onTapGesture {
-                withAnimation {
-                    showInfos.toggle()
-                }
-            }
-            .padding(.bottom, 5)
-            .padding(.trailing, 5)
-            
-            if showInfos {
-                VStack(spacing: 1) {
-                    HStack(spacing: 5) {
-                        Image("blueAllCoinIcon")
-                            .resizable()
-                            .frame(width:12, height: 12)
-                        Text(yesParticipations.reduce(0, {x,y in x + y.stake}).description)
-                            .font(.system(size: 15))
-                            .fontWeight(.bold)
-                            .foregroundColor(AllInColors.blue200)
-                        Spacer()
-                        Text(noParticipations.reduce(0, {x,y in x + y.stake}).description)
-                            .font(.system(size: 15))
-                            .fontWeight(.bold)
-                            .foregroundColor(AllInColors.pink100)
-                        Image("pinkAllCoinIcon")
-                            .resizable()
-                            .frame(width: 12, height: 12)
-                    }
-                    HStack(spacing: 5){
-                        Image("bluePersonIcon")
-                            .resizable()
-                            .frame(width: 12, height: 12)
-                        Text(yesParticipations.count.description)
-                            .font(.system(size: 15))
-                            .fontWeight(.bold)
-                            .foregroundColor(AllInColors.blue200)
-                        Spacer()
-                        Text(noParticipations.count.description)
-                            .font(.system(size: 15))
-                            .fontWeight(.bold)
-                            .foregroundColor(AllInColors.pink100)
-                        Image("pinkPersonIcon")
-                            .resizable()
-                            .frame(width: 12, height: 12)
-                        
-                    }
-                    HStack(spacing: 5){
-                        Image("blueBadgeIcon")
-                            .resizable()
-                            .frame(width: 12, height: 12)
-                        Text(yesParticipations.max(by: { $0.stake < $1.stake })?.stake.description ?? "0")
-                            .font(.system(size: 15))
-                            .fontWeight(.bold)
-                            .foregroundColor(AllInColors.blue200)
-                        Spacer()
-                        Text(noParticipations.max(by: { $0.stake < $1.stake })?.stake.description ?? "0")
-                            .font(.system(size: 15))
-                            .fontWeight(.bold)
-                            .foregroundColor(AllInColors.pink100)
-                        Image("pinkBadgeIcon")
-                            .resizable()
-                            .frame(width: 12, height: 12)
-                        
-                    }
-                    HStack(spacing: 5){
-                        Image("blueTrophyIcon")
-                            .resizable()
-                            .frame(width: 12, height: 12)
-                        Text("1.2")
-                            .font(.system(size: 15))
-                            .fontWeight(.bold)
-                            .foregroundColor(AllInColors.blue200)
-                        Spacer()
-                        Text("1.2")
-                            .font(.system(size: 15))
-                            .fontWeight(.bold)
-                            .foregroundColor(AllInColors.pink100)
-                        Image("pinkTrophyIcon")
-                            .resizable()
-                            .frame(width:12, height: 12)
-                    }
-                }
-            }
-        }
-    }
-}

Sources/AllInApp/AllIn/Components/ChoiceFinalAnswerCell.swift

@@ -14,30 +14,23 @@ struct ChoiceFinalAnswerCell: View {
     var selected = false
     var answer: AnswerDetail
     var rawColor = AllInColors.blueAccentColor
+
     
     var body: some View {
-        ZStack {
+        ZStack{
-            HStack {
+            HStack{
                 Spacer()
                 Text(answer.response)
-                    .textStyle(weight: .bold, color: selected ? .white : rawColor, size: 40)
+                    .textStyle(weight: .bold, color: selected ? .white :rawColor, size: 40).padding(.vertical, 10)
-                    .padding(.vertical, 10)
                 Spacer()
             }
-            HStack {
+            HStack{
                 Spacer()
-                OddCapsule(
+                OddCapsule(backgroundColor: selected ? .white : AllInColors.purpleAccentColor,  foregroundColor: selected ? AllInColors.purpleAccentColor : .white ,odd: answer.odds ).padding(.trailing,20).scaleEffect(0.9)
-                    backgroundColor: selected ? .white : AllInColors.purpleAccentColor,
-                    foregroundColor: selected ? AllInColors.purpleAccentColor : .white,
-                    odd: answer.odds
-                )
-                .padding(.trailing, 20)
-                .scaleEffect(0.9)
             }
-        }
+        }.background(selected ? AllInColors.purpleAccentColor : .white).cornerRadius(17).scaleEffect(selected ? 1.02 : 1).animation(
-        .background(selected ? AllInColors.purpleAccentColor : .white)
+            .easeInOut(duration: 0.3),
-        .cornerRadius(17)
+            value: selected
-        .scaleEffect(selected ? 1.02 : 1)
+        )
-        .animation(.easeInOut(duration: 0.3), value: selected)
     }
 }

Sources/AllInApp/AllIn/Components/CustomBetLine.swift

@@ -1,141 +0,0 @@
-//
-//  CustomBetLine.swift
-//  AllIn
-//
-//  Created by Lucas Delanier on 10/06/2024.
-//
-
-import SwiftUI
-import Model
-
-struct CustomBetLine: View {
-    
-    @State var showInfos: [String: Bool] = [:]
-    var bet: BetDetail
-    
-    var participationsForAnswer: [String: [Participation]] {
-        Dictionary(grouping: bet.participations, by: { $0.answer.uppercased() })
-    }
-    
-    var sortedAnswers: [AnswerDetail] {
-        bet.answers.sorted { $0.totalParticipants > $1.totalParticipants }
-    }
-    
-    func getTextStyle(for answer: AnswerDetail) -> Font.Weight {
-        return answer == sortedAnswers.first ? .bold : .light
-    }
-    
-    func getColor(for answer: AnswerDetail) -> Color {
-        return answer == sortedAnswers.first ? AllInColors.pinkAccentColor : AllInColors.blueAccentColor
-    }
-    
-    func getGradiant(for answer: AnswerDetail) -> LinearGradient {
-        return answer == sortedAnswers.first ? AllInColors.PinkBetGradiant : AllInColors.BlueBetLineGradiant
-    }
-    
-    func getFlameImage(for answer: AnswerDetail) -> String {
-        return answer == sortedAnswers.first ? "pinkFlameIcon" : "blueFlameIcon"
-    }
-    
-    var body: some View {
-        VStack(alignment: .leading, spacing: 0) {
-            ForEach(sortedAnswers, id: \.response) { answer in
-                let participations = participationsForAnswer[answer.response.uppercased()] ?? []
-                let totalParticipations = bet.participations.count
-                let percentage = totalParticipations > 0 ? CGFloat(participations.count) / CGFloat(totalParticipations) : 0.0
-                
-                VStack {
-                    HStack {
-                        Text(answer.response)
-                            .font(.system(size: 15))
-                            .fontWeight(getTextStyle(for: answer))
-                            .foregroundColor(getColor(for: answer))
-                        Spacer()
-                    }
-                    
-                    GeometryReader { geometry in
-                        ZStack(alignment: .leading) {
-                            HStack(spacing: 0) {
-                                Rectangle()
-                                    .frame(width: min(percentage * geometry.size.width, geometry.size.width-20), height: 17)
-                                    .foregroundStyle(getGradiant(for: answer))
-                                    .cornerRadius(999, corners: [.topLeft, .bottomLeft])
-                                Image(getFlameImage(for: answer))
-                                    .resizable()
-                                    .frame(width: 29, height: 32)
-                                    .padding(.leading, -6)
-                                Text("\(Int(percentage * 100))%")
-                                    .font(.system(size: 15))
-                                    .fontWeight(.bold)
-                                    .foregroundStyle(getColor(for: answer))
-                                    .padding(.leading, 2)
-                            }
-                        }
-                        .padding(.bottom, 5)
-                    }
-                    .frame(height: 40)
-                    
-                    HStack {
-                        Spacer()
-                        Text("bet_status_details_drawer")
-                            .textStyle(weight: .medium, color: AllInColors.primaryTextColor, size: 10)
-                        Image(showInfos[answer.response] ?? false ? "chevronUpIcon" : "chevronDownIcon")
-                            .resizable()
-                            .frame(width: 10, height: 7)
-                            .scaledToFill()
-                    }
-                    .onTapGesture {
-                        withAnimation {
-                            showInfos[answer.response, default: false].toggle()
-                        }
-                    }
-                    .padding(.trailing, 5)
-                    
-                    if showInfos[answer.response] ?? false {
-                        HStack{
-                            VStack(alignment: .leading,spacing: 1) {
-                                HStack(spacing: 5) {
-                                    Image(answer == sortedAnswers.first ? "pinkAllCoinIcon" : "blueAllCoinIcon")
-                                        .resizable()
-                                        .frame(width: 12, height: 12)
-                                    Text(participations.reduce(0, { x, y in x + y.stake }).description)
-                                        .font(.system(size: 15))
-                                        .fontWeight(.bold)
-                                        .foregroundColor(getColor(for: answer))
-                                }
-                                HStack(spacing: 5) {
-                                    Image(answer == sortedAnswers.first ? "pinkPersonIcon" : "bluePersonIcon")
-                                        .resizable()
-                                        .frame(width: 12, height: 12)
-                                    Text(participations.count.description)
-                                        .font(.system(size: 15))
-                                        .fontWeight(.bold)
-                                        .foregroundColor(getColor(for: answer))
-                                }
-                                HStack(spacing: 5) {
-                                    Image(answer == sortedAnswers.first ? "pinkBadgeIcon" : "blueBadgeIcon")
-                                        .resizable()
-                                        .frame(width: 12, height: 12)
-                                    Text(participations.max(by: { $0.stake < $1.stake })?.stake.description ?? "0")
-                                        .font(.system(size: 15))
-                                        .fontWeight(.bold)
-                                        .foregroundColor(getColor(for: answer))
-                                }
-                                HStack(spacing: 5) {
-                                    Image(answer == sortedAnswers.first ? "pinkTrophyIcon" : "blueTrophyIcon")
-                                        .resizable()
-                                        .frame(width: 12, height: 12)
-                                    Text(String(format: "%.2f", answer.odds))
-                                        .font(.system(size: 15))
-                                        .fontWeight(.bold)
-                                        .foregroundColor(getColor(for: answer))
-                                }
-                            }
-                            Spacer()
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

Sources/AllInApp/AllIn/Components/DropDownAnswerMenu.swift

@@ -1,3 +1,12 @@
+//
+//  DropDownAnswerMenu.swift
+//  AllIn
+//
+//  Created by Lucas Delanier on 16/01/2024.
+//
+
+import SwiftUI
+
 //
 //  DropDownMenu.swift
 //  AllIn
@@ -6,21 +15,20 @@
 //
 
 import SwiftUI
-import Model
 
 struct DropDownAnswerMenu: View {
     
     @State var expand = false
-    @Binding var selectedAnswer: AnswerDetail
+    @Binding var selectedOption: Int
-    var answers: [AnswerDetail]
+    var options: [(Int, String, Float)]
     
     var body: some View {
         VStack(spacing: 0, content: {
-            Button(action: { withTransaction(Transaction(animation: nil)) { self.expand.toggle() } }) {
+            Button(action: { self.expand.toggle() }) {
                 HStack{
-                    Text(selectedAnswer.response)
+                    Text(options[selectedOption].1.description)
                         .textStyle(weight: .bold, color: AllInColors.blueAccentColor, size: 20)
-                    Text("\(selectedAnswer.odds, specifier: "%.2f")")
+                    Text(options[selectedOption].2.description)
                         .textStyle(weight: .bold, color: AllInColors.lightPurpleColor, size: 10)
                     
                     Spacer()
@@ -35,21 +43,19 @@ struct DropDownAnswerMenu: View {
                     .foregroundColor(AllInColors.delimiterGrey)
                     .padding(.bottom, 18)
                 VStack(spacing: 0) {
-                    ForEach(answers) { (answer: AnswerDetail) in
+                    ForEach(0..<options.count, id: \.self) { index in
-                        if answer != selectedAnswer {
+                        if options[index].0 != selectedOption {
-                            Button(action: {
+                            Button(action: {self.selectedOption = options[index].0
-                                self.selectedAnswer = answer
+                                self.expand.toggle()}) {
-                                self.expand.toggle()}
+                                    HStack{
-                            ) {
+                                        Text(options[index].1.description)
-                                HStack{
+                                            .textStyle(weight: .bold, color: AllInColors.blueAccentColor, size: 20)
-                                    Text(answer.response)
+                                        Text(options[index].2.description)
-                                        .textStyle(weight: .bold, color: AllInColors.blueAccentColor, size: 20)
+                                            .textStyle(weight: .bold, color: AllInColors.lightPurpleColor, size: 10)
-                                    Text("\(answer.odds, specifier: "%.2f")")
+                                        Spacer()
-                                        .textStyle(weight: .bold, color: AllInColors.lightPurpleColor, size: 10)
+                                    }
-                                    Spacer()
                                 }
-                            }
+                                .padding(.bottom, 15)
-                            .padding(.bottom, 15)
                         }
                     }
                 }
@@ -64,3 +70,15 @@ struct DropDownAnswerMenu: View {
         )
     }
 }
+
+struct DropDownAnswerMenu_Previews: PreviewProvider {
+    static var previews: some View {
+        DropDownAnswerMenu(selectedOption: .constant(0), options: [
+            (0, "questionMarkIcon", 1.2),
+            (1, "footballIcon", 2.2),
+            (2, "paintbrushIcon", 3.3)
+        ])
+        .preferredColorScheme(.dark)
+    }
+}
+

Sources/AllInApp/AllIn/Components/Friend.swift

@@ -29,7 +29,7 @@ struct Friend: View {
     
     var body: some View {
         HStack{
-            UserPicture(picture: user.image,username: user.username, size: 45)
+            UserPicture(picture: nil,username: user.username, size: 45)
             Text(user.username)
                 .fontWeight(.medium)
                 .padding(.leading, 5)

Sources/AllInApp/AllIn/Components/Menu.swift

@@ -12,6 +12,7 @@ struct Menu: View {
     
     @Inject var authService: IAuthService
     
+    
     let parameters: [(String, String, String, String)] = [
         ("videoGameImage", String(localized: "drawer_create_a_bet"), String(localized: "drawer_create_a_bet_subtitle"), "CreationBet"),
         ("globeImage", String(localized: "drawer_public_bets"), String(localized: "drawer_public_bets_subtitle"), "Bet"),
@@ -39,7 +40,7 @@ struct Menu: View {
             HStack(spacing: 30) {
                 Spacer()
                 VStack(){
-                    Text(AppStateContainer.shared.user?.bestWin ?? 0, format: .number)
+                    Text(AppStateContainer.shared.user?.bestWin.description ?? "0")
                         .fontWeight(.heavy)
                         .font(.system(size: 15))
                         .foregroundColor(.white)
@@ -49,7 +50,7 @@ struct Menu: View {
                         .foregroundColor(AllInColors.grey600Color)
                 }
                 VStack(){
-                    Text(AppStateContainer.shared.user!.bestWin, format: .number)
+                    Text(AppStateContainer.shared.user?.bestWin.description ?? "0")
                         .fontWeight(.heavy)
                         .font(.system(size: 15))
                         .foregroundColor(.white)
@@ -59,7 +60,7 @@ struct Menu: View {
                         .foregroundColor(AllInColors.grey600Color)
                 }
                 VStack(){
-                    Text(AppStateContainer.shared.user!.nbFriends, format: .number)
+                    Text(AppStateContainer.shared.user?.nbFriends.description ?? "0")
                         .fontWeight(.heavy)
                         .font(.system(size: 15))
                         .foregroundColor(.white)
@@ -103,9 +104,6 @@ struct Menu: View {
         .frame(maxWidth: .infinity,alignment: .leading)
         .background(AllInColors.primaryColor)
         .edgesIgnoringSafeArea(.bottom)
-        .onAppear {
-            authService.refreshAuthentication()
-        }
         
     }
 }

Sources/AllInApp/AllIn/Components/OddCapsule.swift

@@ -14,7 +14,7 @@ struct OddCapsule: View {
     var odd: Float = 0.0
     var body: some View {
         HStack(alignment: .center) {
-            Text("x\(odd, specifier: "%.2f")")
+            Text("x\(odd.description)")
                 .fontWeight(.bold)
                 .foregroundColor(foregroundColor)
         }

Sources/AllInApp/AllIn/Components/ParticipationModal.swift

@@ -6,25 +6,33 @@
 //
 
 import SwiftUI
-import Model
 
 struct ParticipationModal: View {
     
-    @Binding var selectedAnswer: AnswerDetail
+    @Binding private var selectedOption: Int
-    @Binding var mise: String
+    @Binding private var mise: String
-    var phrase: String
+    private var description: String
-    var answers: [AnswerDetail]
+    var participationAddedCallback: (() -> Void)?
-    var participationAddedCallback: () -> Void
-    var checkAndSetError: () -> Bool
-    
     var possibleGain: Int {
-        if let stake = Float(mise) {
+        if let stake = Float(mise), let selectedOption = options.first(where: { $0.0 == self.selectedOption }) {
-            return Int(round(stake * selectedAnswer.odds))
+            return Int(round(stake * selectedOption.2))
         } else {
             return 0
         }
     }
     
+    init(answer: Binding<Int>, mise: Binding<String>, description: String, participationAddedCallback: (() -> Void)? = nil) {
+        self._selectedOption = answer
+        self._mise = mise
+        self.description = description
+        self.participationAddedCallback = participationAddedCallback
+    }
+    
+    let options: [(Int, String, Float)] = [
+        (0, "OUI", 1.2),
+        (1, "NON", 3.3),
+    ]
+    
     var body: some View {
         GeometryReader { geometry in
             VStack(alignment: .leading){
@@ -48,12 +56,12 @@ struct ParticipationModal: View {
                 }
                 .padding(.leading, 15)
                 VStack(alignment: .leading){
-                    Text(phrase)
+                    Text(description)
                         .font(.system(size: 13))
                         .foregroundColor(AllInColors.primaryTextColor)
                         .fontWeight(.light)
                     
-                    DropDownAnswerMenu(selectedAnswer: $selectedAnswer, answers: answers)
+                    DropDownAnswerMenu(selectedOption: $selectedOption, options: options)
                     
                     TextField("", text: $mise, prompt: Text("generic_stake")
                         .foregroundColor(AllInColors.lightGrey300Color)
@@ -96,7 +104,7 @@ struct ParticipationModal: View {
                     .padding(.top, 10)
                     .padding(.bottom, 0)
                     Button {
-                        participationAddedCallback()
+                        participationAddedCallback?()
                     } label: {
                         Text("Miser")
                             .font(.system(size: 23))
@@ -117,4 +125,16 @@ struct ParticipationModal: View {
             .background(AllInColors.underComponentBackgroundColor)
         }
     }
+    
+    func checkAndSetError() -> Bool {
+        if let stake = Int(mise) {
+            if stake <= AppStateContainer.shared.user?.nbCoins ?? 0 && stake > 0 {
+                return false
+            } else {
+                return true
+            }
+        } else {
+            return true
+        }
+    }
 }

Sources/AllInApp/AllIn/Components/RankingRow.swift

@@ -10,7 +10,7 @@ import SwiftUI
 struct RankingRow: View {
     
     var number: Int
-    var image: String?
+    var image: String
     var pseudo: String
     var allCoins: Int
     
@@ -18,12 +18,12 @@ struct RankingRow: View {
         HStack(){
             Text(number.description)
                 .textStyle(weight: .bold, color: AllInColors.lightPurpleColor, size: 18)
-            UserInfo(username: pseudo, picture: image, value: allCoins)
+                .padding(.leading, 15)
+            UserInfo(username: pseudo, value: allCoins)
         }
-        .padding(10)
-        .padding(.horizontal, 5)
         .background(AllInColors.componentBackgroundColor)
         .cornerRadius(8)
+        .padding([.leading,.trailing],20)
         .frame(maxWidth: 750)
     }
 }

Sources/AllInApp/AllIn/Components/RecapBetCard.swift

@@ -73,7 +73,7 @@ struct RecapBetCard: View {
                         .overlay {
                             AllInColors.primaryGradient.frame(width: 50)
                                 .mask(
-                                    Text(betResult.amount.description).font(.system(size: 15)).fontWeight(.medium)
+                                    Text("1630").font(.system(size: 15)).fontWeight(.medium)
                                 )
                         }
                         .padding(0)
@@ -89,8 +89,7 @@ struct RecapBetCard: View {
                 HStack{
                     Text("Côte totale").font(.system(size: 15)).fontWeight(.medium)
                     Spacer()
-                    // TODO bind le odd
+                    Text("3,46")
-                    Text("1,0")
                         .textStyle(weight: .bold, color: .white, size: 18)
                         .padding([.leading,.trailing],10)
                         .padding([.top,.bottom],5)

Sources/AllInApp/AllIn/Components/ResultBanner.swift

@@ -19,16 +19,16 @@ struct ResultBanner: View {
             }.frame(height: 80)
             HStack(spacing: 20){
                 HStack{
-                    Image("blueAllCoinIcon").resizable().frame(maxWidth: 12, maxHeight: 12)
+                    Image("BlueAllCoinIcon").resizable().frame(maxWidth: 12, maxHeight: 12)
                     Text(finalAnswer.stake.description).font(.system(size: 16)).fontWeight(.semibold).foregroundStyle(AllInColors.blueGrey800Color)
                 }
                 HStack{
-                    Image("bluePersonIcon").resizable().frame(maxWidth: 15, maxHeight: 12)
+                    Image("BleuePersonIcon").resizable().frame(maxWidth: 15, maxHeight: 12)
                     Text(finalAnswer.username).font(.system(size: 16)).fontWeight(.semibold).foregroundStyle(AllInColors.blueGrey800Color)
                 }
                 HStack{
-                    Image("blueTrophyIcon").resizable().frame(maxWidth: 15, maxHeight: 12)
+                    Image("BleueTrophyIcon").resizable().frame(maxWidth: 15, maxHeight: 12)
-                    Text("\(odds, specifier: "%.2f")").font(.system(size: 16)).fontWeight(.semibold).foregroundStyle(AllInColors.blueGrey800Color)
+                    Text(odds.description).font(.system(size: 16)).fontWeight(.semibold).foregroundStyle(AllInColors.blueGrey800Color)
                 }
             }
         }

Sources/AllInApp/AllIn/Components/ReviewCard.swift

@@ -42,15 +42,13 @@ struct ReviewCard: View {
             VStack(alignment: .center,spacing:0){
                 HStack(){
                     Spacer()
-                    if bet.status == .finished {
+                    Text(amount.description)
-                        Text(amount.description)
+                        .foregroundColor(.white)
-                            .foregroundColor(.white)
+                        .font(.system(size: 25))
-                            .font(.system(size: 25))
+                        .fontWeight(.bold)
-                            .fontWeight(.bold)
+                    Image("allcoinWhiteIcon")
-                        Image("allcoinWhiteIcon")
+                        .resizable()
-                            .resizable()
+                        .frame(width: 18, height: 20)
-                            .frame(width: 18, height: 20)
-                    }
                     
                     switch bet.status {
                     case .waiting, .inProgress:
@@ -84,8 +82,9 @@ struct ReviewCard: View {
             .frame(width: .infinity)
             .padding(.all,2)
             .background(backgroundColor())
-            .cornerRadius(20, corners: [.bottomLeft,.bottomRight])
             
+            .cornerRadius(20, corners: [.bottomLeft,.bottomRight])
+            .border(width: 1, edges: [.top], color: AllInColors.delimiterGrey)
         }
         .onTapGesture {
             showDetails.toggle()
@@ -94,20 +93,14 @@ struct ReviewCard: View {
         }
     }
     
-    private func backgroundColor() -> some View {
+    private func backgroundColor() -> Color {
-            Group {
+        switch bet.status {
-                if bet.status == .finished && isWin {
+        case .inProgress, .waiting, .closing:
-                    AllInColors.primaryGradient
+            return AllInColors.grey50Color
-                } else {
+        case .finished:
-                    switch bet.status {
+            return Color.black
-                    case .inProgress, .waiting, .closing:
+        case .cancelled:
-                        AllInColors.grey50Color
+            return Color.red
-                    case .finished:
-                        Color.black
-                    case .cancelled:
-                        Color.red
-                    }
-                }
-            }
         }
+    }
 }

Sources/AllInApp/AllIn/Components/UserInfo.swift

@@ -10,11 +10,10 @@ import Model
 
 struct UserInfo: View {
     var username: String
-    var picture: String?
     var value: Int
     var body: some View {
         HStack {
-            UserPicture(picture: picture, username: username, size: 35)
+            UserPicture(username: username, size: 35)
                 .padding(.trailing, 7)
             Text(username)
                 .font(.system(size: 15))
@@ -25,10 +24,10 @@ struct UserInfo: View {
                 .font(.system(size: 18))
                 .foregroundStyle(AllInColors.lightPurpleColor)
                 .fontWeight(.bold)
-                .padding(.trailing, 4)
+                .padding(.trailing, 8)
             Image("PurpleAllCoin")
                 .resizable()
-                .frame(width: 15, height: 16)
+                .frame(width: 11, height: 12)
         }
     }
 }

Sources/AllInApp/AllIn/Components/userPicture.swift

@@ -6,46 +6,41 @@
 //
 
 import SwiftUI
+
 struct UserPicture: View {
     var picture: String?
     var username: String
     var size: CGFloat
-    
     var body: some View {
         ZStack {
-            if let pictureURL = picture {
+            if picture != nil {
-                userImage(url: pictureURL)
+                AsyncImage(
+                    url: URL(string:picture!),
+                    content: { image in
+                        image
+                            .resizable()
+                            .aspectRatio(contentMode: .fit)
+                            .clipShape(Circle())
+                    },
+                    placeholder: {
+                        ProgressView()
+                    }
+                )
             } else {
-                placeholderImage
+                Circle()
+                    .foregroundColor(.gray)
+                    .frame(width: size, height: size)
+                    .overlay(
+                        Text(username.prefix(2).uppercased())
+                            .fontWeight(.medium)
+                            .foregroundStyle(.white)
+                            .font(.system(size: fontSize(for: size)))
+                    )
             }
         }
     }
     
-    @MainActor private func userImage(url: String) -> some View {
+    func fontSize(for diameter: CGFloat) -> CGFloat {
-        AsyncCachedImage(url: URL(string: url)) { image in
-            image
-                .resizable()
-                .frame(width: size, height: size)
-                .clipShape(Circle())
-                } placeholder: {
-                    placeholderImage
-                }
-    }
-
-    
-    private var placeholderImage: some View {
-        Circle()
-            .foregroundColor(.gray)
-            .frame(width: size, height: size)
-            .overlay(
-                Text(username.prefix(2).uppercased())
-                    .fontWeight(.medium)
-                    .foregroundStyle(.white)
-                    .font(.system(size: fontSize(for: size)))
-            )
-    }
-    
-    private func fontSize(for diameter: CGFloat) -> CGFloat {
         let fontScaleFactor: CGFloat = 0.45
         return diameter * fontScaleFactor
     }

Sources/AllInApp/AllIn/Ressources/Colors.swift

@@ -77,12 +77,6 @@ struct AllInColors {
         endPoint: .trailing
     )
     
-    static let BlueBetLineGradiant = LinearGradient(
-        gradient: Gradient(colors: [AllInColors.blue200, AllInColors.blueAccentColor]),
-        startPoint: .leading,
-        endPoint: .trailing
-    )
-    
     static let PinkBetGradiant = LinearGradient(
         gradient: Gradient(colors: [AllInColors.pink100, AllInColors.pink200]),
         startPoint: .leading,

Sources/AllInApp/AllIn/Ressources/en.lproj/Localizable.strings

@@ -178,7 +178,7 @@
 /// Notification
 
 "notification_title_end_bet_date" = "Who will be the winners?";
-"notification_subtitle_end_bet_date %@" = "The %@ bet has reached its deadline. Go to the app to enter the winning answer.";
+"notification_subtitle_end_bet_date %@" = "The %@ bet has reached its deadline. Go to the app to enter the winning answer.";`
 
 /// Empty Views
 
@@ -187,8 +187,3 @@
 "empty_bets_title"= "No bet matches your search";
 "empty_friends_title" = "You don't have any friends yet";
 "empty_friends_explain" = "Add them from this screen";
-
-/// Error Messages
-
-"error_title" = "Error: Failed to Load Content.";
-"error_message" = "The content you are trying to load could not be retrieved. Please check your internet connection and try again";

Sources/AllInApp/AllIn/Ressources/fr.lproj/Localizable.strings

@@ -28,7 +28,6 @@
 "network_error_text" = "Assurez-vous d\'être bien connecté au réseau puis réessayez.";
 
 /// Bet type
-
 "bet_type_binary" = "Oui / Non";
 "bet_type_match" = "Match sportif";
 "bet_type_custom" = "Réponses personnalisées";
@@ -187,8 +186,3 @@
 "empty_bets_title"= "Aucun Bet ne correspond à votre recherche";
 "empty_friends_title" = "Vous n’avez pas encore d’amis";
 "empty_friends_explain" = "Ajoutez les depuis cet écran";
-
-/// Error Messages
-
-"error_title" = "Erreur : Échec du chargement du contenu.";
-"error_message" = "Le contenu que vous essayez de charger n'a pas pu être récupéré. Veuillez vérifier votre connexion internet et réessayer.";

Sources/AllInApp/AllIn/Utils/asyncCachedImage.swift

@@ -1,71 +0,0 @@
-//
-//  asyncCachedImage.swift
-//  AllIn
-//
-//  Created by Lucas Delanier on 06/06/2024.
-//
-
-import SwiftUI
-
-@MainActor
-struct AsyncCachedImage<ImageView: View, PlaceholderView: View>: View {
-    // Input dependencies
-    var url: URL?
-    @ViewBuilder var content: (Image) -> ImageView
-    @ViewBuilder var placeholder: () -> PlaceholderView
-    
-    // Downloaded image
-    @State var image: UIImage? = nil
-    
-    init(
-        url: URL?,
-        @ViewBuilder content: @escaping (Image) -> ImageView,
-        @ViewBuilder placeholder: @escaping () -> PlaceholderView
-    ) {
-        self.url = url
-        self.content = content
-        self.placeholder = placeholder
-    }
-    
-    var body: some View {
-        VStack {
-            if let uiImage = image {
-                content(Image(uiImage: uiImage))
-            } else {
-                placeholder()
-                    .onAppear {
-                        Task {
-                            image = await downloadPhoto()
-                        }
-                    }
-            }
-        }
-    }
-    
-    // Downloads if the image is not cached already
-    // Otherwise returns from the cache
-    private func downloadPhoto() async -> UIImage? {
-        do {
-            guard let url else { return nil }
-            
-            // Check if the image is cached already
-            if let cachedResponse = URLCache.shared.cachedResponse(for: .init(url: url)) {
-                return UIImage(data: cachedResponse.data)
-            } else {
-                let (data, response) = try await URLSession.shared.data(from: url)
-                
-                // Save returned image data into the cache
-                URLCache.shared.storeCachedResponse(.init(response: response, data: data), for: .init(url: url))
-                
-                guard let image = UIImage(data: data) else {
-                    return nil
-                }
-                
-                return image
-            }
-        } catch {
-            print("Error downloading: \(error)")
-            return nil
-        }
-    }
-}

Sources/AllInApp/AllIn/ViewModels/BetViewModel.swift

@@ -13,7 +13,7 @@ import Combine
 class BetViewModel: ObservableObject {
     
     @Inject var manager: Manager
-    @Inject var authService: IAuthService
+    
     @Published var popularBet: Bet?
     @Published private(set) var bets: [Bet] = []
     @Published var betsOver: [BetDetail] = []
@@ -58,7 +58,6 @@ class BetViewModel: ObservableObject {
                 self.betsWon = bets
                 if !self.betsWon.isEmpty {
                     self.showingSheetWon = true
-                    self.authService.refreshAuthentication()
                 }
             }
         }

Sources/AllInApp/AllIn/ViewModels/CreationBetViewModel.swift

@@ -23,36 +23,19 @@ class CreationBetViewModel: ObservableObject {
     @Published var endRegisterDate = Date()
     @Published var endBetDate = Date()
     @Published var betAdded = false
-    @Published var selectedTypeBet = 0 {
+    @Published var selectedOption = 0
-        didSet {
-            values.removeAll()
-            groupedItems.removeAll()
-            response = ""
-        }
-    }
-    @Published var values: [String] = []
     @Published var invited: Set<String> = []
     
     @Published var themeFieldError: String?
     @Published var descriptionFieldError: String?
     @Published var endRegisterDateFieldError: String?
     @Published var endBetDateFieldError: String?
-    @Published var responsesFieldError: String?
     
     @Published var errorMessage: String?
     @Published var showErrorMessage = false
     
     @Published var friends: [User] = []
     
-    let options: [(Int, String, String)] = [
-        (0, "questionMarkIcon", String(localized: "bet_type_binary")),
-        (1, "footballIcon", String(localized: "bet_type_match")),
-        (2, "paintbrushIcon", String(localized: "bet_type_custom"))
-    ]
-    
-    @Published var response = ""
-    @Published var groupedItems: [[String]] = [[String]] ()
-    
     init() {
         getFriends()
     }
@@ -67,14 +50,14 @@ class CreationBetViewModel: ObservableObject {
     
     func create() {
         
-        guard checkAndSetError(forTheme: true, forDescription: true, forEndRegisterDate: true, forEndBetDate: true, forResponse: true) else {
+        guard checkAndSetError(forTheme: true, forDescription: true, forEndRegisterDate: true, forEndBetDate: true) else {
             return
         }
         
         resetAllFieldErrors()
         
         if let user = AppStateContainer.shared.user {
-            manager.addBet(bet: toBet(theme: theme, description: description, endRegister: endRegisterDate, endBet: endBetDate, isPrivate: isPrivate, status: .inProgress, creator: user.username, invited: Array(invited), type: selectedTypeBet)) { statusCode in
+            manager.addBet(bet: toBet(theme: theme, description: description, endRegister: endRegisterDate, endBet: endBetDate, isPrivate: isPrivate, status: .inProgress, creator: user.username, invited: Array(invited), type: selectedOption)) { statusCode in
                 print(statusCode)
                 switch statusCode {
                 case 201:
@@ -89,13 +72,12 @@ class CreationBetViewModel: ObservableObject {
         }
     }
     
-    func checkAndSetError(forTheme checkTheme: Bool, forDescription checkDescription: Bool, forEndRegisterDate checkEndRegisterDate: Bool, forEndBetDate checkEndBetDate: Bool, forResponse checkResponse: Bool) -> Bool {
+    func checkAndSetError(forTheme checkTheme: Bool, forDescription checkDescription: Bool, forEndRegisterDate checkEndRegisterDate: Bool, forEndBetDate checkEndBetDate: Bool) -> Bool {
         
         var newThemeFieldError: String?
         var newDescriptionFieldError: String?
         var newEndRegisterDateFieldError: String?
         var newEndBetDateFieldError: String?
-        var newResponsesFieldError: String?
         
         var hasError = false
         
@@ -123,19 +105,6 @@ class CreationBetViewModel: ObservableObject {
             hasError = true
         }
         
-        if checkResponse, selectedTypeBet == 2 {
-            if values.count < 2 {
-                newResponsesFieldError = "Il doit y'avoir 2 réponses minimum"
-                hasError = true
-            } else {
-                let uniqueValues = Set(values)
-                if uniqueValues.count != values.count {
-                    newResponsesFieldError = "Les réponses doivent être uniques"
-                    hasError = true
-                }
-            }
-        }
-        
         if !hasError {
             // No error
             return true
@@ -146,7 +115,6 @@ class CreationBetViewModel: ObservableObject {
             descriptionFieldError = newDescriptionFieldError
             endRegisterDateFieldError = newEndRegisterDateFieldError
             endBetDateFieldError = newEndBetDateFieldError
-            responsesFieldError = newResponsesFieldError
         }
         return false
     }
@@ -157,7 +125,6 @@ class CreationBetViewModel: ObservableObject {
             descriptionFieldError = nil
             endRegisterDateFieldError = nil
             endBetDateFieldError = nil
-            responsesFieldError = nil
         }
     }
     
@@ -173,11 +140,7 @@ class CreationBetViewModel: ObservableObject {
         case 1:
             return MatchBet(theme: theme, phrase: description, endRegisterDate: endRegister, endBetDate: endBet, isPrivate: isPrivate, status: status, invited: invited, author: creator, nameTeam1: "", nameTeam2: "")
         case 2:
-            var bet = CustomBet(theme: theme, phrase: description, endRegisterDate: endRegister, endBetDate: endBet, isPrivate: isPrivate, status: status, invited: invited, author: creator)
+            return CustomBet(theme: theme, phrase: description, endRegisterDate: endRegister, endBetDate: endBet, isPrivate: isPrivate, status: status, invited: invited, author: creator)
-            for answer in values {
-                bet.addCustomResponse(answer)
-            }
-            return bet
         default:
             return BinaryBet(theme: theme, phrase: description, endRegisterDate: endRegister, endBetDate: endBet, isPrivate: isPrivate, status: status, invited: invited, author: creator)
         }

Sources/AllInApp/AllIn/ViewModels/DetailsViewModel.swift

@@ -15,9 +15,9 @@ class DetailsViewModel: ObservableObject {
     
     @Inject var manager: Manager
     var id: String
-    @Published var selectedAnswer = AnswerDetail(response: "", totalStakes: 0, totalParticipants: 0, highestStake: 0, odds: 0)
+    @Published var answer = 0
     @Published var mise: String = ""
-    
+
     @Published var betDetail: BetDetail?
     
     init(id: String) {
@@ -26,31 +26,30 @@ class DetailsViewModel: ObservableObject {
     }
     
     func getItem(withId id: String) {
-        let semaphore = DispatchSemaphore(value: 0)
         manager.getBet(withId: id) { bet in
-                self.betDetail = bet
+            DispatchQueue.main.async {
-                if let firstAnswer = bet.answers.first {
+                for par in bet.participations {
-                    self.selectedAnswer = firstAnswer
+                    print(par.id)
                 }
-                semaphore.signal()
+                self.betDetail = bet
-        }
+            }
-        
-        let result = semaphore.wait(timeout: DispatchTime.now() + .seconds(2))
-            
-        if result == .timedOut {
-            print("The request has exceeded the deadline")
-            return
         }
     }
     
     func addParticipate() {
         if let stake = Int(mise) {
-            manager.addParticipation(withId: id, withAnswer: selectedAnswer.response, andStake: stake) { statusCode in
+            var rep: String = ""
+            if answer ==  0 {
+                rep = "Yes"
+            } else {
+                rep = "No"
+            }
+            manager.addParticipation(withId: id, withAnswer: rep, andStake: stake) { statusCode in
                 switch statusCode {
                 case 201:
                     AppStateContainer.shared.user?.nbCoins -= stake
                     WidgetCenter.shared.reloadAllTimelines()
-                    
+
                     self.getItem(withId: self.id)
                 default:
                     break
@@ -58,20 +57,10 @@ class DetailsViewModel: ObservableObject {
             }
         }
         mise = ""
-        if let firstAnswer = betDetail!.answers.first {
+        answer = 0
-            self.selectedAnswer = firstAnswer
-        }
     }
     
-    func checkAndSetError() -> Bool {
+    func checkAndSetError() {
-        if let stake = Int(mise) {
+        
-            if stake <= AppStateContainer.shared.user?.nbCoins ?? 0 && stake > 0 {
-                return false
-            } else {
-                return true
-            }
-        } else {
-            return true
-        }
     }
 }

Sources/AllInApp/AllIn/Views/CreationBetView.swift

@@ -28,6 +28,17 @@ struct CreationBetView: View {
     }()
     let screenWidth = UIScreen.main.bounds.width
     
+    @State private var response = ""
+    @State private var values: [String] = []
+    
+    let options: [(Int, String, String)] = [
+        (0, "questionMarkIcon", String(localized: "bet_type_binary")),
+        (1, "footballIcon", String(localized: "bet_type_match")),
+        (2, "paintbrushIcon", String(localized: "bet_type_custom"))
+    ]
+    
+    @State var groupedItems: [[String]] = [[String]] ()
+    
     private func updateGroupedItems() {
         
         var updatedGroupedItems: [[String]] = [[String]] ()
@@ -35,7 +46,7 @@ struct CreationBetView: View {
         var width: CGFloat = 0
         var dynamicWidthLimit: CGFloat
         
-        for value in viewModel.values {
+        for value in values {
             let label = UILabel()
             label.text = value
             label.sizeToFit()
@@ -54,7 +65,7 @@ struct CreationBetView: View {
         }
         updatedGroupedItems.append(tempItems)
         
-        viewModel.groupedItems = updatedGroupedItems
+        groupedItems = updatedGroupedItems
     }
     
     var body: some View {
@@ -97,7 +108,6 @@ struct CreationBetView: View {
                                     .foregroundColor(AllInColors.lightGrey300Color)
                                     .font(.system(size: 14))
                                     .fontWeight(.light))
-                                .autocorrectionDisabled(true)
                                 .padding()
                                 .background(
                                     RoundedRectangle(cornerRadius: 9)
@@ -141,7 +151,6 @@ struct CreationBetView: View {
                                 .foregroundColor(AllInColors.lightGrey300Color)
                                 .font(.system(size: 14))
                                 .fontWeight(.light), axis: .vertical)
-                            .autocorrectionDisabled(true)
                             .lineLimit(4, reservesSpace: true)
                             .padding()
                             .background(
@@ -351,14 +360,14 @@ struct CreationBetView: View {
                 VStack(spacing: 5) {
                     
                     VStack() {
-                        DropDownMenu(selectedOption: $viewModel.selectedTypeBet, options: viewModel.options)
+                        DropDownMenu(selectedOption: $viewModel.selectedOption, options: options)
                     }
                     .padding([.bottom], 15)
                     .frame(width: 340)
                     
                     
                     Group {
-                        switch viewModel.selectedTypeBet {
+                        switch viewModel.selectedOption {
                         case 0:
                             Text("bet_creation_yes_no_bottom_text_1")
                                 .textStyle(weight: .bold, color: AllInColors.veryLightPurpleColor, size: 13)
@@ -376,18 +385,12 @@ struct CreationBetView: View {
                                 .textStyle(weight: .bold, color: AllInColors.veryLightPurpleColor, size: 13)
                                 .padding(.bottom, 15)
                             
-                            if let responseError = $viewModel.responsesFieldError.wrappedValue {
-                                Text(responseError)
-                                    .textStyle(weight: .bold, color: .red, size: 10)
-                            }
-                            
                             VStack(spacing: 5) {
                                 HStack(spacing: 0) {
-                                    TextField("", text: $viewModel.response, prompt: Text("bet_creation_response_title")
+                                    TextField("", text: $response, prompt: Text("bet_creation_response_title")
                                         .foregroundColor(AllInColors.lightGrey200Color)
                                         .font(.system(size: 16))
                                         .fontWeight(.medium))
-                                    .autocorrectionDisabled(true)
                                     .padding()
                                     .background(
                                         Rectangle()
@@ -397,17 +400,17 @@ struct CreationBetView: View {
                                     )
                                     .frame(width: 250, height: 38)
                                     .foregroundColor(.black)
-                                    .onChange(of: viewModel.response) { newValue in
+                                    .onChange(of: response) { newValue in
                                         if newValue.count > 20 {
-                                            viewModel.response = String(newValue.prefix(20))
+                                            response = String(newValue.prefix(20))
                                         }
                                     }
                                     
                                     Button(action: {
-                                        if !viewModel.response.isEmpty && viewModel.values.count < 5 {
+                                        if !response.isEmpty && values.count < 5 {
-                                            viewModel.values.append(viewModel.response)
+                                            values.append(response)
                                             updateGroupedItems()
-                                            viewModel.response = ""
+                                            response = ""
                                         }
                                     }) {
                                         Text("generic_add")
@@ -420,12 +423,12 @@ struct CreationBetView: View {
                                 }
                                 HStack {
                                     Spacer()
-                                    Text(String(localized: "bet_creation_max_answers \(5 - viewModel.values.count)"))
+                                    Text(String(localized: "bet_creation_max_answers \(5 - values.count)"))
                                         .textStyle(weight: .regular, color: AllInColors.primaryTextColor, size: 12)
                                     
                                 }
                                 VStack(spacing: 10) {
-                                    ForEach(viewModel.groupedItems, id: \.self) { items in
+                                    ForEach(groupedItems, id: \.self) { items in
                                         HStack {
                                             ForEach(items, id: \.self) { text in
                                                 HStack {
@@ -433,8 +436,8 @@ struct CreationBetView: View {
                                                         .foregroundColor(.white)
                                                         .lineLimit(1)
                                                     Button(action: {
-                                                        if let index = viewModel.values.firstIndex(of: text) {
+                                                        if let index = values.firstIndex(of: text) {
-                                                            viewModel.values.remove(at: index)
+                                                            values.remove(at: index)
                                                             updateGroupedItems()
                                                         }
                                                     }) {

Sources/AllInApp/AllIn/Views/DetailsView.swift

@@ -57,117 +57,97 @@ struct DetailsView: View {
                 }
                 .padding(.horizontal, 15)
                 .background(StatusValues.1)
-                if viewModel.betDetail != nil{
+                
-                    ScrollView {
+                VStack(spacing: 0) {
-                        VStack(alignment: .leading, spacing: 0) {
+                    VStack(alignment: .leading, spacing: 5) {
-                            HStack(spacing: 3) {
+                        HStack(spacing: 3) {
-                                Spacer()
+                            Spacer()
-                                Text("bet_proposed_by_format")
+                            Text("bet_proposed_by_format")
-                                    .font(.system(size: 10))
+                                .font(.system(size: 10))
-                                    .foregroundColor(AllInColors.grey800Color)
-                                Text((viewModel.betDetail?.bet.author ?? "Unknown").capitalized)
-                                    .font(.system(size: 10))
-                                    .fontWeight(.semibold)
-                                    .foregroundColor(AllInColors.primaryTextColor)
-                                
-                            }
-                            Text(viewModel.betDetail?.bet.theme ?? "Not loaded")
-                                .font(.system(size: 15))
                                 .foregroundColor(AllInColors.grey800Color)
-                            Text(viewModel.betDetail?.bet.phrase ?? "Not loaded")
+                            Text((viewModel.betDetail?.bet.author ?? "Unknown").capitalized)
-                                .font(.system(size: 20))
+                                .font(.system(size: 10))
-                                .fontWeight(.bold)
+                                .fontWeight(.semibold)
-                                .padding(.bottom, 10)
+                                .foregroundColor(AllInColors.primaryTextColor)
-                            HStack {
+                            
-                                HStack {
+                        }
-                                    Spacer()
+                        Text(viewModel.betDetail?.bet.theme ?? "Not loaded")
-                                    Text("bet_starting")
+                            .font(.system(size: 15))
-                                        .font(.system(size: 15))
+                            .foregroundColor(AllInColors.grey800Color)
-                                        .foregroundColor(AllInColors.grey800Color)
+                        Text(viewModel.betDetail?.bet.phrase ?? "Not loaded")
-                                }
+                            .font(.system(size: 20))
-                                .frame(width: 105)
+                            .fontWeight(.bold)
-                                .padding(.trailing, 10)
+                            .padding(.bottom, 10)
-                                TextCapsule(date: viewModel.betDetail?.bet.endRegisterDate ?? Date())
+                        HStack {
-                                Spacer()
-                                
-                            }.padding(.bottom, 10)
                             HStack {
-                                HStack {
-                                    Spacer()
-                                    Text("bet_ends")
-                                        .font(.system(size: 15))
-                                        .foregroundColor(AllInColors.grey800Color)
-                                }
-                                .frame(width: 105)
-                                .padding(.trailing, 10)
-                                TextCapsule(date: viewModel.betDetail?.bet.endBetDate ?? Date())
                                 Spacer()
+                                Text("bet_starting")
+                                    .font(.system(size: 15))
+                                    .foregroundColor(AllInColors.grey800Color)
                             }
-                        }
+                            .frame(width: 105)
-                        .padding(.all, 15)
+                            .padding(.trailing, 10)
-                        .padding(.top, 6)
+                            TextCapsule(date: viewModel.betDetail?.bet.endRegisterDate ?? Date())
-                        .border(width: 1, edges: [.bottom], color: AllInColors.delimiterGrey)
+                            Spacer()
-                        .background(AllInColors.componentBackgroundColor)
-                        .cornerRadius(20, corners: [.topLeft,.topRight])
-                        
-                        if isFinished {
-                            ResultBanner(finalAnswer: (viewModel.betDetail?.wonParticipation)!, odds: (viewModel.betDetail?.odds)!)
-                        }
-                        VStack(alignment: .leading, spacing: 0) {
-                            if let bet = viewModel.betDetail{
-                                BetLineLoading(bet: bet).padding(.vertical, 20)
-                                
-                            }
-                            Text("bet_status_participants_list")
-                                .font(.system(size: 18))
-                                .foregroundStyle(AllInColors.grey100Color)
-                                .fontWeight(.bold)
-                                .padding(.bottom, 10)
                             
-                            ForEach(viewModel.betDetail?.participations ?? []) { participation in
+                        }.padding(.bottom, 10)
-                                UserInfo(username: participation.username, picture: nil , value: participation.stake).padding(.horizontal, 10)
+                        HStack {
+                            HStack {
+                                Spacer()
+                                Text("bet_ends")
+                                    .font(.system(size: 15))
+                                    .foregroundColor(AllInColors.grey800Color)
                             }
-                            .padding(.bottom)
+                            .frame(width: 105)
-                            
+                            .padding(.trailing, 10)
+                            TextCapsule(date: viewModel.betDetail?.bet.endBetDate ?? Date())
                             Spacer()
                         }
-                        .padding([.trailing,.leading], 15)
-                        .padding(.bottom, 100)
-                        
                     }
-                    .frame(maxWidth: .infinity, maxHeight: (geometry.size.height + geometry.safeAreaInsets.bottom) - 50)
+                    .padding(.all, 15)
-                    .background(AllInColors.underComponentBackgroundColor)
+                    .padding(.vertical, 10)
-                    .cornerRadius(15, corners: [.topLeft, .topRight])
+                    .background(AllInColors.componentBackgroundColor)
-                }
+                    .cornerRadius(20, corners: [.topLeft,.topRight]).padding(.bottom,0)
-                else{
+                    
-                    ScrollView {
+                    if isFinished {
-                        HStack(alignment: .center){
+                        ResultBanner(finalAnswer: (viewModel.betDetail?.wonParticipation)!, odds: (viewModel.betDetail?.odds)!)
-                            Spacer()
+                    }
-                            Image(systemName: "exclamationmark.triangle.fill").font(.system(size: 45))
+                    VStack(alignment: .leading, spacing: 5) {
-                            VStack(alignment:.leading){
+                        BetLineLoading(participations: viewModel.betDetail?.participations ?? [])
-                                Text("error_title").font(.system(size: 10))
+                            .padding(.vertical,15)
-                                Text("error_message").font(.system(size: 10))
+                        Text("bet_status_participants_list")
+                            .font(.system(size: 18))
+                            .foregroundStyle(AllInColors.grey100Color)
+                            .fontWeight(.bold)
+                            .padding(.bottom, 10)
+                        ScrollView(showsIndicators: false) {
+                            ForEach(viewModel.betDetail?.participations ?? []) { participation in
+                                UserInfo(username: participation.username, value: participation.stake).padding(.horizontal, 10)
                             }
-                            Spacer()
+                        }
-                        }.opacity(0.6)
+                        .padding(.bottom, geometry.safeAreaInsets.bottom + 28)
-                            .padding(.vertical, 20)
                         
+                        Spacer()
                     }
-                    .frame(maxWidth: .infinity, maxHeight: (geometry.size.height + geometry.safeAreaInsets.bottom) - 50)
+                    .padding([.bottom,.trailing,.leading], 15)
                     .background(AllInColors.underComponentBackgroundColor)
-                    .cornerRadius(15, corners: [.topLeft, .topRight])
+                    .border(width: 1, edges: [.top], color: AllInColors.delimiterGrey)
+                    Spacer()
+                    
                 }
+                .frame(maxWidth: .infinity, maxHeight: (geometry.size.height + geometry.safeAreaInsets.bottom) - 50)
+                .background(AllInColors.componentBackgroundColor)
+                .cornerRadius(15, corners: [.topLeft, .topRight])
                 
                 ParticipateButton(isOpen: $isModalPresented, isParticapatedOpen: $isModalParticipated, bet: viewModel.betDetail?.bet)
                     .padding(.bottom, geometry.safeAreaInsets.bottom + 5)
                     .padding(.horizontal, 10)
             }
             .sheet(isPresented: $isModalParticipated) {
-                ParticipationModal(selectedAnswer: $viewModel.selectedAnswer, mise: $viewModel.mise, phrase: viewModel.betDetail?.bet.phrase ?? "", answers: viewModel.betDetail?.answers ?? [], participationAddedCallback: {
+                ParticipationModal(answer: $viewModel.answer, mise: $viewModel.mise, description: viewModel.betDetail?.bet.phrase ?? "Not loaded", participationAddedCallback: {
                     viewModel.addParticipate()
                     isModalParticipated.toggle()
-                },
+                })
-                                   checkAndSetError: viewModel.checkAndSetError)
                 .presentationDetents([.fraction(0.55)])
             }
             .edgesIgnoringSafeArea(.bottom)

Sources/AllInApp/AllIn/Views/FriendsView.swift

@@ -64,26 +64,22 @@ struct FriendsView: View {
                 }
                 .padding(.top, 50)
                 .tag(0)
-                ScrollView{
+                VStack(alignment: .center, spacing: 0) {
-                    VStack(alignment: .center, spacing: 0) {
+                    if(viewModel.requests.isEmpty){
-                        if(viewModel.requests.isEmpty){
+                        EmptyInfo(emoji:"📬", title: "Aucune demande d'amis en attente", explain: "").padding(.top, 40)
-                            EmptyInfo(emoji:"📬", title: "Aucune demande d'amis en attente", explain: "").padding(.top, 40)
+                    }
-                        }
+                    else{
-                        else{
+                        ScrollView(showsIndicators: false){
-                            ScrollView(showsIndicators: false){
+                            ForEach(viewModel.requests, id: \.self) { request in
-                                ForEach(viewModel.requests, id: \.self) { request in
+                                Friend(user: request, isRequest: true, viewModel: viewModel)
-                                    Friend(user: request, isRequest: true, viewModel: viewModel)
-                                }
-                            }
-                            .refreshable {
-                                viewModel.getRequests()
                             }
-                            .padding(.top, 25)
                         }
-                        Spacer()
+                        .refreshable {
+                            viewModel.getRequests()
+                        }
+                        .padding(.top, 25)
                     }
-                }.refreshable {
+                    Spacer()
-                    viewModel.getRequests()
                 }
                 .padding(.top, 50)
                 .tag(1)

Sources/AllInApp/AllIn/Views/MainView.swift

@@ -60,8 +60,8 @@ struct MainView: View {
                 
                 if self.showMenu {
                     Menu()
-                        .transition(.move(edge: .leading))
                         .frame(width: geometry.size.width*0.83)
+                        .transition(.move(edge: .leading))
                 }
                 
             }

Sources/AllInApp/AllIn/Views/RankingView.swift

@@ -51,7 +51,7 @@ struct RankingView: View {
                             .cornerRadius(41.5, corners: .topLeft)
                             .cornerRadius(8, corners: .topRight)
                             .cornerRadius(15, corners: [.bottomLeft, .bottomRight])
-                            UserPicture(picture: viewModel.friends[0].image, username: viewModel.friends[0].username, size: 70)
+                            UserPicture(picture: nil, username: viewModel.friends[0].username, size: 70)
                                 .offset(x: 0, y: -55)
                             
                             Text("1")
@@ -95,7 +95,7 @@ struct RankingView: View {
                             .cornerRadius(8, corners: .topLeft)
                             .cornerRadius(15, corners: [.bottomLeft, .bottomRight])
                             
-                            UserPicture(picture: viewModel.friends[1].image, username: viewModel.friends[1].username, size: 50)
+                            UserPicture(picture: nil, username: viewModel.friends[1].username, size: 50)
                                 .offset(x: 0, y: -50)
                             
                             Text("2")
@@ -122,14 +122,13 @@ struct RankingView: View {
                             let friend = viewModel.friends[index]
                             RankingRow(
                                 number: index + 1,
-                                image: friend.image,
+                                image: "defaultUserImage",
                                 pseudo: friend.username,
                                 allCoins: friend.nbCoins
                             )
                         }
                     }
                     .padding(.top, 10)
-                    .padding(.horizontal, 20)
                 }
                 Spacer()
             }

Sources/AllInApp/AllInApp.xcodeproj/project.pbxproj

@@ -9,15 +9,12 @@
 /* Begin PBXBuildFile section */
 		120919182B56D0AE00D0FA29 /* ParticipationModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 120919172B56D0AE00D0FA29 /* ParticipationModal.swift */; };
 		1209191A2B56DC6C00D0FA29 /* DropDownAnswerMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 120919192B56DC6C00D0FA29 /* DropDownAnswerMenu.swift */; };
-		12228A212C1760D2008524F4 /* BinaryBetLine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12228A202C1760D2008524F4 /* BinaryBetLine.swift */; };
-		12228A232C176117008524F4 /* CustomBetLine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12228A222C176117008524F4 /* CustomBetLine.swift */; };
 		123225D92B67B46100D30BB3 /* BetEndingValidationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123225D82B67B46100D30BB3 /* BetEndingValidationView.swift */; };
 		123225DB2B67E41400D30BB3 /* ChoiceFinalAnswerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123225DA2B67E41400D30BB3 /* ChoiceFinalAnswerCell.swift */; };
 		123590B42B51792000F7AEBD /* DetailsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123590B32B51792000F7AEBD /* DetailsView.swift */; };
 		123590B62B5537E200F7AEBD /* ResultBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123590B52B5537E200F7AEBD /* ResultBanner.swift */; };
 		123590B82B5541BA00F7AEBD /* ParticipateButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123590B72B5541BA00F7AEBD /* ParticipateButton.swift */; };
 		123F31DB2C0F26E8009B6D65 /* userPicture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123F31DA2C0F26E8009B6D65 /* userPicture.swift */; };
-		123F31E02C11E99E009B6D65 /* asyncCachedImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123F31DF2C11E99E009B6D65 /* asyncCachedImage.swift */; };
 		1244EF602B4EC31E00374ABF /* HistoricBetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1244EF5F2B4EC31E00374ABF /* HistoricBetView.swift */; };
 		1244EF622B4EC67000374ABF /* ReviewCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1244EF612B4EC67000374ABF /* ReviewCard.swift */; };
 		129D051D2B6E7FF0003D3E08 /* OddCapsule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 129D051C2B6E7FF0003D3E08 /* OddCapsule.swift */; };
@@ -151,15 +148,12 @@
 		120919192B56DC6C00D0FA29 /* DropDownAnswerMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DropDownAnswerMenu.swift; sourceTree = "<group>"; };
 		122278B72B4BDE1100E632AA /* DependencyInjection.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DependencyInjection.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		122278B92B4BDE9500E632AA /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Package.swift; path = ../Model/Package.swift; sourceTree = "<group>"; };
-		12228A202C1760D2008524F4 /* BinaryBetLine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BinaryBetLine.swift; sourceTree = "<group>"; };
-		12228A222C176117008524F4 /* CustomBetLine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomBetLine.swift; sourceTree = "<group>"; };
 		123225D82B67B46100D30BB3 /* BetEndingValidationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BetEndingValidationView.swift; sourceTree = "<group>"; };
 		123225DA2B67E41400D30BB3 /* ChoiceFinalAnswerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChoiceFinalAnswerCell.swift; sourceTree = "<group>"; };
 		123590B32B51792000F7AEBD /* DetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailsView.swift; sourceTree = "<group>"; };
 		123590B52B5537E200F7AEBD /* ResultBanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResultBanner.swift; sourceTree = "<group>"; };
 		123590B72B5541BA00F7AEBD /* ParticipateButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParticipateButton.swift; sourceTree = "<group>"; };
 		123F31DA2C0F26E8009B6D65 /* userPicture.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = userPicture.swift; sourceTree = "<group>"; };
-		123F31DF2C11E99E009B6D65 /* asyncCachedImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = asyncCachedImage.swift; sourceTree = "<group>"; };
 		1244EF5F2B4EC31E00374ABF /* HistoricBetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoricBetView.swift; sourceTree = "<group>"; };
 		1244EF612B4EC67000374ABF /* ReviewCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewCard.swift; sourceTree = "<group>"; };
 		129D051C2B6E7FF0003D3E08 /* OddCapsule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OddCapsule.swift; sourceTree = "<group>"; };
@@ -280,14 +274,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		123F31DE2C11E979009B6D65 /* Utils */ = {
-			isa = PBXGroup;
-			children = (
-				123F31DF2C11E99E009B6D65 /* asyncCachedImage.swift */,
-			);
-			path = Utils;
-			sourceTree = "<group>";
-		};
 		EC1D15402B715A7A0094833E /* Protocols */ = {
 			isa = PBXGroup;
 			children = (
@@ -323,7 +309,6 @@
 		EC6B969A2B24B4CC00FC1C58 /* AllIn */ = {
 			isa = PBXGroup;
 			children = (
-				123F31DE2C11E979009B6D65 /* Utils */,
 				ECF872852B93B9D900F9D240 /* AllIn.entitlements */,
 				EC7EF7462B87E3470022B5D9 /* QuickActions */,
 				ECB7BC662B2F1AAD002A6654 /* ViewModels */,
@@ -448,8 +433,6 @@
 				129D051C2B6E7FF0003D3E08 /* OddCapsule.swift */,
 				12A9E4932C07132600AB8677 /* EmptyInfo.swift */,
 				123F31DA2C0F26E8009B6D65 /* userPicture.swift */,
-				12228A202C1760D2008524F4 /* BinaryBetLine.swift */,
-				12228A222C176117008524F4 /* CustomBetLine.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -681,7 +664,6 @@
 			files = (
 				EC6B96CC2B24B7E500FC1C58 /* IAuthService.swift in Sources */,
 				ECB26A172B4073F100FE06B3 /* CreationBetViewModel.swift in Sources */,
-				12228A232C176117008524F4 /* CustomBetLine.swift in Sources */,
 				EC3077092B24CF7F0060E34D /* Colors.swift in Sources */,
 				EC6B969E2B24B4CC00FC1C58 /* ContentView.swift in Sources */,
 				EC89F7BD2B250D66003821CE /* LoginView.swift in Sources */,
@@ -694,7 +676,6 @@
 				EC6B969C2B24B4CC00FC1C58 /* AllInApp.swift in Sources */,
 				123590B42B51792000F7AEBD /* DetailsView.swift in Sources */,
 				ECB26A192B40744F00FE06B3 /* RankingViewModel.swift in Sources */,
-				123F31E02C11E99E009B6D65 /* asyncCachedImage.swift in Sources */,
 				EC650A502B2793D5003AFCAD /* TextCapsule.swift in Sources */,
 				EC650A482B25DCFF003AFCAD /* UsersPreview.swift in Sources */,
 				EC17A15E2B6A955E008A8679 /* CurrentBetView.swift in Sources */,
@@ -728,7 +709,6 @@
 				EC01937E2B25C52E005D81E6 /* TopBar.swift in Sources */,
 				ECA9D1CB2B2DA2320076E0EC /* DropDownFriends.swift in Sources */,
 				123590B82B5541BA00F7AEBD /* ParticipateButton.swift in Sources */,
-				12228A212C1760D2008524F4 /* BinaryBetLine.swift in Sources */,
 				EC01FCC32B56650400BB2390 /* DetailsViewModel.swift in Sources */,
 				ECB26A1B2B40746C00FE06B3 /* FriendsViewModel.swift in Sources */,
 				ECB7BC682B2F1ADF002A6654 /* LoginViewModel.swift in Sources */,
@@ -936,7 +916,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"AllIn/Preview Content\"";
-				DEVELOPMENT_TEAM = P39ZK4GA2T;
+				DEVELOPMENT_TEAM = 35KQ5BDC64;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_CFBundleDisplayName = "All In";
@@ -970,7 +950,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"AllIn/Preview Content\"";
-				DEVELOPMENT_TEAM = P39ZK4GA2T;
+				DEVELOPMENT_TEAM = 35KQ5BDC64;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_CFBundleDisplayName = "All In";
@@ -1074,7 +1054,7 @@
 				CODE_SIGN_ENTITLEMENTS = AllInWidgetsExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = P39ZK4GA2T;
+				DEVELOPMENT_TEAM = 35KQ5BDC64;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AllInWidgets/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = AllInWidgets;
@@ -1102,7 +1082,7 @@
 				CODE_SIGN_ENTITLEMENTS = AllInWidgetsExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = P39ZK4GA2T;
+				DEVELOPMENT_TEAM = 35KQ5BDC64;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AllInWidgets/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = AllInWidgets;

Sources/Api/Sources/Api/Factory/FactoryApiBet.swift

@@ -24,7 +24,7 @@ public class FactoryApiBet: FactoryBet {
             "endRegistration": formatZonedDateTime(dateTime: bet.endRegisterDate),
             "endBet": formatZonedDateTime(dateTime: bet.endBetDate),
             "isPrivate": String(bet.isPrivate),
-            "response": bet.getResponses(),
+            "response": ["Yes","No"],
             "userInvited": bet.invited,
             "type": betTypeString(fromType: String(describing: type(of: bet)))
         ]

Sources/Api/Sources/Api/UserApiManager.swift

@@ -67,6 +67,7 @@ public struct UserApiManager: UserDataManager {
                 print ("ALLIN : get bets won")
                 do {
                     if let httpResponse = response as? HTTPURLResponse, let jsonArray = try JSONSerialization.jsonObject(with: data, options: []) as? [[String: Any]] {
+                        print(jsonArray)
                         for json in jsonArray {
                             if let bet = FactoryApiBet().toBetResultDetail(from: json) {
                                 print(bet)

Sources/DependencyInjection/DependencyInjection.xcodeproj/project.pbxproj

@@ -343,7 +343,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = P39ZK4GA2T;
+				DEVELOPMENT_TEAM = 35KQ5BDC64;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -382,7 +382,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = P39ZK4GA2T;
+				DEVELOPMENT_TEAM = 35KQ5BDC64;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";

Sources/Model/Sources/Model/AnswerDetail.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 /// A class representing detailed information about a specific answer option for a bet.
-public class AnswerDetail: ObservableObject, Codable, Equatable, Identifiable, Hashable {
+public class AnswerDetail: ObservableObject, Identifiable, Codable {
     
     /// The response or outcome associated with this answer.
     public private(set) var response: String
@@ -41,19 +41,4 @@ public class AnswerDetail: ObservableObject, Codable, Equatable, Identifiable, H
         self.odds = odds
     }
     
-    public static func == (lhs: AnswerDetail, rhs: AnswerDetail) -> Bool {
-        return lhs.response == rhs.response &&
-        lhs.totalStakes == rhs.totalStakes &&
-        lhs.totalParticipants == rhs.totalParticipants &&
-        lhs.highestStake == rhs.highestStake &&
-        lhs.odds == rhs.odds
-    }
-    
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(response)
-        hasher.combine(totalStakes)
-        hasher.combine(totalParticipants)
-        hasher.combine(highestStake)
-        hasher.combine(odds)
-    }
 }

Sources/Model/Sources/Model/Bet.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 /// A class representing a betting entity, including details about the bet theme, participants, and deadlines.
-public class Bet: ObservableObject, Codable {
+public class Bet: ObservableObject, Identifiable, Codable {
     
     /// The id for the bet.
     public private(set) var id: String
@@ -112,11 +112,4 @@ public class Bet: ObservableObject, Codable {
         self.author = author
     }
     
-    /// Function that returns an empty list of responses
-    ///
-    /// - Returns: An empty list of responses
-    public func getResponses() -> [String] {
-        return []
-    }
-    
 }

Sources/Model/Sources/Model/CustomBet.swift

@@ -10,21 +10,4 @@ import Foundation
 /// A subclass of Bet that represents a custom bet, allowing users to define their own parameters and rules.
 public class CustomBet: Bet {
     
-    /// List of custom responses
-    private var customResponses: [String] = []
-    
-    /// Override the getResponses function to return custom responses
-    ///
-    /// - Returns: A list of custom responses
-    public override func getResponses() -> [String] {
-        return customResponses
-    }
-    
-    /// Add a custom response
-    ///
-    /// - Parameter response: The custom response to add
-    public func addCustomResponse(_ response: String) {
-        customResponses.append(response)
-    }
-    
 }