Skip to content
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

Jump to bottom

Load guardians from backend #2544

Merged
merged 4 commits into from
Aug 16, 2022
Merged

Load guardians from backend #2544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8812bb1
Load guardians from backend
Aug 11, 2022
3b95b1e
Remove file
Aug 11, 2022
563b13b
Rename fields
Aug 12, 2022
999dae5
Fix comment
Aug 15, 2022
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
20 changes: 16 additions & 4 deletions Multisig.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@
0472B2BE286A49420049BA17 /* GuardianListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0472B2BC286A49420049BA17 /* GuardianListViewController.swift */; };
0472B2C3286A497A0049BA17 /* GuardianTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0472B2C1286A497A0049BA17 /* GuardianTableViewCell.swift */; };
0472B2C4286A497A0049BA17 /* GuardianTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0472B2C2286A497A0049BA17 /* GuardianTableViewCell.xib */; };
0472B2C6286A6FB70049BA17 /* Guardians.csv in Resources */ = {isa = PBXBuildFile; fileRef = 0472B2C5286A6FB70049BA17 /* Guardians.csv */; };
0472B2C9286BC5D70049BA17 /* ClaimingAmountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0472B2C7286BC5D70049BA17 /* ClaimingAmountViewController.swift */; };
0472B2CE286BCB530049BA17 /* AvailableClaimingAmountTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0472B2CC286BCB530049BA17 /* AvailableClaimingAmountTableViewCell.swift */; };
0472B2CF286BCB530049BA17 /* AvailableClaimingAmountTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0472B2CD286BCB530049BA17 /* AvailableClaimingAmountTableViewCell.xib */; };
Expand All @@ -116,6 +115,8 @@
047588182774D6D2001DD992 /* ReviewSendFundsTransactionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047588162774D6D2001DD992 /* ReviewSendFundsTransactionViewController.swift */; };
047691592464026400D73D8B /* SectionHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047691582464026400D73D8B /* SectionHeader.swift */; };
0476915D2464034D00D73D8B /* Safe+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0476915B2464034D00D73D8B /* Safe+CoreDataClass.swift */; };
047A5B8F28A54FCB00BB8B2A /* SafeClaimingService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047A5B8E28A54FCB00BB8B2A /* SafeClaimingService.swift */; };
047A5B9128A5582F00BB8B2A /* GuardiansRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047A5B9028A5582F00BB8B2A /* GuardiansRequest.swift */; };
048643B124DAB5D6003DD966 /* RegisterNotificationTokenRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048643B024DAB5D6003DD966 /* RegisterNotificationTokenRequest.swift */; };
048643B324DAB5E3003DD966 /* UnregisterNotificationTokenRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048643B224DAB5E3003DD966 /* UnregisterNotificationTokenRequest.swift */; };
048AA142260D053400382E24 /* MainTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048AA141260D053300382E24 /* MainTabBarViewController.swift */; };
Expand Down Expand Up @@ -1024,7 +1025,6 @@
0472B2BC286A49420049BA17 /* GuardianListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuardianListViewController.swift; sourceTree = "<group>"; };
0472B2C1286A497A0049BA17 /* GuardianTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuardianTableViewCell.swift; sourceTree = "<group>"; };
0472B2C2286A497A0049BA17 /* GuardianTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GuardianTableViewCell.xib; sourceTree = "<group>"; };
0472B2C5286A6FB70049BA17 /* Guardians.csv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Guardians.csv; sourceTree = "<group>"; };
0472B2C7286BC5D70049BA17 /* ClaimingAmountViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClaimingAmountViewController.swift; sourceTree = "<group>"; };
0472B2CC286BCB530049BA17 /* AvailableClaimingAmountTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvailableClaimingAmountTableViewCell.swift; sourceTree = "<group>"; };
0472B2CD286BCB530049BA17 /* AvailableClaimingAmountTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AvailableClaimingAmountTableViewCell.xib; sourceTree = "<group>"; };
Expand All @@ -1037,6 +1037,8 @@
047691582464026400D73D8B /* SectionHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SectionHeader.swift; sourceTree = "<group>"; };
0476915A2464034D00D73D8B /* Safe+CoreDataProperties.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Safe+CoreDataProperties.swift"; sourceTree = "<group>"; };
0476915B2464034D00D73D8B /* Safe+CoreDataClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Safe+CoreDataClass.swift"; sourceTree = "<group>"; };
047A5B8E28A54FCB00BB8B2A /* SafeClaimingService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafeClaimingService.swift; sourceTree = "<group>"; };
047A5B9028A5582F00BB8B2A /* GuardiansRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuardiansRequest.swift; sourceTree = "<group>"; };
048643B024DAB5D6003DD966 /* RegisterNotificationTokenRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterNotificationTokenRequest.swift; sourceTree = "<group>"; };
048643B224DAB5E3003DD966 /* UnregisterNotificationTokenRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnregisterNotificationTokenRequest.swift; sourceTree = "<group>"; };
048AA141260D053300382E24 /* MainTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabBarViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2089,6 +2091,15 @@
path = Settings;
sourceTree = "<group>";
};
047A5B8D28A54FAC00BB8B2A /* Safe Claiming Service */ = {
isa = PBXGroup;
children = (
047A5B8E28A54FCB00BB8B2A /* SafeClaimingService.swift */,
047A5B9028A5582F00BB8B2A /* GuardiansRequest.swift */,
);
path = "Safe Claiming Service ";
sourceTree = "<group>";
};
047A653225ADE8E800AE8845 /* SwiftUI */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -3257,7 +3268,6 @@
children = (
043350AA28086115003725E2 /* Animations */,
0A93DD5F2445CC8B00688050 /* Assets.xcassets */,
0472B2C5286A6FB70049BA17 /* Guardians.csv */,
0A93DDAA244604A400688050 /* Averta-Regular.otf */,
0A93DD642445CC8B00688050 /* LaunchScreen.storyboard */,
);
Expand Down Expand Up @@ -3473,6 +3483,7 @@
5532D4DF2449A4C00067505A /* Services */ = {
isa = PBXGroup;
children = (
047A5B8D28A54FAC00BB8B2A /* Safe Claiming Service */,
5532D4B72449A17D0067505A /* Utils */,
0A9BC33824602E9500EB9C5D /* EthereumNodeService.swift */,
043ABD0924EF0C33008826D5 /* Safe Client Gateway Service */,
Expand Down Expand Up @@ -4339,7 +4350,6 @@
558836712565385F0014E8C7 /* RemoveCell.xib in Resources */,
6AFD26E0285797DD00336FFE /* IdenticonInfoView.xib in Resources */,
6AAE34E0282A2F1600CCFC95 /* OwnerHeaderView.xib in Resources */,
0472B2C6286A6FB70049BA17 /* Guardians.csv in Resources */,
6AAE34E9282A833D00CCFC95 /* EnterOwnerNameViewController.xib in Resources */,
6A386C5D281A7792003FBCB3 /* AddRemoveOwnerTableViewCell.xib in Resources */,
6ADEB01C2795AB410062ADFE /* InfoLabel.xib in Resources */,
Expand Down Expand Up @@ -4788,6 +4798,7 @@
6AFD26DB285764A200336FFE /* ReceiveAddOwnerLinkViewController.swift in Sources */,
0AA9F2552498CC82005BD60F /* DataString.swift in Sources */,
0493A28B262979820056EC49 /* UpdateController.swift in Sources */,
047A5B8F28A54FCB00BB8B2A /* SafeClaimingService.swift in Sources */,
048643B324DAB5E3003DD966 /* UnregisterNotificationTokenRequest.swift in Sources */,
554A16B3266E4D4900807049 /* EIP712Transformer.swift in Sources */,
048D72BF268359E20095999C /* ChainManager.swift in Sources */,
Expand Down Expand Up @@ -4931,6 +4942,7 @@
6AC2D47727EC661D00D422CA /* SignatureRequestToWalletViewController.swift in Sources */,
04AFFBD2282BBE1900429513 /* RemoveOwnerFlow.swift in Sources */,
5596C03E25507F3C00EF23A5 /* CollectibleTableViewCell.swift in Sources */,
047A5B9128A5582F00BB8B2A /* GuardiansRequest.swift in Sources */,
0A3FDAEC26AEB5BF006A7DC3 /* KeyInfo+Shared.swift in Sources */,
04CE3F9924B6120F00826AEE /* CollectibleMetaData.swift in Sources */,
0A0EFCAA246EB28600D3D8BF /* Pasteboard.swift in Sources */,
Expand Down
3 changes: 2 additions & 1 deletion Multisig/Cross-layer/App.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ class App {
lazy var clientGatewayService = SafeClientGatewayService(
url: App.configuration.services.clientGatewayURL,
logger: LogService.shared)

lazy var claimingService = SafeClaimingService(logger: LogService.shared)

var nodeService = EthereumNodeService()

let notificationHandler = RemoteNotificationHandler()
Expand Down
38 changes: 38 additions & 0 deletions Multisig/Data/Services/Safe Claiming Service /GuardiansRequest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
//
// GuardiansRequest.swift
// Multisig
//
// Created by Mouaz on 8/11/22.
// Copyright © 2022 Gnosis Ltd. All rights reserved.
//

import Foundation

struct GuardiansRequest: JSONRequest {
var httpMethod: String { "GET" }

var urlPath: String {
"/api/v1/guardians/"
}

typealias ResponseType = [Guardian]
}

struct Guardian: Decodable {
let name: String?
let reason: String?
let contribution: String?
let address: AddressString
let ens: String?
let imageUrl: String?
let startDate: String?
var imageURL: URL? {
imageUrl == nil ? nil : URL(string: imageUrl!)
}
}

extension SafeClaimingService {
func asyncGuardians(completion: @escaping (Result<GuardiansRequest.ResponseType, Error>) -> Void) -> URLSessionTask? {
asyncExecute(request: GuardiansRequest(), completion: completion)
}
}
32 changes: 32 additions & 0 deletions Multisig/Data/Services/Safe Claiming Service /SafeClaimingService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
//
// SafeClaimingService.swift
// Multisig
//
// Created by Mouaz on 8/11/22.
// Copyright © 2022 Gnosis Ltd. All rights reserved.
//

import Foundation
class SafeClaimingService {
var url: URL
private let httpClient: JSONHTTPClient

var jsonDecoder: JSONDecoder {
httpClient.jsonDecoder
}

init(logger: Logger) {
self.url = URL(string: "https://claim-mobile-api.herokuapp.com")!
httpClient = JSONHTTPClient(url: url, logger: logger)
httpClient.jsonDecoder.dateDecodingStrategy = .millisecondsSince1970
}

@discardableResult
func execute<T: JSONRequest>(request: T) throws -> T.ResponseType {
try httpClient.execute(request: request)
}

func asyncExecute<T: JSONRequest>(request: T, completion: @escaping (Result<T.ResponseType, Error>) -> Void) -> URLSessionTask? {
httpClient.asyncExecute(request: request, completion: completion)
}
}
Loading