ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 22:25:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a8628602dd0b1eac81b20233d82be9bfe27cd05e'

Browse Source 
Wallet improvements
This commit is contained in:
Peter
2019-09-27 18:28:42 +04:00
parent 3c8823a70c a8628602dd
commit bfe58ca788
84 changed files with 6179 additions and 4401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
submodules/SettingsUI/Sources/SettingsController.swift
View File

@@ -205,9 +205,9 @@ private enum SettingsEntry: ItemListNodeEntry {
return 1010
case .language:
return 1011
case .passport:
return 1012
case .wallet:
return 1012
case .passport:
return 1013
case .watch:
return 1014
@@ -574,12 +574,12 @@ private func settingsEntries(account: Account, presentationData: PresentationDat
let languageName = presentationData.strings.primaryComponent.localizedName
entries.append(.language(presentationData.theme, PresentationResourcesSettings.language, presentationData.strings.Settings_AppLanguage, languageName.isEmpty ? presentationData.strings.Localization_LanguageName : languageName))
if hasWallet {
entries.append(.wallet(presentationData.theme, PresentationResourcesSettings.wallet, "Gram Wallet", ""))
}
if hasPassport {
entries.append(.passport(presentationData.theme, PresentationResourcesSettings.passport, presentationData.strings.Settings_Passport, ""))
}
if hasWallet || experimentalUISettings.wallets {
entries.append(.wallet(presentationData.theme, PresentationResourcesSettings.passport, "Wallet", ""))
}
if hasWatchApp {
entries.append(.watch(presentationData.theme, PresentationResourcesSettings.watch, presentationData.strings.Settings_AppleWatch, ""))
@@ -850,7 +850,7 @@ public func settingsController(context: AccountContext, accountManager: AccountM
let _ = (contextValue.get()
|> deliverOnMainQueue
|> take(1)).start(next: { context in
openWallet(context: context, push: { c in
context.sharedContext.openWallet(context: context, walletContext: .generic, present: { c in
pushControllerImpl?(c)
})
})
@@ -1098,8 +1098,7 @@ public func settingsController(context: AccountContext, accountManager: AccountM
)
)
let hasWallet = .single(false)
|> then(contextValue.get()
let hasWallet = contextValue.get()
|> mapToSignal { context in
return context.account.postbox.preferencesView(keys: [PreferencesKeys.appConfiguration])
|> map { view -> Bool in
@@ -1107,7 +1106,7 @@ public func settingsController(context: AccountContext, accountManager: AccountM
let configuration = WalletConfiguration.with(appConfiguration: appConfiguration)
return configuration.enabled
}
})
}
let hasPassport = ValuePromise<Bool>(false)
let updatePassport: () -> Void = {
@@ -1618,36 +1617,3 @@ private func accountContextMenuItems(context: AccountContext, logout: @escaping
return items
}
}
func openWallet(context: AccountContext, push: @escaping (ViewController) -> Void) {
guard let tonContext = context.tonContext else {
return
}
let _ = (combineLatest(queue: .mainQueue(),
availableWallets(postbox: context.account.postbox),
tonContext.keychain.encryptionPublicKey()
)
|> deliverOnMainQueue).start(next: { wallets, currentPublicKey in
if wallets.wallets.isEmpty {
if let _ = currentPublicKey {
push(WalletSplashScreen(context: context, tonContext: tonContext, mode: .intro))
} else {
push(WalletSplashScreen(context: context, tonContext: tonContext, mode: .secureStorageNotAvailable))
}
} else {
let walletInfo = wallets.wallets[0].info
if let currentPublicKey = currentPublicKey {
if currentPublicKey == walletInfo.encryptedSecret.publicKey {
let _ = (walletAddress(publicKey: walletInfo.publicKey, tonInstance: tonContext.instance)
|> deliverOnMainQueue).start(next: { address in
push(WalletInfoScreen(context: context, tonContext: tonContext, walletInfo: walletInfo, address: address))
})
} else {
push(WalletSplashScreen(context: context, tonContext: tonContext, mode: .secureStorageReset(.changed)))
}
} else {
push(WalletSplashScreen(context: context, tonContext: tonContext, mode: .secureStorageReset(.notAvailable)))
}
}
})
}