Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
radeknovis committed Oct 18, 2023
1 parent d4e8924 commit 95573d3
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
6 changes: 4 additions & 2 deletions Sample/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -322,14 +322,15 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Example/Example.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_ASSET_PATHS = "\"Example/Preview Content\"";
DEVELOPMENT_TEAM = W5R8AG9K22;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Example/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Web3Modal Sample";
INFOPLIST_KEY_NSCameraUsageDescription = "Web3Modal requires access to your phone’s camera.";
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES;
"INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES;
Expand Down Expand Up @@ -363,14 +364,15 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Example/Example.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_ASSET_PATHS = "\"Example/Preview Content\"";
DEVELOPMENT_TEAM = W5R8AG9K22;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Example/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Web3Modal Sample";
INFOPLIST_KEY_NSCameraUsageDescription = "Web3Modal requires access to your phone’s camera.";
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES;
"INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES;
Expand Down
5 changes: 4 additions & 1 deletion Sample/Example/ExampleApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ import SwiftUI
import Web3Modal
import WalletConnectSign

#if DEBUG
import Atlantis
#endif

@main
struct ExampleApp: App {
init() {

#if DEBUG
Atlantis.start()
#endif

let metadata = AppMetadata(
name: "Web3Modal Swift Dapp",
Expand All @@ -26,7 +30,6 @@ struct ExampleApp: App {

Web3Modal.configure(
projectId: projectId,
chainId: Blockchain("eip155:1")!,
metadata: metadata
)
}
Expand Down
6 changes: 3 additions & 3 deletions Sources/Web3Modal/Screens/GetAWalletView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ struct GetAWalletView: View {
Text(wallet.name)
})
.buttonStyle(W3MListSelectStyle(
imageContent: {
AsyncImage(url: URL(string: "https://api.web3modal.com/getWalletImage/\(wallet.imageId)")) { image in
imageContent: { _ in
AsyncImage(url: URL(string: "https://api.web3modal.com/getWalletImage/\(wallet.imageId)")) { image in
image.resizable()
} placeholder: {
Image.Wallet
Expand All @@ -32,7 +32,7 @@ struct GetAWalletView: View {
Text("Explorer all")
})
.buttonStyle(W3MListSelectStyle(
imageContent: {
imageContent: { _ in
W3MAllWalletsImage(images: [
.init(image: Image("MockWalletImage", bundle: .UIModule), walletName: "Metamask"),
.init(image: Image("MockWalletImage", bundle: .UIModule), walletName: "Trust"),
Expand Down
8 changes: 4 additions & 4 deletions Sources/Web3Modal/Sheets/Web3ModalView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct Web3ModalView: View {
EmptyView()
case .getWallet:
GetAWalletView(
wallets: Wallet.stubList
wallets: []
)
}
}
Expand Down Expand Up @@ -88,7 +88,7 @@ struct Web3ModalView: View {
Text("WalletConnect")
})
.buttonStyle(W3MListSelectStyle(
imageContent: {
imageContent: { _ in
ZStack {
Color.Blue100

Expand All @@ -105,7 +105,7 @@ struct Web3ModalView: View {
Text("Rainbow")
})
.buttonStyle(W3MListSelectStyle(
imageContent: { Image("MockWalletImage", bundle: .UIModule).resizable() }
imageContent: { _ in Image("MockWalletImage", bundle: .UIModule).resizable() }
))

Button(action: {
Expand All @@ -114,7 +114,7 @@ struct Web3ModalView: View {
Text("All wallets")
})
.buttonStyle(W3MListSelectStyle(
imageContent: {
imageContent: { _ in
W3MAllWalletsImage(images: [
.init(image: Image("MockWalletImage", bundle: .UIModule), walletName: "Metamask"),
.init(image: Image("MockWalletImage", bundle: .UIModule), walletName: "Trust"),
Expand Down

0 comments on commit 95573d3

Please sign in to comment.