Skip to content

removes matic as a valid usdc wallet #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stuartwk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

removes matic as a valid usdc wallet #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...k/Main/Account/Wallets/ConnectWalletSheet/EnterWalletAddress/EnterWalletAddressView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ struct EnterWalletAddressView: View {
UrTextField(
text: $viewModel.walletAddress,
label: "USDC wallet address",
placeholder: "Enter a Solana or Matic USDC wallet address",
supportingText: "USDC addresses on Solana and Polygon are currently supported",
placeholder: "Enter a Solana USDC wallet address",
supportingText: "USDC addresses on Solana are currently supported",
isEnabled: !accountWalletsViewModel.isCreatingWallet,
submitLabel: .continue,
onSubmit: {
Expand Down
11 changes: 3 additions & 8 deletions ...n/Account/Wallets/ConnectWalletSheet/EnterWalletAddress/EnterWalletAddressViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,15 @@ extension EnterWalletAddressView {

private func validateAddress(_ address: String) {
Task {
async let solanaValidation = validateAddress(address, chain: "SOL")
async let maticValidation = validateAddress(address, chain: "MATIC")

let (solanaResult, polygonResult) = await (solanaValidation, maticValidation)
let solanaResult = await validateAddress(address, chain: "SOL")

switch (solanaResult, polygonResult) {
case (.success(let isSolanaValid), .success(let isPolygonValid)):
switch (solanaResult) {
case (.success(let isSolanaValid)):

if isSolanaValid {
self.chain = WalletChain.sol
self.isValidWalletAddress = true
} else if isPolygonValid {
self.chain = WalletChain.matic
self.isValidWalletAddress = true
} else {
self.chain = WalletChain.invalid
self.isValidWalletAddress = false
Expand Down
1 change: 0 additions & 1 deletion app/network/Shared/Models/WalletChain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ import Foundation

enum WalletChain: String {
case sol = "SOL"
case matic = "MATIC"
case invalid = "INVALID"
}
Loading