chore: Merge master into digital-ocean-dns

pull/213/head
NaiJi ✨ 2023-01-29 08:54:31 +04:00
commit 10593229b2
2 changed files with 6 additions and 2 deletions

View File

@ -133,8 +133,13 @@ class _Card extends StatelessWidget {
Column(
children: [
GestureDetector(
<<<<<<< HEAD
onTap: () => launchURL(
'https://${service.url}',
=======
onTap: () => _launchURL(
service.url,
>>>>>>> master
),
child: Text(
'${service.url}',

View File

@ -55,8 +55,7 @@ class _RecoveryConfirmServerState extends State<RecoveryConfirmServer> {
if (servers != null && servers.isNotEmpty)
Column(
children: [
if (servers.length == 1 ||
(!_isExtended && _isServerFound(servers)))
if (!_isExtended && _isServerFound(servers))
confirmServer(
context,
_firstValidServer(servers),