fix: merge conflicts with main branch

.gitignore

@@ -41,5 +41,9 @@ Modules/litewallet-partner-api-ios
 litewallet-partner-api-ios
 /partner-keys.plist
 partner-keys.plist
+<<<<<<< HEAD
 GoogleService-Info.plist
 *.gpx
+=======
+GoogleService-Info.plist
+>>>>>>> main

litewallet/AlertFailureView.swift

@@ -0,0 +1,51 @@
+import SwiftUI
+
+struct AlertFailureView: View {
+	let alertFailureType: AlertFailureType
+
+	let errorMessage: String
+
+	init(alertFailureType: AlertFailureType, errorMessage: String) {
+		self.alertFailureType = alertFailureType
+		self.errorMessage = errorMessage
+	}
+
+	var body: some View {
+		VStack {
+			Text(alertFailureType.header)
+				.foregroundColor(.white)
+				.font(Font(UIFont.barlowBold(size: 18.0)))
+				.padding()
+
+			Divider()
+				.frame(maxHeight: 1.0)
+				.background(Color(UIColor.transparentWhite))
+
+			Image(systemName: "nosign")
+				.resizable()
+				.aspectRatio(contentMode: .fit)
+				.frame(width: 40,
+				       height: 40,
+				       alignment: /*@START_MENU_TOKEN@*/ .center/*@END_MENU_TOKEN@*/)
+				.foregroundColor(.white)
+				.padding()
+
+			Text(self.errorMessage.localizedCapitalized)
+				.foregroundColor(.white)
+				.font(Font(UIFont.barlowSemiBold(size: 16.0)))
+				.padding(.bottom, 60)
+		}
+		.background(Color(UIColor.gray))
+		.cornerRadius(6.0)
+	}
+}
+
+struct AlertFailureView_Previews: PreviewProvider {
+	static let alert = AlertFailureType.failedResolution
+	static let errorMessage = "Test Error"
+
+	static var previews: some View {
+		AlertFailureView(alertFailureType: alert, errorMessage: errorMessage)
+			.environment(\.locale, .init(identifier: "en"))
+	}
+}

litewallet/Assets.xcassets/Branding/Logo.imageset/Contents.json

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

litewallet/Assets.xcassets/Branding/Logo_ltcnew.imageset/Contents.json

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

litewallet/Assets.xcassets/Branding/NewLogo/new-logo-white.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Litewallet_white_icon_355.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Litewallet-fin_white_icon711.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Litewallet_white_icon.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

litewallet/Assets.xcassets/Branding/NewLogo/newLogo-clear.imageset/Contents.json

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

litewallet/Assets.xcassets/Branding/NewLogo/newLogo-white-background.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "litewallet-logotype_white-100.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "litewallet-logotype_white-200.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "litewallet-logotype_white-300.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

litewallet/Assets.xcassets/Branding/NewLogo/newLogotyoe-white.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Screenshot 2023-12-12 at 12.16.04 PM.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

litewallet/Assets.xcassets/Branding/NewLogo/newLogotype-clear-background.imageset/Contents.json

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

litewallet/Assets.xcassets/Branding/launchLiteWalletImage.imageset/Contents.json

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

litewallet/Assets.xcassets/Branding/lofigirl.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Screenshot 2023-12-12 at 12.16.04 PM.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

litewallet/Assets.xcassets/MenuButtonIcon.imageset/Contents.json

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

litewallet/Assets.xcassets/MenuIcons/Profile.imageset/Contents.json

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

litewallet/Assets.xcassets/MenuIcons/buy_icon_gray.imageset/Contents.json

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

litewallet/Assets.xcassets/Particle Sprite Atlas.spriteatlas/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

litewallet/Assets.xcassets/Particle Sprite Atlas.spriteatlas/bokeh.imageset/Contents.json

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

litewallet/Assets.xcassets/Particle Sprite Atlas.spriteatlas/spark.imageset/Contents.json

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