Merge branch 'master' into master-ios
This commit is contained in:
@@ -36,10 +36,12 @@ struct CreateSimpleXAddress: View {
|
||||
shareQRCodeButton(userAddress)
|
||||
.frame(maxWidth: .infinity)
|
||||
|
||||
Spacer()
|
||||
|
||||
shareViaEmailButton(userAddress)
|
||||
.frame(maxWidth: .infinity)
|
||||
if MFMailComposeViewController.canSendMail() {
|
||||
Spacer()
|
||||
|
||||
shareViaEmailButton(userAddress)
|
||||
.frame(maxWidth: .infinity)
|
||||
}
|
||||
|
||||
Spacer()
|
||||
|
||||
|
||||
@@ -192,7 +192,9 @@ struct UserAddressView: View {
|
||||
Section {
|
||||
QRCode(uri: userAddress.connReqContact)
|
||||
shareQRCodeButton(userAddress)
|
||||
shareViaEmailButton(userAddress)
|
||||
if MFMailComposeViewController.canSendMail() {
|
||||
shareViaEmailButton(userAddress)
|
||||
}
|
||||
shareWithContactsButton()
|
||||
autoAcceptToggle()
|
||||
learnMoreButton()
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
name: simplex-chat
|
||||
version: 5.0.0.2
|
||||
version: 5.1.0.0
|
||||
#synopsis:
|
||||
#description:
|
||||
homepage: https://github.com/simplex-chat/simplex-chat#readme
|
||||
|
||||
@@ -5,7 +5,7 @@ cabal-version: 1.12
|
||||
-- see: https://github.com/sol/hpack
|
||||
|
||||
name: simplex-chat
|
||||
version: 5.0.0.2
|
||||
version: 5.1.0.0
|
||||
category: Web, System, Services, Cryptography
|
||||
homepage: https://github.com/simplex-chat/simplex-chat#readme
|
||||
author: simplex.chat
|
||||
|
||||
Reference in New Issue
Block a user