From 9f351bae2f784623254dabd758af25699bf3f77b Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Mon, 26 Jan 2026 21:03:47 +0100
Subject: [PATCH 01/30] WIP Add network position provider

This commit adds both UDP & TCP sockets under one network provider.
We further differ external provider into bluetooth and network
providers.
---
 app/CMakeLists.txt                            |   2 +
 app/appsettings.cpp                           |   8 +-
 app/position/positionkit.cpp                  |  74 ++++----
 .../providers/bluetoothpositionprovider.cpp   |   4 +-
 .../providers/networkpositionprovider.cpp     | 168 ++++++++++++++++++
 .../providers/networkpositionprovider.h       |  64 +++++++
 .../providers/positionprovidersmodel.cpp      |  11 +-
 .../providers/positionprovidersmodel.h        |   2 +-
 app/qml/gps/MMGpsDataDrawer.qml               |  11 +-
 app/qml/gps/MMPositionProviderPage.qml        |  97 +++++++++-
 app/qml/map/MMMapController.qml               |   4 +-
 app/test/testposition.cpp                     |  10 +-
 app/test/testvariablesmanager.cpp             |   2 +-
 gallery/positionkit.h                         |   2 +-
 14 files changed, 398 insertions(+), 61 deletions(-)
 create mode 100644 app/position/providers/networkpositionprovider.cpp
 create mode 100644 app/position/providers/networkpositionprovider.h

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index e474aa9b2..ed7a78f83 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -32,6 +32,7 @@ set(MM_SRCS
     ios/iosutils.cpp
     position/providers/abstractpositionprovider.cpp
     position/providers/internalpositionprovider.cpp
+    position/providers/networkpositionprovider.cpp
     position/providers/positionprovidersmodel.cpp
     position/providers/simulatedpositionprovider.cpp
     position/tracking/abstracttrackingbackend.cpp
@@ -122,6 +123,7 @@ set(MM_HDRS
     ios/iosutils.h
     position/providers/abstractpositionprovider.h
     position/providers/internalpositionprovider.h
+    position/providers/networkpositionprovider.h
     position/providers/positionprovidersmodel.h
     position/providers/simulatedpositionprovider.h
     position/tracking/abstracttrackingbackend.h
diff --git a/app/appsettings.cpp b/app/appsettings.cpp
index 58e340ec1..e781e108a 100644
--- a/app/appsettings.cpp
+++ b/app/appsettings.cpp
@@ -215,6 +215,7 @@ QVariantList AppSettings::savedPositionProviders() const
     QStringList provider;
     provider << settings.value( "providerName" ).toString();
     provider << settings.value( "providerAddress" ).toString();
+    provider << settings.value( "providerType" ).toString();
     providers.push_back( provider );
   }
 
@@ -238,15 +239,16 @@ void AppSettings::savePositionProviders( const QVariantList &providers )
   {
     QVariantList provider = providers[i].toList();
 
-    if ( provider.length() < 2 )
+    if ( provider.length() < 3 )
     {
       CoreUtils::log( QStringLiteral( "AppSettings" ), QStringLiteral( "Tried to save provider without sufficient data" ) );
       continue;
     }
     settings.setArrayIndex( i );
 
-    settings.setValue( "providerName", providers[i].toList()[0] );
-    settings.setValue( "providerAddress", providers[i].toList()[1] );
+    settings.setValue( "providerName", provider[0] );
+    settings.setValue( "providerAddress", provider[1] );
+    settings.setValue( "providerType", provider[2] );
   }
   settings.endArray();
 }
diff --git a/app/position/positionkit.cpp b/app/position/positionkit.cpp
index 85c6677a5..1e0be92ba 100644
--- a/app/position/positionkit.cpp
+++ b/app/position/positionkit.cpp
@@ -18,6 +18,7 @@
 
 #include "position/providers/internalpositionprovider.h"
 #include "position/providers/simulatedpositionprovider.h"
+#include "providers/networkpositionprovider.h"
 #ifdef ANDROID
 #include "position/providers/androidpositionprovider.h"
 #include <android/log.h>
@@ -128,13 +129,12 @@ AbstractPositionProvider *PositionKit::constructProvider( const QString &type, c
 {
   QString providerType( type );
 
-  // currently the only external provider is bluetooth, so manually set internal provider for platforms that
-  // do not support reading bluetooth serial
+  // set internal provider for platforms that do not support reading bluetooth serial
 #ifndef HAVE_BLUETOOTH
   providerType = QStringLiteral( "internal" );
 #endif
 
-  if ( providerType == QStringLiteral( "external" ) )
+  if ( providerType == QStringLiteral( "external_bt" ) )
   {
 #ifdef HAVE_BLUETOOTH
     AbstractPositionProvider *provider = new BluetoothPositionProvider( id, name, *mPositionTransformer );
@@ -142,39 +142,47 @@ AbstractPositionProvider *PositionKit::constructProvider( const QString &type, c
     return provider;
 #endif
   }
-  else // type == internal
+
+  if ( providerType == QStringLiteral( "external_ip" ) )
   {
-    if ( id == QStringLiteral( "simulated" ) )
-    {
-      AbstractPositionProvider *provider = new SimulatedPositionProvider( *mPositionTransformer );
-      QQmlEngine::setObjectOwnership( provider, QQmlEngine::CppOwnership );
-      return provider;
-    }
+    AbstractPositionProvider *provider = new NetworkPositionProvider( id, name );
+    QQmlEngine::setObjectOwnership( provider, QQmlEngine::CppOwnership );
+    return provider;
+  }
+
+  // type == internal
+  if ( id == QStringLiteral( "simulated" ) )
+  {
+    AbstractPositionProvider *provider = new SimulatedPositionProvider();
+    QQmlEngine::setObjectOwnership( provider, QQmlEngine::CppOwnership );
+    return provider;
+  }
+
 #ifdef ANDROID
-    if ( id == QStringLiteral( "android_fused" ) || id == QStringLiteral( "android_gps" ) )
+  if ( id == QStringLiteral( "android_fused" ) || id == QStringLiteral( "android_gps" ) )
+  {
+    bool fused = ( id == QStringLiteral( "android_fused" ) );
+    if ( fused && !AndroidPositionProvider::isFusedAvailable() )
     {
-      const bool fused = ( id == QStringLiteral( "android_fused" ) );
-      if ( fused && !AndroidPositionProvider::isFusedAvailable() )
-      {
-        // TODO: inform user + use AndroidPositionProvider::fusedErrorString() output?
+      // TODO: inform user + use AndroidPositionProvider::fusedErrorString() output?
 
-        // fallback to the default - at this point the Qt Positioning implementation
-        AbstractPositionProvider *provider = new InternalPositionProvider( *mPositionTransformer );
-        QQmlEngine::setObjectOwnership( provider, QQmlEngine::CppOwnership );
-        return provider;
-      }
-      __android_log_print( ANDROID_LOG_INFO, "CPP", "MAKE PROVIDER %d", fused );
-      AbstractPositionProvider *provider = new AndroidPositionProvider( fused, *mPositionTransformer );
+      // fallback to the default - at this point the Qt Positioning implementation
+      AbstractPositionProvider *provider = new InternalPositionProvider();
       QQmlEngine::setObjectOwnership( provider, QQmlEngine::CppOwnership );
       return provider;
     }
+    __android_log_print( ANDROID_LOG_INFO, "CPP", "MAKE PROVIDER %d", fused );
+    AbstractPositionProvider *provider = new AndroidPositionProvider( fused );
+    QQmlEngine::setObjectOwnership( provider, QQmlEngine::CppOwnership );
+    return provider;
+  }
 #endif
-    else // id == devicegps
-    {
-      AbstractPositionProvider *provider = new InternalPositionProvider( *mPositionTransformer );
-      QQmlEngine::setObjectOwnership( provider, QQmlEngine::CppOwnership );
-      return provider;
-    }
+
+  // id == devicegps
+  {
+    AbstractPositionProvider *provider = new InternalPositionProvider();
+    QQmlEngine::setObjectOwnership( provider, QQmlEngine::CppOwnership );
+    return provider;
   }
 }
 
@@ -207,8 +215,10 @@ AbstractPositionProvider *PositionKit::constructActiveProvider( AppSettings *app
   }
   else
   {
-    // find name of the active provider
+    // find name & type of the active provider
     QString providerName;
+    // Migration from single external provider to multiple currently, missing type == bluetooth provider
+    QString providerType = QStringLiteral( "external_bt" );
     QVariantList providers = appsettings->savedPositionProviders();
 
     for ( const auto &provider : providers )
@@ -223,10 +233,14 @@ AbstractPositionProvider *PositionKit::constructActiveProvider( AppSettings *app
       if ( providerData[1] == providerId )
       {
         providerName = providerData[0].toString();
+        if ( !providerData.at( 3 ).isNull() )
+        {
+          providerType = providerData[3].toString();
+        }
       }
     }
 
-    return constructProvider( QStringLiteral( "external" ), providerId, providerName );
+    return constructProvider( providerType, providerId, providerName );
   }
 }
 
diff --git a/app/position/providers/bluetoothpositionprovider.cpp b/app/position/providers/bluetoothpositionprovider.cpp
index c96a235db..6303bb37d 100644
--- a/app/position/providers/bluetoothpositionprovider.cpp
+++ b/app/position/providers/bluetoothpositionprovider.cpp
@@ -30,8 +30,8 @@ QgsGpsInformation NmeaParser::parseNmeaString( const QString &nmeaString )
   return mLastGPSInformation;
 }
 
-BluetoothPositionProvider::BluetoothPositionProvider( const QString &addr, const QString &name, PositionTransformer &positionTransformer, QObject *parent )
-  : AbstractPositionProvider( addr, QStringLiteral( "external" ), name, positionTransformer, parent )
+BluetoothPositionProvider::BluetoothPositionProvider( const QString &addr, const QString &name, QObject *parent )
+  : AbstractPositionProvider( addr, QStringLiteral( "external_bt" ), name, parent )
   , mTargetAddress( addr )
 {
   mSocket = std::unique_ptr<QBluetoothSocket>( new QBluetoothSocket( QBluetoothServiceInfo::RfcommProtocol ) );
diff --git a/app/position/providers/networkpositionprovider.cpp b/app/position/providers/networkpositionprovider.cpp
new file mode 100644
index 000000000..d96b3bcc6
--- /dev/null
+++ b/app/position/providers/networkpositionprovider.cpp
@@ -0,0 +1,168 @@
+/***************************************************************************
+*                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "networkpositionprovider.h"
+
+#include "coreutils.h"
+
+static int ONE_SECOND_MS = 1000;
+
+NetworkPositionProvider::NetworkPositionProvider( const QString &addr, const QString &name, QObject *parent )
+  : AbstractPositionProvider( addr, QStringLiteral( "external_ip" ), name, parent )
+{
+  const QStringList targetAddress = addr.split( ":" );
+  mTargetAddress = targetAddress.at( 0 );
+  mTargetPort = targetAddress.at( 1 ).toInt();
+
+  mTcpSocket = std::make_unique<QTcpSocket>();
+  mUdpSocket = std::make_unique<QUdpSocket>();
+
+// only one socket will be active depending on, which will find host, the other will be closed
+// connect(mTcpSocket.get(), &QAbstractSocket::hostFound, this, [this]
+// {
+//  CoreUtils::log("NetworkPositionProvider", "TCP socket found host, aborting UDP socket");
+//  mUdpSocket->abort();
+// });
+// connect(mUdpSocket.get(), &QAbstractSocket::hostFound, this, [this]
+// {
+//  CoreUtils::log("NetworkPositionProvider", "UDP socket found host, aborting TCP socket");
+//  mTcpSocket->abort();
+// });
+
+  connect( mTcpSocket.get(), &QAbstractSocket::readyRead, this, &NetworkPositionProvider::positionUpdateReceived );
+  connect( mUdpSocket.get(), &QAbstractSocket::readyRead, this, &NetworkPositionProvider::positionUpdateReceived );
+
+  connect( mTcpSocket.get(), &QAbstractSocket::stateChanged, this, &NetworkPositionProvider::socketStateChanged );
+  connect( mUdpSocket.get(), &QAbstractSocket::stateChanged, this, &NetworkPositionProvider::socketStateChanged );
+
+  mReconnectTimer.setSingleShot( false );
+  mReconnectTimer.setInterval( ONE_SECOND_MS );
+  connect( &mReconnectTimer, &QTimer::timeout, this, &NetworkPositionProvider::reconnectTimeout );
+
+  NetworkPositionProvider::startUpdates();
+}
+
+void NetworkPositionProvider::startUpdates()
+{
+  CoreUtils::log( "NetworkPositionProvider", "Connecting to host..." );
+  mTcpSocket->connectToHost( mTargetAddress, mTargetPort );
+  mUdpSocket->connectToHost( mTargetAddress, mTargetPort );
+}
+
+void NetworkPositionProvider::stopUpdates()
+{
+  if ( mTcpSocket->state() != QAbstractSocket::UnconnectedState && mTcpSocket->state() != QAbstractSocket::ClosingState )
+  {
+    mTcpSocket->disconnectFromHost();
+  }
+  if ( mUdpSocket->state() != QAbstractSocket::UnconnectedState && mUdpSocket->state() != QAbstractSocket::ClosingState )
+  {
+    mUdpSocket->disconnectFromHost();
+  }
+}
+
+void NetworkPositionProvider::closeProvider()
+{
+  mTcpSocket->close();
+  mUdpSocket->close();
+}
+
+void NetworkPositionProvider::positionUpdateReceived()
+{
+  const QAbstractSocket *socket = dynamic_cast<QAbstractSocket *>( sender() );
+  const QString socketTypeToString = QMetaEnum::fromType<QAbstractSocket::SocketType>().valueToKey( socket->socketType() );
+  CoreUtils::log( "NetworkPositionProvider", QStringLiteral( "%1 socket has received new data!" ).arg( socketTypeToString ) );
+  if ( mTcpSocket->isValid() || mUdpSocket->isValid() )
+  {
+    const QByteArray rawNmeaData = activeSocket()->readAll();
+    const QString nmeaData( rawNmeaData );
+    const QgsGpsInformation gpsInfo = mNmeaParser.parseNmeaString( nmeaData );
+
+    emit positionChanged( GeoPosition::fromQgsGpsInformation( gpsInfo ) );
+  }
+}
+
+void NetworkPositionProvider::socketStateChanged( const QAbstractSocket::SocketState state )
+{
+  if ( state == QAbstractSocket::SocketState::ConnectingState || state == QAbstractSocket::SocketState::HostLookupState )
+  {
+    setState( tr( "Connecting to %1" ).arg( mProviderName ), State::Connecting );
+  }
+  else if ( state == QAbstractSocket::SocketState::ConnectedState )
+  {
+    setState( tr( "Connected" ), State::Connected );
+  }
+  else if ( state == QAbstractSocket::SocketState::UnconnectedState )
+  {
+    setState( tr( "No connection" ), State::NoConnection );
+    startReconnectTimer();
+    // let's also invalidate current position since we no longer have connection
+    emit positionChanged( GeoPosition() );
+  }
+  const QAbstractSocket *socket = dynamic_cast<QAbstractSocket *>( sender() );
+  const QString socketTypeToString = QMetaEnum::fromType<QAbstractSocket::SocketType>().valueToKey( socket->socketType() );
+  const QString stateToString = QMetaEnum::fromType<QAbstractSocket::SocketState>().valueToKey( state );
+  CoreUtils::log( QStringLiteral( "NetworkPositionProvider" ), QStringLiteral( "%1 Socket changed state, code: %2" ).arg( socketTypeToString, stateToString ) );
+}
+
+void NetworkPositionProvider::reconnectTimeout()
+{
+  if ( mSecondsLeftToReconnect <= 1 )
+  {
+    reconnect();
+  }
+  else
+  {
+    mSecondsLeftToReconnect--;
+    setState( tr( "No connection, reconnecting in (%1)" ).arg( mSecondsLeftToReconnect ), State::WaitingToReconnect );
+    mReconnectTimer.start();
+  }
+}
+
+QAbstractSocket *NetworkPositionProvider::activeSocket() const
+{
+  if ( mTcpSocket->state() >= QAbstractSocket::ConnectingState && mTcpSocket->state() <= QAbstractSocket::BoundState )
+  {
+    return mTcpSocket.get();
+  }
+
+  if ( mUdpSocket->state() >= QAbstractSocket::ConnectingState && mUdpSocket->state() <= QAbstractSocket::BoundState )
+  {
+    return mUdpSocket.get();
+  }
+
+//TODO: wouldn't it be better to guard against nullptr in caller and return nullptr here?
+  return new QAbstractSocket( QAbstractSocket::UnknownSocketType, nullptr );
+}
+
+void NetworkPositionProvider::reconnect()
+{
+  mReconnectTimer.stop();
+
+  setState( tr( "Reconnecting" ), State::Connecting );
+
+  CoreUtils::log( QStringLiteral( "NetworkPositionProvider" ), QStringLiteral( "Reconnecting to %1" ).arg( mProviderName ) );
+
+  stopUpdates();
+  startUpdates();
+}
+
+void NetworkPositionProvider::startReconnectTimer()
+{
+  mSecondsLeftToReconnect = mReconnectDelay / ONE_SECOND_MS;
+  setState( tr( "No connection, reconnecting in (%1)" ).arg( mSecondsLeftToReconnect ), State::WaitingToReconnect );
+
+  mReconnectTimer.start();
+
+// first time do reconnect in short time, then each other in long time
+  if ( mReconnectDelay == NetworkPositionProvider::ShortDelay )
+  {
+    mReconnectDelay = NetworkPositionProvider::LongDelay;
+  }
+}
diff --git a/app/position/providers/networkpositionprovider.h b/app/position/providers/networkpositionprovider.h
new file mode 100644
index 000000000..5a8755417
--- /dev/null
+++ b/app/position/providers/networkpositionprovider.h
@@ -0,0 +1,64 @@
+/***************************************************************************
+*                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+
+#ifndef NETWORKPOSITIONPROVIDER_H
+#define NETWORKPOSITIONPROVIDER_H
+
+#include <QTcpSocket>
+#include <QUdpSocket>
+
+#include "abstractpositionprovider.h"
+#include "bluetoothpositionprovider.h"
+
+
+class NetworkPositionProvider : public AbstractPositionProvider
+{
+    Q_OBJECT
+
+// signalizes in how many [ms] we will try to reconnect to GPS again
+    enum ReconnectDelay
+    {
+      ShortDelay = 3000,
+      LongDelay = 5000
+    };
+
+  public:
+    explicit NetworkPositionProvider( const QString &addr, const QString &name, QObject *parent = nullptr );
+
+    void startUpdates() override;
+    void stopUpdates() override;
+    void closeProvider() override;
+
+  public slots:
+    void positionUpdateReceived();
+    void socketStateChanged( QAbstractSocket::SocketState state );
+    void reconnectTimeout();
+
+  private:
+// utility function, which should return the socket in use
+    QAbstractSocket *activeSocket() const;
+// trigger the reconnection flow for both sockets
+    void reconnect();
+    // start the reconnection timeout
+    void startReconnectTimer();
+
+    std::unique_ptr<QTcpSocket> mTcpSocket;
+    std::unique_ptr<QUdpSocket> mUdpSocket;
+
+    int mReconnectDelay = ReconnectDelay::ShortDelay; // in how many [ms] we will try to reconnect again
+    int mSecondsLeftToReconnect; // how many seconds are left to reconnect. Reconnects if less than or equal to one
+    QTimer mReconnectTimer; // timer that times out each second and lowers the mSecondsLeftToReconnect by one
+
+    QString mTargetAddress; // IP address or hostname of the receiver
+    int mTargetPort; // active port of the receiver
+
+    NmeaParser mNmeaParser; // parser to decode received NMEA strings
+};
+#endif //NETWORKPOSITIONPROVIDER_H
diff --git a/app/position/providers/positionprovidersmodel.cpp b/app/position/providers/positionprovidersmodel.cpp
index e070e4576..b51373f2b 100644
--- a/app/position/providers/positionprovidersmodel.cpp
+++ b/app/position/providers/positionprovidersmodel.cpp
@@ -134,16 +134,17 @@ void PositionProvidersModel::removeProvider( const QString &providerId )
   }
 }
 
-void PositionProvidersModel::addProvider( const QString &name, const QString &providerId )
+void PositionProvidersModel::addProvider( const QString &name, const QString &providerId, const QString &providerType )
 {
   if ( providerId.isEmpty() )
     return;
 
   PositionProvider toAdd;
+  const QString deviceDesc = providerType == QStringLiteral( "external_bt" ) ? tr( " Bluetooth device" ) : tr( " Network device" );
   toAdd.name = name;
   toAdd.providerId = providerId;
-  toAdd.description = providerId + " " + tr( " Bluetooth device" );
-  toAdd.providerType = "external";
+  toAdd.description = providerId + " " + deviceDesc;
+  toAdd.providerType = providerType;
 
   if ( mProviders.contains( toAdd ) )
     return;
@@ -218,8 +219,8 @@ QVariantList PositionProvidersModel::toVariantList() const
     if ( mProviders[i].providerType == QStringLiteral( "internal" ) )
       continue;
 
-    QStringList a = { mProviders[i].name, mProviders[i].providerId };
-    out.push_back( a );
+    QStringList provider = { mProviders[i].name, mProviders[i].providerId, mProviders[i].providerType };
+    out.push_back( provider );
   }
 
   return out;
diff --git a/app/position/providers/positionprovidersmodel.h b/app/position/providers/positionprovidersmodel.h
index dc24171fe..a05589504 100644
--- a/app/position/providers/positionprovidersmodel.h
+++ b/app/position/providers/positionprovidersmodel.h
@@ -67,7 +67,7 @@ class PositionProvidersModel : public QAbstractListModel
     QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const override;
 
     Q_INVOKABLE void removeProvider( const QString &providerId );
-    Q_INVOKABLE void addProvider( const QString &providerName, const QString &providerId );
+    Q_INVOKABLE void addProvider( const QString &providerName, const QString &providerId, const QString &providerType );
 
     AppSettings *appSettings() const;
     void setAppSettings( AppSettings * );
diff --git a/app/qml/gps/MMGpsDataDrawer.qml b/app/qml/gps/MMGpsDataDrawer.qml
index 1b018bbe3..ad4456e8c 100644
--- a/app/qml/gps/MMGpsDataDrawer.qml
+++ b/app/qml/gps/MMGpsDataDrawer.qml
@@ -73,7 +73,7 @@ MMComponents.MMDrawer {
 
             width: parent.width / 2
 
-            visible: PositionKit.positionProvider && PositionKit.positionProvider.type() === "external"
+            visible: __positionKit.positionProvider && __positionKit.positionProvider.type().includes("external")
 
             title: qsTr( "Status" )
             value: PositionKit.positionProvider ? PositionKit.positionProvider.stateMessage : ""
@@ -214,7 +214,7 @@ MMComponents.MMDrawer {
               PositionKit.fix
             }
 
-            visible: PositionKit.positionProvider && PositionKit.positionProvider.type() === "external"
+            visible: __positionKit.positionProvider && __positionKit.positionProvider.type().includes("external")
 
             alignmentRight: Positioner.index % 2 === 1
           }
@@ -247,7 +247,7 @@ MMComponents.MMDrawer {
               __inputUtils.formatNumber( PositionKit.hdop, 2 )
             }
 
-            visible: PositionKit.positionProvider && PositionKit.positionProvider.type() === "external"
+            visible: __positionKit.positionProvider && __positionKit.positionProvider.type().includes("external")
 
             alignmentRight: Positioner.index % 2 === 1
           }
@@ -264,7 +264,7 @@ MMComponents.MMDrawer {
               __inputUtils.formatNumber( PositionKit.vdop, 2 )
             }
 
-            visible: PositionKit.positionProvider && PositionKit.positionProvider.type() === "external"
+            visible: __positionKit.positionProvider && __positionKit.positionProvider.type().includes("external")
 
             alignmentRight: Positioner.index % 2 === 1
           }
@@ -281,7 +281,7 @@ MMComponents.MMDrawer {
               __inputUtils.formatNumber( PositionKit.pdop, 2 )
             }
 
-            visible: PositionKit.positionProvider && PositionKit.positionProvider.type() === "external"
+            visible: __positionKit.positionProvider && __positionKit.positionProvider.type().includes("external")
 
             alignmentRight: Positioner.index % 2 === 1
           }
@@ -329,6 +329,7 @@ MMComponents.MMDrawer {
               }
               __inputUtils.formatNumber( PositionKit.geoidSeparation, 2 ) + " m"
             }
+            visible: __positionKit.positionProvider && __positionKit.positionProvider.type().includes("external")
 
             alignmentRight: Positioner.index % 2 === 1
           }
diff --git a/app/qml/gps/MMPositionProviderPage.qml b/app/qml/gps/MMPositionProviderPage.qml
index c98d9a0c8..5ff5e5964 100644
--- a/app/qml/gps/MMPositionProviderPage.qml
+++ b/app/qml/gps/MMPositionProviderPage.qml
@@ -8,6 +8,7 @@
  ***************************************************************************/
 
 import QtQuick
+import QtQml.Models
 import QtQuick.Controls
 import QtQuick.Dialogs
 
@@ -16,6 +17,7 @@ import MMInput
 
 import "../components" as MMComponents
 import "../dialogs" as MMDialogs
+import "../inputs" as MMInputs
 
 MMComponents.MMPage {
   id: root
@@ -94,7 +96,7 @@ MMComponents.MMPage {
           if ( ListView.section === "internal" ) {
             let ix = providersModel.index( index + 1, 0 )
             let type = providersModel.data( ix, MM.PositionProvidersModel.ProviderType )
-            if ( type === "external" ) return false
+            if ( type.includes("external") ) return false
           }
 
           return true
@@ -135,7 +137,90 @@ MMComponents.MMPage {
 
       text: qsTr( "Connect new receiver" )
 
-      onClicked: bluetoothDiscoveryLoader.active = true
+      onClicked: providerTypeDrawer.open()
+    }
+
+    MMComponents.MMListDrawer {
+      id: providerTypeDrawer
+
+      drawerHeader.title: qsTr("Pick the correct provider type")
+      drawerHeader.titleFont: __style.t2
+
+      list.model: ListModel {
+        ListElement {
+          name: qsTr( "Bluetooth provider" )
+          type: "bluetooth"
+        }
+        ListElement {
+          name: qsTr( "Network provider" )
+          type: "network"
+        }
+      }
+
+      list.delegate: MMComponents.MMListDelegate {
+        required property string name
+        required property string type
+
+        text: name
+        onClicked: {
+          providerTypeDrawer.close()
+          if (type === "bluetooth") {
+            bluetoothDiscoveryLoader.active = true
+          }
+          else if (type === "network"){
+            networkProviderInfoDrawer.open()
+          }
+        }
+      }
+    }
+
+    MMComponents.MMDrawerDialog {
+      id: networkProviderInfoDrawer
+
+      signal confirmButtonClicked(string address, int port)
+
+      title: qsTr("Network provider setup")
+      imageSource: __style.externalGpsGreenImage
+      description: qsTr( "To connect to the external device please specify the IP address and port below." )
+      primaryButton.text: qsTr( "Confirm" )
+      primaryButton.type: MMComponents.MMButton.Primary
+
+      additionalContent: Column {
+        width: parent.width
+        spacing: __style.spacing20
+
+        MMInputs.MMTextInput {
+          id: ipAddressInput
+
+          width: parent.width
+          textFieldBackground.color: __style.lightGreenColor
+
+          title: qsTr("IP address")
+          placeholderText: qsTr("localhost")
+        }
+
+        MMInputs.MMTextInput {
+          id: portInput
+
+          width: parent.width
+          textFieldBackground.color: __style.lightGreenColor
+
+          title: qsTr("Port")
+          placeholderText: qsTr("1234")
+        }
+      }
+
+      onPrimaryButtonClicked: {
+        close()
+        confirmButtonClicked(ipAddressInput.text, portInput.text)
+      }
+
+      onConfirmButtonClicked: function( address, port ) {
+        const deviceAddress = address + ":" + port
+        __positionKit.positionProvider = __positionKit.constructProvider( "external_ip", deviceAddress, "Network provider" )
+
+        providersModel.addProvider( "Network provider", deviceAddress, "external_ip" )
+      }
     }
 
     MMComponents.MMMessage {
@@ -205,9 +290,9 @@ MMComponents.MMPage {
 
     MMAddPositionProviderDrawer {
       onInitiatedConnectionTo: function ( deviceAddress, deviceName ) {
-        PositionKit.positionProvider = PositionKit.constructProvider( "external", deviceAddress, deviceName )
+        __positionKit.positionProvider = __positionKit.constructProvider( "external_bt", deviceAddress, deviceName )
 
-        providersModel.addProvider( deviceName, deviceAddress )
+        providersModel.addProvider( deviceName, deviceAddress, "external_bt" )
         list.model.discovering = false
         close()
 
@@ -239,7 +324,7 @@ MMComponents.MMPage {
   }
 
   function constructProvider( type, id, name ) {
-    if ( type === "external" ) {
+    if ( type === "external_bt" ) {
       // Is bluetooth turned on?
       if ( !__inputUtils.isBluetoothTurnedOn() ) {
         __inputUtils.turnBluetoothOn()
@@ -253,7 +338,7 @@ MMComponents.MMPage {
 
     PositionKit.positionProvider = PositionKit.constructProvider( type, id, name )
 
-    if ( type === "external" ) {
+    if ( type === "external_bt" ) {
       connectingDialogLoader.open()
     }
   }
diff --git a/app/qml/map/MMMapController.qml b/app/qml/map/MMMapController.qml
index ae892281d..6766d3f32 100644
--- a/app/qml/map/MMMapController.qml
+++ b/app/qml/map/MMMapController.qml
@@ -679,7 +679,7 @@ Item {
           visible: {
             if ( root.mapExtentOffset > 0 && root.state !== "stakeout" ) return false
 
-            if ( PositionKit.positionProvider && PositionKit.positionProvider.type() === "external" ) {
+            if ( __positionKit.positionProvider && __positionKit.positionProvider.type().includes("external") ) {
               // for external receivers we want to show gps panel and accuracy button
               // even when the GPS receiver is not sending position data
               return true
@@ -699,7 +699,7 @@ Item {
             {
               return ""
             }
-            else if ( PositionKit.positionProvider.type() === "external" )
+            else if ( __positionKit.positionProvider.type().includes("external") )
             {
               if ( PositionKit.positionProvider.state === MM.PositionProvider.Connecting )
               {
diff --git a/app/test/testposition.cpp b/app/test/testposition.cpp
index 6c0bdba26..740ef6f43 100644
--- a/app/test/testposition.cpp
+++ b/app/test/testposition.cpp
@@ -106,8 +106,8 @@ void TestPosition::testBluetoothProviderConnection()
   QCOMPARE( "testBluetoothProvider", pkProvider->name() );
   QCOMPARE( "AA:AA:AA:AA:00:00", btProvider->id() );
   QCOMPARE( "AA:AA:AA:AA:00:00", pkProvider->id() );
-  QCOMPARE( "external", btProvider->type() );
-  QCOMPARE( "external", pkProvider->type() );
+  QCOMPARE( "external_bt", btProvider->type() );
+  QCOMPARE( "external_bt", pkProvider->type() );
 
   //
   // let's continue with BT instance,
@@ -257,11 +257,11 @@ void TestPosition::testPositionProviderKeysInSettings()
   rawSettings.remove( AppSettings::POSITION_PROVIDERS_GROUP ); // make sure nothing is there from previous tests
 
 #ifdef HAVE_BLUETOOTH
-  positionKit->setPositionProvider( positionKit->constructProvider( "external", "AA:BB:CC:DD:EE:FF", "testProviderA" ) );
+  positionKit->setPositionProvider( positionKit->constructProvider( "external_bt", "AA:BB:CC:DD:EE:FF", "testProviderA" ) );
 
   QCOMPARE( positionKit->positionProvider()->id(), "AA:BB:CC:DD:EE:FF" );
   QCOMPARE( positionKit->positionProvider()->name(), "testProviderA" );
-  QCOMPARE( positionKit->positionProvider()->type(), "external" );
+  QCOMPARE( positionKit->positionProvider()->type(), "external_bt" );
 
   QCOMPARE( rawSettings.value( CoreUtils::QSETTINGS_APP_GROUP_NAME + "/activePositionProviderId" ).toString(), "AA:BB:CC:DD:EE:FF" );
 #endif
@@ -279,7 +279,7 @@ void TestPosition::testPositionProviderKeysInSettings()
   QCOMPARE( providersModel.data( providersModel.index( 1 ), PositionProvidersModel::ProviderId ), "simulated" );
 
   providersModel.setAppSettings( &appSettings );
-  providersModel.addProvider( "testProviderB", "AA:00:11:22:23:44" );
+  providersModel.addProvider( "testProviderB", "AA:00:11:22:23:44", "external_bt" );
 
   // app settings should have one saved provider - testProviderB
   QVariantList providers = appSettings.savedPositionProviders();
diff --git a/app/test/testvariablesmanager.cpp b/app/test/testvariablesmanager.cpp
index e7bda0498..cd191c431 100644
--- a/app/test/testvariablesmanager.cpp
+++ b/app/test/testvariablesmanager.cpp
@@ -84,7 +84,7 @@ void TestVariablesManager::testPositionVariables()
   evaluateExpression( QStringLiteral( "@position_gps_antenna_height" ), QStringLiteral( "0.000" ), &context );
   evaluateExpression( QStringLiteral( "@position_provider_address" ), QStringLiteral( "AA:AA:FF:AA:00:10" ), &context );
   evaluateExpression( QStringLiteral( "@position_provider_name" ), QStringLiteral( "testBluetoothProvider" ), &context );
-  evaluateExpression( QStringLiteral( "@position_provider_type" ), QStringLiteral( "external" ), &context );
+  evaluateExpression( QStringLiteral( "@position_provider_type" ), QStringLiteral( "external_bt" ), &context );
 
   mAppSettings->setGpsAntennaHeight( 1.6784 );
   pos.verticalSpeed = 1.345;
diff --git a/gallery/positionkit.h b/gallery/positionkit.h
index 059a3e737..bab5f6dfc 100644
--- a/gallery/positionkit.h
+++ b/gallery/positionkit.h
@@ -61,7 +61,7 @@ class  PositionKit : public QObject
 
   private:
     QString pProviderName = "Gps Source is ok!";
-    QString pProviderType = "external";
+    QString pProviderType = "external_bt";
     QString pProviderMessage = "Connected";
     QString pStateMessage = "Message";
     QString pLastRead = "17:19:08 CEST";

From 9d2f8e395c3513a436687b4512d9476a6f1a9c75 Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Fri, 30 Jan 2026 15:39:50 +0100
Subject: [PATCH 02/30] Fix UDP issues

---
 .../providers/networkpositionprovider.cpp     | 143 ++++++++++++------
 .../providers/networkpositionprovider.h       |  15 +-
 2 files changed, 103 insertions(+), 55 deletions(-)

diff --git a/app/position/providers/networkpositionprovider.cpp b/app/position/providers/networkpositionprovider.cpp
index d96b3bcc6..857bb63aa 100644
--- a/app/position/providers/networkpositionprovider.cpp
+++ b/app/position/providers/networkpositionprovider.cpp
@@ -9,12 +9,16 @@
 
 #include "networkpositionprovider.h"
 
+#include <QApplication>
+#include <QNetworkDatagram>
+
 #include "coreutils.h"
 
 static int ONE_SECOND_MS = 1000;
 
 NetworkPositionProvider::NetworkPositionProvider( const QString &addr, const QString &name, QObject *parent )
-  : AbstractPositionProvider( addr, QStringLiteral( "external_ip" ), name, parent )
+  : AbstractPositionProvider( addr, QStringLiteral( "external_ip" ), name, parent ),
+    mSecondsLeftToReconnect( ReconnectDelay::ShortDelay / ONE_SECOND_MS )
 {
   const QStringList targetAddress = addr.split( ":" );
   mTargetAddress = targetAddress.at( 0 );
@@ -23,36 +27,38 @@ NetworkPositionProvider::NetworkPositionProvider( const QString &addr, const QSt
   mTcpSocket = std::make_unique<QTcpSocket>();
   mUdpSocket = std::make_unique<QUdpSocket>();
 
-// only one socket will be active depending on, which will find host, the other will be closed
-// connect(mTcpSocket.get(), &QAbstractSocket::hostFound, this, [this]
-// {
-//  CoreUtils::log("NetworkPositionProvider", "TCP socket found host, aborting UDP socket");
-//  mUdpSocket->abort();
-// });
-// connect(mUdpSocket.get(), &QAbstractSocket::hostFound, this, [this]
-// {
-//  CoreUtils::log("NetworkPositionProvider", "UDP socket found host, aborting TCP socket");
-//  mTcpSocket->abort();
-// });
-
-  connect( mTcpSocket.get(), &QAbstractSocket::readyRead, this, &NetworkPositionProvider::positionUpdateReceived );
-  connect( mUdpSocket.get(), &QAbstractSocket::readyRead, this, &NetworkPositionProvider::positionUpdateReceived );
+  connect( mTcpSocket.get(), &QTcpSocket::readyRead, this, &NetworkPositionProvider::positionUpdateReceived );
+  connect( mUdpSocket.get(), &QUdpSocket::readyRead, this, &NetworkPositionProvider::positionUpdateReceived );
 
-  connect( mTcpSocket.get(), &QAbstractSocket::stateChanged, this, &NetworkPositionProvider::socketStateChanged );
-  connect( mUdpSocket.get(), &QAbstractSocket::stateChanged, this, &NetworkPositionProvider::socketStateChanged );
+  connect( mTcpSocket.get(), &QTcpSocket::stateChanged, this, &NetworkPositionProvider::socketStateChanged );
+  connect( mUdpSocket.get(), &QUdpSocket::stateChanged, this, &NetworkPositionProvider::socketStateChanged );
 
   mReconnectTimer.setSingleShot( false );
   mReconnectTimer.setInterval( ONE_SECOND_MS );
   connect( &mReconnectTimer, &QTimer::timeout, this, &NetworkPositionProvider::reconnectTimeout );
+  mUdpReconnectTimer.setSingleShot( true );
+  connect( &mUdpReconnectTimer, &QTimer::timeout, this, [this]
+    {
+      CoreUtils::log( QStringLiteral( "NetworkPositionProvider" ), QStringLiteral( "UDP socket no data received in threshold, triggering reconnect..." ) );
+      if ( mTcpSocket->state() != QAbstractSocket::ConnectedState )
+      {
+        setState( tr( "No connection" ), State::NoConnection );
+        startReconnectTimer();
+        // let's also invalidate current position since we no longer have connection
+        emit positionChanged( GeoPosition() );
+      }
+    } );
 
   NetworkPositionProvider::startUpdates();
 }
 
 void NetworkPositionProvider::startUpdates()
 {
+  // TODO: QHostAddress doesn't support hostname lookup (QHostInfo does)
   CoreUtils::log( "NetworkPositionProvider", "Connecting to host..." );
   mTcpSocket->connectToHost( mTargetAddress, mTargetPort );
-  mUdpSocket->connectToHost( mTargetAddress, mTargetPort );
+  mUdpSocket->bind( QHostAddress::LocalHost, mTargetPort );
+  mUdpReconnectTimer.start( ReconnectDelay::ExtraLongDelay );
 }
 
 void NetworkPositionProvider::stopUpdates()
@@ -75,37 +81,92 @@ void NetworkPositionProvider::closeProvider()
 
 void NetworkPositionProvider::positionUpdateReceived()
 {
-  const QAbstractSocket *socket = dynamic_cast<QAbstractSocket *>( sender() );
+  QAbstractSocket *socket = dynamic_cast<QAbstractSocket *>( sender() );
   const QString socketTypeToString = QMetaEnum::fromType<QAbstractSocket::SocketType>().valueToKey( socket->socketType() );
   CoreUtils::log( "NetworkPositionProvider", QStringLiteral( "%1 socket has received new data!" ).arg( socketTypeToString ) );
-  if ( mTcpSocket->isValid() || mUdpSocket->isValid() )
+
+  // if udp is not connected to the host yet, connect
+  // this approach will let us use QIODevice functions for both sockets
+  if ( socket->socketType() == QAbstractSocket::UdpSocket && mUdpSocket->state() != QAbstractSocket::ConnectedState )
   {
-    const QByteArray rawNmeaData = activeSocket()->readAll();
-    const QString nmeaData( rawNmeaData );
-    const QgsGpsInformation gpsInfo = mNmeaParser.parseNmeaString( nmeaData );
+    mUdpReconnectTimer.stop();
 
-    emit positionChanged( GeoPosition::fromQgsGpsInformation( gpsInfo ) );
+    // if by any chance we showed wrong message in the status like "no connection", fix it here
+    // we know the connection is working because we just received data from the device
+    setState( tr( "Connected" ), State::Connected );
+
+    QHostAddress peerAddress;
+    int peerPort;
+    // process the incoming data as it will break the signal emitting if unprocessed
+    while ( mUdpSocket->hasPendingDatagrams() )
+    {
+      QNetworkDatagram datagram = mUdpSocket->receiveDatagram();
+      peerAddress = datagram.senderAddress();
+      peerPort = datagram.senderPort();
+      const QByteArray rawNmeaData = datagram.data();
+      const QString nmeaData( rawNmeaData );
+      const QgsGpsInformation gpsInfo = mNmeaParser.parseNmeaString( nmeaData );
+      emit positionChanged( GeoPosition::fromQgsGpsInformation( gpsInfo ) );
+    }
+
+    // "connect" to peer if we are not already connecting
+    if (mUdpSocket->state() != QAbstractSocket::ConnectedState && mUdpSocket->state() != QAbstractSocket::ConnectingState)
+    {
+      mUdpSocket->connectToHost( peerAddress.toString(), peerPort );
+    }
+    return;
   }
+
+  // stop the UDP silence timer, we just received data
+  // kills the timer when the app was minimized, and we were able to reconnect in the meantime
+  if ( socket->socketType() == QAbstractSocket::UdpSocket )
+  {
+    mUdpReconnectTimer.stop();
+  }
+
+  // if by any chance we showed wrong message in the status like "no connection", fix it here
+  // we know the connection is working because we just received data from the device
+  setState( tr( "Connected" ), State::Connected );
+
+  const QByteArray rawNmeaData = socket->readAll();
+  const QString nmeaData( rawNmeaData );
+  const QgsGpsInformation gpsInfo = mNmeaParser.parseNmeaString( nmeaData );
+
+  emit positionChanged( GeoPosition::fromQgsGpsInformation( gpsInfo ) );
 }
 
 void NetworkPositionProvider::socketStateChanged( const QAbstractSocket::SocketState state )
 {
-  if ( state == QAbstractSocket::SocketState::ConnectingState || state == QAbstractSocket::SocketState::HostLookupState )
+  const QAbstractSocket *socket = dynamic_cast<QAbstractSocket *>( sender() );
+
+  if ( state == QAbstractSocket::ConnectingState || state == QAbstractSocket::HostLookupState )
   {
     setState( tr( "Connecting to %1" ).arg( mProviderName ), State::Connecting );
   }
-  else if ( state == QAbstractSocket::SocketState::ConnectedState )
+  // Only with TCP we can be sure in ConnectedState that we are connected, with UDP we wait until the first datagram arrives
+  else if ( state == QAbstractSocket::ConnectedState  && socket->socketType() == QAbstractSocket::TcpSocket )
   {
     setState( tr( "Connected" ), State::Connected );
   }
-  else if ( state == QAbstractSocket::SocketState::UnconnectedState )
+  else if ( state == QAbstractSocket::UnconnectedState )
   {
-    setState( tr( "No connection" ), State::NoConnection );
-    startReconnectTimer();
-    // let's also invalidate current position since we no longer have connection
-    emit positionChanged( GeoPosition() );
+    const bool isUdpSocketListening = mUdpSocket->state() == QAbstractSocket::ConnectedState || mUdpSocket->state() == QAbstractSocket::BoundState || mUdpReconnectTimer.isActive();
+    if ( socket->socketType() == QAbstractSocket::TcpSocket && !isUdpSocketListening && QApplication::applicationState() == Qt::ApplicationActive)
+    {
+      setState( tr( "No connection" ), State::NoConnection );
+      startReconnectTimer();
+      // let's also invalidate current position since we no longer have connection
+      emit positionChanged( GeoPosition() );
+    }
+    else if (socket->socketType() == QAbstractSocket::UdpSocket && QApplication::applicationState() == Qt::ApplicationActive)
+    {
+      setState( tr( "No connection" ), State::NoConnection );
+      startReconnectTimer();
+      // let's also invalidate current position since we no longer have connection
+      emit positionChanged( GeoPosition() );
+    }
   }
-  const QAbstractSocket *socket = dynamic_cast<QAbstractSocket *>( sender() );
+
   const QString socketTypeToString = QMetaEnum::fromType<QAbstractSocket::SocketType>().valueToKey( socket->socketType() );
   const QString stateToString = QMetaEnum::fromType<QAbstractSocket::SocketState>().valueToKey( state );
   CoreUtils::log( QStringLiteral( "NetworkPositionProvider" ), QStringLiteral( "%1 Socket changed state, code: %2" ).arg( socketTypeToString, stateToString ) );
@@ -125,22 +186,6 @@ void NetworkPositionProvider::reconnectTimeout()
   }
 }
 
-QAbstractSocket *NetworkPositionProvider::activeSocket() const
-{
-  if ( mTcpSocket->state() >= QAbstractSocket::ConnectingState && mTcpSocket->state() <= QAbstractSocket::BoundState )
-  {
-    return mTcpSocket.get();
-  }
-
-  if ( mUdpSocket->state() >= QAbstractSocket::ConnectingState && mUdpSocket->state() <= QAbstractSocket::BoundState )
-  {
-    return mUdpSocket.get();
-  }
-
-//TODO: wouldn't it be better to guard against nullptr in caller and return nullptr here?
-  return new QAbstractSocket( QAbstractSocket::UnknownSocketType, nullptr );
-}
-
 void NetworkPositionProvider::reconnect()
 {
   mReconnectTimer.stop();
@@ -160,7 +205,7 @@ void NetworkPositionProvider::startReconnectTimer()
 
   mReconnectTimer.start();
 
-// first time do reconnect in short time, then each other in long time
+  // first time do reconnect in short time, then each other in long time
   if ( mReconnectDelay == NetworkPositionProvider::ShortDelay )
   {
     mReconnectDelay = NetworkPositionProvider::LongDelay;
diff --git a/app/position/providers/networkpositionprovider.h b/app/position/providers/networkpositionprovider.h
index 5a8755417..d14b458a0 100644
--- a/app/position/providers/networkpositionprovider.h
+++ b/app/position/providers/networkpositionprovider.h
@@ -22,11 +22,12 @@ class NetworkPositionProvider : public AbstractPositionProvider
 {
     Q_OBJECT
 
-// signalizes in how many [ms] we will try to reconnect to GPS again
+    // signalizes in how many [ms] we will try to reconnect to GPS again
     enum ReconnectDelay
     {
-      ShortDelay = 3000,
-      LongDelay = 5000
+      ShortDelay = 3000,      // 3 secs
+      LongDelay = 5000,       // 5 secs
+      ExtraLongDelay = 10000  // 10 secs
     };
 
   public:
@@ -37,14 +38,15 @@ class NetworkPositionProvider : public AbstractPositionProvider
     void closeProvider() override;
 
   public slots:
+    // processes the received nmea data and emits new position
     void positionUpdateReceived();
+    // changes the provider state depending on the socket states
     void socketStateChanged( QAbstractSocket::SocketState state );
+    // checks if enough time passed since last reconnect and triggers it if necessary
     void reconnectTimeout();
 
   private:
-// utility function, which should return the socket in use
-    QAbstractSocket *activeSocket() const;
-// trigger the reconnection flow for both sockets
+    // trigger the reconnection flow for both sockets
     void reconnect();
     // start the reconnection timeout
     void startReconnectTimer();
@@ -55,6 +57,7 @@ class NetworkPositionProvider : public AbstractPositionProvider
     int mReconnectDelay = ReconnectDelay::ShortDelay; // in how many [ms] we will try to reconnect again
     int mSecondsLeftToReconnect; // how many seconds are left to reconnect. Reconnects if less than or equal to one
     QTimer mReconnectTimer; // timer that times out each second and lowers the mSecondsLeftToReconnect by one
+    QTimer mUdpReconnectTimer; // timer that times out after ExtraLongDelay and triggers reconnect
 
     QString mTargetAddress; // IP address or hostname of the receiver
     int mTargetPort; // active port of the receiver

From 75357b558f8bd3b877339c885eb6424086468f67 Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Fri, 30 Jan 2026 22:22:43 +0100
Subject: [PATCH 03/30] Fix external provider recreation bug

---
 app/position/positionkit.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/position/positionkit.cpp b/app/position/positionkit.cpp
index 1e0be92ba..d46d913a5 100644
--- a/app/position/positionkit.cpp
+++ b/app/position/positionkit.cpp
@@ -233,9 +233,9 @@ AbstractPositionProvider *PositionKit::constructActiveProvider( AppSettings *app
       if ( providerData[1] == providerId )
       {
         providerName = providerData[0].toString();
-        if ( !providerData.at( 3 ).isNull() )
+        if ( !providerData.at( 2 ).isNull() )
         {
-          providerType = providerData[3].toString();
+          providerType = providerData[2].toString();
         }
       }
     }

From 389492f6fb34e218ee411b1e60b4e8a959fef26d Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Fri, 30 Jan 2026 23:11:52 +0100
Subject: [PATCH 04/30] Fix another restart provider bug

---
 app/position/providers/positionprovidersmodel.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/position/providers/positionprovidersmodel.cpp b/app/position/providers/positionprovidersmodel.cpp
index b51373f2b..c9a91b6ea 100644
--- a/app/position/providers/positionprovidersmodel.cpp
+++ b/app/position/providers/positionprovidersmodel.cpp
@@ -197,10 +197,12 @@ void PositionProvidersModel::setAppSettings( AppSettings *as )
         }
 
         PositionProvider provider;
+        const QString providerType = providerData[2].isNull() ? QStringLiteral( "external_bt" ) : QStringLiteral( "external_ip" );
+        const QString deviceDesc = providerType == QStringLiteral( "external_bt" ) ? tr( " Bluetooth device" ) : tr( " Network device" );
         provider.name = providerData[0].toString();
         provider.providerId = providerData[1].toString();
-        provider.description = provider.providerId + " " + tr( "Bluetooth device" );
-        provider.providerType = "external";
+        provider.description = provider.providerId + deviceDesc;
+        provider.providerType = providerType;
 
         mProviders.append( provider );
       }

From ba8b80109312c5fcbb7201ccae03a7aa8f1f2e41 Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Mon, 16 Feb 2026 18:58:16 +0100
Subject: [PATCH 05/30] Add Alias field for network provider

---
 app/qml/gps/MMPositionProviderPage.qml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/qml/gps/MMPositionProviderPage.qml b/app/qml/gps/MMPositionProviderPage.qml
index 5ff5e5964..41d6e4180 100644
--- a/app/qml/gps/MMPositionProviderPage.qml
+++ b/app/qml/gps/MMPositionProviderPage.qml
@@ -177,8 +177,6 @@ MMComponents.MMPage {
     MMComponents.MMDrawerDialog {
       id: networkProviderInfoDrawer
 
-      signal confirmButtonClicked(string address, int port)
-
       title: qsTr("Network provider setup")
       imageSource: __style.externalGpsGreenImage
       description: qsTr( "To connect to the external device please specify the IP address and port below." )
@@ -189,6 +187,16 @@ MMComponents.MMPage {
         width: parent.width
         spacing: __style.spacing20
 
+        MMInputs.MMTextInput {
+          id: aliasInput
+
+          width: parent.width
+          textFieldBackground.color: __style.lightGreenColor
+
+          title: qsTr("Device alias")
+          placeholderText: qsTr("Green device")
+        }
+
         MMInputs.MMTextInput {
           id: ipAddressInput
 
@@ -210,16 +218,13 @@ MMComponents.MMPage {
         }
       }
 
-      onPrimaryButtonClicked: {
+      onPrimaryButtonClicked: function() {
         close()
-        confirmButtonClicked(ipAddressInput.text, portInput.text)
-      }
 
-      onConfirmButtonClicked: function( address, port ) {
-        const deviceAddress = address + ":" + port
-        __positionKit.positionProvider = __positionKit.constructProvider( "external_ip", deviceAddress, "Network provider" )
+        const deviceAddress = ipAddressInput.text + ":" + portInput.text
+        __positionKit.positionProvider = __positionKit.constructProvider( "external_ip", deviceAddress, aliasInput.text )
 
-        providersModel.addProvider( "Network provider", deviceAddress, "external_ip" )
+        providersModel.addProvider( aliasInput.text, deviceAddress, "external_ip" )
       }
     }
 

From 68d463a0bb881ce30363b15fd663ba035f5718ed Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Tue, 17 Feb 2026 14:32:30 +0100
Subject: [PATCH 06/30] Refactor NmeaParser

---
 app/CMakeLists.txt                            |  2 ++
 .../providers/bluetoothpositionprovider.cpp   | 11 -------
 .../providers/bluetoothpositionprovider.h     | 23 ++-----------
 .../providers/networkpositionprovider.cpp     | 24 +++++++-------
 app/position/providers/nmeaparser.cpp         | 23 +++++++++++++
 app/position/providers/nmeaparser.h           | 32 +++++++++++++++++++
 6 files changed, 72 insertions(+), 43 deletions(-)
 create mode 100644 app/position/providers/nmeaparser.cpp
 create mode 100644 app/position/providers/nmeaparser.h

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index ed7a78f83..00c0041cc 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -35,6 +35,7 @@ set(MM_SRCS
     position/providers/networkpositionprovider.cpp
     position/providers/positionprovidersmodel.cpp
     position/providers/simulatedpositionprovider.cpp
+    position/providers/nmeaparser.cpp
     position/tracking/abstracttrackingbackend.cpp
     position/tracking/internaltrackingbackend.cpp
     position/tracking/positiontrackinghighlight.cpp
@@ -126,6 +127,7 @@ set(MM_HDRS
     position/providers/networkpositionprovider.h
     position/providers/positionprovidersmodel.h
     position/providers/simulatedpositionprovider.h
+    position/providers/nmeaparser.h
     position/tracking/abstracttrackingbackend.h
     position/tracking/internaltrackingbackend.h
     position/tracking/positiontrackinghighlight.h
diff --git a/app/position/providers/bluetoothpositionprovider.cpp b/app/position/providers/bluetoothpositionprovider.cpp
index 6303bb37d..9c8bbe1c5 100644
--- a/app/position/providers/bluetoothpositionprovider.cpp
+++ b/app/position/providers/bluetoothpositionprovider.cpp
@@ -19,17 +19,6 @@
 #include <QPermissions>
 #endif
 
-NmeaParser::NmeaParser() : QgsNmeaConnection( new QBluetoothSocket() )
-{
-}
-
-QgsGpsInformation NmeaParser::parseNmeaString( const QString &nmeaString )
-{
-  mStringBuffer = nmeaString;
-  processStringBuffer();
-  return mLastGPSInformation;
-}
-
 BluetoothPositionProvider::BluetoothPositionProvider( const QString &addr, const QString &name, QObject *parent )
   : AbstractPositionProvider( addr, QStringLiteral( "external_bt" ), name, parent )
   , mTargetAddress( addr )
diff --git a/app/position/providers/bluetoothpositionprovider.h b/app/position/providers/bluetoothpositionprovider.h
index 4670131da..ad60d19a9 100644
--- a/app/position/providers/bluetoothpositionprovider.h
+++ b/app/position/providers/bluetoothpositionprovider.h
@@ -10,29 +10,12 @@
 #ifndef BLUETOOTHPOSITIONPROVIDER_H
 #define BLUETOOTHPOSITIONPROVIDER_H
 
-#include "abstractpositionprovider.h"
-
-#include "qgsnmeaconnection.h"
-
 #include <QBluetoothSocket>
 #include <QBluetoothLocalDevice>
 #include <QTimer>
 
-/**
- * NmeaParser is a big hack how to reuse QGIS NmeaConnection function in order to (a) keep ownership of bluetooth
- * socket, (b) do not have multiple unique_ptrs holding the same pointer and to avoid some possible crashes.
- *
- * Note: This way of reusing makes the parser highly dependent on QgsNmeaConnection class and any change inside the class
- * can lead to misbehavior's. See implementation of QgsNmeaConnection and QgsGpsConnection for more details.
- */
-class NmeaParser : public QgsNmeaConnection
-{
-  public:
-    NmeaParser();
-
-    // Takes nmea string and returns gps position
-    QgsGpsInformation parseNmeaString( const QString &nmeaString );
-};
+#include "abstractpositionprovider.h"
+#include "nmeaparser.h"
 
 /**
  * BluetoothPositionProvider initiates connection to bluetooth device
@@ -51,7 +34,7 @@ class BluetoothPositionProvider : public AbstractPositionProvider
     };
 
   public:
-    BluetoothPositionProvider( const QString &addr, const QString &name, PositionTransformer &positionTransformer, QObject *parent = nullptr );
+    BluetoothPositionProvider( const QString &addr, const QString &name, QObject *parent = nullptr );
     ~BluetoothPositionProvider() override;
 
     void startUpdates() override;
diff --git a/app/position/providers/networkpositionprovider.cpp b/app/position/providers/networkpositionprovider.cpp
index 857bb63aa..b2d0af2fa 100644
--- a/app/position/providers/networkpositionprovider.cpp
+++ b/app/position/providers/networkpositionprovider.cpp
@@ -38,16 +38,16 @@ NetworkPositionProvider::NetworkPositionProvider( const QString &addr, const QSt
   connect( &mReconnectTimer, &QTimer::timeout, this, &NetworkPositionProvider::reconnectTimeout );
   mUdpReconnectTimer.setSingleShot( true );
   connect( &mUdpReconnectTimer, &QTimer::timeout, this, [this]
+  {
+    CoreUtils::log( QStringLiteral( "NetworkPositionProvider" ), QStringLiteral( "UDP socket no data received in threshold, triggering reconnect..." ) );
+    if ( mTcpSocket->state() != QAbstractSocket::ConnectedState )
     {
-      CoreUtils::log( QStringLiteral( "NetworkPositionProvider" ), QStringLiteral( "UDP socket no data received in threshold, triggering reconnect..." ) );
-      if ( mTcpSocket->state() != QAbstractSocket::ConnectedState )
-      {
-        setState( tr( "No connection" ), State::NoConnection );
-        startReconnectTimer();
-        // let's also invalidate current position since we no longer have connection
-        emit positionChanged( GeoPosition() );
-      }
-    } );
+      setState( tr( "No connection" ), State::NoConnection );
+      startReconnectTimer();
+      // let's also invalidate current position since we no longer have connection
+      emit positionChanged( GeoPosition() );
+    }
+  } );
 
   NetworkPositionProvider::startUpdates();
 }
@@ -110,7 +110,7 @@ void NetworkPositionProvider::positionUpdateReceived()
     }
 
     // "connect" to peer if we are not already connecting
-    if (mUdpSocket->state() != QAbstractSocket::ConnectedState && mUdpSocket->state() != QAbstractSocket::ConnectingState)
+    if ( mUdpSocket->state() != QAbstractSocket::ConnectedState && mUdpSocket->state() != QAbstractSocket::ConnectingState )
     {
       mUdpSocket->connectToHost( peerAddress.toString(), peerPort );
     }
@@ -151,14 +151,14 @@ void NetworkPositionProvider::socketStateChanged( const QAbstractSocket::SocketS
   else if ( state == QAbstractSocket::UnconnectedState )
   {
     const bool isUdpSocketListening = mUdpSocket->state() == QAbstractSocket::ConnectedState || mUdpSocket->state() == QAbstractSocket::BoundState || mUdpReconnectTimer.isActive();
-    if ( socket->socketType() == QAbstractSocket::TcpSocket && !isUdpSocketListening && QApplication::applicationState() == Qt::ApplicationActive)
+    if ( socket->socketType() == QAbstractSocket::TcpSocket && !isUdpSocketListening && QApplication::applicationState() == Qt::ApplicationActive )
     {
       setState( tr( "No connection" ), State::NoConnection );
       startReconnectTimer();
       // let's also invalidate current position since we no longer have connection
       emit positionChanged( GeoPosition() );
     }
-    else if (socket->socketType() == QAbstractSocket::UdpSocket && QApplication::applicationState() == Qt::ApplicationActive)
+    else if ( socket->socketType() == QAbstractSocket::UdpSocket && QApplication::applicationState() == Qt::ApplicationActive )
     {
       setState( tr( "No connection" ), State::NoConnection );
       startReconnectTimer();
diff --git a/app/position/providers/nmeaparser.cpp b/app/position/providers/nmeaparser.cpp
new file mode 100644
index 000000000..69a8f1015
--- /dev/null
+++ b/app/position/providers/nmeaparser.cpp
@@ -0,0 +1,23 @@
+/***************************************************************************
+*                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "nmeaparser.h"
+
+#include <QBuffer>
+
+NmeaParser::NmeaParser() : QgsNmeaConnection( new QBuffer() )
+{
+}
+
+QgsGpsInformation NmeaParser::parseNmeaString( const QString &nmeaString )
+{
+  mStringBuffer = nmeaString;
+  processStringBuffer();
+  return mLastGPSInformation;
+}
\ No newline at end of file
diff --git a/app/position/providers/nmeaparser.h b/app/position/providers/nmeaparser.h
new file mode 100644
index 000000000..fc47d7e82
--- /dev/null
+++ b/app/position/providers/nmeaparser.h
@@ -0,0 +1,32 @@
+/***************************************************************************
+*                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef NMEAPARSER_H
+#define NMEAPARSER_H
+
+#include <qgsnmeaconnection.h>
+
+/**
+ * NmeaParser is a big hack how to reuse QGIS NmeaConnection function in order to (a) keep ownership of bluetooth
+ * socket, (b) do not have multiple unique_ptrs holding the same pointer and to avoid some possible crashes.
+ *
+ * Note: This way of reusing makes the parser highly dependent on QgsNmeaConnection class and any change inside the class
+ * can lead to misbehavior's. See implementation of QgsNmeaConnection and QgsGpsConnection for more details.
+ */
+class NmeaParser : public QgsNmeaConnection
+{
+  public:
+    NmeaParser();
+
+// Takes nmea string and returns gps position
+    QgsGpsInformation parseNmeaString( const QString &nmeaString );
+};
+
+
+#endif //NMEAPARSER_H
\ No newline at end of file

From c0f609f260f32761307547a0de483bdcc9390dcc Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Tue, 17 Feb 2026 14:48:12 +0100
Subject: [PATCH 07/30] Fix breaking bluetooth include

---
 app/position/providers/networkpositionprovider.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/position/providers/networkpositionprovider.h b/app/position/providers/networkpositionprovider.h
index d14b458a0..794f63458 100644
--- a/app/position/providers/networkpositionprovider.h
+++ b/app/position/providers/networkpositionprovider.h
@@ -13,9 +13,10 @@
 
 #include <QTcpSocket>
 #include <QUdpSocket>
+#include <QTimer>
 
 #include "abstractpositionprovider.h"
-#include "bluetoothpositionprovider.h"
+#include "nmeaparser.h"
 
 
 class NetworkPositionProvider : public AbstractPositionProvider

From 5ae1d6ca44e4641e521103793da16e31b760401f Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Tue, 17 Feb 2026 17:47:41 +0100
Subject: [PATCH 08/30] Update tests

---
 app/test/testposition.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/test/testposition.cpp b/app/test/testposition.cpp
index 740ef6f43..0b8ec3567 100644
--- a/app/test/testposition.cpp
+++ b/app/test/testposition.cpp
@@ -257,7 +257,7 @@ void TestPosition::testPositionProviderKeysInSettings()
   rawSettings.remove( AppSettings::POSITION_PROVIDERS_GROUP ); // make sure nothing is there from previous tests
 
 #ifdef HAVE_BLUETOOTH
-  positionKit->setPositionProvider( positionKit->constructProvider( "external_bt", "AA:BB:CC:DD:EE:FF", "testProviderA" ) );
+  positionKit->setPositionProvider( PositionKit::constructProvider( "external_bt", "AA:BB:CC:DD:EE:FF", "testProviderA" ) );
 
   QCOMPARE( positionKit->positionProvider()->id(), "AA:BB:CC:DD:EE:FF" );
   QCOMPARE( positionKit->positionProvider()->name(), "testProviderA" );
@@ -266,7 +266,7 @@ void TestPosition::testPositionProviderKeysInSettings()
   QCOMPARE( rawSettings.value( CoreUtils::QSETTINGS_APP_GROUP_NAME + "/activePositionProviderId" ).toString(), "AA:BB:CC:DD:EE:FF" );
 #endif
 
-  positionKit->setPositionProvider( positionKit->constructProvider( "internal", "devicegps" ) );
+  positionKit->setPositionProvider( PositionKit::constructProvider( "internal", "devicegps" ) );
 
   QCOMPARE( rawSettings.value( CoreUtils::QSETTINGS_APP_GROUP_NAME + "/activePositionProviderId" ).toString(), "devicegps" );
 
@@ -280,19 +280,27 @@ void TestPosition::testPositionProviderKeysInSettings()
 
   providersModel.setAppSettings( &appSettings );
   providersModel.addProvider( "testProviderB", "AA:00:11:22:23:44", "external_bt" );
+  providersModel.addProvider( "testProviderC", "localhost:9000", "external_ip" );
 
-  // app settings should have one saved provider - testProviderB
+  // app settings should have two saved providers - testProviderB & testProviderC
   QVariantList providers = appSettings.savedPositionProviders();
 
-  QCOMPARE( providers.count(), 1 ); // we have one (external) provider
-  QCOMPARE( providers.at( 0 ).toList().count(), 2 ); // the provider has two properties
+  QCOMPARE( providers.count(), 2 ); // we have two (external) providers
+  QCOMPARE( providers.at( 0 ).toList().count(), 3 ); // the provider has two properties
 
   QVariantList providerData = providers.at( 0 ).toList();
   QCOMPARE( providerData.at( 0 ).toString(), "testProviderB" );
   QCOMPARE( providerData.at( 1 ).toString(), "AA:00:11:22:23:44" );
+  QCOMPARE( providerData.at( 2 ).toString(), "external_bt" );
+
+  providerData = providers.at( 1 ).toList();
+  QCOMPARE( providerData.at( 0 ).toString(), "testProviderC" );
+  QCOMPARE( providerData.at( 1 ).toString(), "localhost:9000" );
+  QCOMPARE( providerData.at( 2 ).toString(), "external_ip" );
 
   // remove that provider
   providersModel.removeProvider( "AA:00:11:22:23:44" );
+  providersModel.removeProvider( "localhost:9000" );
 
   providers = appSettings.savedPositionProviders();
 

From 57e07104b695f426957e45656c51a0d65673dcd0 Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Tue, 17 Feb 2026 18:17:33 +0100
Subject: [PATCH 09/30] Fix merge leftovers

---
 app/position/positionkit.cpp                         | 2 +-
 app/position/providers/bluetoothpositionprovider.cpp | 4 ++--
 app/position/providers/networkpositionprovider.cpp   | 4 ++--
 app/position/providers/networkpositionprovider.h     | 2 +-
 app/test/testposition.cpp                            | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/position/positionkit.cpp b/app/position/positionkit.cpp
index d46d913a5..3026db294 100644
--- a/app/position/positionkit.cpp
+++ b/app/position/positionkit.cpp
@@ -145,7 +145,7 @@ AbstractPositionProvider *PositionKit::constructProvider( const QString &type, c
 
   if ( providerType == QStringLiteral( "external_ip" ) )
   {
-    AbstractPositionProvider *provider = new NetworkPositionProvider( id, name );
+    AbstractPositionProvider *provider = new NetworkPositionProvider( id, name, *mPositionTransformer );
     QQmlEngine::setObjectOwnership( provider, QQmlEngine::CppOwnership );
     return provider;
   }
diff --git a/app/position/providers/bluetoothpositionprovider.cpp b/app/position/providers/bluetoothpositionprovider.cpp
index 9c8bbe1c5..380c595fe 100644
--- a/app/position/providers/bluetoothpositionprovider.cpp
+++ b/app/position/providers/bluetoothpositionprovider.cpp
@@ -19,8 +19,8 @@
 #include <QPermissions>
 #endif
 
-BluetoothPositionProvider::BluetoothPositionProvider( const QString &addr, const QString &name, QObject *parent )
-  : AbstractPositionProvider( addr, QStringLiteral( "external_bt" ), name, parent )
+BluetoothPositionProvider::BluetoothPositionProvider( const QString &addr, const QString &name, PositionTransformer &positionTransformer, QObject *parent )
+  : AbstractPositionProvider( addr, QStringLiteral( "external_bt" ), name, positionTransformer, parent )
   , mTargetAddress( addr )
 {
   mSocket = std::unique_ptr<QBluetoothSocket>( new QBluetoothSocket( QBluetoothServiceInfo::RfcommProtocol ) );
diff --git a/app/position/providers/networkpositionprovider.cpp b/app/position/providers/networkpositionprovider.cpp
index b2d0af2fa..93189d3ac 100644
--- a/app/position/providers/networkpositionprovider.cpp
+++ b/app/position/providers/networkpositionprovider.cpp
@@ -16,8 +16,8 @@
 
 static int ONE_SECOND_MS = 1000;
 
-NetworkPositionProvider::NetworkPositionProvider( const QString &addr, const QString &name, QObject *parent )
-  : AbstractPositionProvider( addr, QStringLiteral( "external_ip" ), name, parent ),
+NetworkPositionProvider::NetworkPositionProvider( const QString &addr, const QString &name, PositionTransformer &positionTransformer, QObject *parent )
+  : AbstractPositionProvider( addr, QStringLiteral( "external_ip" ), name, positionTransformer, parent ),
     mSecondsLeftToReconnect( ReconnectDelay::ShortDelay / ONE_SECOND_MS )
 {
   const QStringList targetAddress = addr.split( ":" );
diff --git a/app/position/providers/networkpositionprovider.h b/app/position/providers/networkpositionprovider.h
index 794f63458..9d4bc080f 100644
--- a/app/position/providers/networkpositionprovider.h
+++ b/app/position/providers/networkpositionprovider.h
@@ -32,7 +32,7 @@ class NetworkPositionProvider : public AbstractPositionProvider
     };
 
   public:
-    explicit NetworkPositionProvider( const QString &addr, const QString &name, QObject *parent = nullptr );
+    NetworkPositionProvider( const QString &addr, const QString &name, PositionTransformer &positionTransformer, QObject *parent = nullptr );
 
     void startUpdates() override;
     void stopUpdates() override;
diff --git a/app/test/testposition.cpp b/app/test/testposition.cpp
index 0b8ec3567..d3b78c73b 100644
--- a/app/test/testposition.cpp
+++ b/app/test/testposition.cpp
@@ -257,7 +257,7 @@ void TestPosition::testPositionProviderKeysInSettings()
   rawSettings.remove( AppSettings::POSITION_PROVIDERS_GROUP ); // make sure nothing is there from previous tests
 
 #ifdef HAVE_BLUETOOTH
-  positionKit->setPositionProvider( PositionKit::constructProvider( "external_bt", "AA:BB:CC:DD:EE:FF", "testProviderA" ) );
+  positionKit->setPositionProvider( positionKit->constructProvider( "external_bt", "AA:BB:CC:DD:EE:FF", "testProviderA" ) );
 
   QCOMPARE( positionKit->positionProvider()->id(), "AA:BB:CC:DD:EE:FF" );
   QCOMPARE( positionKit->positionProvider()->name(), "testProviderA" );
@@ -266,7 +266,7 @@ void TestPosition::testPositionProviderKeysInSettings()
   QCOMPARE( rawSettings.value( CoreUtils::QSETTINGS_APP_GROUP_NAME + "/activePositionProviderId" ).toString(), "AA:BB:CC:DD:EE:FF" );
 #endif
 
-  positionKit->setPositionProvider( PositionKit::constructProvider( "internal", "devicegps" ) );
+  positionKit->setPositionProvider( positionKit->constructProvider( "internal", "devicegps" ) );
 
   QCOMPARE( rawSettings.value( CoreUtils::QSETTINGS_APP_GROUP_NAME + "/activePositionProviderId" ).toString(), "devicegps" );
 

From 0220d3d7f0347adf103653b20fea882d48567a44 Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Tue, 17 Feb 2026 18:19:25 +0100
Subject: [PATCH 10/30] Remove debug logs

---
 app/position/providers/networkpositionprovider.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/position/providers/networkpositionprovider.cpp b/app/position/providers/networkpositionprovider.cpp
index 93189d3ac..ef5b52654 100644
--- a/app/position/providers/networkpositionprovider.cpp
+++ b/app/position/providers/networkpositionprovider.cpp
@@ -12,8 +12,6 @@
 #include <QApplication>
 #include <QNetworkDatagram>
 
-#include "coreutils.h"
-
 static int ONE_SECOND_MS = 1000;
 
 NetworkPositionProvider::NetworkPositionProvider( const QString &addr, const QString &name, PositionTransformer &positionTransformer, QObject *parent )
@@ -39,7 +37,6 @@ NetworkPositionProvider::NetworkPositionProvider( const QString &addr, const QSt
   mUdpReconnectTimer.setSingleShot( true );
   connect( &mUdpReconnectTimer, &QTimer::timeout, this, [this]
   {
-    CoreUtils::log( QStringLiteral( "NetworkPositionProvider" ), QStringLiteral( "UDP socket no data received in threshold, triggering reconnect..." ) );
     if ( mTcpSocket->state() != QAbstractSocket::ConnectedState )
     {
       setState( tr( "No connection" ), State::NoConnection );
@@ -55,7 +52,6 @@ NetworkPositionProvider::NetworkPositionProvider( const QString &addr, const QSt
 void NetworkPositionProvider::startUpdates()
 {
   // TODO: QHostAddress doesn't support hostname lookup (QHostInfo does)
-  CoreUtils::log( "NetworkPositionProvider", "Connecting to host..." );
   mTcpSocket->connectToHost( mTargetAddress, mTargetPort );
   mUdpSocket->bind( QHostAddress::LocalHost, mTargetPort );
   mUdpReconnectTimer.start( ReconnectDelay::ExtraLongDelay );
@@ -83,7 +79,6 @@ void NetworkPositionProvider::positionUpdateReceived()
 {
   QAbstractSocket *socket = dynamic_cast<QAbstractSocket *>( sender() );
   const QString socketTypeToString = QMetaEnum::fromType<QAbstractSocket::SocketType>().valueToKey( socket->socketType() );
-  CoreUtils::log( "NetworkPositionProvider", QStringLiteral( "%1 socket has received new data!" ).arg( socketTypeToString ) );
 
   // if udp is not connected to the host yet, connect
   // this approach will let us use QIODevice functions for both sockets
@@ -169,7 +164,6 @@ void NetworkPositionProvider::socketStateChanged( const QAbstractSocket::SocketS
 
   const QString socketTypeToString = QMetaEnum::fromType<QAbstractSocket::SocketType>().valueToKey( socket->socketType() );
   const QString stateToString = QMetaEnum::fromType<QAbstractSocket::SocketState>().valueToKey( state );
-  CoreUtils::log( QStringLiteral( "NetworkPositionProvider" ), QStringLiteral( "%1 Socket changed state, code: %2" ).arg( socketTypeToString, stateToString ) );
 }
 
 void NetworkPositionProvider::reconnectTimeout()
@@ -192,8 +186,6 @@ void NetworkPositionProvider::reconnect()
 
   setState( tr( "Reconnecting" ), State::Connecting );
 
-  CoreUtils::log( QStringLiteral( "NetworkPositionProvider" ), QStringLiteral( "Reconnecting to %1" ).arg( mProviderName ) );
-
   stopUpdates();
   startUpdates();
 }

From 2cd278e2109637dbee33e90c9f6ce5b4cb67fbab Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Wed, 18 Feb 2026 09:02:33 +0100
Subject: [PATCH 11/30] Fix android merge error

---
 app/position/positionkit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/position/positionkit.cpp b/app/position/positionkit.cpp
index 3026db294..ee55ed6f1 100644
--- a/app/position/positionkit.cpp
+++ b/app/position/positionkit.cpp
@@ -161,7 +161,7 @@ AbstractPositionProvider *PositionKit::constructProvider( const QString &type, c
 #ifdef ANDROID
   if ( id == QStringLiteral( "android_fused" ) || id == QStringLiteral( "android_gps" ) )
   {
-    bool fused = ( id == QStringLiteral( "android_fused" ) );
+    const bool fused = ( id == QStringLiteral( "android_fused" ) );
     if ( fused && !AndroidPositionProvider::isFusedAvailable() )
     {
       // TODO: inform user + use AndroidPositionProvider::fusedErrorString() output?

From 1d57f50a63cd6644625d663d2926363eb76b4899 Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Wed, 18 Feb 2026 10:49:32 +0100
Subject: [PATCH 12/30] Add position processing for network provider

---
 app/position/positiontransformer.cpp               | 5 +++++
 app/position/positiontransformer.h                 | 8 ++++++++
 app/position/providers/networkpositionprovider.cpp | 5 ++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/position/positiontransformer.cpp b/app/position/positiontransformer.cpp
index 3d5dd559c..52071dd16 100644
--- a/app/position/positiontransformer.cpp
+++ b/app/position/positiontransformer.cpp
@@ -50,6 +50,11 @@ GeoPosition PositionTransformer::processBluetoothPosition( GeoPosition geoPositi
   return geoPosition;
 }
 
+GeoPosition PositionTransformer::processNetworkPosition( const GeoPosition &geoPosition )
+{
+  return processBluetoothPosition( geoPosition );
+}
+
 GeoPosition PositionTransformer::processAndroidPosition( GeoPosition geoPosition )
 {
   if ( geoPosition.elevation != std::numeric_limits<double>::quiet_NaN() )
diff --git a/app/position/positiontransformer.h b/app/position/positiontransformer.h
index 87e4a2c6a..0bac4de0f 100644
--- a/app/position/positiontransformer.h
+++ b/app/position/positiontransformer.h
@@ -49,6 +49,14 @@ class PositionTransformer : QObject
      */
     GeoPosition processBluetoothPosition( GeoPosition geoPosition );
 
+    /**
+     * Transform the elevation if the user sets custom vertical CRS. The elevation gets recalculated to ellipsoid elevation
+     * and then back to orthometric based on specified CRS.
+     * \note This method should be used only with NetworkPositionProvider to mitigate unnecessary transformations
+     * \return Copy of passed geoPosition with processed elevation and elevation separation.
+     */
+    GeoPosition processNetworkPosition( const GeoPosition &geoPosition );
+
     /**
     * Transform the elevation from EPSG:4979 (WGS84 (EPSG:4326) + ellipsoidal height) to specified geoid model
     * (by default EPSG:9707 (WGS84 + EGM96))
diff --git a/app/position/providers/networkpositionprovider.cpp b/app/position/providers/networkpositionprovider.cpp
index ef5b52654..fbe533b65 100644
--- a/app/position/providers/networkpositionprovider.cpp
+++ b/app/position/providers/networkpositionprovider.cpp
@@ -101,7 +101,9 @@ void NetworkPositionProvider::positionUpdateReceived()
       const QByteArray rawNmeaData = datagram.data();
       const QString nmeaData( rawNmeaData );
       const QgsGpsInformation gpsInfo = mNmeaParser.parseNmeaString( nmeaData );
-      emit positionChanged( GeoPosition::fromQgsGpsInformation( gpsInfo ) );
+      GeoPosition transformedPosition = mPositionTransformer->processNetworkPosition( GeoPosition::fromQgsGpsInformation( gpsInfo ) );
+
+      emit positionChanged( transformedPosition );
     }
 
     // "connect" to peer if we are not already connecting
@@ -126,6 +128,7 @@ void NetworkPositionProvider::positionUpdateReceived()
   const QByteArray rawNmeaData = socket->readAll();
   const QString nmeaData( rawNmeaData );
   const QgsGpsInformation gpsInfo = mNmeaParser.parseNmeaString( nmeaData );
+  GeoPosition transformedPosition = mPositionTransformer->processNetworkPosition( GeoPosition::fromQgsGpsInformation( gpsInfo ) );
 
   emit positionChanged( GeoPosition::fromQgsGpsInformation( gpsInfo ) );
 }

From 880ce504bba72ee36911dd66208db0e2f82fa324 Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Wed, 18 Feb 2026 11:12:47 +0100
Subject: [PATCH 13/30] Add processing tests

---
 app/test/testposition.cpp | 67 +++++++++++++++++++++++++++++++++++++++
 app/test/testposition.h   |  1 +
 2 files changed, 68 insertions(+)

diff --git a/app/test/testposition.cpp b/app/test/testposition.cpp
index d3b78c73b..b7c4a75b6 100644
--- a/app/test/testposition.cpp
+++ b/app/test/testposition.cpp
@@ -770,6 +770,73 @@ void TestPosition::testPositionTransformerInternalDesktopPosition()
   QVERIFY( qgsDoubleNear( newPosition.elevation, 171.3 ) );
 }
 
+void TestPosition::testPositionTransformerNetworkPosition()
+{
+ // prepare position transformers
+  // WGS84 + ellipsoid
+  QgsCoordinateReferenceSystem ellipsoidHeightCrs = QgsCoordinateReferenceSystem::fromEpsgId( 4979 );
+  // WGS84 + EGM96
+  QgsCoordinateReferenceSystem geoidHeightCrs = QgsCoordinateReferenceSystem::fromEpsgId( 9707 );
+  PositionTransformer passThroughTransformer( ellipsoidHeightCrs, geoidHeightCrs, true, QgsCoordinateTransformContext() );
+  PositionTransformer positionTransformer( ellipsoidHeightCrs, geoidHeightCrs, false, QgsCoordinateTransformContext() );
+
+#ifdef  HAVE_BLUETOOTH
+  // mini file contains only minimal info like position and date
+  QString miniNmeaPositionFilePath = TestUtils::testDataDir() + "/position/nmea_petrzalka_mini.txt";
+  QFile miniNmeaFile( miniNmeaPositionFilePath );
+  miniNmeaFile.open( QFile::ReadOnly );
+
+  QVERIFY( miniNmeaFile.isOpen() );
+
+  NmeaParser parser;
+  QgsGpsInformation position = parser.parseNmeaString( miniNmeaFile.readAll() );
+  GeoPosition geoPosition = GeoPosition::fromQgsGpsInformation( position );
+
+  QVERIFY( qgsDoubleNear( geoPosition.latitude, 48.10305 ) );
+  QVERIFY( qgsDoubleNear( geoPosition.longitude, 17.1064 ) );
+  QCOMPARE( geoPosition.elevation, 171.3 );
+  QCOMPARE( geoPosition.elevation_diff, std::numeric_limits<double>::quiet_NaN() );
+#else
+  GeoPosition geoPosition;
+  geoPosition.latitude = 48.10305;
+  geoPosition.longitude = 17.1064;
+  geoPosition.elevation = 171.3;
+#endif
+
+  // transform with pass through disabled and missing elevation separation
+  GeoPosition newPosition = positionTransformer.processNetworkPosition( geoPosition );
+
+  QVERIFY( qgsDoubleNear( newPosition.latitude, 48.10305 ) );
+  QVERIFY( qgsDoubleNear( newPosition.longitude, 17.1064 ) );
+  QCOMPARE( newPosition.elevation, 171.3 );
+  QCOMPARE( newPosition.elevation_diff, std::numeric_limits<double>::quiet_NaN() );
+
+  // transform with pass through enabled and missing elevation separation
+  newPosition = passThroughTransformer.processNetworkPosition( geoPosition );
+
+  QVERIFY( qgsDoubleNear( newPosition.latitude, 48.10305 ) );
+  QVERIFY( qgsDoubleNear( newPosition.longitude, 17.1064 ) );
+  QCOMPARE( newPosition.elevation, 171.3 );
+  QCOMPARE( newPosition.elevation_diff, std::numeric_limits<double>::quiet_NaN() );
+
+  // transform with pass through enabled and elevation separation
+  geoPosition.elevation_diff = 40;
+  newPosition = passThroughTransformer.processNetworkPosition( geoPosition );
+
+  QVERIFY( qgsDoubleNear( newPosition.latitude, 48.10305 ) );
+  QVERIFY( qgsDoubleNear( newPosition.longitude, 17.1064 ) );
+  QCOMPARE( newPosition.elevation, 171.3 );
+  QCOMPARE( newPosition.elevation_diff, 40 );
+
+  // transform with pass through disabled and elevation separation
+  newPosition = positionTransformer.processNetworkPosition( geoPosition );
+
+  QVERIFY( qgsDoubleNear( newPosition.latitude, 48.10305 ) );
+  QVERIFY( qgsDoubleNear( newPosition.longitude, 17.1064 ) );
+  QVERIFY( qgsDoubleNear( newPosition.elevation, 167.53574931171875 ) );
+  QVERIFY( qgsDoubleNear( newPosition.elevation_diff, 43.764250688281265 ) );
+}
+
 void TestPosition::testPositionTransformerSimulatedPosition()
 {
   // prepare position transformers
diff --git a/app/test/testposition.h b/app/test/testposition.h
index 3636b89c3..40ffd45c6 100644
--- a/app/test/testposition.h
+++ b/app/test/testposition.h
@@ -44,6 +44,7 @@ class TestPosition: public QObject
     void testPositionTransformerInternalAndroidPosition();
     void testPositionTransformerInternalIosPosition();
     void testPositionTransformerInternalDesktopPosition();
+    void testPositionTransformerNetworkPosition();
     void testPositionTransformerSimulatedPosition();
 
   private:

From 3310a84d07a9196c502b360bb425814e64788cc1 Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Wed, 18 Feb 2026 11:17:27 +0100
Subject: [PATCH 14/30] Fix formatting

---
 app/test/testposition.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test/testposition.cpp b/app/test/testposition.cpp
index b7c4a75b6..846c4c227 100644
--- a/app/test/testposition.cpp
+++ b/app/test/testposition.cpp
@@ -772,7 +772,7 @@ void TestPosition::testPositionTransformerInternalDesktopPosition()
 
 void TestPosition::testPositionTransformerNetworkPosition()
 {
- // prepare position transformers
+// prepare position transformers
   // WGS84 + ellipsoid
   QgsCoordinateReferenceSystem ellipsoidHeightCrs = QgsCoordinateReferenceSystem::fromEpsgId( 4979 );
   // WGS84 + EGM96

From c5d88052533c980fa7f0d143f0b4a353695daf5c Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Wed, 11 Mar 2026 12:58:18 +0100
Subject: [PATCH 15/30] Fix provider removal crash + minor cleanup

---
 app/position/providers/networkpositionprovider.cpp | 9 +++++----
 app/qml/gps/MMPositionProviderPage.qml             | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/position/providers/networkpositionprovider.cpp b/app/position/providers/networkpositionprovider.cpp
index fbe533b65..b2b552e65 100644
--- a/app/position/providers/networkpositionprovider.cpp
+++ b/app/position/providers/networkpositionprovider.cpp
@@ -73,12 +73,16 @@ void NetworkPositionProvider::closeProvider()
 {
   mTcpSocket->close();
   mUdpSocket->close();
+  if ( mTcpSocket) mTcpSocket->disconnect();
+  if ( mUdpSocket) mUdpSocket->disconnect();
+
+  mUdpReconnectTimer.stop();
+  mReconnectTimer.stop();
 }
 
 void NetworkPositionProvider::positionUpdateReceived()
 {
   QAbstractSocket *socket = dynamic_cast<QAbstractSocket *>( sender() );
-  const QString socketTypeToString = QMetaEnum::fromType<QAbstractSocket::SocketType>().valueToKey( socket->socketType() );
 
   // if udp is not connected to the host yet, connect
   // this approach will let us use QIODevice functions for both sockets
@@ -164,9 +168,6 @@ void NetworkPositionProvider::socketStateChanged( const QAbstractSocket::SocketS
       emit positionChanged( GeoPosition() );
     }
   }
-
-  const QString socketTypeToString = QMetaEnum::fromType<QAbstractSocket::SocketType>().valueToKey( socket->socketType() );
-  const QString stateToString = QMetaEnum::fromType<QAbstractSocket::SocketState>().valueToKey( state );
 }
 
 void NetworkPositionProvider::reconnectTimeout()
diff --git a/app/qml/gps/MMPositionProviderPage.qml b/app/qml/gps/MMPositionProviderPage.qml
index 41d6e4180..550636f18 100644
--- a/app/qml/gps/MMPositionProviderPage.qml
+++ b/app/qml/gps/MMPositionProviderPage.qml
@@ -222,7 +222,7 @@ MMComponents.MMPage {
         close()
 
         const deviceAddress = ipAddressInput.text + ":" + portInput.text
-        __positionKit.positionProvider = __positionKit.constructProvider( "external_ip", deviceAddress, aliasInput.text )
+        PositionKit.positionProvider = PositionKit.constructProvider( "external_ip", deviceAddress, aliasInput.text )
 
         providersModel.addProvider( aliasInput.text, deviceAddress, "external_ip" )
       }

From c415f608642d8d4b1ede48fc83d83945b47d719b Mon Sep 17 00:00:00 2001
From: Gabriel Bolbotina <bolbotinagabriel@gmail.com>
Date: Thu, 12 Mar 2026 14:55:47 +0200
Subject: [PATCH 16/30] Added bluetooth and network provider icons Modified the
 MMIconCheckBoxHorizontal to feature a description if needed Modularised the
 MMPositionProviderPage Refactored MMBluetoothConnectionDrawer to be used for
 the network provider as well Changes the connecting and failure images for
 the network provider Other small changes

---
 app/icons/Bluetooth.svg                       |   3 +
 app/icons/Network.svg                         |   6 +
 app/icons/icons.qrc                           |   2 +
 app/images/ExternalBluetoothProvider.svg      | 274 +++++++++++++++++
 app/images/ExternalGpsGreen.svg               |  19 --
 app/images/ExternalGpsRed.svg                 | 272 ++++++++++++++++-
 app/images/ExternalNetworkProvider.svg        | 277 ++++++++++++++++++
 app/images/images.qrc                         |   3 +-
 app/mmstyle.h                                 |  10 +-
 .../providers/networkpositionprovider.cpp     |   4 +-
 app/qml/CMakeLists.txt                        |   4 +-
 .../components/MMIconCheckBoxHorizontal.qml   |  61 +++-
 app/qml/gps/MMAddPositionProviderDrawer.qml   |  18 +-
 ...=> MMExternalProviderConnectionDrawer.qml} |  27 +-
 app/qml/gps/MMNetworkProviderDrawer.qml       | 119 ++++++++
 app/qml/gps/MMPositionProviderPage.qml        | 188 +++++-------
 app/qml/gps/MMProviderTypeDrawer.qml          | 102 +++++++
 gallery/qml.qrc                               |   2 +-
 gallery/qml/pages/ChecksPage.qml              |   4 +-
 gallery/qml/pages/DrawerPage.qml              |   5 +-
 gallery/qml/pages/ImagesPage.qml              |   3 +-
 21 files changed, 1232 insertions(+), 171 deletions(-)
 create mode 100644 app/icons/Bluetooth.svg
 create mode 100644 app/icons/Network.svg
 create mode 100644 app/images/ExternalBluetoothProvider.svg
 delete mode 100644 app/images/ExternalGpsGreen.svg
 create mode 100644 app/images/ExternalNetworkProvider.svg
 rename app/qml/gps/{MMBluetoothConnectionDrawer.qml => MMExternalProviderConnectionDrawer.qml} (75%)
 create mode 100644 app/qml/gps/MMNetworkProviderDrawer.qml
 create mode 100644 app/qml/gps/MMProviderTypeDrawer.qml

diff --git a/app/icons/Bluetooth.svg b/app/icons/Bluetooth.svg
new file mode 100644
index 000000000..f18e6d485
--- /dev/null
+++ b/app/icons/Bluetooth.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 7.5L16 16.5L12 21V3L16 7.5L8 16.5" stroke="#004C45" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/app/icons/Network.svg b/app/icons/Network.svg
new file mode 100644
index 000000000..3ff4e7b3d
--- /dev/null
+++ b/app/icons/Network.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17 9C18.6569 9 20 7.65685 20 6C20 4.34315 18.6569 3 17 3C15.3431 3 14 4.34315 14 6C14 7.65685 15.3431 9 17 9Z" stroke="#004C45" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18 21C19.6569 21 21 19.6569 21 18C21 16.3431 19.6569 15 18 15C16.3431 15 15 16.3431 15 18C15 19.6569 16.3431 21 18 21Z" stroke="#004C45" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 15C7.65685 15 9 13.6569 9 12C9 10.3431 7.65685 9 6 9C4.34315 9 3 10.3431 3 12C3 13.6569 4.34315 15 6 15Z" stroke="#004C45" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 7L9 10.6215M14 17L9 13.3785" stroke="#004C45" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/app/icons/icons.qrc b/app/icons/icons.qrc
index 8d9a78db9..261db4fb3 100644
--- a/app/icons/icons.qrc
+++ b/app/icons/icons.qrc
@@ -7,6 +7,7 @@
         <file>ArrowLinkRight.svg</file>
         <file>ArrowUp.svg</file>
         <file>Back.svg</file>
+        <file>Bluetooth.svg</file>
         <file>Briefcase.svg</file>
         <file>Calendar.svg</file>
         <file>Checkmark.svg</file>
@@ -57,6 +58,7 @@
         <file>Mouth.svg</file>
         <file>NaturalResources.svg</file>
         <file>Next.svg</file>
+        <file>Network.svg</file>
         <file>Other.svg</file>
         <file>Others.svg</file>
         <file>Personal.svg</file>
diff --git a/app/images/ExternalBluetoothProvider.svg b/app/images/ExternalBluetoothProvider.svg
new file mode 100644
index 000000000..35f92c7bd
--- /dev/null
+++ b/app/images/ExternalBluetoothProvider.svg
@@ -0,0 +1,274 @@
+<svg width="154" height="126" viewBox="0 0 154 126" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M84 126C117.136 126 144 99.1893 144 66.0006C144 32.8108 117.018 6 84 6C50.8639 6 24 32.8108 24 66.0006C24 99.1893 50.8639 126 84 126Z" fill="#B7CDC4"/>
+<path d="M108.5 89.8998C108.2 90.0998 107.8 90.0998 107.5 89.8998C107.4 89.7998 107.3 89.7999 107.3 89.6999V89.5999V104.3C107.3 104.4 107.4 104.5 107.5 104.6C107.8 104.8 108.2 104.8 108.5 104.6C108.6 104.6 108.6 104.5 108.7 104.5C108.7 104.5 108.8 104.4 108.8 104.3V89.5999C108.7 89.6999 108.6 89.7998 108.5 89.8998Z" fill="white"/>
+<path d="M108.5 89.2999C108.2 89.0999 107.8 89.0999 107.5 89.2999C107.2 89.4999 107.2 89.6999 107.5 89.8999C107.8 90.0999 108.2 90.0999 108.5 89.8999C108.7 89.6999 108.7 89.3999 108.5 89.2999Z" fill="#B7CDC4"/>
+<path d="M108.5 75.2997C108.2 75.4997 107.8 75.4997 107.5 75.2997C107.4 75.1997 107.3 75.1998 107.3 75.0998V74.9998V89.6998C107.3 89.7998 107.4 89.8998 107.5 89.9998C107.8 90.1998 108.2 90.1998 108.5 89.9998C108.6 89.9998 108.6 89.8997 108.7 89.8997C108.7 89.8997 108.8 89.7998 108.8 89.6998V74.9998C108.7 75.0998 108.6 75.1997 108.5 75.2997Z" fill="#004C45"/>
+<path d="M108.5 74.6998C108.2 74.4998 107.8 74.4998 107.5 74.6998C107.2 74.8998 107.2 75.0998 107.5 75.2998C107.8 75.4998 108.2 75.4998 108.5 75.2998C108.7 75.0998 108.7 74.7998 108.5 74.6998Z" fill="#004C45"/>
+<path d="M108.5 60.5998C108.2 60.7998 107.8 60.7998 107.5 60.5998C107.4 60.4998 107.3 60.4998 107.3 60.3998V60.2998V74.9998C107.3 75.0998 107.4 75.1998 107.5 75.2998C107.8 75.4998 108.2 75.4998 108.5 75.2998C108.6 75.2998 108.6 75.1998 108.7 75.1998C108.7 75.1998 108.8 75.0998 108.8 74.9998V60.2998C108.7 60.3998 108.6 60.4998 108.5 60.5998Z" fill="white"/>
+<path d="M108.5 59.9999C108.2 59.7999 107.8 59.7999 107.5 59.9999C107.2 60.1999 107.2 60.3999 107.5 60.5999C107.8 60.7999 108.2 60.7999 108.5 60.5999C108.7 60.3999 108.7 60.1999 108.5 59.9999Z" fill="#B7CDC4"/>
+<path d="M108.5 45.9997C108.2 46.1997 107.8 46.1997 107.5 45.9997C107.4 45.8997 107.3 45.8997 107.3 45.7997V45.6997V60.3997C107.3 60.4997 107.4 60.5997 107.5 60.6997C107.8 60.8997 108.2 60.8997 108.5 60.6997C108.6 60.6997 108.6 60.5997 108.7 60.5997C108.7 60.4997 108.8 60.4997 108.8 60.3997V45.6997C108.7 45.7997 108.6 45.8997 108.5 45.9997Z" fill="#004C45"/>
+<path d="M108.5 45.3998C108.2 45.1998 107.8 45.1998 107.5 45.3998C107.2 45.5998 107.2 45.7998 107.5 45.9998C107.8 46.1998 108.2 46.1998 108.5 45.9998C108.7 45.7998 108.7 45.5998 108.5 45.3998Z" fill="#004C45"/>
+<path d="M108.5 31.3998C108.2 31.5998 107.8 31.5998 107.5 31.3998C107.4 31.2998 107.3 31.2999 107.3 31.1999V31.0999V45.7998C107.3 45.8998 107.4 45.9999 107.5 46.0999C107.8 46.2999 108.2 46.2999 108.5 46.0999C108.6 46.0999 108.6 45.9998 108.7 45.9998C108.7 45.8998 108.8 45.8998 108.8 45.7998V31.0999C108.7 31.1999 108.6 31.2998 108.5 31.3998Z" fill="white"/>
+<path d="M108.5 30.7999C108.2 30.5999 107.8 30.5999 107.5 30.7999C107.2 30.9999 107.2 31.1999 107.5 31.3999C107.8 31.5999 108.2 31.5999 108.5 31.3999C108.7 31.1999 108.7 30.9999 108.5 30.7999Z" fill="#B7CDC4"/>
+<path d="M108.5 16.7997C108.2 16.9997 107.8 16.9997 107.5 16.7997C107.4 16.6997 107.3 16.6998 107.3 16.5998V16.4998V31.1998C107.3 31.2998 107.4 31.3998 107.5 31.4998C107.8 31.6998 108.2 31.6998 108.5 31.4998C108.6 31.4998 108.6 31.3997 108.7 31.3997C108.7 31.3997 108.8 31.2998 108.8 31.1998V16.4998C108.7 16.5998 108.6 16.6997 108.5 16.7997Z" fill="#004C45"/>
+<path d="M108.5 16.1998C108.2 15.9998 107.8 15.9998 107.5 16.1998C107.2 16.3998 107.2 16.5998 107.5 16.7998C107.8 16.9998 108.2 16.9998 108.5 16.7998C108.7 16.5998 108.7 16.3998 108.5 16.1998Z" fill="#004C45"/>
+<path d="M108.3 100.9L108.6 100.8L110.1 101.7L109.9 101.8L108.3 100.9Z" fill="white"/>
+<path d="M110.1 101.6L110.3 101.4V102L110.1 102.1V101.6Z" fill="white"/>
+<path d="M109.9 101.5L110.1 101.3L110.3 101.4L110.1 101.6L109.9 101.5Z" fill="white"/>
+<path d="M110.1 101.6V102.1L108.3 101.1V100.9L109.9 101.8V101.5L110.1 101.6Z" fill="#B7CDC4"/>
+<path d="M108.3 97.5999L108.6 97.3999L110.1 98.2999L109.9 98.4999L108.3 97.5999Z" fill="white"/>
+<path d="M110.1 98.2998L110.3 98.0999V98.6999L110.1 98.7998V98.2998Z" fill="white"/>
+<path d="M109.9 98.1998L110.1 97.9998L110.3 98.0998L110.1 98.2997L109.9 98.1998Z" fill="white"/>
+<path d="M110.1 98.2998V98.7998L108.3 97.7998V97.5999L109.9 98.4998V98.1999L110.1 98.2998Z" fill="#B7CDC4"/>
+<path d="M108.3 94.2998L108.6 94.0999L110.1 94.9998L109.9 95.1999L108.3 94.2998Z" fill="white"/>
+<path d="M110.1 94.8998L110.3 94.7998V95.2998L110.1 95.4998V94.8998Z" fill="white"/>
+<path d="M109.9 94.7997L110.1 94.6997L110.3 94.7997L110.1 94.8997L109.9 94.7997Z" fill="white"/>
+<path d="M110.1 94.8998V95.4998L108.3 94.4998V94.2998L109.9 95.1998V94.7998L110.1 94.8998Z" fill="#B7CDC4"/>
+<path d="M108.3 90.8998L108.6 90.7998L110.1 91.6998L109.9 91.7998L108.3 90.8998Z" fill="white"/>
+<path d="M110.1 91.5998L110.3 91.4998V91.9998L110.1 92.1998V91.5998Z" fill="white"/>
+<path d="M109.9 91.4999L110.1 91.3999L110.3 91.4999L110.1 91.5999L109.9 91.4999Z" fill="white"/>
+<path d="M110.1 91.5999V92.1999L108.3 91.1999V90.8999L109.9 91.7999V91.4999L110.1 91.5999Z" fill="#B7CDC4"/>
+<path d="M106 101.8L105.8 101.7L107.3 100.8L107.6 100.9L106 101.8Z" fill="white"/>
+<path d="M105.9 102.1L105.6 102V101.4L105.8 101.6L105.9 102.1Z" fill="#B7CDC4"/>
+<path d="M105.8 101.6L105.6 101.4L105.8 101.3L106 101.5L105.8 101.6Z" fill="white"/>
+<path d="M106 101.5V101.8L107.6 100.9V101.1L105.9 102.1L105.8 101.6L106 101.5Z" fill="white"/>
+<path d="M106 98.4999L105.8 98.2999L107.3 97.3999L107.6 97.5999L106 98.4999Z" fill="white"/>
+<path d="M105.9 98.7998L105.6 98.6999V98.0999L105.8 98.2998L105.9 98.7998Z" fill="#B7CDC4"/>
+<path d="M105.8 98.2997L105.6 98.0998L105.8 97.9998L106 98.1998L105.8 98.2997Z" fill="white"/>
+<path d="M106 98.1999V98.4998L107.6 97.5999V97.7998L105.9 98.7998L105.8 98.2998L106 98.1999Z" fill="white"/>
+<path d="M106 95.1999L105.8 94.9998L107.3 94.0999L107.6 94.2998L106 95.1999Z" fill="white"/>
+<path d="M105.9 95.4998L105.6 95.2998V94.7998L105.8 94.8998L105.9 95.4998Z" fill="#B7CDC4"/>
+<path d="M105.8 94.8997L105.6 94.7997L105.8 94.6997L106 94.7997L105.8 94.8997Z" fill="white"/>
+<path d="M106 94.7998V95.1998L107.6 94.2998V94.4998L105.9 95.4998L105.8 94.8998L106 94.7998Z" fill="white"/>
+<path d="M106 91.7998L105.8 91.6998L107.3 90.7998L107.6 90.8998L106 91.7998Z" fill="white"/>
+<path d="M105.9 92.1998L105.6 91.9998V91.4998L105.8 91.5998L105.9 92.1998Z" fill="#B7CDC4"/>
+<path d="M105.8 91.5999L105.6 91.4999L105.8 91.3999L106 91.4999L105.8 91.5999Z" fill="white"/>
+<path d="M106 91.4999V91.7999L107.6 90.8999V91.1999L105.9 92.1999L105.8 91.5999L106 91.4999Z" fill="white"/>
+<path d="M108.3 87.2998L108.6 87.0999L110.1 87.9998L109.9 88.0999L108.3 87.2998Z" fill="#004C45"/>
+<path d="M110.1 87.8998L110.3 87.7998V88.2998L110.1 88.4998V87.8998Z" fill="#004C45"/>
+<path d="M109.9 87.7999L110.1 87.7L110.3 87.7999L110.1 87.8999L109.9 87.7999Z" fill="#004C45"/>
+<path d="M110.1 87.8998V88.4998L108.3 87.4998V87.2998L109.9 88.0998V87.7998L110.1 87.8998Z" fill="#004C45"/>
+<path d="M108.3 83.8998L108.6 83.7998L110.1 84.6998L109.9 84.7998L108.3 83.8998Z" fill="#004C45"/>
+<path d="M110.1 84.5998L110.3 84.4998V84.9998L110.1 85.1998V84.5998Z" fill="#004C45"/>
+<path d="M109.9 84.4999L110.1 84.3999L110.3 84.4999L110.1 84.5999L109.9 84.4999Z" fill="#004C45"/>
+<path d="M110.1 84.5999V85.1999L108.3 84.1999V83.8999L109.9 84.7999V84.4999L110.1 84.5999Z" fill="#004C45"/>
+<path d="M108.3 80.5998L108.6 80.4998L110.1 81.2997L109.9 81.4998L108.3 80.5998Z" fill="#004C45"/>
+<path d="M110.1 81.2998L110.3 81.0999V81.6999L110.1 81.7998V81.2998Z" fill="#004C45"/>
+<path d="M109.9 81.1998L110.1 80.9998L110.3 81.0998L110.1 81.2997L109.9 81.1998Z" fill="#004C45"/>
+<path d="M110.1 81.2998V81.7998L108.3 80.7998V80.5999L109.9 81.4998V81.1999L110.1 81.2998Z" fill="#004C45"/>
+<path d="M108.3 77.2998L108.6 77.0999L110.1 77.9998L109.9 78.1999L108.3 77.2998Z" fill="#004C45"/>
+<path d="M110.1 77.9998L110.3 77.7998V78.3998L110.1 78.4998V77.9998Z" fill="#004C45"/>
+<path d="M109.9 77.8999L110.1 77.7L110.3 77.7999L110.1 77.9999L109.9 77.8999Z" fill="#004C45"/>
+<path d="M110.1 77.9998V78.4998L108.3 77.4998V77.2998L109.9 78.1998V77.8998L110.1 77.9998Z" fill="#004C45"/>
+<path d="M106 88.0999L105.8 87.9998L107.3 87.0999L107.6 87.2998L106 88.0999Z" fill="#004C45"/>
+<path d="M105.9 88.4998L105.6 88.2998V87.7998L105.8 87.8998L105.9 88.4998Z" fill="#004C45"/>
+<path d="M105.8 87.8999L105.6 87.7999L105.8 87.7L106 87.7999L105.8 87.8999Z" fill="#004C45"/>
+<path d="M106 87.7998V88.0998L107.6 87.2998V87.4998L105.9 88.4998L105.8 87.8998L106 87.7998Z" fill="#004C45"/>
+<path d="M106 84.7998L105.8 84.6998L107.3 83.7998L107.6 83.8998L106 84.7998Z" fill="#004C45"/>
+<path d="M105.9 85.1998L105.6 84.9998V84.4998L105.8 84.5998L105.9 85.1998Z" fill="#004C45"/>
+<path d="M105.8 84.5999L105.6 84.4999L105.8 84.3999L106 84.4999L105.8 84.5999Z" fill="#004C45"/>
+<path d="M106 84.4999V84.7999L107.6 83.8999V84.0999L105.9 85.1999L105.8 84.5999L106 84.4999Z" fill="#004C45"/>
+<path d="M106 81.4998L105.8 81.3997L107.3 80.4998L107.6 80.5998L106 81.4998Z" fill="#004C45"/>
+<path d="M105.9 81.7998L105.6 81.6999V81.0999L105.8 81.2998L105.9 81.7998Z" fill="#004C45"/>
+<path d="M105.8 81.2997L105.6 81.0998L105.8 80.9998L106 81.1998L105.8 81.2997Z" fill="#004C45"/>
+<path d="M106 81.1999V81.4998L107.6 80.5999V80.7998L105.9 81.7998L105.8 81.2998L106 81.1999Z" fill="#004C45"/>
+<path d="M106 78.1999L105.8 77.9998L107.3 77.0999L107.6 77.2998L106 78.1999Z" fill="#004C45"/>
+<path d="M105.9 78.4998L105.6 78.3998V77.7998L105.8 77.9998L105.9 78.4998Z" fill="#004C45"/>
+<path d="M105.8 77.9999L105.6 77.7999L105.8 77.7L106 77.8999L105.8 77.9999Z" fill="#004C45"/>
+<path d="M106 77.8998V78.1998L107.6 77.2998V77.4998L105.9 78.4998L105.8 77.9998L106 77.8998Z" fill="#004C45"/>
+<path d="M108.3 73.1999L108.6 73.0999L110.1 73.9998L109.9 74.0999L108.3 73.1999Z" fill="white"/>
+<path d="M110.1 73.8998L110.3 73.7998V74.2998L110.1 74.4998V73.8998Z" fill="white"/>
+<path d="M109.9 73.7999L110.1 73.7L110.3 73.7999L110.1 73.8999L109.9 73.7999Z" fill="white"/>
+<path d="M110.1 73.8999V74.4999L108.3 73.3999V73.2L109.9 74.0999V73.7999L110.1 73.8999Z" fill="#B7CDC4"/>
+<path d="M108.3 69.8998L108.6 69.7998L110.1 70.5998L109.9 70.7998L108.3 69.8998Z" fill="white"/>
+<path d="M110.1 70.5999L110.3 70.3999V70.9999L110.1 71.0999V70.5999Z" fill="white"/>
+<path d="M109.9 70.4998L110.1 70.2998L110.3 70.3998L110.1 70.5998L109.9 70.4998Z" fill="white"/>
+<path d="M110.1 70.5999V71.0999L108.3 70.0999V69.8999L109.9 70.7999V70.4999L110.1 70.5999Z" fill="#B7CDC4"/>
+<path d="M108.3 66.5999L108.6 66.3999L110.1 67.2999L109.9 67.4999L108.3 66.5999Z" fill="white"/>
+<path d="M110.1 67.2998L110.3 67.0999V67.6999L110.1 67.7998V67.2998Z" fill="white"/>
+<path d="M109.9 67.0998L110.1 66.9998L110.3 67.0998L110.1 67.2997L109.9 67.0998Z" fill="white"/>
+<path d="M110.1 67.2998V67.7998L108.3 66.7998V66.5999L109.9 67.4998V67.0999L110.1 67.2998Z" fill="#B7CDC4"/>
+<path d="M108.3 63.2998L108.6 63.0999L110.1 63.9998L109.9 64.0999L108.3 63.2998Z" fill="white"/>
+<path d="M110.1 63.8998L110.3 63.7998V64.2998L110.1 64.4998V63.8998Z" fill="white"/>
+<path d="M109.9 63.7999L110.1 63.7L110.3 63.7999L110.1 63.8999L109.9 63.7999Z" fill="white"/>
+<path d="M110.1 63.8998V64.4998L108.3 63.4998V63.2998L109.9 64.0998V63.7998L110.1 63.8998Z" fill="#B7CDC4"/>
+<path d="M106 74.0999L105.8 73.9998L107.3 73.0999L107.6 73.1999L106 74.0999Z" fill="white"/>
+<path d="M105.9 74.4998L105.6 74.2998V73.7998L105.8 73.8998L105.9 74.4998Z" fill="#B7CDC4"/>
+<path d="M105.8 73.8999L105.6 73.7999L105.8 73.7L106 73.7999L105.8 73.8999Z" fill="white"/>
+<path d="M106 73.7999V74.0999L107.6 73.2V73.4999L105.9 74.4999L105.8 73.8999L106 73.7999Z" fill="white"/>
+<path d="M106 70.7998L105.8 70.5998L107.3 69.7998L107.6 69.8998L106 70.7998Z" fill="white"/>
+<path d="M105.9 71.0999L105.6 70.9999V70.3999L105.8 70.5999L105.9 71.0999Z" fill="#B7CDC4"/>
+<path d="M105.8 70.5998L105.6 70.3998L105.8 70.2998L106 70.4998L105.8 70.5998Z" fill="white"/>
+<path d="M106 70.4999V70.7999L107.6 69.8999V70.0999L105.9 71.0999L105.8 70.5999L106 70.4999Z" fill="white"/>
+<path d="M106 67.4999L105.8 67.2999L107.3 66.3999L107.6 66.5999L106 67.4999Z" fill="white"/>
+<path d="M105.9 67.7998L105.6 67.6999V67.0999L105.8 67.2998L105.9 67.7998Z" fill="#B7CDC4"/>
+<path d="M105.8 67.2997L105.6 67.0998L105.8 66.9998L106 67.1998L105.8 67.2997Z" fill="white"/>
+<path d="M106 67.1999V67.4998L107.6 66.5999V66.7998L105.9 67.7998L105.8 67.2998L106 67.1999Z" fill="white"/>
+<path d="M106 64.0999L105.8 63.9998L107.3 63.0999L107.6 63.1999L106 64.0999Z" fill="white"/>
+<path d="M105.9 64.4998L105.6 64.2998V63.7998L105.8 63.8998L105.9 64.4998Z" fill="#B7CDC4"/>
+<path d="M105.8 63.8999L105.6 63.7999L105.8 63.7L106 63.7999L105.8 63.8999Z" fill="white"/>
+<path d="M106 63.7999V64.0999L107.6 63.2V63.4999L105.9 64.4999L105.8 63.8999L106 63.7999Z" fill="white"/>
+<path d="M108.3 59.8997L108.6 59.6997L110.1 60.5997L109.9 60.7997L108.3 59.8997Z" fill="#004C45"/>
+<path d="M110.1 60.5999L110.3 60.3999V60.9999L110.1 61.0999V60.5999Z" fill="#004C45"/>
+<path d="M109.9 60.4998L110.1 60.2998L110.3 60.3998L110.1 60.5998L109.9 60.4998Z" fill="#004C45"/>
+<path d="M110.1 60.5999V61.0999L108.3 60.0999V59.8999L109.9 60.7999V60.4999L110.1 60.5999Z" fill="#004C45"/>
+<path d="M108.3 56.5999L108.6 56.3999L110.1 57.2999L109.9 57.4999L108.3 56.5999Z" fill="#004C45"/>
+<path d="M110.1 57.2998L110.3 57.0999V57.5999L110.1 57.7998V57.2998Z" fill="#004C45"/>
+<path d="M109.9 57.0998L110.1 56.9998L110.3 57.0998L110.1 57.2997L109.9 57.0998Z" fill="#004C45"/>
+<path d="M110.1 57.2998V57.7998L108.3 56.7998V56.5999L109.9 57.4998V57.0999L110.1 57.2998Z" fill="#004C45"/>
+<path d="M108.3 53.1999L108.6 53.0999L110.1 53.9998L109.9 54.0999L108.3 53.1999Z" fill="#004C45"/>
+<path d="M110.1 53.8998L110.3 53.7998V54.2998L110.1 54.4998V53.8998Z" fill="#004C45"/>
+<path d="M109.9 53.7997L110.1 53.6997L110.3 53.7997L110.1 53.8997L109.9 53.7997Z" fill="#004C45"/>
+<path d="M110.1 53.8997V54.4997L108.3 53.4997V53.1997L109.9 54.0997V53.7997L110.1 53.8997Z" fill="#004C45"/>
+<path d="M108.3 49.8998L108.6 49.7998L110.1 50.6998L109.9 50.7998L108.3 49.8998Z" fill="#004C45"/>
+<path d="M110.1 50.5998L110.3 50.4998V50.9998L110.1 51.0998V50.5998Z" fill="#004C45"/>
+<path d="M109.9 50.4998L110.1 50.2998L110.3 50.4998L110.1 50.5998L109.9 50.4998Z" fill="#004C45"/>
+<path d="M110.1 50.5999V51.0999L108.3 50.0999V49.8999L109.9 50.7999V50.4999L110.1 50.5999Z" fill="#004C45"/>
+<path d="M106 60.7999L105.8 60.5999L107.3 59.7L107.6 59.8999L106 60.7999Z" fill="#004C45"/>
+<path d="M105.9 61.0999L105.6 60.9999V60.3999L105.8 60.5999L105.9 61.0999Z" fill="#004C45"/>
+<path d="M105.8 60.5998L105.6 60.3998L105.8 60.2998L106 60.4998L105.8 60.5998Z" fill="#004C45"/>
+<path d="M106 60.4999V60.7999L107.6 59.8999V60.0999L105.9 61.0999L105.8 60.5999L106 60.4999Z" fill="#004C45"/>
+<path d="M106 57.4999L105.8 57.2999L107.3 56.3999L107.6 56.5999L106 57.4999Z" fill="#004C45"/>
+<path d="M105.9 57.7998L105.6 57.5999V57.0999L105.8 57.2998L105.9 57.7998Z" fill="#004C45"/>
+<path d="M105.8 57.3L105.6 57.1L105.8 57L106 57.1L105.8 57.3Z" fill="#004C45"/>
+<path d="M106 57.0999V57.4998L107.6 56.5999V56.7998L105.9 57.7998L105.8 57.2998L106 57.0999Z" fill="#004C45"/>
+<path d="M106 54.0999L105.8 53.9998L107.3 53.0999L107.6 53.1999L106 54.0999Z" fill="#004C45"/>
+<path d="M105.9 54.4998L105.6 54.2998V53.7998L105.8 53.8998L105.9 54.4998Z" fill="#004C45"/>
+<path d="M105.8 53.8999L105.6 53.7999L105.8 53.7L106 53.7999L105.8 53.8999Z" fill="#004C45"/>
+<path d="M106 53.7999V54.0999L107.6 53.2V53.4999L105.9 54.4999L105.8 53.8999L106 53.7999Z" fill="#004C45"/>
+<path d="M106 50.7998L105.8 50.6998L107.3 49.7998L107.6 49.8998L106 50.7998Z" fill="#004C45"/>
+<path d="M105.9 51.1L105.6 51V50.5L105.8 50.6L105.9 51.1Z" fill="#004C45"/>
+<path d="M105.8 50.5998L105.6 50.4998L105.8 50.2998L106 50.4998L105.8 50.5998Z" fill="#004C45"/>
+<path d="M106 50.4999V50.7999L107.6 49.8999V50.0999L105.9 51.0999L105.8 50.5999L106 50.4999Z" fill="#004C45"/>
+<path d="M108.3 46.5999L108.6 46.3999L110.1 47.2999L109.9 47.4999L108.3 46.5999Z" fill="#004C45"/>
+<path d="M110.1 47.2998L110.3 47.0999V47.6999L110.1 47.7998V47.2998Z" fill="#004C45"/>
+<path d="M109.9 47.2L110.1 47L110.3 47.1L110.1 47.3L109.9 47.2Z" fill="#004C45"/>
+<path d="M110.1 47.2998V47.7998L108.3 46.7998V46.5999L109.9 47.4998V47.1999L110.1 47.2998Z" fill="#004C45"/>
+<path d="M106 47.4999L105.8 47.2999L107.3 46.3999L107.6 46.5999L106 47.4999Z" fill="#004C45"/>
+<path d="M105.9 47.7998L105.6 47.6999V47.0999L105.8 47.2998L105.9 47.7998Z" fill="#004C45"/>
+<path d="M105.8 47.3L105.6 47.1L105.8 47L106 47.2L105.8 47.3Z" fill="#004C45"/>
+<path d="M106 47.1999V47.4998L107.6 46.5999V46.7998L105.9 47.7998L105.8 47.2998L106 47.1999Z" fill="#004C45"/>
+<path d="M108.3 43.3999L108.6 43.2L110.1 44.0999L109.9 44.2L108.3 43.3999Z" fill="white"/>
+<path d="M110.1 43.9999L110.3 43.8999V44.3999L110.1 44.5999V43.9999Z" fill="white"/>
+<path d="M109.9 43.8998L110.1 43.7998L110.3 43.8998L110.1 43.9998L109.9 43.8998Z" fill="white"/>
+<path d="M110.1 43.9999V44.5999L108.3 43.5999V43.3999L109.9 44.1999V43.8999L110.1 43.9999Z" fill="#B7CDC4"/>
+<path d="M108.3 39.9999L108.6 39.8999L110.1 40.7999L109.9 40.8999L108.3 39.9999Z" fill="white"/>
+<path d="M110.1 40.6999L110.3 40.5999V41.0999L110.1 41.2998V40.6999Z" fill="white"/>
+<path d="M109.9 40.6L110.1 40.5L110.3 40.6L110.1 40.7L109.9 40.6Z" fill="white"/>
+<path d="M110.1 40.7V41.3L108.3 40.2V40L109.9 40.9V40.6L110.1 40.7Z" fill="#B7CDC4"/>
+<path d="M108.3 36.6999L108.6 36.5999L110.1 37.3998L109.9 37.5999L108.3 36.6999Z" fill="white"/>
+<path d="M110.1 37.3999L110.3 37.2V37.7999L110.1 37.8999V37.3999Z" fill="white"/>
+<path d="M109.9 37.2998L110.1 37.0999L110.3 37.1999L110.1 37.3998L109.9 37.2998Z" fill="white"/>
+<path d="M110.1 37.3999V37.8999L108.3 36.8999V36.7L109.9 37.5999V37.2999L110.1 37.3999Z" fill="#B7CDC4"/>
+<path d="M108.3 33.3999L108.6 33.2L110.1 34.0999L109.9 34.2999L108.3 33.3999Z" fill="white"/>
+<path d="M110.1 34.0999L110.3 33.8999V34.4999L110.1 34.5999V34.0999Z" fill="white"/>
+<path d="M109.9 33.8998L110.1 33.7998L110.3 33.8998L110.1 34.0998L109.9 33.8998Z" fill="white"/>
+<path d="M110.1 34.0999V34.5999L108.3 33.5999V33.3999L109.9 34.2999V33.8999L110.1 34.0999Z" fill="#B7CDC4"/>
+<path d="M106 44.2L105.8 44.0999L107.3 43.2L107.6 43.3999L106 44.2Z" fill="white"/>
+<path d="M105.9 44.5999L105.6 44.3999V43.8999L105.8 43.9999L105.9 44.5999Z" fill="#B7CDC4"/>
+<path d="M105.8 43.9998L105.6 43.8998L105.8 43.7998L106 43.8998L105.8 43.9998Z" fill="white"/>
+<path d="M106 43.8999V44.1999L107.6 43.3999V43.5999L105.9 44.5999L105.8 43.9999L106 43.8999Z" fill="white"/>
+<path d="M106 40.8999L105.8 40.7999L107.3 39.8999L107.6 39.9999L106 40.8999Z" fill="white"/>
+<path d="M105.9 41.2998L105.6 41.0999V40.5999L105.8 40.6999L105.9 41.2998Z" fill="#B7CDC4"/>
+<path d="M105.8 40.7L105.6 40.6L105.8 40.5L106 40.6L105.8 40.7Z" fill="white"/>
+<path d="M106 40.6V40.9L107.6 40V40.2L105.9 41.3L105.8 40.7L106 40.6Z" fill="white"/>
+<path d="M106 37.5999L105.8 37.4998L107.3 36.5999L107.6 36.6999L106 37.5999Z" fill="white"/>
+<path d="M105.9 37.8999L105.6 37.7999V37.2L105.8 37.3999L105.9 37.8999Z" fill="#B7CDC4"/>
+<path d="M105.8 37.3998L105.6 37.1999L105.8 37.0999L106 37.2998L105.8 37.3998Z" fill="white"/>
+<path d="M106 37.2999V37.5999L107.6 36.7V36.8999L105.9 37.8999L105.8 37.3999L106 37.2999Z" fill="white"/>
+<path d="M106 34.2999L105.8 34.0999L107.3 33.2L107.6 33.3999L106 34.2999Z" fill="white"/>
+<path d="M105.9 34.5999L105.6 34.4999V33.8999L105.8 34.0999L105.9 34.5999Z" fill="#B7CDC4"/>
+<path d="M105.8 34.0998L105.6 33.8998L105.8 33.7998L106 33.9998L105.8 34.0998Z" fill="white"/>
+<path d="M106 33.9999V34.2999L107.6 33.3999V33.5999L105.9 34.5999L105.8 34.0999L106 33.9999Z" fill="white"/>
+<path d="M108.3 29.6999L108.6 29.5999L110.1 30.3998L109.9 30.5999L108.3 29.6999Z" fill="#004C45"/>
+<path d="M110.1 30.3999L110.3 30.2V30.7999L110.1 30.8999V30.3999Z" fill="#004C45"/>
+<path d="M109.9 30.2998L110.1 30.0999L110.3 30.1999L110.1 30.3998L109.9 30.2998Z" fill="#004C45"/>
+<path d="M110.1 30.3999V30.8999L108.3 29.8999V29.7L109.9 30.5999V30.2999L110.1 30.3999Z" fill="#004C45"/>
+<path d="M108.3 26.3999L108.6 26.2L110.1 27.0999L109.9 27.2999L108.3 26.3999Z" fill="#004C45"/>
+<path d="M110.1 27.0999L110.3 26.8999V27.4999L110.1 27.5999V27.0999Z" fill="#004C45"/>
+<path d="M109.9 26.8998L110.1 26.7998L110.3 26.8998L110.1 27.0998L109.9 26.8998Z" fill="#004C45"/>
+<path d="M110.1 27.0999V27.5999L108.3 26.5999V26.3999L109.9 27.2999V26.8999L110.1 27.0999Z" fill="#004C45"/>
+<path d="M108.3 23.0999L108.6 22.8999L110.1 23.7999L109.9 23.8999L108.3 23.0999Z" fill="#004C45"/>
+<path d="M110.1 23.6999L110.3 23.5999V24.0999L110.1 24.2998V23.6999Z" fill="#004C45"/>
+<path d="M109.9 23.5998L110.1 23.4998L110.3 23.5998L110.1 23.6998L109.9 23.5998Z" fill="#004C45"/>
+<path d="M110.1 23.6999V24.2998L108.3 23.2998V23.0999L109.9 23.8998V23.5999L110.1 23.6999Z" fill="#004C45"/>
+<path d="M108.3 19.6999L108.6 19.5999L110.1 20.4998L109.9 20.5999L108.3 19.6999Z" fill="#004C45"/>
+<path d="M110.1 20.3998L110.3 20.2998V20.7998L110.1 20.8998V20.3998Z" fill="#004C45"/>
+<path d="M109.9 20.2998L110.1 20.0999L110.3 20.2998L110.1 20.3998L109.9 20.2998Z" fill="#004C45"/>
+<path d="M110.1 20.3999V20.8999L108.3 19.8999V19.7L109.9 20.5999V20.2999L110.1 20.3999Z" fill="#004C45"/>
+<path d="M106 30.5999L105.8 30.3998L107.3 29.5999L107.6 29.6999L106 30.5999Z" fill="#004C45"/>
+<path d="M105.9 30.8999L105.6 30.7999V30.2L105.8 30.3999L105.9 30.8999Z" fill="#004C45"/>
+<path d="M105.8 30.3998L105.6 30.1999L105.8 30.0999L106 30.2998L105.8 30.3998Z" fill="#004C45"/>
+<path d="M106 30.2999V30.5999L107.6 29.7V29.8999L105.9 30.8999L105.8 30.3999L106 30.2999Z" fill="#004C45"/>
+<path d="M106 27.2999L105.8 27.0999L107.3 26.2L107.6 26.3999L106 27.2999Z" fill="#004C45"/>
+<path d="M105.9 27.5999L105.6 27.4999V26.8999L105.8 27.0999L105.9 27.5999Z" fill="#004C45"/>
+<path d="M105.8 27.0998L105.6 26.8998L105.8 26.7998L106 26.9998L105.8 27.0998Z" fill="#004C45"/>
+<path d="M106 26.9999V27.2999L107.6 26.3999V26.5999L105.9 27.5999L105.8 27.0999L106 26.9999Z" fill="#004C45"/>
+<path d="M106 23.8999L105.8 23.7999L107.3 22.8999L107.6 23.0999L106 23.8999Z" fill="#004C45"/>
+<path d="M105.9 24.2998L105.6 24.0999V23.5999L105.8 23.6999L105.9 24.2998Z" fill="#004C45"/>
+<path d="M105.8 23.6998L105.6 23.5998L105.8 23.4998L106 23.5998L105.8 23.6998Z" fill="#004C45"/>
+<path d="M106 23.5999V23.8998L107.6 23.0999V23.2998L105.9 24.2998L105.8 23.6999L106 23.5999Z" fill="#004C45"/>
+<path d="M106 20.5999L105.8 20.4998L107.3 19.5999L107.6 19.6999L106 20.5999Z" fill="#004C45"/>
+<path d="M105.9 20.9998L105.6 20.7998V20.2998L105.8 20.3998L105.9 20.9998Z" fill="#004C45"/>
+<path d="M105.8 20.3998L105.6 20.2998L105.8 20.0999L106 20.2998L105.8 20.3998Z" fill="#004C45"/>
+<path d="M106 20.2999V20.5999L107.6 19.7V19.8999L105.9 20.9999L105.8 20.3999L106 20.2999Z" fill="#004C45"/>
+<path d="M136.2 104.7C136.1 104.7 136.1 104.7 136.2 104.7L109.2 16.4999C109.2 16.3999 109.2 16.3999 109.3 16.3999C109.4 16.3999 109.4 16.3999 109.4 16.4999L136.3 104.7C136.3 104.7 136.3 104.7 136.2 104.7Z" fill="white"/>
+<path d="M107.9 121V17.3998C107.9 17.2998 107.9 17.2998 108 17.2998C108.1 17.2998 108.1 17.2998 108.1 17.3998L107.9 121C108 121 108 120.9 107.9 121Z" fill="#B7CDC4"/>
+<path d="M79.4999 104.6C79.3999 104.6 79.3999 104.5 79.3999 104.5L106.3 16.4999C106.3 16.3999 106.4 16.3999 106.4 16.3999C106.5 16.3999 106.5 16.4999 106.5 16.4999L79.4999 104.6C79.5999 104.6 79.5999 104.6 79.4999 104.6Z" fill="white"/>
+<path d="M111.1 15.2V15.4999C111.1 15.6999 111 15.7999 110.8 15.8999V15.5999C111 15.4999 111.1 15.3 111.1 15.2Z" fill="#B7CDC4"/>
+<path d="M105.1 15.5999V15.8998C104.9 15.7998 104.8 15.5998 104.8 15.3998V15.0999C104.8 15.2999 104.9 15.4999 105.1 15.5999Z" fill="#B7CDC4"/>
+<path d="M110.8 15.5999V15.8998L109.9 16.4998V16.0999L110.8 15.5999Z" fill="#004C45"/>
+<path d="M106 16.0999V16.4998L105.1 15.8998V15.5999L106 16.0999Z" fill="#004C45"/>
+<path d="M109.9 16.0999V16.3998C109.8 16.4998 109.7 16.4999 109.7 16.5999V16.2998C109.7 16.2998 109.8 16.1999 109.9 16.0999Z" fill="#B7CDC4"/>
+<path d="M106.2 16.2998V16.5999C106.2 16.4999 106.1 16.3998 106 16.3998V16.0999C106.1 16.1999 106.2 16.2998 106.2 16.2998Z" fill="#B7CDC4"/>
+<path d="M108.3 17.4999V17.7998C108.1 17.6998 107.8 17.6998 107.5 17.7998V17.4999C107.8 17.2999 108.1 17.2999 108.3 17.4999Z" fill="#B7CDC4"/>
+<path d="M109.2 17.9998V18.2997L108.3 17.7997V17.4998L109.2 17.9998Z" fill="#004C45"/>
+<path d="M107.6 17.4998V17.7997L106.7 18.2997V17.9998L107.6 17.4998Z" fill="#004C45"/>
+<path d="M111.1 17.4998V17.7997C111.1 17.9997 111 18.0997 110.8 18.2997C110.4 18.4997 109.7 18.4997 109.2 18.2997V17.9998C109.6 18.1998 110.3 18.2998 110.8 17.9998C111 17.8998 111.1 17.6998 111.1 17.4998Z" fill="#B7CDC4"/>
+<path d="M106.7 17.9998V18.2997C106.3 18.4997 105.6 18.4997 105.1 18.2997C104.9 18.1997 104.8 17.9997 104.8 17.7997V17.4998C104.8 17.6998 104.9 17.7998 105.1 17.9998C105.6 18.1998 106.3 18.1998 106.7 17.9998Z" fill="#B7CDC4"/>
+<path d="M110.8 14.6999C111.2 14.8999 111.2 15.3998 110.8 15.5998L109.9 16.0998C109.7 16.1998 109.7 16.3998 109.9 16.4998L110.8 16.9998C111.2 17.1998 111.2 17.6998 110.8 17.8998C110.4 18.0998 109.7 18.0998 109.2 17.8998L108.3 17.3998C108.1 17.2998 107.8 17.2998 107.5 17.3998L106.6 17.8998C106.2 18.0998 105.5 18.0998 105 17.8998C104.6 17.5998 104.6 17.1998 105 16.9998L105.9 16.4998C106.1 16.3998 106.1 16.1998 105.9 16.0998L105 15.5998C104.6 15.2998 104.6 14.8999 105 14.6999C105.4 14.3999 106.1 14.3999 106.6 14.6999L107.5 15.1999C107.7 15.2999 108 15.2999 108.3 15.1999L109.2 14.6999C109.6 14.4999 110.3 14.4999 110.8 14.6999Z" fill="#004C45"/>
+<path d="M106 5.2998V13.1998L104.9 13.7998V5.99982L106 5.2998Z" fill="#E2E2E2"/>
+<path d="M104.9 5.99982V13.7998L104.5 13.5998V5.7998L104.9 5.99982Z" fill="#004C45"/>
+<path d="M106 5.29984L104.9 5.99985L104.5 5.79984L104.6 5.59985L105.4 5.19986L105.6 5.09985L106 5.29984Z" fill="#B7CDC4"/>
+<path d="M105.6 5.10001C105.5 5.10001 105.4 5.10001 105.4 5.10001C105.4 5.10001 105.4 5.1 105.4 5V14.9V15C105.5 15 105.6 15 105.6 15C105.6 15 105.6 15 105.6 14.9V5.10001Z" fill="white"/>
+<path d="M105.6 4.8999C105.5 4.8999 105.4 4.8999 105.4 4.8999C105.3 4.8999 105.3 4.99991 105.4 4.99991C105.5 4.99991 105.6 4.99991 105.6 4.99991C105.7 4.99991 105.7 4.9999 105.6 4.8999Z" fill="#B7CDC4"/>
+<path d="M111.3 5.7998V13.6998L111 13.8998V5.99982L111.3 5.7998Z" fill="#E2E2E2"/>
+<path d="M111 5.99991V13.8999L109.9 13.1999V5.3999L111 5.99991Z" fill="#004C45"/>
+<path d="M111.3 5.69995V5.79993L111 5.99994L109.9 5.39993L110.2 5.19995H110.5L111.3 5.69995Z" fill="#B7CDC4"/>
+<path d="M110.5 4.99991C110.4 4.99991 110.3 4.99991 110.3 4.99991C110.3 4.99991 110.3 4.9999 110.3 4.8999V14.7999V14.8999C110.4 14.8999 110.5 14.8999 110.5 14.8999C110.5 14.8999 110.5 14.8999 110.5 14.7999V4.99991Z" fill="#004C45"/>
+<path d="M110.5 4.8999C110.4 4.8999 110.3 4.8999 110.3 4.8999C110.2 4.8999 110.2 4.99991 110.3 4.99991C110.4 4.99991 110.5 4.99991 110.5 4.99991C110.6 4.99991 110.6 4.8999 110.5 4.8999Z" fill="#B7CDC4"/>
+<path d="M105.6 7.79993C105.5 7.79993 105.4 7.79993 105.4 7.79993C105.4 7.79993 105.4 7.79995 105.4 7.69995V17.5999V17.7C105.5 17.7 105.6 17.7 105.6 17.7C105.6 17.7 105.6 17.6999 105.6 17.5999V7.79993Z" fill="white"/>
+<path d="M105.6 7.69995C105.5 7.69995 105.4 7.69995 105.4 7.69995C105.3 7.69995 105.3 7.79993 105.4 7.79993C105.5 7.79993 105.6 7.79993 105.6 7.79993V7.69995Z" fill="#B7CDC4"/>
+<path d="M105.3 8.69983V16.5998L104.5 16.0998V8.2998L105.3 8.69983Z" fill="#004C45"/>
+<path d="M105.6 8.69995V16.5999H105.3V8.69995H105.6Z" fill="#004C45"/>
+<path d="M105.9 8.5L106 16.4L105.6 16.6V8.70001L105.9 8.5Z" fill="#E2E2E2"/>
+<path d="M105.9 8.49991L105.6 8.69992H105.3L104.5 8.2999V8.09991L104.9 7.8999L105.9 8.49991Z" fill="#B7CDC4"/>
+<path d="M110.5 7.79993C110.4 7.79993 110.3 7.79993 110.3 7.79993C110.3 7.79993 110.3 7.79995 110.3 7.69995V17.5999V17.7C110.4 17.7 110.5 17.7 110.5 17.7C110.5 17.7 110.5 17.6999 110.5 17.5999V7.79993Z" fill="white"/>
+<path d="M110.5 7.69995C110.4 7.69995 110.3 7.69995 110.3 7.69995C110.2 7.69995 110.2 7.79993 110.3 7.79993C110.4 7.79993 110.5 7.79993 110.5 7.79993V7.69995Z" fill="#B7CDC4"/>
+<path d="M111.3 8.09985V15.8998L111.2 15.9998V8.19986L111.3 8.09985Z" fill="white"/>
+<path d="M111.2 8.19995V15.9999L110.5 16.4999L110.4 8.69995L111.2 8.19995Z" fill="#E2E2E2"/>
+<path d="M110.4 8.69995L110.5 16.4999H110.2V8.69995H110.4Z" fill="#004C45"/>
+<path d="M110.2 8.70001V16.5L109.8 16.3V8.5L110.2 8.70001Z" fill="#004C45"/>
+<path d="M111.3 8.09991L111.2 8.19992L110.4 8.69992H110.2L109.8 8.49991L110.9 7.8999L111.3 8.09991Z" fill="#B7CDC4"/>
+<path d="M108.1 5.8999L108.3 16.3999C108.3 16.3999 108.3 16.4999 108.2 16.4999C108.1 16.5999 107.9 16.5999 107.8 16.4999L107.7 16.3999L107.9 5.8999C107.9 5.9999 108 5.9999 108.1 5.8999C108.1 5.9999 108 5.9999 108.1 5.8999Z" fill="white"/>
+<mask id="mask0_5928_17374" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="107" y="5" width="2" height="12">
+<path d="M108.1 5.8999L108.3 16.3999C108.3 16.3999 108.3 16.4999 108.2 16.4999C108.1 16.5999 107.9 16.5999 107.8 16.4999L107.7 16.3999L107.9 5.8999C107.9 5.9999 108 5.9999 108.1 5.8999C108.1 5.9999 108 5.9999 108.1 5.8999Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_5928_17374)">
+<path d="M108 6H107.9L107.7 16.5C107.7 16.5 107.7 16.6 107.8 16.6C107.9 16.7 108.1 16.7 108.2 16.6L108.3 16.5L108 6Z" fill="#004C45"/>
+</g>
+<path d="M108 5.8999H107.9V5.99991C107.9 5.99991 108 5.9999 108 5.8999C108.1 5.9999 108.1 5.8999 108 5.8999Z" fill="#B7CDC4"/>
+<path d="M100.559 109.077L69.3622 113.963C67.295 114.277 65.165 112.554 64.6326 110.079L48.4389 34.8744C47.4992 31.335 50.6941 29.4243 52.7614 29.1111L82.4237 24.9452C84.4909 24.632 86.6209 26.3547 87.1533 28.8292L105.446 103.878C105.978 106.352 104.694 108.451 100.559 109.077Z" fill="#B7CDC4"/>
+<path d="M102.689 108.2L71.4919 113.086C69.4247 113.399 67.2947 111.677 66.7622 109.202L50.5686 33.9973C50.0361 31.5228 51.289 29.2676 53.3563 28.923L84.5534 24.0367C86.6206 23.7235 88.7505 25.4463 89.283 27.9207L105.477 103.126C106.04 105.632 104.788 107.887 102.689 108.2Z" fill="white"/>
+<path d="M103.383 100.666C103.771 102.414 102.618 104.13 100.854 104.432L72.2821 109.323C70.63 109.606 69.048 108.538 68.6926 106.9L53.5829 37.2513C53.2028 35.4989 54.3685 33.7857 56.1381 33.4961L84.4164 28.8688C86.0561 28.6005 87.62 29.6591 87.98 31.2811L103.383 100.666Z" fill="#73D19C"/>
+<path d="M143 26C145.761 26 148 23.7622 148 21C148 18.239 145.761 16 143 16C140.239 16 138 18.239 138 21C138 23.7622 140.239 26 143 26Z" fill="#B7CDC4"/>
+<path d="M151 6C152.657 6 154 4.65645 154 3.00003C154 1.34254 152.657 0 151 0C149.344 0 148 1.34254 148 3.00003C148 4.65645 149.344 6 151 6Z" fill="#B7CDC4"/>
+<path d="M35 13C36.6575 13 38 11.6575 38 10C38 8.34356 36.6575 7 35 7C33.3436 7 32 8.34356 32 10C32 11.6575 33.3436 13 35 13Z" fill="#B7CDC4"/>
+<path d="M6 86C9.31385 86 12 83.3115 12 80C12 76.6885 9.31385 74 6 74C2.68615 74 0 76.6885 0 80C0 83.3115 2.68615 86 6 86Z" fill="#B7CDC4"/>
+<path d="M113.854 95.9589C115.539 92.991 115.979 88.9752 115.014 85.2627C114.051 81.5115 111.679 78.1797 108.713 76.4174C108.257 76.1314 107.632 76.3049 107.346 76.7606C107.222 76.9891 107.175 77.2588 107.243 77.5323C107.313 77.7671 107.461 78.0043 107.689 78.128C110.197 79.643 112.237 82.4603 113.061 85.742C113.886 88.9849 113.542 92.4225 112.105 94.9335C111.818 95.428 111.992 96.0149 112.487 96.3021C112.981 96.5894 113.607 96.4159 113.854 95.9589Z" fill="#004C45"/>
+<path d="M110.389 94.0641C111.511 91.7367 111.716 88.9921 111.027 86.3348C110.339 83.6387 108.786 81.341 106.665 79.8385C106.21 79.5138 105.587 79.6099 105.263 80.0644C105.099 80.3303 105.051 80.6 105.12 80.8735C105.19 81.1083 105.3 81.3056 105.528 81.4292C107.271 82.6482 108.566 84.5501 109.114 86.7766C109.702 88.9656 109.512 91.2457 108.597 93.1536C108.349 93.6493 108.562 94.2375 109.058 94.486C109.553 94.7733 110.141 94.5598 110.389 94.0641Z" fill="#004C45"/>
+<path d="M106.927 92.0922C107.636 90.5264 107.769 88.8257 107.356 87.2236C106.906 85.5428 105.906 84.1154 104.468 83.0613C104.014 82.7366 103.39 82.8327 103.066 83.2872C102.902 83.5531 102.853 83.8616 102.922 84.135C102.992 84.3698 103.102 84.5671 103.292 84.6895C104.39 85.4613 105.092 86.5303 105.441 87.7041C105.752 88.8767 105.636 90.0742 105.133 91.2591C104.923 91.7561 105.136 92.3442 105.633 92.5541C106.128 92.8413 106.716 92.6279 106.927 92.0922Z" fill="#004C45"/>
+<path d="M103.955 88.121C103.61 86.8311 102.316 86.0917 101.027 86.3987C99.7375 86.7444 98.9981 88.038 99.3051 89.3267C99.6508 90.6166 100.944 91.356 102.233 91.049C103.523 90.7033 104.301 89.411 103.955 88.121Z" fill="#004C45"/>
+<circle cx="109" cy="89" r="19" fill="#004C45"/>
+<path d="M105 84.5L113 93.5L109 98V80L113 84.5L105 93.5" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/app/images/ExternalGpsGreen.svg b/app/images/ExternalGpsGreen.svg
deleted file mode 100644
index d5a833bd7..000000000
--- a/app/images/ExternalGpsGreen.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<svg width="160" height="140" viewBox="0 0 160 140" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M87 133C120.136 133 147 106.189 147 73.0006C147 39.8108 120.018 13 87 13C53.8639 13 27 39.8108 27 73.0006C27 106.189 53.8639 133 87 133Z" fill="#B7CDC4"/>
-<path d="M146 33C148.761 33 151 30.7622 151 28C151 25.239 148.761 23 146 23C143.239 23 141 25.239 141 28C141 30.7622 143.239 33 146 33Z" fill="#B7CDC4"/>
-<path d="M154 13C155.657 13 157 11.6565 157 10C157 8.34254 155.657 7 154 7C152.344 7 151 8.34254 151 10C151 11.6565 152.344 13 154 13Z" fill="#B7CDC4"/>
-<path d="M38 20C39.6575 20 41 18.6575 41 17C41 15.3436 39.6575 14 38 14C36.3436 14 35 15.3436 35 17C35 18.6575 36.3436 20 38 20Z" fill="#B7CDC4"/>
-<path d="M9 93C12.3138 93 15 90.3115 15 87C15 83.6885 12.3138 81 9 81C5.68615 81 3 83.6885 3 87C3 90.3115 5.68615 93 9 93Z" fill="#B7CDC4"/>
-<path d="M103.559 116.077L72.3622 120.963C70.295 121.276 68.165 119.554 67.6326 117.079L51.4389 41.8743C50.4992 38.3348 53.6941 36.4242 55.7614 36.1109L85.4237 31.9451C87.4909 31.6318 89.6209 33.3546 90.1533 35.829L108.446 110.877C108.978 113.352 107.694 115.45 103.559 116.077Z" fill="#B7CDC4"/>
-<path d="M105.689 115.2L74.4917 120.086C72.4244 120.399 70.2945 118.677 69.762 116.202L53.5683 40.9973C53.0359 38.5228 54.2888 36.2676 56.356 35.923L87.5531 31.0367C89.6204 30.7235 91.7503 32.4463 92.2828 34.9207L108.476 110.126C109.04 112.632 107.787 114.887 105.689 115.2Z" fill="white"/>
-<path d="M106.383 107.666C106.771 109.414 105.618 111.13 103.854 111.432L75.2821 116.323C73.63 116.606 72.048 115.538 71.6926 113.9L56.5829 44.2512C56.2028 42.4988 57.3685 40.7856 59.1381 40.496L87.4164 35.8686C89.0561 35.6003 90.62 36.659 90.98 38.281L106.383 107.666Z" fill="#73D19C"/>
-<path d="M116.854 102.959C118.539 99.9911 118.979 95.9753 118.014 92.2628C117.051 88.5116 114.679 85.1798 111.713 83.4175C111.257 83.1315 110.632 83.305 110.346 83.7607C110.222 83.9892 110.175 84.259 110.243 84.5324C110.313 84.7672 110.461 85.0045 110.689 85.1281C113.197 86.6431 115.237 89.4604 116.061 92.7421C116.886 95.9851 116.542 99.4227 115.105 101.934C114.818 102.428 114.992 103.015 115.487 103.302C115.981 103.59 116.607 103.416 116.854 102.959Z" fill="#004C45"/>
-<path d="M113.389 101.064C114.511 98.7368 114.716 95.9922 114.027 93.3349C113.339 90.6389 111.786 88.3411 109.665 86.8386C109.21 86.5139 108.587 86.61 108.262 87.0645C108.099 87.3304 108.051 87.6001 108.12 87.8736C108.19 88.1084 108.3 88.3057 108.528 88.4293C110.271 89.6483 111.566 91.5502 112.114 93.7767C112.702 95.9657 112.512 98.2458 111.597 100.154C111.349 100.649 111.562 101.238 112.058 101.486C112.552 101.773 113.14 101.56 113.389 101.064Z" fill="#004C45"/>
-<path d="M109.927 99.0922C110.636 97.5264 110.769 95.8257 110.356 94.2236C109.906 92.5428 108.906 91.1154 107.468 90.0613C107.014 89.7366 106.39 89.8327 106.066 90.2872C105.902 90.5531 105.853 90.8616 105.922 91.135C105.992 91.3698 106.102 91.5671 106.292 91.6895C107.39 92.4613 108.092 93.5303 108.441 94.7041C108.752 95.8767 108.636 97.0742 108.133 98.2591C107.923 98.7561 108.136 99.3442 108.633 99.5541C109.128 99.8413 109.716 99.6279 109.927 99.0922Z" fill="#004C45"/>
-<path d="M106.955 95.1211C106.61 93.8312 105.316 93.0918 104.027 93.3988C102.737 93.7445 101.998 95.0381 102.305 96.3268C102.651 97.6167 103.944 98.3561 105.233 98.0491C106.523 97.7034 107.301 96.4111 106.955 95.1211Z" fill="#004C45"/>
-<circle cx="112" cy="96" r="19" fill="#004C45"/>
-<path d="M75.8916 69.5417L87.5264 77.1464L83.8435 83.5493L80.0882 63.905L85.8259 68.2509L77.7692 79.3638" stroke="#004C45" stroke-width="1.75"/>
-<path d="M104.591 90.2466C104.297 90.4436 104.094 90.7492 104.025 91.0963C103.957 91.4433 104.029 91.8034 104.226 92.0973C104.423 92.3911 104.728 92.5947 105.076 92.6632C105.423 92.7317 105.783 92.6596 106.077 92.4626C107.83 91.2914 109.892 90.6663 112.001 90.6663C114.109 90.6663 116.171 91.2914 117.925 92.4626C118.218 92.6596 118.579 92.7317 118.926 92.6632C119.273 92.5947 119.578 92.3911 119.775 92.0973C119.972 91.8034 120.044 91.4433 119.976 91.0963C119.907 90.7492 119.704 90.4436 119.41 90.2466C117.217 88.7818 114.638 88 112.001 88C109.363 88 106.785 88.7818 104.591 90.2466Z" fill="white"/>
-<path d="M106.731 97.0369C106.843 97.172 106.98 97.2838 107.134 97.366C107.289 97.4482 107.458 97.499 107.633 97.5158C107.807 97.5325 107.983 97.5147 108.15 97.4634C108.318 97.4121 108.474 97.3283 108.609 97.2169C109.564 96.4303 110.763 96 112.001 95.9995C113.194 95.9951 114.354 96.3951 115.291 97.1342C115.428 97.2514 115.587 97.3397 115.759 97.3938C115.931 97.4478 116.111 97.4665 116.291 97.4488C116.47 97.431 116.644 97.3771 116.801 97.2904C116.959 97.2036 117.098 97.0858 117.209 96.9441C117.32 96.8023 117.401 96.6395 117.447 96.4655C117.494 96.2916 117.505 96.11 117.479 95.9317C117.453 95.7535 117.392 95.5823 117.298 95.4285C117.204 95.2747 117.081 95.1415 116.934 95.0369C115.529 93.9279 113.79 93.3273 112.001 93.3328C110.144 93.334 108.345 93.9797 106.911 95.1595C106.776 95.2709 106.664 95.4079 106.582 95.5626C106.5 95.7172 106.449 95.8866 106.432 96.0609C106.416 96.2352 106.433 96.4112 106.485 96.5786C106.536 96.7461 106.62 96.9018 106.731 97.0369Z" fill="white"/>
-<path d="M114.667 101.333C114.667 99.8603 113.473 98.6664 112.001 98.6664C110.528 98.6664 109.334 99.8603 109.334 101.333C109.334 102.806 110.528 104 112.001 104C113.473 104 114.667 102.806 114.667 101.333Z" fill="white"/>
-</svg>
diff --git a/app/images/ExternalGpsRed.svg b/app/images/ExternalGpsRed.svg
index 9fd5a52d2..67f981956 100644
--- a/app/images/ExternalGpsRed.svg
+++ b/app/images/ExternalGpsRed.svg
@@ -1,14 +1,276 @@
 <svg width="160" height="140" viewBox="0 0 160 140" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M87 133C120.136 133 147 106.189 147 73.0006C147 39.8108 120.018 13 87 13C53.8639 13 27 39.8108 27 73.0006C27 106.189 53.8639 133 87 133Z" fill="#F0C4BC"/>
+<path d="M111.5 96.8998C111.2 97.0998 110.8 97.0998 110.5 96.8998C110.4 96.7998 110.3 96.7999 110.3 96.6999V96.5999V111.3C110.3 111.4 110.4 111.5 110.5 111.6C110.8 111.8 111.2 111.8 111.5 111.6C111.6 111.6 111.6 111.5 111.7 111.5C111.7 111.5 111.8 111.4 111.8 111.3V96.5999C111.7 96.6999 111.6 96.7998 111.5 96.8998Z" fill="white"/>
+<path d="M111.5 96.2999C111.2 96.0999 110.8 96.0999 110.5 96.2999C110.2 96.4999 110.2 96.6999 110.5 96.8999C110.8 97.0999 111.2 97.0999 111.5 96.8999C111.7 96.6999 111.7 96.3999 111.5 96.2999Z" fill="#B7CDC4"/>
+<path d="M111.5 82.2997C111.2 82.4997 110.8 82.4997 110.5 82.2997C110.4 82.1997 110.3 82.1998 110.3 82.0998V81.9998V96.6998C110.3 96.7998 110.4 96.8998 110.5 96.9998C110.8 97.1998 111.2 97.1998 111.5 96.9998C111.6 96.9998 111.6 96.8997 111.7 96.8997C111.7 96.8997 111.8 96.7998 111.8 96.6998V81.9998C111.7 82.0998 111.6 82.1997 111.5 82.2997Z" fill="#004C45"/>
+<path d="M111.5 81.6998C111.2 81.4998 110.8 81.4998 110.5 81.6998C110.2 81.8998 110.2 82.0998 110.5 82.2998C110.8 82.4998 111.2 82.4998 111.5 82.2998C111.7 82.0998 111.7 81.7998 111.5 81.6998Z" fill="#004C45"/>
+<path d="M111.5 67.5998C111.2 67.7998 110.8 67.7998 110.5 67.5998C110.4 67.4998 110.3 67.4998 110.3 67.3998V67.2998V81.9998C110.3 82.0998 110.4 82.1998 110.5 82.2998C110.8 82.4998 111.2 82.4998 111.5 82.2998C111.6 82.2998 111.6 82.1998 111.7 82.1998C111.7 82.1998 111.8 82.0998 111.8 81.9998V67.2998C111.7 67.3998 111.6 67.4998 111.5 67.5998Z" fill="white"/>
+<path d="M111.5 66.9999C111.2 66.7999 110.8 66.7999 110.5 66.9999C110.2 67.1999 110.2 67.3999 110.5 67.5999C110.8 67.7999 111.2 67.7999 111.5 67.5999C111.7 67.3999 111.7 67.1999 111.5 66.9999Z" fill="#B7CDC4"/>
+<path d="M111.5 52.9997C111.2 53.1997 110.8 53.1997 110.5 52.9997C110.4 52.8997 110.3 52.8997 110.3 52.7997V52.6997V67.3997C110.3 67.4997 110.4 67.5997 110.5 67.6997C110.8 67.8997 111.2 67.8997 111.5 67.6997C111.6 67.6997 111.6 67.5997 111.7 67.5997C111.7 67.4997 111.8 67.4997 111.8 67.3997V52.6997C111.7 52.7997 111.6 52.8997 111.5 52.9997Z" fill="#004C45"/>
+<path d="M111.5 52.3998C111.2 52.1998 110.8 52.1998 110.5 52.3998C110.2 52.5998 110.2 52.7998 110.5 52.9998C110.8 53.1998 111.2 53.1998 111.5 52.9998C111.7 52.7998 111.7 52.5998 111.5 52.3998Z" fill="#004C45"/>
+<path d="M111.5 38.3998C111.2 38.5998 110.8 38.5998 110.5 38.3998C110.4 38.2998 110.3 38.2999 110.3 38.1999V38.0999V52.7998C110.3 52.8998 110.4 52.9999 110.5 53.0999C110.8 53.2999 111.2 53.2999 111.5 53.0999C111.6 53.0999 111.6 52.9998 111.7 52.9998C111.7 52.8998 111.8 52.8998 111.8 52.7998V38.0999C111.7 38.1999 111.6 38.2998 111.5 38.3998Z" fill="white"/>
+<path d="M111.5 37.7999C111.2 37.5999 110.8 37.5999 110.5 37.7999C110.2 37.9999 110.2 38.1999 110.5 38.3999C110.8 38.5999 111.2 38.5999 111.5 38.3999C111.7 38.1999 111.7 37.9999 111.5 37.7999Z" fill="#B7CDC4"/>
+<path d="M111.5 23.7997C111.2 23.9997 110.8 23.9997 110.5 23.7997C110.4 23.6997 110.3 23.6998 110.3 23.5998V23.4998V38.1998C110.3 38.2998 110.4 38.3998 110.5 38.4998C110.8 38.6998 111.2 38.6998 111.5 38.4998C111.6 38.4998 111.6 38.3997 111.7 38.3997C111.7 38.3997 111.8 38.2998 111.8 38.1998V23.4998C111.7 23.5998 111.6 23.6997 111.5 23.7997Z" fill="#004C45"/>
+<path d="M111.5 23.1998C111.2 22.9998 110.8 22.9998 110.5 23.1998C110.2 23.3998 110.2 23.5998 110.5 23.7998C110.8 23.9998 111.2 23.9998 111.5 23.7998C111.7 23.5998 111.7 23.3998 111.5 23.1998Z" fill="#004C45"/>
+<path d="M111.3 107.9L111.6 107.8L113.1 108.7L112.9 108.8L111.3 107.9Z" fill="white"/>
+<path d="M113.1 108.6L113.3 108.4V109L113.1 109.1V108.6Z" fill="white"/>
+<path d="M112.9 108.5L113.1 108.3L113.3 108.4L113.1 108.6L112.9 108.5Z" fill="white"/>
+<path d="M113.1 108.6V109.1L111.3 108.1V107.9L112.9 108.8V108.5L113.1 108.6Z" fill="#B7CDC4"/>
+<path d="M111.3 104.6L111.6 104.4L113.1 105.3L112.9 105.5L111.3 104.6Z" fill="white"/>
+<path d="M113.1 105.3L113.3 105.1V105.7L113.1 105.8V105.3Z" fill="white"/>
+<path d="M112.9 105.2L113.1 105L113.3 105.1L113.1 105.3L112.9 105.2Z" fill="white"/>
+<path d="M113.1 105.3V105.8L111.3 104.8V104.6L112.9 105.5V105.2L113.1 105.3Z" fill="#B7CDC4"/>
+<path d="M111.3 101.3L111.6 101.1L113.1 102L112.9 102.2L111.3 101.3Z" fill="white"/>
+<path d="M113.1 101.9L113.3 101.8V102.3L113.1 102.5V101.9Z" fill="white"/>
+<path d="M112.9 101.8L113.1 101.7L113.3 101.8L113.1 101.9L112.9 101.8Z" fill="white"/>
+<path d="M113.1 101.9V102.5L111.3 101.5V101.3L112.9 102.2V101.8L113.1 101.9Z" fill="#B7CDC4"/>
+<path d="M111.3 97.8998L111.6 97.7998L113.1 98.6998L112.9 98.7998L111.3 97.8998Z" fill="white"/>
+<path d="M113.1 98.5998L113.3 98.4998V98.9998L113.1 99.1998V98.5998Z" fill="white"/>
+<path d="M112.9 98.4999L113.1 98.3999L113.3 98.4999L113.1 98.5999L112.9 98.4999Z" fill="white"/>
+<path d="M113.1 98.5999V99.1999L111.3 98.1999V97.8999L112.9 98.7999V98.4999L113.1 98.5999Z" fill="#B7CDC4"/>
+<path d="M109 108.8L108.8 108.7L110.3 107.8L110.6 107.9L109 108.8Z" fill="white"/>
+<path d="M108.9 109.1L108.6 109V108.4L108.8 108.6L108.9 109.1Z" fill="#B7CDC4"/>
+<path d="M108.8 108.6L108.6 108.4L108.8 108.3L109 108.5L108.8 108.6Z" fill="white"/>
+<path d="M109 108.5V108.8L110.6 107.9V108.1L108.9 109.1L108.8 108.6L109 108.5Z" fill="white"/>
+<path d="M109 105.5L108.8 105.3L110.3 104.4L110.6 104.6L109 105.5Z" fill="white"/>
+<path d="M108.9 105.8L108.6 105.7V105.1L108.8 105.3L108.9 105.8Z" fill="#B7CDC4"/>
+<path d="M108.8 105.3L108.6 105.1L108.8 105L109 105.2L108.8 105.3Z" fill="white"/>
+<path d="M109 105.2V105.5L110.6 104.6V104.8L108.9 105.8L108.8 105.3L109 105.2Z" fill="white"/>
+<path d="M109 102.2L108.8 102L110.3 101.1L110.6 101.3L109 102.2Z" fill="white"/>
+<path d="M108.9 102.5L108.6 102.3V101.8L108.8 101.9L108.9 102.5Z" fill="#B7CDC4"/>
+<path d="M108.8 101.9L108.6 101.8L108.8 101.7L109 101.8L108.8 101.9Z" fill="white"/>
+<path d="M109 101.8V102.2L110.6 101.3V101.5L108.9 102.5L108.8 101.9L109 101.8Z" fill="white"/>
+<path d="M109 98.7998L108.8 98.6998L110.3 97.7998L110.6 97.8998L109 98.7998Z" fill="white"/>
+<path d="M108.9 99.1998L108.6 98.9998V98.4998L108.8 98.5998L108.9 99.1998Z" fill="#B7CDC4"/>
+<path d="M108.8 98.5999L108.6 98.4999L108.8 98.3999L109 98.4999L108.8 98.5999Z" fill="white"/>
+<path d="M109 98.4999V98.7999L110.6 97.8999V98.1999L108.9 99.1999L108.8 98.5999L109 98.4999Z" fill="white"/>
+<path d="M111.3 94.2998L111.6 94.0999L113.1 94.9998L112.9 95.0999L111.3 94.2998Z" fill="#004C45"/>
+<path d="M113.1 94.8998L113.3 94.7998V95.2998L113.1 95.4998V94.8998Z" fill="#004C45"/>
+<path d="M112.9 94.7999L113.1 94.7L113.3 94.7999L113.1 94.8999L112.9 94.7999Z" fill="#004C45"/>
+<path d="M113.1 94.8998V95.4998L111.3 94.4998V94.2998L112.9 95.0998V94.7998L113.1 94.8998Z" fill="#004C45"/>
+<path d="M111.3 90.8998L111.6 90.7998L113.1 91.6998L112.9 91.7998L111.3 90.8998Z" fill="#004C45"/>
+<path d="M113.1 91.5998L113.3 91.4998V91.9998L113.1 92.1998V91.5998Z" fill="#004C45"/>
+<path d="M112.9 91.4999L113.1 91.3999L113.3 91.4999L113.1 91.5999L112.9 91.4999Z" fill="#004C45"/>
+<path d="M113.1 91.5999V92.1999L111.3 91.1999V90.8999L112.9 91.7999V91.4999L113.1 91.5999Z" fill="#004C45"/>
+<path d="M111.3 87.5998L111.6 87.4998L113.1 88.2997L112.9 88.4998L111.3 87.5998Z" fill="#004C45"/>
+<path d="M113.1 88.2998L113.3 88.0999V88.6999L113.1 88.7998V88.2998Z" fill="#004C45"/>
+<path d="M112.9 88.1998L113.1 87.9998L113.3 88.0998L113.1 88.2997L112.9 88.1998Z" fill="#004C45"/>
+<path d="M113.1 88.2998V88.7998L111.3 87.7998V87.5999L112.9 88.4998V88.1999L113.1 88.2998Z" fill="#004C45"/>
+<path d="M111.3 84.2998L111.6 84.0999L113.1 84.9998L112.9 85.1999L111.3 84.2998Z" fill="#004C45"/>
+<path d="M113.1 84.9998L113.3 84.7998V85.3998L113.1 85.4998V84.9998Z" fill="#004C45"/>
+<path d="M112.9 84.8999L113.1 84.7L113.3 84.7999L113.1 84.9999L112.9 84.8999Z" fill="#004C45"/>
+<path d="M113.1 84.9998V85.4998L111.3 84.4998V84.2998L112.9 85.1998V84.8998L113.1 84.9998Z" fill="#004C45"/>
+<path d="M109 95.0999L108.8 94.9998L110.3 94.0999L110.6 94.2998L109 95.0999Z" fill="#004C45"/>
+<path d="M108.9 95.4998L108.6 95.2998V94.7998L108.8 94.8998L108.9 95.4998Z" fill="#004C45"/>
+<path d="M108.8 94.8999L108.6 94.7999L108.8 94.7L109 94.7999L108.8 94.8999Z" fill="#004C45"/>
+<path d="M109 94.7998V95.0998L110.6 94.2998V94.4998L108.9 95.4998L108.8 94.8998L109 94.7998Z" fill="#004C45"/>
+<path d="M109 91.7998L108.8 91.6998L110.3 90.7998L110.6 90.8998L109 91.7998Z" fill="#004C45"/>
+<path d="M108.9 92.1998L108.6 91.9998V91.4998L108.8 91.5998L108.9 92.1998Z" fill="#004C45"/>
+<path d="M108.8 91.5999L108.6 91.4999L108.8 91.3999L109 91.4999L108.8 91.5999Z" fill="#004C45"/>
+<path d="M109 91.4999V91.7999L110.6 90.8999V91.0999L108.9 92.1999L108.8 91.5999L109 91.4999Z" fill="#004C45"/>
+<path d="M109 88.4998L108.8 88.3997L110.3 87.4998L110.6 87.5998L109 88.4998Z" fill="#004C45"/>
+<path d="M108.9 88.7998L108.6 88.6999V88.0999L108.8 88.2998L108.9 88.7998Z" fill="#004C45"/>
+<path d="M108.8 88.2997L108.6 88.0998L108.8 87.9998L109 88.1998L108.8 88.2997Z" fill="#004C45"/>
+<path d="M109 88.1999V88.4998L110.6 87.5999V87.7998L108.9 88.7998L108.8 88.2998L109 88.1999Z" fill="#004C45"/>
+<path d="M109 85.1999L108.8 84.9998L110.3 84.0999L110.6 84.2998L109 85.1999Z" fill="#004C45"/>
+<path d="M108.9 85.4998L108.6 85.3998V84.7998L108.8 84.9998L108.9 85.4998Z" fill="#004C45"/>
+<path d="M108.8 84.9999L108.6 84.7999L108.8 84.7L109 84.8999L108.8 84.9999Z" fill="#004C45"/>
+<path d="M109 84.8998V85.1998L110.6 84.2998V84.4998L108.9 85.4998L108.8 84.9998L109 84.8998Z" fill="#004C45"/>
+<path d="M111.3 80.1999L111.6 80.0999L113.1 80.9998L112.9 81.0999L111.3 80.1999Z" fill="white"/>
+<path d="M113.1 80.8998L113.3 80.7998V81.2998L113.1 81.4998V80.8998Z" fill="white"/>
+<path d="M112.9 80.7999L113.1 80.7L113.3 80.7999L113.1 80.8999L112.9 80.7999Z" fill="white"/>
+<path d="M113.1 80.8999V81.4999L111.3 80.3999V80.2L112.9 81.0999V80.7999L113.1 80.8999Z" fill="#B7CDC4"/>
+<path d="M111.3 76.8998L111.6 76.7998L113.1 77.5998L112.9 77.7998L111.3 76.8998Z" fill="white"/>
+<path d="M113.1 77.5999L113.3 77.3999V77.9999L113.1 78.0999V77.5999Z" fill="white"/>
+<path d="M112.9 77.4998L113.1 77.2998L113.3 77.3998L113.1 77.5998L112.9 77.4998Z" fill="white"/>
+<path d="M113.1 77.5999V78.0999L111.3 77.0999V76.8999L112.9 77.7999V77.4999L113.1 77.5999Z" fill="#B7CDC4"/>
+<path d="M111.3 73.5999L111.6 73.3999L113.1 74.2999L112.9 74.4999L111.3 73.5999Z" fill="white"/>
+<path d="M113.1 74.2998L113.3 74.0999V74.6999L113.1 74.7998V74.2998Z" fill="white"/>
+<path d="M112.9 74.0998L113.1 73.9998L113.3 74.0998L113.1 74.2997L112.9 74.0998Z" fill="white"/>
+<path d="M113.1 74.2998V74.7998L111.3 73.7998V73.5999L112.9 74.4998V74.0999L113.1 74.2998Z" fill="#B7CDC4"/>
+<path d="M111.3 70.2998L111.6 70.0999L113.1 70.9998L112.9 71.0999L111.3 70.2998Z" fill="white"/>
+<path d="M113.1 70.8998L113.3 70.7998V71.2998L113.1 71.4998V70.8998Z" fill="white"/>
+<path d="M112.9 70.7999L113.1 70.7L113.3 70.7999L113.1 70.8999L112.9 70.7999Z" fill="white"/>
+<path d="M113.1 70.8998V71.4998L111.3 70.4998V70.2998L112.9 71.0998V70.7998L113.1 70.8998Z" fill="#B7CDC4"/>
+<path d="M109 81.0999L108.8 80.9998L110.3 80.0999L110.6 80.1999L109 81.0999Z" fill="white"/>
+<path d="M108.9 81.4998L108.6 81.2998V80.7998L108.8 80.8998L108.9 81.4998Z" fill="#B7CDC4"/>
+<path d="M108.8 80.8999L108.6 80.7999L108.8 80.7L109 80.7999L108.8 80.8999Z" fill="white"/>
+<path d="M109 80.7999V81.0999L110.6 80.2V80.4999L108.9 81.4999L108.8 80.8999L109 80.7999Z" fill="white"/>
+<path d="M109 77.7998L108.8 77.5998L110.3 76.7998L110.6 76.8998L109 77.7998Z" fill="white"/>
+<path d="M108.9 78.0999L108.6 77.9999V77.3999L108.8 77.5999L108.9 78.0999Z" fill="#B7CDC4"/>
+<path d="M108.8 77.5998L108.6 77.3998L108.8 77.2998L109 77.4998L108.8 77.5998Z" fill="white"/>
+<path d="M109 77.4999V77.7999L110.6 76.8999V77.0999L108.9 78.0999L108.8 77.5999L109 77.4999Z" fill="white"/>
+<path d="M109 74.4999L108.8 74.2999L110.3 73.3999L110.6 73.5999L109 74.4999Z" fill="white"/>
+<path d="M108.9 74.7998L108.6 74.6999V74.0999L108.8 74.2998L108.9 74.7998Z" fill="#B7CDC4"/>
+<path d="M108.8 74.2997L108.6 74.0998L108.8 73.9998L109 74.1998L108.8 74.2997Z" fill="white"/>
+<path d="M109 74.1999V74.4998L110.6 73.5999V73.7998L108.9 74.7998L108.8 74.2998L109 74.1999Z" fill="white"/>
+<path d="M109 71.0999L108.8 70.9998L110.3 70.0999L110.6 70.1999L109 71.0999Z" fill="white"/>
+<path d="M108.9 71.4998L108.6 71.2998V70.7998L108.8 70.8998L108.9 71.4998Z" fill="#B7CDC4"/>
+<path d="M108.8 70.8999L108.6 70.7999L108.8 70.7L109 70.7999L108.8 70.8999Z" fill="white"/>
+<path d="M109 70.7999V71.0999L110.6 70.2V70.4999L108.9 71.4999L108.8 70.8999L109 70.7999Z" fill="white"/>
+<path d="M111.3 66.8997L111.6 66.6997L113.1 67.5997L112.9 67.7997L111.3 66.8997Z" fill="#004C45"/>
+<path d="M113.1 67.5999L113.3 67.3999V67.9999L113.1 68.0999V67.5999Z" fill="#004C45"/>
+<path d="M112.9 67.4998L113.1 67.2998L113.3 67.3998L113.1 67.5998L112.9 67.4998Z" fill="#004C45"/>
+<path d="M113.1 67.5999V68.0999L111.3 67.0999V66.8999L112.9 67.7999V67.4999L113.1 67.5999Z" fill="#004C45"/>
+<path d="M111.3 63.5999L111.6 63.3999L113.1 64.2999L112.9 64.4999L111.3 63.5999Z" fill="#004C45"/>
+<path d="M113.1 64.2998L113.3 64.0999V64.5999L113.1 64.7998V64.2998Z" fill="#004C45"/>
+<path d="M112.9 64.0998L113.1 63.9998L113.3 64.0998L113.1 64.2997L112.9 64.0998Z" fill="#004C45"/>
+<path d="M113.1 64.2998V64.7998L111.3 63.7998V63.5999L112.9 64.4998V64.0999L113.1 64.2998Z" fill="#004C45"/>
+<path d="M111.3 60.1999L111.6 60.0999L113.1 60.9998L112.9 61.0999L111.3 60.1999Z" fill="#004C45"/>
+<path d="M113.1 60.8998L113.3 60.7998V61.2998L113.1 61.4998V60.8998Z" fill="#004C45"/>
+<path d="M112.9 60.7997L113.1 60.6997L113.3 60.7997L113.1 60.8997L112.9 60.7997Z" fill="#004C45"/>
+<path d="M113.1 60.8997V61.4997L111.3 60.4997V60.1997L112.9 61.0997V60.7997L113.1 60.8997Z" fill="#004C45"/>
+<path d="M111.3 56.8998L111.6 56.7998L113.1 57.6998L112.9 57.7998L111.3 56.8998Z" fill="#004C45"/>
+<path d="M113.1 57.5998L113.3 57.4998V57.9998L113.1 58.0998V57.5998Z" fill="#004C45"/>
+<path d="M112.9 57.4998L113.1 57.2998L113.3 57.4998L113.1 57.5998L112.9 57.4998Z" fill="#004C45"/>
+<path d="M113.1 57.5999V58.0999L111.3 57.0999V56.8999L112.9 57.7999V57.4999L113.1 57.5999Z" fill="#004C45"/>
+<path d="M109 67.7999L108.8 67.5999L110.3 66.7L110.6 66.8999L109 67.7999Z" fill="#004C45"/>
+<path d="M108.9 68.0999L108.6 67.9999V67.3999L108.8 67.5999L108.9 68.0999Z" fill="#004C45"/>
+<path d="M108.8 67.5998L108.6 67.3998L108.8 67.2998L109 67.4998L108.8 67.5998Z" fill="#004C45"/>
+<path d="M109 67.4999V67.7999L110.6 66.8999V67.0999L108.9 68.0999L108.8 67.5999L109 67.4999Z" fill="#004C45"/>
+<path d="M109 64.4999L108.8 64.2999L110.3 63.3999L110.6 63.5999L109 64.4999Z" fill="#004C45"/>
+<path d="M108.9 64.7998L108.6 64.5999V64.0999L108.8 64.2998L108.9 64.7998Z" fill="#004C45"/>
+<path d="M108.8 64.3L108.6 64.1L108.8 64L109 64.1L108.8 64.3Z" fill="#004C45"/>
+<path d="M109 64.0999V64.4998L110.6 63.5999V63.7998L108.9 64.7998L108.8 64.2998L109 64.0999Z" fill="#004C45"/>
+<path d="M109 61.0999L108.8 60.9998L110.3 60.0999L110.6 60.1999L109 61.0999Z" fill="#004C45"/>
+<path d="M108.9 61.4998L108.6 61.2998V60.7998L108.8 60.8998L108.9 61.4998Z" fill="#004C45"/>
+<path d="M108.8 60.8999L108.6 60.7999L108.8 60.7L109 60.7999L108.8 60.8999Z" fill="#004C45"/>
+<path d="M109 60.7999V61.0999L110.6 60.2V60.4999L108.9 61.4999L108.8 60.8999L109 60.7999Z" fill="#004C45"/>
+<path d="M109 57.7998L108.8 57.6998L110.3 56.7998L110.6 56.8998L109 57.7998Z" fill="#004C45"/>
+<path d="M108.9 58.1L108.6 58V57.5L108.8 57.6L108.9 58.1Z" fill="#004C45"/>
+<path d="M108.8 57.5998L108.6 57.4998L108.8 57.2998L109 57.4998L108.8 57.5998Z" fill="#004C45"/>
+<path d="M109 57.4999V57.7999L110.6 56.8999V57.0999L108.9 58.0999L108.8 57.5999L109 57.4999Z" fill="#004C45"/>
+<path d="M111.3 53.5999L111.6 53.3999L113.1 54.2999L112.9 54.4999L111.3 53.5999Z" fill="#004C45"/>
+<path d="M113.1 54.2998L113.3 54.0999V54.6999L113.1 54.7998V54.2998Z" fill="#004C45"/>
+<path d="M112.9 54.2L113.1 54L113.3 54.1L113.1 54.3L112.9 54.2Z" fill="#004C45"/>
+<path d="M113.1 54.2998V54.7998L111.3 53.7998V53.5999L112.9 54.4998V54.1999L113.1 54.2998Z" fill="#004C45"/>
+<path d="M109 54.4999L108.8 54.2999L110.3 53.3999L110.6 53.5999L109 54.4999Z" fill="#004C45"/>
+<path d="M108.9 54.7998L108.6 54.6999V54.0999L108.8 54.2998L108.9 54.7998Z" fill="#004C45"/>
+<path d="M108.8 54.3L108.6 54.1L108.8 54L109 54.2L108.8 54.3Z" fill="#004C45"/>
+<path d="M109 54.1999V54.4998L110.6 53.5999V53.7998L108.9 54.7998L108.8 54.2998L109 54.1999Z" fill="#004C45"/>
+<path d="M111.3 50.3999L111.6 50.2L113.1 51.0999L112.9 51.2L111.3 50.3999Z" fill="white"/>
+<path d="M113.1 50.9999L113.3 50.8999V51.3999L113.1 51.5999V50.9999Z" fill="white"/>
+<path d="M112.9 50.8998L113.1 50.7998L113.3 50.8998L113.1 50.9998L112.9 50.8998Z" fill="white"/>
+<path d="M113.1 50.9999V51.5999L111.3 50.5999V50.3999L112.9 51.1999V50.8999L113.1 50.9999Z" fill="#B7CDC4"/>
+<path d="M111.3 46.9999L111.6 46.8999L113.1 47.7999L112.9 47.8999L111.3 46.9999Z" fill="white"/>
+<path d="M113.1 47.6999L113.3 47.5999V48.0999L113.1 48.2998V47.6999Z" fill="white"/>
+<path d="M112.9 47.6L113.1 47.5L113.3 47.6L113.1 47.7L112.9 47.6Z" fill="white"/>
+<path d="M113.1 47.7V48.3L111.3 47.2V47L112.9 47.9V47.6L113.1 47.7Z" fill="#B7CDC4"/>
+<path d="M111.3 43.6999L111.6 43.5999L113.1 44.3998L112.9 44.5999L111.3 43.6999Z" fill="white"/>
+<path d="M113.1 44.3999L113.3 44.2V44.7999L113.1 44.8999V44.3999Z" fill="white"/>
+<path d="M112.9 44.2998L113.1 44.0999L113.3 44.1999L113.1 44.3998L112.9 44.2998Z" fill="white"/>
+<path d="M113.1 44.3999V44.8999L111.3 43.8999V43.7L112.9 44.5999V44.2999L113.1 44.3999Z" fill="#B7CDC4"/>
+<path d="M111.3 40.3999L111.6 40.2L113.1 41.0999L112.9 41.2999L111.3 40.3999Z" fill="white"/>
+<path d="M113.1 41.0999L113.3 40.8999V41.4999L113.1 41.5999V41.0999Z" fill="white"/>
+<path d="M112.9 40.8998L113.1 40.7998L113.3 40.8998L113.1 41.0998L112.9 40.8998Z" fill="white"/>
+<path d="M113.1 41.0999V41.5999L111.3 40.5999V40.3999L112.9 41.2999V40.8999L113.1 41.0999Z" fill="#B7CDC4"/>
+<path d="M109 51.2L108.8 51.0999L110.3 50.2L110.6 50.3999L109 51.2Z" fill="white"/>
+<path d="M108.9 51.5999L108.6 51.3999V50.8999L108.8 50.9999L108.9 51.5999Z" fill="#B7CDC4"/>
+<path d="M108.8 50.9998L108.6 50.8998L108.8 50.7998L109 50.8998L108.8 50.9998Z" fill="white"/>
+<path d="M109 50.8999V51.1999L110.6 50.3999V50.5999L108.9 51.5999L108.8 50.9999L109 50.8999Z" fill="white"/>
+<path d="M109 47.8999L108.8 47.7999L110.3 46.8999L110.6 46.9999L109 47.8999Z" fill="white"/>
+<path d="M108.9 48.2998L108.6 48.0999V47.5999L108.8 47.6999L108.9 48.2998Z" fill="#B7CDC4"/>
+<path d="M108.8 47.7L108.6 47.6L108.8 47.5L109 47.6L108.8 47.7Z" fill="white"/>
+<path d="M109 47.6V47.9L110.6 47V47.2L108.9 48.3L108.8 47.7L109 47.6Z" fill="white"/>
+<path d="M109 44.5999L108.8 44.4998L110.3 43.5999L110.6 43.6999L109 44.5999Z" fill="white"/>
+<path d="M108.9 44.8999L108.6 44.7999V44.2L108.8 44.3999L108.9 44.8999Z" fill="#B7CDC4"/>
+<path d="M108.8 44.3998L108.6 44.1999L108.8 44.0999L109 44.2998L108.8 44.3998Z" fill="white"/>
+<path d="M109 44.2999V44.5999L110.6 43.7V43.8999L108.9 44.8999L108.8 44.3999L109 44.2999Z" fill="white"/>
+<path d="M109 41.2999L108.8 41.0999L110.3 40.2L110.6 40.3999L109 41.2999Z" fill="white"/>
+<path d="M108.9 41.5999L108.6 41.4999V40.8999L108.8 41.0999L108.9 41.5999Z" fill="#B7CDC4"/>
+<path d="M108.8 41.0998L108.6 40.8998L108.8 40.7998L109 40.9998L108.8 41.0998Z" fill="white"/>
+<path d="M109 40.9999V41.2999L110.6 40.3999V40.5999L108.9 41.5999L108.8 41.0999L109 40.9999Z" fill="white"/>
+<path d="M111.3 36.6999L111.6 36.5999L113.1 37.3998L112.9 37.5999L111.3 36.6999Z" fill="#004C45"/>
+<path d="M113.1 37.3999L113.3 37.2V37.7999L113.1 37.8999V37.3999Z" fill="#004C45"/>
+<path d="M112.9 37.2998L113.1 37.0999L113.3 37.1999L113.1 37.3998L112.9 37.2998Z" fill="#004C45"/>
+<path d="M113.1 37.3999V37.8999L111.3 36.8999V36.7L112.9 37.5999V37.2999L113.1 37.3999Z" fill="#004C45"/>
+<path d="M111.3 33.3999L111.6 33.2L113.1 34.0999L112.9 34.2999L111.3 33.3999Z" fill="#004C45"/>
+<path d="M113.1 34.0999L113.3 33.8999V34.4999L113.1 34.5999V34.0999Z" fill="#004C45"/>
+<path d="M112.9 33.8998L113.1 33.7998L113.3 33.8998L113.1 34.0998L112.9 33.8998Z" fill="#004C45"/>
+<path d="M113.1 34.0999V34.5999L111.3 33.5999V33.3999L112.9 34.2999V33.8999L113.1 34.0999Z" fill="#004C45"/>
+<path d="M111.3 30.0999L111.6 29.8999L113.1 30.7999L112.9 30.8999L111.3 30.0999Z" fill="#004C45"/>
+<path d="M113.1 30.6999L113.3 30.5999V31.0999L113.1 31.2998V30.6999Z" fill="#004C45"/>
+<path d="M112.9 30.5998L113.1 30.4998L113.3 30.5998L113.1 30.6998L112.9 30.5998Z" fill="#004C45"/>
+<path d="M113.1 30.6999V31.2998L111.3 30.2998V30.0999L112.9 30.8998V30.5999L113.1 30.6999Z" fill="#004C45"/>
+<path d="M111.3 26.6999L111.6 26.5999L113.1 27.4998L112.9 27.5999L111.3 26.6999Z" fill="#004C45"/>
+<path d="M113.1 27.3998L113.3 27.2998V27.7998L113.1 27.8998V27.3998Z" fill="#004C45"/>
+<path d="M112.9 27.2998L113.1 27.0999L113.3 27.2998L113.1 27.3998L112.9 27.2998Z" fill="#004C45"/>
+<path d="M113.1 27.3999V27.8999L111.3 26.8999V26.7L112.9 27.5999V27.2999L113.1 27.3999Z" fill="#004C45"/>
+<path d="M109 37.5999L108.8 37.3998L110.3 36.5999L110.6 36.6999L109 37.5999Z" fill="#004C45"/>
+<path d="M108.9 37.8999L108.6 37.7999V37.2L108.8 37.3999L108.9 37.8999Z" fill="#004C45"/>
+<path d="M108.8 37.3998L108.6 37.1999L108.8 37.0999L109 37.2998L108.8 37.3998Z" fill="#004C45"/>
+<path d="M109 37.2999V37.5999L110.6 36.7V36.8999L108.9 37.8999L108.8 37.3999L109 37.2999Z" fill="#004C45"/>
+<path d="M109 34.2999L108.8 34.0999L110.3 33.2L110.6 33.3999L109 34.2999Z" fill="#004C45"/>
+<path d="M108.9 34.5999L108.6 34.4999V33.8999L108.8 34.0999L108.9 34.5999Z" fill="#004C45"/>
+<path d="M108.8 34.0998L108.6 33.8998L108.8 33.7998L109 33.9998L108.8 34.0998Z" fill="#004C45"/>
+<path d="M109 33.9999V34.2999L110.6 33.3999V33.5999L108.9 34.5999L108.8 34.0999L109 33.9999Z" fill="#004C45"/>
+<path d="M109 30.8999L108.8 30.7999L110.3 29.8999L110.6 30.0999L109 30.8999Z" fill="#004C45"/>
+<path d="M108.9 31.2998L108.6 31.0999V30.5999L108.8 30.6999L108.9 31.2998Z" fill="#004C45"/>
+<path d="M108.8 30.6998L108.6 30.5998L108.8 30.4998L109 30.5998L108.8 30.6998Z" fill="#004C45"/>
+<path d="M109 30.5999V30.8998L110.6 30.0999V30.2998L108.9 31.2998L108.8 30.6999L109 30.5999Z" fill="#004C45"/>
+<path d="M109 27.5999L108.8 27.4998L110.3 26.5999L110.6 26.6999L109 27.5999Z" fill="#004C45"/>
+<path d="M108.9 27.9998L108.6 27.7998V27.2998L108.8 27.3998L108.9 27.9998Z" fill="#004C45"/>
+<path d="M108.8 27.3998L108.6 27.2998L108.8 27.0999L109 27.2998L108.8 27.3998Z" fill="#004C45"/>
+<path d="M109 27.2999V27.5999L110.6 26.7V26.8999L108.9 27.9999L108.8 27.3999L109 27.2999Z" fill="#004C45"/>
+<path d="M139.2 111.7C139.1 111.7 139.1 111.7 139.2 111.7L112.2 23.4999C112.2 23.3999 112.2 23.3999 112.3 23.3999C112.4 23.3999 112.4 23.3999 112.4 23.4999L139.3 111.7C139.3 111.7 139.3 111.7 139.2 111.7Z" fill="white"/>
+<path d="M110.9 128V24.3998C110.9 24.2998 110.9 24.2998 111 24.2998C111.1 24.2998 111.1 24.2998 111.1 24.3998L110.9 128C111 128 111 127.9 110.9 128Z" fill="#B7CDC4"/>
+<path d="M82.4999 111.6C82.3999 111.6 82.3999 111.5 82.3999 111.5L109.3 23.4999C109.3 23.3999 109.4 23.3999 109.4 23.3999C109.5 23.3999 109.5 23.4999 109.5 23.4999L82.4999 111.6C82.5999 111.6 82.5999 111.6 82.4999 111.6Z" fill="white"/>
+<path d="M114.1 22.2V22.4999C114.1 22.6999 114 22.7999 113.8 22.8999V22.5999C114 22.4999 114.1 22.3 114.1 22.2Z" fill="#B7CDC4"/>
+<path d="M108.1 22.5999V22.8998C107.9 22.7998 107.8 22.5998 107.8 22.3998V22.0999C107.8 22.2999 107.9 22.4999 108.1 22.5999Z" fill="#B7CDC4"/>
+<path d="M113.8 22.5999V22.8998L112.9 23.4998V23.0999L113.8 22.5999Z" fill="#004C45"/>
+<path d="M109 23.0999V23.4998L108.1 22.8998V22.5999L109 23.0999Z" fill="#004C45"/>
+<path d="M112.9 23.0999V23.3998C112.8 23.4998 112.7 23.4999 112.7 23.5999V23.2998C112.7 23.2998 112.8 23.1999 112.9 23.0999Z" fill="#B7CDC4"/>
+<path d="M109.2 23.2998V23.5999C109.2 23.4999 109.1 23.3998 109 23.3998V23.0999C109.1 23.1999 109.2 23.2998 109.2 23.2998Z" fill="#B7CDC4"/>
+<path d="M111.3 24.4999V24.7998C111.1 24.6998 110.8 24.6998 110.5 24.7998V24.4999C110.8 24.2999 111.1 24.2999 111.3 24.4999Z" fill="#B7CDC4"/>
+<path d="M112.2 24.9998V25.2997L111.3 24.7997V24.4998L112.2 24.9998Z" fill="#004C45"/>
+<path d="M110.6 24.4998V24.7997L109.7 25.2997V24.9998L110.6 24.4998Z" fill="#004C45"/>
+<path d="M114.1 24.4998V24.7997C114.1 24.9997 114 25.0997 113.8 25.2997C113.4 25.4997 112.7 25.4997 112.2 25.2997V24.9998C112.6 25.1998 113.3 25.2998 113.8 24.9998C114 24.8998 114.1 24.6998 114.1 24.4998Z" fill="#B7CDC4"/>
+<path d="M109.7 24.9998V25.2997C109.3 25.4997 108.6 25.4997 108.1 25.2997C107.9 25.1997 107.8 24.9997 107.8 24.7997V24.4998C107.8 24.6998 107.9 24.7998 108.1 24.9998C108.6 25.1998 109.3 25.1998 109.7 24.9998Z" fill="#B7CDC4"/>
+<path d="M113.8 21.6999C114.2 21.8999 114.2 22.3998 113.8 22.5998L112.9 23.0998C112.7 23.1998 112.7 23.3998 112.9 23.4998L113.8 23.9998C114.2 24.1998 114.2 24.6998 113.8 24.8998C113.4 25.0998 112.7 25.0998 112.2 24.8998L111.3 24.3998C111.1 24.2998 110.8 24.2998 110.5 24.3998L109.6 24.8998C109.2 25.0998 108.5 25.0998 108 24.8998C107.6 24.5998 107.6 24.1998 108 23.9998L108.9 23.4998C109.1 23.3998 109.1 23.1998 108.9 23.0998L108 22.5998C107.6 22.2998 107.6 21.8999 108 21.6999C108.4 21.3999 109.1 21.3999 109.6 21.6999L110.5 22.1999C110.7 22.2999 111 22.2999 111.3 22.1999L112.2 21.6999C112.6 21.4999 113.3 21.4999 113.8 21.6999Z" fill="#004C45"/>
+<path d="M109 12.2998V20.1998L107.9 20.7998V12.9998L109 12.2998Z" fill="#E2E2E2"/>
+<path d="M107.9 12.9998V20.7998L107.5 20.5998V12.7998L107.9 12.9998Z" fill="#004C45"/>
+<path d="M109 12.2998L107.9 12.9998L107.5 12.7998L107.6 12.5999L108.4 12.1999L108.6 12.0999L109 12.2998Z" fill="#B7CDC4"/>
+<path d="M108.6 12.1C108.5 12.1 108.4 12.1 108.4 12.1C108.4 12.1 108.4 12.1 108.4 12V21.9V22C108.5 22 108.6 22 108.6 22C108.6 22 108.6 22 108.6 21.9V12.1Z" fill="white"/>
+<path d="M108.6 11.8999C108.5 11.8999 108.4 11.8999 108.4 11.8999C108.3 11.8999 108.3 11.9999 108.4 11.9999C108.5 11.9999 108.6 11.9999 108.6 11.9999C108.7 11.9999 108.7 11.9999 108.6 11.8999Z" fill="#B7CDC4"/>
+<path d="M114.3 12.7998V20.6998L114 20.8998V12.9998L114.3 12.7998Z" fill="#E2E2E2"/>
+<path d="M114 12.9999V20.8999L112.9 20.1999V12.3999L114 12.9999Z" fill="#004C45"/>
+<path d="M114.3 12.7V12.7999L114 12.9999L112.9 12.3999L113.2 12.2H113.5L114.3 12.7Z" fill="#B7CDC4"/>
+<path d="M113.5 11.9999C113.4 11.9999 113.3 11.9999 113.3 11.9999C113.3 11.9999 113.3 11.9999 113.3 11.8999V21.7999V21.8999C113.4 21.8999 113.5 21.8999 113.5 21.8999C113.5 21.8999 113.5 21.8999 113.5 21.7999V11.9999Z" fill="#004C45"/>
+<path d="M113.5 11.8999C113.4 11.8999 113.3 11.8999 113.3 11.8999C113.2 11.8999 113.2 11.9999 113.3 11.9999C113.4 11.9999 113.5 11.9999 113.5 11.9999C113.6 11.9999 113.6 11.8999 113.5 11.8999Z" fill="#B7CDC4"/>
+<path d="M108.6 14.7999C108.5 14.7999 108.4 14.7999 108.4 14.7999C108.4 14.7999 108.4 14.8 108.4 14.7V24.5999V24.7C108.5 24.7 108.6 24.7 108.6 24.7C108.6 24.7 108.6 24.6999 108.6 24.5999V14.7999Z" fill="white"/>
+<path d="M108.6 14.7C108.5 14.7 108.4 14.7 108.4 14.7C108.3 14.7 108.3 14.7999 108.4 14.7999C108.5 14.7999 108.6 14.7999 108.6 14.7999V14.7Z" fill="#B7CDC4"/>
+<path d="M108.3 15.6998V23.5998L107.5 23.0998V15.2998L108.3 15.6998Z" fill="#004C45"/>
+<path d="M108.6 15.7V23.5999H108.3V15.7H108.6Z" fill="#004C45"/>
+<path d="M108.9 15.5L109 23.4L108.6 23.6V15.7L108.9 15.5Z" fill="#E2E2E2"/>
+<path d="M108.9 15.4999L108.6 15.6999H108.3L107.5 15.2999V15.0999L107.9 14.8999L108.9 15.4999Z" fill="#B7CDC4"/>
+<path d="M113.5 14.7999C113.4 14.7999 113.3 14.7999 113.3 14.7999C113.3 14.7999 113.3 14.8 113.3 14.7V24.5999V24.7C113.4 24.7 113.5 24.7 113.5 24.7C113.5 24.7 113.5 24.6999 113.5 24.5999V14.7999Z" fill="white"/>
+<path d="M113.5 14.7C113.4 14.7 113.3 14.7 113.3 14.7C113.2 14.7 113.2 14.7999 113.3 14.7999C113.4 14.7999 113.5 14.7999 113.5 14.7999V14.7Z" fill="#B7CDC4"/>
+<path d="M114.3 15.0999V22.8998L114.2 22.9998V15.1999L114.3 15.0999Z" fill="white"/>
+<path d="M114.2 15.2V22.9999L113.5 23.4999L113.4 15.7L114.2 15.2Z" fill="#E2E2E2"/>
+<path d="M113.4 15.7L113.5 23.4999H113.2V15.7H113.4Z" fill="#004C45"/>
+<path d="M113.2 15.7V23.5L112.8 23.3V15.5L113.2 15.7Z" fill="#004C45"/>
+<path d="M114.3 15.0999L114.2 15.1999L113.4 15.6999H113.2L112.8 15.4999L113.9 14.8999L114.3 15.0999Z" fill="#B7CDC4"/>
+<path d="M111.1 12.8999L111.3 23.3999C111.3 23.3999 111.3 23.4999 111.2 23.4999C111.1 23.5999 110.9 23.5999 110.8 23.4999L110.7 23.3999L110.9 12.8999C110.9 12.9999 111 12.9999 111.1 12.8999C111.1 12.9999 111 12.9999 111.1 12.8999Z" fill="white"/>
+<mask id="mask0_5930_13914" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="110" y="12" width="2" height="12">
+<path d="M111.1 12.8999L111.3 23.3999C111.3 23.3999 111.3 23.4999 111.2 23.4999C111.1 23.5999 110.9 23.5999 110.8 23.4999L110.7 23.3999L110.9 12.8999C110.9 12.9999 111 12.9999 111.1 12.8999C111.1 12.9999 111 12.9999 111.1 12.8999Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_5930_13914)">
+<path d="M111 13H110.9L110.7 23.5C110.7 23.5 110.7 23.6 110.8 23.6C110.9 23.7 111.1 23.7 111.2 23.6L111.3 23.5L111 13Z" fill="#004C45"/>
+</g>
+<path d="M111 12.8999H110.9V12.9999C110.9 12.9999 111 12.9999 111 12.8999C111.1 12.9999 111.1 12.8999 111 12.8999Z" fill="#B7CDC4"/>
+<path d="M103.559 116.077L72.3622 120.963C70.295 121.277 68.165 119.554 67.6326 117.079L51.4389 41.8744C50.4992 38.335 53.6941 36.4243 55.7614 36.1111L85.4237 31.9452C87.4909 31.632 89.6209 33.3547 90.1533 35.8292L108.446 110.878C108.978 113.352 107.694 115.451 103.559 116.077Z" fill="#B7CDC4"/>
+<path d="M105.689 115.2L74.4919 120.086C72.4247 120.399 70.2947 118.677 69.7622 116.202L53.5686 40.9973C53.0361 38.5228 54.289 36.2676 56.3563 35.923L87.5534 31.0367C89.6206 30.7235 91.7505 32.4463 92.283 34.9207L108.477 110.126C109.04 112.632 107.788 114.887 105.689 115.2Z" fill="white"/>
+<path d="M106.383 107.666C106.771 109.414 105.618 111.13 103.854 111.432L75.2821 116.323C73.63 116.606 72.048 115.538 71.6926 113.9L56.5829 44.2513C56.2028 42.4989 57.3685 40.7857 59.1381 40.4961L87.4164 35.8688C89.0561 35.6005 90.62 36.6591 90.98 38.2811L106.383 107.666Z" fill="#73D19C"/>
 <path d="M146 33C148.761 33 151 30.7622 151 28C151 25.239 148.761 23 146 23C143.239 23 141 25.239 141 28C141 30.7622 143.239 33 146 33Z" fill="#F0C4BC"/>
 <path d="M154 13C155.657 13 157 11.6565 157 10C157 8.34254 155.657 7 154 7C152.344 7 151 8.34254 151 10C151 11.6565 152.344 13 154 13Z" fill="#F0C4BC"/>
 <path d="M38 20C39.6575 20 41 18.6575 41 17C41 15.3436 39.6575 14 38 14C36.3436 14 35 15.3436 35 17C35 18.6575 36.3436 20 38 20Z" fill="#F0C4BC"/>
 <path d="M9 93C12.3138 93 15 90.3115 15 87C15 83.6885 12.3138 81 9 81C5.68615 81 3 83.6885 3 87C3 90.3115 5.68615 93 9 93Z" fill="#F0C4BC"/>
-<path d="M103.559 116.077L72.3622 120.963C70.295 121.276 68.165 119.554 67.6326 117.079L51.4389 41.8743C50.4992 38.3348 53.6941 36.4242 55.7614 36.1109L85.4237 31.9451C87.4909 31.6318 89.6209 33.3546 90.1533 35.829L108.446 110.877C108.978 113.352 107.694 115.45 103.559 116.077Z" fill="#B7CDC4"/>
-<path d="M105.689 115.2L74.4917 120.086C72.4244 120.399 70.2945 118.677 69.762 116.202L53.5683 40.9973C53.0359 38.5228 54.2888 36.2676 56.356 35.923L87.5531 31.0367C89.6204 30.7235 91.7503 32.4463 92.2828 34.9207L108.476 110.126C109.04 112.632 107.787 114.887 105.689 115.2Z" fill="white"/>
-<path d="M106.383 107.666C106.771 109.414 105.618 111.13 103.854 111.432L75.2821 116.323C73.63 116.606 72.048 115.538 71.6926 113.9L56.5829 44.2513C56.2028 42.4989 57.3685 40.7856 59.1381 40.4961L87.4164 35.8687C89.0561 35.6004 90.62 36.659 90.98 38.281L106.383 107.666Z" fill="#73D19C"/>
-<path d="M75.8916 69.5417L87.5264 77.1464L83.8435 83.5493L80.0882 63.905L85.8259 68.2509L77.7692 79.3638" stroke="#004C45" stroke-width="1.75"/>
+<path d="M116.854 102.959C118.539 99.991 118.979 95.9752 118.014 92.2627C117.051 88.5115 114.679 85.1797 111.713 83.4174C111.257 83.1314 110.632 83.3049 110.346 83.7606C110.222 83.9891 110.175 84.2588 110.243 84.5323C110.313 84.7671 110.461 85.0043 110.689 85.128C113.197 86.643 115.237 89.4603 116.061 92.742C116.886 95.9849 116.542 99.4225 115.105 101.934C114.818 102.428 114.992 103.015 115.487 103.302C115.981 103.589 116.607 103.416 116.854 102.959Z" fill="#004C45"/>
+<path d="M113.389 101.064C114.511 98.7367 114.716 95.9921 114.027 93.3348C113.339 90.6387 111.786 88.341 109.665 86.8385C109.21 86.5138 108.587 86.6099 108.263 87.0644C108.099 87.3303 108.051 87.6 108.12 87.8735C108.19 88.1083 108.3 88.3056 108.528 88.4292C110.271 89.6482 111.566 91.5501 112.114 93.7766C112.702 95.9656 112.512 98.2457 111.597 100.154C111.349 100.649 111.562 101.237 112.058 101.486C112.553 101.773 113.141 101.56 113.389 101.064Z" fill="#004C45"/>
+<path d="M109.927 99.0922C110.636 97.5264 110.769 95.8257 110.356 94.2236C109.906 92.5428 108.906 91.1154 107.468 90.0613C107.014 89.7366 106.39 89.8327 106.066 90.2872C105.902 90.5531 105.853 90.8616 105.922 91.135C105.992 91.3698 106.102 91.5671 106.292 91.6895C107.39 92.4613 108.092 93.5303 108.441 94.7041C108.752 95.8767 108.636 97.0742 108.133 98.2591C107.923 98.7561 108.136 99.3442 108.633 99.5541C109.128 99.8413 109.716 99.6279 109.927 99.0922Z" fill="#004C45"/>
+<path d="M106.955 95.121C106.61 93.8311 105.316 93.0917 104.027 93.3987C102.737 93.7444 101.998 95.038 102.305 96.3267C102.651 97.6166 103.944 98.356 105.233 98.049C106.523 97.7033 107.301 96.411 106.955 95.121Z" fill="#004C45"/>
+<circle cx="112" cy="96" r="19" fill="#004C45"/>
 <circle cx="112" cy="96" r="19" fill="#5A2740"/>
 <path d="M112 104C113.105 104 114 103.105 114 102C114 100.895 113.105 100 112 100C110.895 100 110 100.895 110 102C110 103.105 110.895 104 112 104Z" fill="white"/>
-<path d="M112 98.6667C112.353 98.6667 112.693 98.5262 112.943 98.2761C113.193 98.0261 113.333 97.687 113.333 97.3333V89.3333C113.333 88.9797 113.193 88.6406 112.943 88.3905C112.693 88.1405 112.353 88 112 88C111.646 88 111.307 88.1405 111.057 88.3905C110.807 88.6406 110.667 88.9797 110.667 89.3333V97.3333C110.667 97.687 110.807 98.0261 111.057 98.2761C111.307 98.5262 111.646 98.6667 112 98.6667Z" fill="white"/>
+<path d="M112 98.6667C112.354 98.6667 112.693 98.5262 112.943 98.2761C113.193 98.0261 113.333 97.687 113.333 97.3333V89.3333C113.333 88.9797 113.193 88.6406 112.943 88.3905C112.693 88.1405 112.354 88 112 88C111.646 88 111.307 88.1405 111.057 88.3905C110.807 88.6406 110.667 88.9797 110.667 89.3333V97.3333C110.667 97.687 110.807 98.0261 111.057 98.2761C111.307 98.5262 111.646 98.6667 112 98.6667Z" fill="white"/>
 </svg>
diff --git a/app/images/ExternalNetworkProvider.svg b/app/images/ExternalNetworkProvider.svg
new file mode 100644
index 000000000..a2602f99f
--- /dev/null
+++ b/app/images/ExternalNetworkProvider.svg
@@ -0,0 +1,277 @@
+<svg width="160" height="140" viewBox="0 0 160 140" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M87 133C120.136 133 147 106.189 147 73.0006C147 39.8108 120.018 13 87 13C53.8639 13 27 39.8108 27 73.0006C27 106.189 53.8639 133 87 133Z" fill="#B7CDC4"/>
+<path d="M111.5 96.8998C111.2 97.0998 110.8 97.0998 110.5 96.8998C110.4 96.7998 110.3 96.7999 110.3 96.6999V96.5999V111.3C110.3 111.4 110.4 111.5 110.5 111.6C110.8 111.8 111.2 111.8 111.5 111.6C111.6 111.6 111.6 111.5 111.7 111.5C111.7 111.5 111.8 111.4 111.8 111.3V96.5999C111.7 96.6999 111.6 96.7998 111.5 96.8998Z" fill="white"/>
+<path d="M111.5 96.2999C111.2 96.0999 110.8 96.0999 110.5 96.2999C110.2 96.4999 110.2 96.6999 110.5 96.8999C110.8 97.0999 111.2 97.0999 111.5 96.8999C111.7 96.6999 111.7 96.3999 111.5 96.2999Z" fill="#B7CDC4"/>
+<path d="M111.5 82.2997C111.2 82.4997 110.8 82.4997 110.5 82.2997C110.4 82.1997 110.3 82.1998 110.3 82.0998V81.9998V96.6998C110.3 96.7998 110.4 96.8998 110.5 96.9998C110.8 97.1998 111.2 97.1998 111.5 96.9998C111.6 96.9998 111.6 96.8997 111.7 96.8997C111.7 96.8997 111.8 96.7998 111.8 96.6998V81.9998C111.7 82.0998 111.6 82.1997 111.5 82.2997Z" fill="#004C45"/>
+<path d="M111.5 81.6998C111.2 81.4998 110.8 81.4998 110.5 81.6998C110.2 81.8998 110.2 82.0998 110.5 82.2998C110.8 82.4998 111.2 82.4998 111.5 82.2998C111.7 82.0998 111.7 81.7998 111.5 81.6998Z" fill="#004C45"/>
+<path d="M111.5 67.5998C111.2 67.7998 110.8 67.7998 110.5 67.5998C110.4 67.4998 110.3 67.4998 110.3 67.3998V67.2998V81.9998C110.3 82.0998 110.4 82.1998 110.5 82.2998C110.8 82.4998 111.2 82.4998 111.5 82.2998C111.6 82.2998 111.6 82.1998 111.7 82.1998C111.7 82.1998 111.8 82.0998 111.8 81.9998V67.2998C111.7 67.3998 111.6 67.4998 111.5 67.5998Z" fill="white"/>
+<path d="M111.5 66.9999C111.2 66.7999 110.8 66.7999 110.5 66.9999C110.2 67.1999 110.2 67.3999 110.5 67.5999C110.8 67.7999 111.2 67.7999 111.5 67.5999C111.7 67.3999 111.7 67.1999 111.5 66.9999Z" fill="#B7CDC4"/>
+<path d="M111.5 52.9997C111.2 53.1997 110.8 53.1997 110.5 52.9997C110.4 52.8997 110.3 52.8997 110.3 52.7997V52.6997V67.3997C110.3 67.4997 110.4 67.5997 110.5 67.6997C110.8 67.8997 111.2 67.8997 111.5 67.6997C111.6 67.6997 111.6 67.5997 111.7 67.5997C111.7 67.4997 111.8 67.4997 111.8 67.3997V52.6997C111.7 52.7997 111.6 52.8997 111.5 52.9997Z" fill="#004C45"/>
+<path d="M111.5 52.3998C111.2 52.1998 110.8 52.1998 110.5 52.3998C110.2 52.5998 110.2 52.7998 110.5 52.9998C110.8 53.1998 111.2 53.1998 111.5 52.9998C111.7 52.7998 111.7 52.5998 111.5 52.3998Z" fill="#004C45"/>
+<path d="M111.5 38.3998C111.2 38.5998 110.8 38.5998 110.5 38.3998C110.4 38.2998 110.3 38.2999 110.3 38.1999V38.0999V52.7998C110.3 52.8998 110.4 52.9999 110.5 53.0999C110.8 53.2999 111.2 53.2999 111.5 53.0999C111.6 53.0999 111.6 52.9998 111.7 52.9998C111.7 52.8998 111.8 52.8998 111.8 52.7998V38.0999C111.7 38.1999 111.6 38.2998 111.5 38.3998Z" fill="white"/>
+<path d="M111.5 37.7999C111.2 37.5999 110.8 37.5999 110.5 37.7999C110.2 37.9999 110.2 38.1999 110.5 38.3999C110.8 38.5999 111.2 38.5999 111.5 38.3999C111.7 38.1999 111.7 37.9999 111.5 37.7999Z" fill="#B7CDC4"/>
+<path d="M111.5 23.7997C111.2 23.9997 110.8 23.9997 110.5 23.7997C110.4 23.6997 110.3 23.6998 110.3 23.5998V23.4998V38.1998C110.3 38.2998 110.4 38.3998 110.5 38.4998C110.8 38.6998 111.2 38.6998 111.5 38.4998C111.6 38.4998 111.6 38.3997 111.7 38.3997C111.7 38.3997 111.8 38.2998 111.8 38.1998V23.4998C111.7 23.5998 111.6 23.6997 111.5 23.7997Z" fill="#004C45"/>
+<path d="M111.5 23.1998C111.2 22.9998 110.8 22.9998 110.5 23.1998C110.2 23.3998 110.2 23.5998 110.5 23.7998C110.8 23.9998 111.2 23.9998 111.5 23.7998C111.7 23.5998 111.7 23.3998 111.5 23.1998Z" fill="#004C45"/>
+<path d="M111.3 107.9L111.6 107.8L113.1 108.7L112.9 108.8L111.3 107.9Z" fill="white"/>
+<path d="M113.1 108.6L113.3 108.4V109L113.1 109.1V108.6Z" fill="white"/>
+<path d="M112.9 108.5L113.1 108.3L113.3 108.4L113.1 108.6L112.9 108.5Z" fill="white"/>
+<path d="M113.1 108.6V109.1L111.3 108.1V107.9L112.9 108.8V108.5L113.1 108.6Z" fill="#B7CDC4"/>
+<path d="M111.3 104.6L111.6 104.4L113.1 105.3L112.9 105.5L111.3 104.6Z" fill="white"/>
+<path d="M113.1 105.3L113.3 105.1V105.7L113.1 105.8V105.3Z" fill="white"/>
+<path d="M112.9 105.2L113.1 105L113.3 105.1L113.1 105.3L112.9 105.2Z" fill="white"/>
+<path d="M113.1 105.3V105.8L111.3 104.8V104.6L112.9 105.5V105.2L113.1 105.3Z" fill="#B7CDC4"/>
+<path d="M111.3 101.3L111.6 101.1L113.1 102L112.9 102.2L111.3 101.3Z" fill="white"/>
+<path d="M113.1 101.9L113.3 101.8V102.3L113.1 102.5V101.9Z" fill="white"/>
+<path d="M112.9 101.8L113.1 101.7L113.3 101.8L113.1 101.9L112.9 101.8Z" fill="white"/>
+<path d="M113.1 101.9V102.5L111.3 101.5V101.3L112.9 102.2V101.8L113.1 101.9Z" fill="#B7CDC4"/>
+<path d="M111.3 97.8998L111.6 97.7998L113.1 98.6998L112.9 98.7998L111.3 97.8998Z" fill="white"/>
+<path d="M113.1 98.5998L113.3 98.4998V98.9998L113.1 99.1998V98.5998Z" fill="white"/>
+<path d="M112.9 98.4999L113.1 98.3999L113.3 98.4999L113.1 98.5999L112.9 98.4999Z" fill="white"/>
+<path d="M113.1 98.5999V99.1999L111.3 98.1999V97.8999L112.9 98.7999V98.4999L113.1 98.5999Z" fill="#B7CDC4"/>
+<path d="M109 108.8L108.8 108.7L110.3 107.8L110.6 107.9L109 108.8Z" fill="white"/>
+<path d="M108.9 109.1L108.6 109V108.4L108.8 108.6L108.9 109.1Z" fill="#B7CDC4"/>
+<path d="M108.8 108.6L108.6 108.4L108.8 108.3L109 108.5L108.8 108.6Z" fill="white"/>
+<path d="M109 108.5V108.8L110.6 107.9V108.1L108.9 109.1L108.8 108.6L109 108.5Z" fill="white"/>
+<path d="M109 105.5L108.8 105.3L110.3 104.4L110.6 104.6L109 105.5Z" fill="white"/>
+<path d="M108.9 105.8L108.6 105.7V105.1L108.8 105.3L108.9 105.8Z" fill="#B7CDC4"/>
+<path d="M108.8 105.3L108.6 105.1L108.8 105L109 105.2L108.8 105.3Z" fill="white"/>
+<path d="M109 105.2V105.5L110.6 104.6V104.8L108.9 105.8L108.8 105.3L109 105.2Z" fill="white"/>
+<path d="M109 102.2L108.8 102L110.3 101.1L110.6 101.3L109 102.2Z" fill="white"/>
+<path d="M108.9 102.5L108.6 102.3V101.8L108.8 101.9L108.9 102.5Z" fill="#B7CDC4"/>
+<path d="M108.8 101.9L108.6 101.8L108.8 101.7L109 101.8L108.8 101.9Z" fill="white"/>
+<path d="M109 101.8V102.2L110.6 101.3V101.5L108.9 102.5L108.8 101.9L109 101.8Z" fill="white"/>
+<path d="M109 98.7998L108.8 98.6998L110.3 97.7998L110.6 97.8998L109 98.7998Z" fill="white"/>
+<path d="M108.9 99.1998L108.6 98.9998V98.4998L108.8 98.5998L108.9 99.1998Z" fill="#B7CDC4"/>
+<path d="M108.8 98.5999L108.6 98.4999L108.8 98.3999L109 98.4999L108.8 98.5999Z" fill="white"/>
+<path d="M109 98.4999V98.7999L110.6 97.8999V98.1999L108.9 99.1999L108.8 98.5999L109 98.4999Z" fill="white"/>
+<path d="M111.3 94.2998L111.6 94.0999L113.1 94.9998L112.9 95.0999L111.3 94.2998Z" fill="#004C45"/>
+<path d="M113.1 94.8998L113.3 94.7998V95.2998L113.1 95.4998V94.8998Z" fill="#004C45"/>
+<path d="M112.9 94.7999L113.1 94.7L113.3 94.7999L113.1 94.8999L112.9 94.7999Z" fill="#004C45"/>
+<path d="M113.1 94.8998V95.4998L111.3 94.4998V94.2998L112.9 95.0998V94.7998L113.1 94.8998Z" fill="#004C45"/>
+<path d="M111.3 90.8998L111.6 90.7998L113.1 91.6998L112.9 91.7998L111.3 90.8998Z" fill="#004C45"/>
+<path d="M113.1 91.5998L113.3 91.4998V91.9998L113.1 92.1998V91.5998Z" fill="#004C45"/>
+<path d="M112.9 91.4999L113.1 91.3999L113.3 91.4999L113.1 91.5999L112.9 91.4999Z" fill="#004C45"/>
+<path d="M113.1 91.5999V92.1999L111.3 91.1999V90.8999L112.9 91.7999V91.4999L113.1 91.5999Z" fill="#004C45"/>
+<path d="M111.3 87.5998L111.6 87.4998L113.1 88.2997L112.9 88.4998L111.3 87.5998Z" fill="#004C45"/>
+<path d="M113.1 88.2998L113.3 88.0999V88.6999L113.1 88.7998V88.2998Z" fill="#004C45"/>
+<path d="M112.9 88.1998L113.1 87.9998L113.3 88.0998L113.1 88.2997L112.9 88.1998Z" fill="#004C45"/>
+<path d="M113.1 88.2998V88.7998L111.3 87.7998V87.5999L112.9 88.4998V88.1999L113.1 88.2998Z" fill="#004C45"/>
+<path d="M111.3 84.2998L111.6 84.0999L113.1 84.9998L112.9 85.1999L111.3 84.2998Z" fill="#004C45"/>
+<path d="M113.1 84.9998L113.3 84.7998V85.3998L113.1 85.4998V84.9998Z" fill="#004C45"/>
+<path d="M112.9 84.8999L113.1 84.7L113.3 84.7999L113.1 84.9999L112.9 84.8999Z" fill="#004C45"/>
+<path d="M113.1 84.9998V85.4998L111.3 84.4998V84.2998L112.9 85.1998V84.8998L113.1 84.9998Z" fill="#004C45"/>
+<path d="M109 95.0999L108.8 94.9998L110.3 94.0999L110.6 94.2998L109 95.0999Z" fill="#004C45"/>
+<path d="M108.9 95.4998L108.6 95.2998V94.7998L108.8 94.8998L108.9 95.4998Z" fill="#004C45"/>
+<path d="M108.8 94.8999L108.6 94.7999L108.8 94.7L109 94.7999L108.8 94.8999Z" fill="#004C45"/>
+<path d="M109 94.7998V95.0998L110.6 94.2998V94.4998L108.9 95.4998L108.8 94.8998L109 94.7998Z" fill="#004C45"/>
+<path d="M109 91.7998L108.8 91.6998L110.3 90.7998L110.6 90.8998L109 91.7998Z" fill="#004C45"/>
+<path d="M108.9 92.1998L108.6 91.9998V91.4998L108.8 91.5998L108.9 92.1998Z" fill="#004C45"/>
+<path d="M108.8 91.5999L108.6 91.4999L108.8 91.3999L109 91.4999L108.8 91.5999Z" fill="#004C45"/>
+<path d="M109 91.4999V91.7999L110.6 90.8999V91.0999L108.9 92.1999L108.8 91.5999L109 91.4999Z" fill="#004C45"/>
+<path d="M109 88.4998L108.8 88.3997L110.3 87.4998L110.6 87.5998L109 88.4998Z" fill="#004C45"/>
+<path d="M108.9 88.7998L108.6 88.6999V88.0999L108.8 88.2998L108.9 88.7998Z" fill="#004C45"/>
+<path d="M108.8 88.2997L108.6 88.0998L108.8 87.9998L109 88.1998L108.8 88.2997Z" fill="#004C45"/>
+<path d="M109 88.1999V88.4998L110.6 87.5999V87.7998L108.9 88.7998L108.8 88.2998L109 88.1999Z" fill="#004C45"/>
+<path d="M109 85.1999L108.8 84.9998L110.3 84.0999L110.6 84.2998L109 85.1999Z" fill="#004C45"/>
+<path d="M108.9 85.4998L108.6 85.3998V84.7998L108.8 84.9998L108.9 85.4998Z" fill="#004C45"/>
+<path d="M108.8 84.9999L108.6 84.7999L108.8 84.7L109 84.8999L108.8 84.9999Z" fill="#004C45"/>
+<path d="M109 84.8998V85.1998L110.6 84.2998V84.4998L108.9 85.4998L108.8 84.9998L109 84.8998Z" fill="#004C45"/>
+<path d="M111.3 80.1999L111.6 80.0999L113.1 80.9998L112.9 81.0999L111.3 80.1999Z" fill="white"/>
+<path d="M113.1 80.8998L113.3 80.7998V81.2998L113.1 81.4998V80.8998Z" fill="white"/>
+<path d="M112.9 80.7999L113.1 80.7L113.3 80.7999L113.1 80.8999L112.9 80.7999Z" fill="white"/>
+<path d="M113.1 80.8999V81.4999L111.3 80.3999V80.2L112.9 81.0999V80.7999L113.1 80.8999Z" fill="#B7CDC4"/>
+<path d="M111.3 76.8998L111.6 76.7998L113.1 77.5998L112.9 77.7998L111.3 76.8998Z" fill="white"/>
+<path d="M113.1 77.5999L113.3 77.3999V77.9999L113.1 78.0999V77.5999Z" fill="white"/>
+<path d="M112.9 77.4998L113.1 77.2998L113.3 77.3998L113.1 77.5998L112.9 77.4998Z" fill="white"/>
+<path d="M113.1 77.5999V78.0999L111.3 77.0999V76.8999L112.9 77.7999V77.4999L113.1 77.5999Z" fill="#B7CDC4"/>
+<path d="M111.3 73.5999L111.6 73.3999L113.1 74.2999L112.9 74.4999L111.3 73.5999Z" fill="white"/>
+<path d="M113.1 74.2998L113.3 74.0999V74.6999L113.1 74.7998V74.2998Z" fill="white"/>
+<path d="M112.9 74.0998L113.1 73.9998L113.3 74.0998L113.1 74.2997L112.9 74.0998Z" fill="white"/>
+<path d="M113.1 74.2998V74.7998L111.3 73.7998V73.5999L112.9 74.4998V74.0999L113.1 74.2998Z" fill="#B7CDC4"/>
+<path d="M111.3 70.2998L111.6 70.0999L113.1 70.9998L112.9 71.0999L111.3 70.2998Z" fill="white"/>
+<path d="M113.1 70.8998L113.3 70.7998V71.2998L113.1 71.4998V70.8998Z" fill="white"/>
+<path d="M112.9 70.7999L113.1 70.7L113.3 70.7999L113.1 70.8999L112.9 70.7999Z" fill="white"/>
+<path d="M113.1 70.8998V71.4998L111.3 70.4998V70.2998L112.9 71.0998V70.7998L113.1 70.8998Z" fill="#B7CDC4"/>
+<path d="M109 81.0999L108.8 80.9998L110.3 80.0999L110.6 80.1999L109 81.0999Z" fill="white"/>
+<path d="M108.9 81.4998L108.6 81.2998V80.7998L108.8 80.8998L108.9 81.4998Z" fill="#B7CDC4"/>
+<path d="M108.8 80.8999L108.6 80.7999L108.8 80.7L109 80.7999L108.8 80.8999Z" fill="white"/>
+<path d="M109 80.7999V81.0999L110.6 80.2V80.4999L108.9 81.4999L108.8 80.8999L109 80.7999Z" fill="white"/>
+<path d="M109 77.7998L108.8 77.5998L110.3 76.7998L110.6 76.8998L109 77.7998Z" fill="white"/>
+<path d="M108.9 78.0999L108.6 77.9999V77.3999L108.8 77.5999L108.9 78.0999Z" fill="#B7CDC4"/>
+<path d="M108.8 77.5998L108.6 77.3998L108.8 77.2998L109 77.4998L108.8 77.5998Z" fill="white"/>
+<path d="M109 77.4999V77.7999L110.6 76.8999V77.0999L108.9 78.0999L108.8 77.5999L109 77.4999Z" fill="white"/>
+<path d="M109 74.4999L108.8 74.2999L110.3 73.3999L110.6 73.5999L109 74.4999Z" fill="white"/>
+<path d="M108.9 74.7998L108.6 74.6999V74.0999L108.8 74.2998L108.9 74.7998Z" fill="#B7CDC4"/>
+<path d="M108.8 74.2997L108.6 74.0998L108.8 73.9998L109 74.1998L108.8 74.2997Z" fill="white"/>
+<path d="M109 74.1999V74.4998L110.6 73.5999V73.7998L108.9 74.7998L108.8 74.2998L109 74.1999Z" fill="white"/>
+<path d="M109 71.0999L108.8 70.9998L110.3 70.0999L110.6 70.1999L109 71.0999Z" fill="white"/>
+<path d="M108.9 71.4998L108.6 71.2998V70.7998L108.8 70.8998L108.9 71.4998Z" fill="#B7CDC4"/>
+<path d="M108.8 70.8999L108.6 70.7999L108.8 70.7L109 70.7999L108.8 70.8999Z" fill="white"/>
+<path d="M109 70.7999V71.0999L110.6 70.2V70.4999L108.9 71.4999L108.8 70.8999L109 70.7999Z" fill="white"/>
+<path d="M111.3 66.8997L111.6 66.6997L113.1 67.5997L112.9 67.7997L111.3 66.8997Z" fill="#004C45"/>
+<path d="M113.1 67.5999L113.3 67.3999V67.9999L113.1 68.0999V67.5999Z" fill="#004C45"/>
+<path d="M112.9 67.4998L113.1 67.2998L113.3 67.3998L113.1 67.5998L112.9 67.4998Z" fill="#004C45"/>
+<path d="M113.1 67.5999V68.0999L111.3 67.0999V66.8999L112.9 67.7999V67.4999L113.1 67.5999Z" fill="#004C45"/>
+<path d="M111.3 63.5999L111.6 63.3999L113.1 64.2999L112.9 64.4999L111.3 63.5999Z" fill="#004C45"/>
+<path d="M113.1 64.2998L113.3 64.0999V64.5999L113.1 64.7998V64.2998Z" fill="#004C45"/>
+<path d="M112.9 64.0998L113.1 63.9998L113.3 64.0998L113.1 64.2997L112.9 64.0998Z" fill="#004C45"/>
+<path d="M113.1 64.2998V64.7998L111.3 63.7998V63.5999L112.9 64.4998V64.0999L113.1 64.2998Z" fill="#004C45"/>
+<path d="M111.3 60.1999L111.6 60.0999L113.1 60.9998L112.9 61.0999L111.3 60.1999Z" fill="#004C45"/>
+<path d="M113.1 60.8998L113.3 60.7998V61.2998L113.1 61.4998V60.8998Z" fill="#004C45"/>
+<path d="M112.9 60.7997L113.1 60.6997L113.3 60.7997L113.1 60.8997L112.9 60.7997Z" fill="#004C45"/>
+<path d="M113.1 60.8997V61.4997L111.3 60.4997V60.1997L112.9 61.0997V60.7997L113.1 60.8997Z" fill="#004C45"/>
+<path d="M111.3 56.8998L111.6 56.7998L113.1 57.6998L112.9 57.7998L111.3 56.8998Z" fill="#004C45"/>
+<path d="M113.1 57.5998L113.3 57.4998V57.9998L113.1 58.0998V57.5998Z" fill="#004C45"/>
+<path d="M112.9 57.4998L113.1 57.2998L113.3 57.4998L113.1 57.5998L112.9 57.4998Z" fill="#004C45"/>
+<path d="M113.1 57.5999V58.0999L111.3 57.0999V56.8999L112.9 57.7999V57.4999L113.1 57.5999Z" fill="#004C45"/>
+<path d="M109 67.7999L108.8 67.5999L110.3 66.7L110.6 66.8999L109 67.7999Z" fill="#004C45"/>
+<path d="M108.9 68.0999L108.6 67.9999V67.3999L108.8 67.5999L108.9 68.0999Z" fill="#004C45"/>
+<path d="M108.8 67.5998L108.6 67.3998L108.8 67.2998L109 67.4998L108.8 67.5998Z" fill="#004C45"/>
+<path d="M109 67.4999V67.7999L110.6 66.8999V67.0999L108.9 68.0999L108.8 67.5999L109 67.4999Z" fill="#004C45"/>
+<path d="M109 64.4999L108.8 64.2999L110.3 63.3999L110.6 63.5999L109 64.4999Z" fill="#004C45"/>
+<path d="M108.9 64.7998L108.6 64.5999V64.0999L108.8 64.2998L108.9 64.7998Z" fill="#004C45"/>
+<path d="M108.8 64.3L108.6 64.1L108.8 64L109 64.1L108.8 64.3Z" fill="#004C45"/>
+<path d="M109 64.0999V64.4998L110.6 63.5999V63.7998L108.9 64.7998L108.8 64.2998L109 64.0999Z" fill="#004C45"/>
+<path d="M109 61.0999L108.8 60.9998L110.3 60.0999L110.6 60.1999L109 61.0999Z" fill="#004C45"/>
+<path d="M108.9 61.4998L108.6 61.2998V60.7998L108.8 60.8998L108.9 61.4998Z" fill="#004C45"/>
+<path d="M108.8 60.8999L108.6 60.7999L108.8 60.7L109 60.7999L108.8 60.8999Z" fill="#004C45"/>
+<path d="M109 60.7999V61.0999L110.6 60.2V60.4999L108.9 61.4999L108.8 60.8999L109 60.7999Z" fill="#004C45"/>
+<path d="M109 57.7998L108.8 57.6998L110.3 56.7998L110.6 56.8998L109 57.7998Z" fill="#004C45"/>
+<path d="M108.9 58.1L108.6 58V57.5L108.8 57.6L108.9 58.1Z" fill="#004C45"/>
+<path d="M108.8 57.5998L108.6 57.4998L108.8 57.2998L109 57.4998L108.8 57.5998Z" fill="#004C45"/>
+<path d="M109 57.4999V57.7999L110.6 56.8999V57.0999L108.9 58.0999L108.8 57.5999L109 57.4999Z" fill="#004C45"/>
+<path d="M111.3 53.5999L111.6 53.3999L113.1 54.2999L112.9 54.4999L111.3 53.5999Z" fill="#004C45"/>
+<path d="M113.1 54.2998L113.3 54.0999V54.6999L113.1 54.7998V54.2998Z" fill="#004C45"/>
+<path d="M112.9 54.2L113.1 54L113.3 54.1L113.1 54.3L112.9 54.2Z" fill="#004C45"/>
+<path d="M113.1 54.2998V54.7998L111.3 53.7998V53.5999L112.9 54.4998V54.1999L113.1 54.2998Z" fill="#004C45"/>
+<path d="M109 54.4999L108.8 54.2999L110.3 53.3999L110.6 53.5999L109 54.4999Z" fill="#004C45"/>
+<path d="M108.9 54.7998L108.6 54.6999V54.0999L108.8 54.2998L108.9 54.7998Z" fill="#004C45"/>
+<path d="M108.8 54.3L108.6 54.1L108.8 54L109 54.2L108.8 54.3Z" fill="#004C45"/>
+<path d="M109 54.1999V54.4998L110.6 53.5999V53.7998L108.9 54.7998L108.8 54.2998L109 54.1999Z" fill="#004C45"/>
+<path d="M111.3 50.3999L111.6 50.2L113.1 51.0999L112.9 51.2L111.3 50.3999Z" fill="white"/>
+<path d="M113.1 50.9999L113.3 50.8999V51.3999L113.1 51.5999V50.9999Z" fill="white"/>
+<path d="M112.9 50.8998L113.1 50.7998L113.3 50.8998L113.1 50.9998L112.9 50.8998Z" fill="white"/>
+<path d="M113.1 50.9999V51.5999L111.3 50.5999V50.3999L112.9 51.1999V50.8999L113.1 50.9999Z" fill="#B7CDC4"/>
+<path d="M111.3 46.9999L111.6 46.8999L113.1 47.7999L112.9 47.8999L111.3 46.9999Z" fill="white"/>
+<path d="M113.1 47.6999L113.3 47.5999V48.0999L113.1 48.2998V47.6999Z" fill="white"/>
+<path d="M112.9 47.6L113.1 47.5L113.3 47.6L113.1 47.7L112.9 47.6Z" fill="white"/>
+<path d="M113.1 47.7V48.3L111.3 47.2V47L112.9 47.9V47.6L113.1 47.7Z" fill="#B7CDC4"/>
+<path d="M111.3 43.6999L111.6 43.5999L113.1 44.3998L112.9 44.5999L111.3 43.6999Z" fill="white"/>
+<path d="M113.1 44.3999L113.3 44.2V44.7999L113.1 44.8999V44.3999Z" fill="white"/>
+<path d="M112.9 44.2998L113.1 44.0999L113.3 44.1999L113.1 44.3998L112.9 44.2998Z" fill="white"/>
+<path d="M113.1 44.3999V44.8999L111.3 43.8999V43.7L112.9 44.5999V44.2999L113.1 44.3999Z" fill="#B7CDC4"/>
+<path d="M111.3 40.3999L111.6 40.2L113.1 41.0999L112.9 41.2999L111.3 40.3999Z" fill="white"/>
+<path d="M113.1 41.0999L113.3 40.8999V41.4999L113.1 41.5999V41.0999Z" fill="white"/>
+<path d="M112.9 40.8998L113.1 40.7998L113.3 40.8998L113.1 41.0998L112.9 40.8998Z" fill="white"/>
+<path d="M113.1 41.0999V41.5999L111.3 40.5999V40.3999L112.9 41.2999V40.8999L113.1 41.0999Z" fill="#B7CDC4"/>
+<path d="M109 51.2L108.8 51.0999L110.3 50.2L110.6 50.3999L109 51.2Z" fill="white"/>
+<path d="M108.9 51.5999L108.6 51.3999V50.8999L108.8 50.9999L108.9 51.5999Z" fill="#B7CDC4"/>
+<path d="M108.8 50.9998L108.6 50.8998L108.8 50.7998L109 50.8998L108.8 50.9998Z" fill="white"/>
+<path d="M109 50.8999V51.1999L110.6 50.3999V50.5999L108.9 51.5999L108.8 50.9999L109 50.8999Z" fill="white"/>
+<path d="M109 47.8999L108.8 47.7999L110.3 46.8999L110.6 46.9999L109 47.8999Z" fill="white"/>
+<path d="M108.9 48.2998L108.6 48.0999V47.5999L108.8 47.6999L108.9 48.2998Z" fill="#B7CDC4"/>
+<path d="M108.8 47.7L108.6 47.6L108.8 47.5L109 47.6L108.8 47.7Z" fill="white"/>
+<path d="M109 47.6V47.9L110.6 47V47.2L108.9 48.3L108.8 47.7L109 47.6Z" fill="white"/>
+<path d="M109 44.5999L108.8 44.4998L110.3 43.5999L110.6 43.6999L109 44.5999Z" fill="white"/>
+<path d="M108.9 44.8999L108.6 44.7999V44.2L108.8 44.3999L108.9 44.8999Z" fill="#B7CDC4"/>
+<path d="M108.8 44.3998L108.6 44.1999L108.8 44.0999L109 44.2998L108.8 44.3998Z" fill="white"/>
+<path d="M109 44.2999V44.5999L110.6 43.7V43.8999L108.9 44.8999L108.8 44.3999L109 44.2999Z" fill="white"/>
+<path d="M109 41.2999L108.8 41.0999L110.3 40.2L110.6 40.3999L109 41.2999Z" fill="white"/>
+<path d="M108.9 41.5999L108.6 41.4999V40.8999L108.8 41.0999L108.9 41.5999Z" fill="#B7CDC4"/>
+<path d="M108.8 41.0998L108.6 40.8998L108.8 40.7998L109 40.9998L108.8 41.0998Z" fill="white"/>
+<path d="M109 40.9999V41.2999L110.6 40.3999V40.5999L108.9 41.5999L108.8 41.0999L109 40.9999Z" fill="white"/>
+<path d="M111.3 36.6999L111.6 36.5999L113.1 37.3998L112.9 37.5999L111.3 36.6999Z" fill="#004C45"/>
+<path d="M113.1 37.3999L113.3 37.2V37.7999L113.1 37.8999V37.3999Z" fill="#004C45"/>
+<path d="M112.9 37.2998L113.1 37.0999L113.3 37.1999L113.1 37.3998L112.9 37.2998Z" fill="#004C45"/>
+<path d="M113.1 37.3999V37.8999L111.3 36.8999V36.7L112.9 37.5999V37.2999L113.1 37.3999Z" fill="#004C45"/>
+<path d="M111.3 33.3999L111.6 33.2L113.1 34.0999L112.9 34.2999L111.3 33.3999Z" fill="#004C45"/>
+<path d="M113.1 34.0999L113.3 33.8999V34.4999L113.1 34.5999V34.0999Z" fill="#004C45"/>
+<path d="M112.9 33.8998L113.1 33.7998L113.3 33.8998L113.1 34.0998L112.9 33.8998Z" fill="#004C45"/>
+<path d="M113.1 34.0999V34.5999L111.3 33.5999V33.3999L112.9 34.2999V33.8999L113.1 34.0999Z" fill="#004C45"/>
+<path d="M111.3 30.0999L111.6 29.8999L113.1 30.7999L112.9 30.8999L111.3 30.0999Z" fill="#004C45"/>
+<path d="M113.1 30.6999L113.3 30.5999V31.0999L113.1 31.2998V30.6999Z" fill="#004C45"/>
+<path d="M112.9 30.5998L113.1 30.4998L113.3 30.5998L113.1 30.6998L112.9 30.5998Z" fill="#004C45"/>
+<path d="M113.1 30.6999V31.2998L111.3 30.2998V30.0999L112.9 30.8998V30.5999L113.1 30.6999Z" fill="#004C45"/>
+<path d="M111.3 26.6999L111.6 26.5999L113.1 27.4998L112.9 27.5999L111.3 26.6999Z" fill="#004C45"/>
+<path d="M113.1 27.3998L113.3 27.2998V27.7998L113.1 27.8998V27.3998Z" fill="#004C45"/>
+<path d="M112.9 27.2998L113.1 27.0999L113.3 27.2998L113.1 27.3998L112.9 27.2998Z" fill="#004C45"/>
+<path d="M113.1 27.3999V27.8999L111.3 26.8999V26.7L112.9 27.5999V27.2999L113.1 27.3999Z" fill="#004C45"/>
+<path d="M109 37.5999L108.8 37.3998L110.3 36.5999L110.6 36.6999L109 37.5999Z" fill="#004C45"/>
+<path d="M108.9 37.8999L108.6 37.7999V37.2L108.8 37.3999L108.9 37.8999Z" fill="#004C45"/>
+<path d="M108.8 37.3998L108.6 37.1999L108.8 37.0999L109 37.2998L108.8 37.3998Z" fill="#004C45"/>
+<path d="M109 37.2999V37.5999L110.6 36.7V36.8999L108.9 37.8999L108.8 37.3999L109 37.2999Z" fill="#004C45"/>
+<path d="M109 34.2999L108.8 34.0999L110.3 33.2L110.6 33.3999L109 34.2999Z" fill="#004C45"/>
+<path d="M108.9 34.5999L108.6 34.4999V33.8999L108.8 34.0999L108.9 34.5999Z" fill="#004C45"/>
+<path d="M108.8 34.0998L108.6 33.8998L108.8 33.7998L109 33.9998L108.8 34.0998Z" fill="#004C45"/>
+<path d="M109 33.9999V34.2999L110.6 33.3999V33.5999L108.9 34.5999L108.8 34.0999L109 33.9999Z" fill="#004C45"/>
+<path d="M109 30.8999L108.8 30.7999L110.3 29.8999L110.6 30.0999L109 30.8999Z" fill="#004C45"/>
+<path d="M108.9 31.2998L108.6 31.0999V30.5999L108.8 30.6999L108.9 31.2998Z" fill="#004C45"/>
+<path d="M108.8 30.6998L108.6 30.5998L108.8 30.4998L109 30.5998L108.8 30.6998Z" fill="#004C45"/>
+<path d="M109 30.5999V30.8998L110.6 30.0999V30.2998L108.9 31.2998L108.8 30.6999L109 30.5999Z" fill="#004C45"/>
+<path d="M109 27.5999L108.8 27.4998L110.3 26.5999L110.6 26.6999L109 27.5999Z" fill="#004C45"/>
+<path d="M108.9 27.9998L108.6 27.7998V27.2998L108.8 27.3998L108.9 27.9998Z" fill="#004C45"/>
+<path d="M108.8 27.3998L108.6 27.2998L108.8 27.0999L109 27.2998L108.8 27.3998Z" fill="#004C45"/>
+<path d="M109 27.2999V27.5999L110.6 26.7V26.8999L108.9 27.9999L108.8 27.3999L109 27.2999Z" fill="#004C45"/>
+<path d="M139.2 111.7C139.1 111.7 139.1 111.7 139.2 111.7L112.2 23.4999C112.2 23.3999 112.2 23.3999 112.3 23.3999C112.4 23.3999 112.4 23.3999 112.4 23.4999L139.3 111.7C139.3 111.7 139.3 111.7 139.2 111.7Z" fill="white"/>
+<path d="M110.9 128V24.3998C110.9 24.2998 110.9 24.2998 111 24.2998C111.1 24.2998 111.1 24.2998 111.1 24.3998L110.9 128C111 128 111 127.9 110.9 128Z" fill="#B7CDC4"/>
+<path d="M82.4999 111.6C82.3999 111.6 82.3999 111.5 82.3999 111.5L109.3 23.4999C109.3 23.3999 109.4 23.3999 109.4 23.3999C109.5 23.3999 109.5 23.4999 109.5 23.4999L82.4999 111.6C82.5999 111.6 82.5999 111.6 82.4999 111.6Z" fill="white"/>
+<path d="M114.1 22.2V22.4999C114.1 22.6999 114 22.7999 113.8 22.8999V22.5999C114 22.4999 114.1 22.3 114.1 22.2Z" fill="#B7CDC4"/>
+<path d="M108.1 22.5999V22.8998C107.9 22.7998 107.8 22.5998 107.8 22.3998V22.0999C107.8 22.2999 107.9 22.4999 108.1 22.5999Z" fill="#B7CDC4"/>
+<path d="M113.8 22.5999V22.8998L112.9 23.4998V23.0999L113.8 22.5999Z" fill="#004C45"/>
+<path d="M109 23.0999V23.4998L108.1 22.8998V22.5999L109 23.0999Z" fill="#004C45"/>
+<path d="M112.9 23.0999V23.3998C112.8 23.4998 112.7 23.4999 112.7 23.5999V23.2998C112.7 23.2998 112.8 23.1999 112.9 23.0999Z" fill="#B7CDC4"/>
+<path d="M109.2 23.2998V23.5999C109.2 23.4999 109.1 23.3998 109 23.3998V23.0999C109.1 23.1999 109.2 23.2998 109.2 23.2998Z" fill="#B7CDC4"/>
+<path d="M111.3 24.4999V24.7998C111.1 24.6998 110.8 24.6998 110.5 24.7998V24.4999C110.8 24.2999 111.1 24.2999 111.3 24.4999Z" fill="#B7CDC4"/>
+<path d="M112.2 24.9998V25.2997L111.3 24.7997V24.4998L112.2 24.9998Z" fill="#004C45"/>
+<path d="M110.6 24.4998V24.7997L109.7 25.2997V24.9998L110.6 24.4998Z" fill="#004C45"/>
+<path d="M114.1 24.4998V24.7997C114.1 24.9997 114 25.0997 113.8 25.2997C113.4 25.4997 112.7 25.4997 112.2 25.2997V24.9998C112.6 25.1998 113.3 25.2998 113.8 24.9998C114 24.8998 114.1 24.6998 114.1 24.4998Z" fill="#B7CDC4"/>
+<path d="M109.7 24.9998V25.2997C109.3 25.4997 108.6 25.4997 108.1 25.2997C107.9 25.1997 107.8 24.9997 107.8 24.7997V24.4998C107.8 24.6998 107.9 24.7998 108.1 24.9998C108.6 25.1998 109.3 25.1998 109.7 24.9998Z" fill="#B7CDC4"/>
+<path d="M113.8 21.6999C114.2 21.8999 114.2 22.3998 113.8 22.5998L112.9 23.0998C112.7 23.1998 112.7 23.3998 112.9 23.4998L113.8 23.9998C114.2 24.1998 114.2 24.6998 113.8 24.8998C113.4 25.0998 112.7 25.0998 112.2 24.8998L111.3 24.3998C111.1 24.2998 110.8 24.2998 110.5 24.3998L109.6 24.8998C109.2 25.0998 108.5 25.0998 108 24.8998C107.6 24.5998 107.6 24.1998 108 23.9998L108.9 23.4998C109.1 23.3998 109.1 23.1998 108.9 23.0998L108 22.5998C107.6 22.2998 107.6 21.8999 108 21.6999C108.4 21.3999 109.1 21.3999 109.6 21.6999L110.5 22.1999C110.7 22.2999 111 22.2999 111.3 22.1999L112.2 21.6999C112.6 21.4999 113.3 21.4999 113.8 21.6999Z" fill="#004C45"/>
+<path d="M109 12.2998V20.1998L107.9 20.7998V12.9998L109 12.2998Z" fill="#E2E2E2"/>
+<path d="M107.9 12.9998V20.7998L107.5 20.5998V12.7998L107.9 12.9998Z" fill="#004C45"/>
+<path d="M109 12.2998L107.9 12.9998L107.5 12.7998L107.6 12.5999L108.4 12.1999L108.6 12.0999L109 12.2998Z" fill="#B7CDC4"/>
+<path d="M108.6 12.1C108.5 12.1 108.4 12.1 108.4 12.1C108.4 12.1 108.4 12.1 108.4 12V21.9V22C108.5 22 108.6 22 108.6 22C108.6 22 108.6 22 108.6 21.9V12.1Z" fill="white"/>
+<path d="M108.6 11.8999C108.5 11.8999 108.4 11.8999 108.4 11.8999C108.3 11.8999 108.3 11.9999 108.4 11.9999C108.5 11.9999 108.6 11.9999 108.6 11.9999C108.7 11.9999 108.7 11.9999 108.6 11.8999Z" fill="#B7CDC4"/>
+<path d="M114.3 12.7998V20.6998L114 20.8998V12.9998L114.3 12.7998Z" fill="#E2E2E2"/>
+<path d="M114 12.9999V20.8999L112.9 20.1999V12.3999L114 12.9999Z" fill="#004C45"/>
+<path d="M114.3 12.7V12.7999L114 12.9999L112.9 12.3999L113.2 12.2H113.5L114.3 12.7Z" fill="#B7CDC4"/>
+<path d="M113.5 11.9999C113.4 11.9999 113.3 11.9999 113.3 11.9999C113.3 11.9999 113.3 11.9999 113.3 11.8999V21.7999V21.8999C113.4 21.8999 113.5 21.8999 113.5 21.8999C113.5 21.8999 113.5 21.8999 113.5 21.7999V11.9999Z" fill="#004C45"/>
+<path d="M113.5 11.8999C113.4 11.8999 113.3 11.8999 113.3 11.8999C113.2 11.8999 113.2 11.9999 113.3 11.9999C113.4 11.9999 113.5 11.9999 113.5 11.9999C113.6 11.9999 113.6 11.8999 113.5 11.8999Z" fill="#B7CDC4"/>
+<path d="M108.6 14.7999C108.5 14.7999 108.4 14.7999 108.4 14.7999C108.4 14.7999 108.4 14.8 108.4 14.7V24.5999V24.7C108.5 24.7 108.6 24.7 108.6 24.7C108.6 24.7 108.6 24.6999 108.6 24.5999V14.7999Z" fill="white"/>
+<path d="M108.6 14.7C108.5 14.7 108.4 14.7 108.4 14.7C108.3 14.7 108.3 14.7999 108.4 14.7999C108.5 14.7999 108.6 14.7999 108.6 14.7999V14.7Z" fill="#B7CDC4"/>
+<path d="M108.3 15.6998V23.5998L107.5 23.0998V15.2998L108.3 15.6998Z" fill="#004C45"/>
+<path d="M108.6 15.7V23.5999H108.3V15.7H108.6Z" fill="#004C45"/>
+<path d="M108.9 15.5L109 23.4L108.6 23.6V15.7L108.9 15.5Z" fill="#E2E2E2"/>
+<path d="M108.9 15.4999L108.6 15.6999H108.3L107.5 15.2999V15.0999L107.9 14.8999L108.9 15.4999Z" fill="#B7CDC4"/>
+<path d="M113.5 14.7999C113.4 14.7999 113.3 14.7999 113.3 14.7999C113.3 14.7999 113.3 14.8 113.3 14.7V24.5999V24.7C113.4 24.7 113.5 24.7 113.5 24.7C113.5 24.7 113.5 24.6999 113.5 24.5999V14.7999Z" fill="white"/>
+<path d="M113.5 14.7C113.4 14.7 113.3 14.7 113.3 14.7C113.2 14.7 113.2 14.7999 113.3 14.7999C113.4 14.7999 113.5 14.7999 113.5 14.7999V14.7Z" fill="#B7CDC4"/>
+<path d="M114.3 15.0999V22.8998L114.2 22.9998V15.1999L114.3 15.0999Z" fill="white"/>
+<path d="M114.2 15.2V22.9999L113.5 23.4999L113.4 15.7L114.2 15.2Z" fill="#E2E2E2"/>
+<path d="M113.4 15.7L113.5 23.4999H113.2V15.7H113.4Z" fill="#004C45"/>
+<path d="M113.2 15.7V23.5L112.8 23.3V15.5L113.2 15.7Z" fill="#004C45"/>
+<path d="M114.3 15.0999L114.2 15.1999L113.4 15.6999H113.2L112.8 15.4999L113.9 14.8999L114.3 15.0999Z" fill="#B7CDC4"/>
+<path d="M111.1 12.8999L111.3 23.3999C111.3 23.3999 111.3 23.4999 111.2 23.4999C111.1 23.5999 110.9 23.5999 110.8 23.4999L110.7 23.3999L110.9 12.8999C110.9 12.9999 111 12.9999 111.1 12.8999C111.1 12.9999 111 12.9999 111.1 12.8999Z" fill="white"/>
+<mask id="mask0_5928_17786" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="110" y="12" width="2" height="12">
+<path d="M111.1 12.8999L111.3 23.3999C111.3 23.3999 111.3 23.4999 111.2 23.4999C111.1 23.5999 110.9 23.5999 110.8 23.4999L110.7 23.3999L110.9 12.8999C110.9 12.9999 111 12.9999 111.1 12.8999C111.1 12.9999 111 12.9999 111.1 12.8999Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_5928_17786)">
+<path d="M111 13H110.9L110.7 23.5C110.7 23.5 110.7 23.6 110.8 23.6C110.9 23.7 111.1 23.7 111.2 23.6L111.3 23.5L111 13Z" fill="#004C45"/>
+</g>
+<path d="M111 12.8999H110.9V12.9999C110.9 12.9999 111 12.9999 111 12.8999C111.1 12.9999 111.1 12.8999 111 12.8999Z" fill="#B7CDC4"/>
+<path d="M103.559 116.077L72.3622 120.963C70.295 121.277 68.165 119.554 67.6326 117.079L51.4389 41.8744C50.4992 38.335 53.6941 36.4243 55.7614 36.1111L85.4237 31.9452C87.4909 31.632 89.6209 33.3547 90.1533 35.8292L108.446 110.878C108.978 113.352 107.694 115.451 103.559 116.077Z" fill="#B7CDC4"/>
+<path d="M105.689 115.2L74.4919 120.086C72.4247 120.399 70.2947 118.677 69.7622 116.202L53.5686 40.9973C53.0361 38.5228 54.289 36.2676 56.3563 35.923L87.5534 31.0367C89.6206 30.7235 91.7505 32.4463 92.283 34.9207L108.477 110.126C109.04 112.632 107.788 114.887 105.689 115.2Z" fill="white"/>
+<path d="M106.383 107.666C106.771 109.414 105.618 111.13 103.854 111.432L75.2821 116.323C73.63 116.606 72.048 115.538 71.6926 113.9L56.5829 44.2513C56.2028 42.4989 57.3685 40.7857 59.1381 40.4961L87.4164 35.8688C89.0561 35.6005 90.62 36.6591 90.98 38.2811L106.383 107.666Z" fill="#73D19C"/>
+<path d="M146 33C148.761 33 151 30.7622 151 28C151 25.239 148.761 23 146 23C143.239 23 141 25.239 141 28C141 30.7622 143.239 33 146 33Z" fill="#B7CDC4"/>
+<path d="M154 13C155.657 13 157 11.6565 157 10C157 8.34254 155.657 7 154 7C152.344 7 151 8.34254 151 10C151 11.6565 152.344 13 154 13Z" fill="#B7CDC4"/>
+<path d="M38 20C39.6575 20 41 18.6575 41 17C41 15.3436 39.6575 14 38 14C36.3436 14 35 15.3436 35 17C35 18.6575 36.3436 20 38 20Z" fill="#B7CDC4"/>
+<path d="M9 93C12.3138 93 15 90.3115 15 87C15 83.6885 12.3138 81 9 81C5.68615 81 3 83.6885 3 87C3 90.3115 5.68615 93 9 93Z" fill="#B7CDC4"/>
+<path d="M116.854 102.959C118.539 99.991 118.979 95.9752 118.014 92.2627C117.051 88.5115 114.679 85.1797 111.713 83.4174C111.257 83.1314 110.632 83.3049 110.346 83.7606C110.222 83.9891 110.175 84.2588 110.243 84.5323C110.313 84.7671 110.461 85.0043 110.689 85.128C113.197 86.643 115.237 89.4603 116.061 92.742C116.886 95.9849 116.542 99.4225 115.105 101.934C114.818 102.428 114.992 103.015 115.487 103.302C115.981 103.589 116.607 103.416 116.854 102.959Z" fill="#004C45"/>
+<path d="M113.389 101.064C114.511 98.7367 114.716 95.9921 114.027 93.3348C113.339 90.6387 111.786 88.341 109.665 86.8385C109.21 86.5138 108.587 86.6099 108.263 87.0644C108.099 87.3303 108.051 87.6 108.12 87.8735C108.19 88.1083 108.3 88.3056 108.528 88.4292C110.271 89.6482 111.566 91.5501 112.114 93.7766C112.702 95.9656 112.512 98.2457 111.597 100.154C111.349 100.649 111.562 101.237 112.058 101.486C112.553 101.773 113.141 101.56 113.389 101.064Z" fill="#004C45"/>
+<path d="M109.927 99.0922C110.636 97.5264 110.769 95.8257 110.356 94.2236C109.906 92.5428 108.906 91.1154 107.468 90.0613C107.014 89.7366 106.39 89.8327 106.066 90.2872C105.902 90.5531 105.853 90.8616 105.922 91.135C105.992 91.3698 106.102 91.5671 106.292 91.6895C107.39 92.4613 108.092 93.5303 108.441 94.7041C108.752 95.8767 108.636 97.0742 108.133 98.2591C107.923 98.7561 108.136 99.3442 108.633 99.5541C109.128 99.8413 109.716 99.6279 109.927 99.0922Z" fill="#004C45"/>
+<path d="M106.955 95.121C106.61 93.8311 105.316 93.0917 104.027 93.3987C102.737 93.7444 101.998 95.038 102.305 96.3267C102.651 97.6166 103.944 98.356 105.233 98.049C106.523 97.7033 107.301 96.411 106.955 95.121Z" fill="#004C45"/>
+<circle cx="112" cy="96" r="19" fill="#004C45"/>
+<path d="M116 93C117.657 93 119 91.6569 119 90C119 88.3431 117.657 87 116 87C114.343 87 113 88.3431 113 90C113 91.6569 114.343 93 116 93Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M117 105C118.657 105 120 103.657 120 102C120 100.343 118.657 99 117 99C115.343 99 114 100.343 114 102C114 103.657 115.343 105 117 105Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M105 99C106.657 99 108 97.6569 108 96C108 94.3431 106.657 93 105 93C103.343 93 102 94.3431 102 96C102 97.6569 103.343 99 105 99Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M113 91L108 94.6215M113 101L108 97.3785" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/app/images/images.qrc b/app/images/images.qrc
index b0b772a30..2d2cf69f2 100644
--- a/app/images/images.qrc
+++ b/app/images/images.qrc
@@ -19,8 +19,9 @@
         <file>UploadImage.svg</file>
         <file>WarnLogoImage.svg</file>
         <file>NoMapThemesImage.svg</file>
+        <file>ExternalBluetoothProvider.svg</file>
         <file>ExternalGpsRed.svg</file>
-        <file>ExternalGpsGreen.svg</file>
+        <file>ExternalNetworkProvider.svg</file>
         <file>NegativeMMSymbol.svg</file>
         <file>PositiveMMSymbol.svg</file>
         <file>NeutralMMSymbol.svg</file>
diff --git a/app/mmstyle.h b/app/mmstyle.h
index 1dc74b4f6..f51f4a567 100644
--- a/app/mmstyle.h
+++ b/app/mmstyle.h
@@ -112,6 +112,7 @@ class MMStyle: public QObject
     Q_PROPERTY( QUrl arrowDownIcon READ arrowDownIcon CONSTANT )
     Q_PROPERTY( QUrl arrowLinkRightIcon READ arrowLinkRightIcon CONSTANT )
     Q_PROPERTY( QUrl arrowUpIcon READ arrowUpIcon CONSTANT )
+    Q_PROPERTY( QUrl bluetoothIcon READ bluetoothIcon CONSTANT )
     Q_PROPERTY( QUrl backIcon READ backIcon CONSTANT )
     Q_PROPERTY( QUrl briefcaseIcon READ briefcaseIcon CONSTANT )
     Q_PROPERTY( QUrl calendarIcon READ calendarIcon CONSTANT )
@@ -144,6 +145,7 @@ class MMStyle: public QObject
     Q_PROPERTY( QUrl mouthIcon READ mouthIcon CONSTANT )
     Q_PROPERTY( QUrl naturalResourcesIcon READ naturalResourcesIcon CONSTANT )
     Q_PROPERTY( QUrl nextIcon READ nextIcon CONSTANT )
+    Q_PROPERTY( QUrl networkIcon READ networkIcon CONSTANT )
     Q_PROPERTY( QUrl otherIcon READ otherIcon CONSTANT )
     Q_PROPERTY( QUrl othersIcon READ othersIcon CONSTANT )
     Q_PROPERTY( QUrl plusIcon READ plusIcon CONSTANT )
@@ -227,8 +229,9 @@ class MMStyle: public QObject
     Q_PROPERTY( QUrl positionTrackingRunningImage READ positionTrackingRunningImage CONSTANT )
     Q_PROPERTY( QUrl positionTrackingStartImage READ positionTrackingStartImage CONSTANT )
     Q_PROPERTY( QUrl syncImage READ syncImage CONSTANT )
-    Q_PROPERTY( QUrl externalGpsGreenImage READ externalGpsGreenImage CONSTANT )
     Q_PROPERTY( QUrl externalGpsRedImage READ externalGpsRedImage CONSTANT )
+    Q_PROPERTY( QUrl externalBluetoothGreenImage READ externalBluetoothGreenImage CONSTANT )
+    Q_PROPERTY( QUrl externalNetworkGreenImage READ externalNetworkGreenImage CONSTANT )
     Q_PROPERTY( QUrl negativeMMSymbolImage READ negativeMMSymbolImage CONSTANT )
     Q_PROPERTY( QUrl positiveMMSymbolImage READ positiveMMSymbolImage CONSTANT )
     Q_PROPERTY( QUrl neutralMMSymbolImage READ neutralMMSymbolImage CONSTANT )
@@ -424,6 +427,7 @@ class MMStyle: public QObject
     QUrl arrowLinkRightIcon() const {return QUrl( "qrc:/ArrowLinkRight.svg" );}
     QUrl arrowUpIcon() const {return QUrl( "qrc:/ArrowUp.svg" );}
     QUrl backIcon() const {return QUrl( "qrc:/Back.svg" );}
+    QUrl bluetoothIcon() const {return QUrl( "qrc:/Bluetooth.svg" );}
     QUrl briefcaseIcon() const {return QUrl( "qrc:/Briefcase.svg" );}
     QUrl calendarIcon() const {return QUrl( "qrc:/Calendar.svg" );}
     QUrl checkmarkIcon() const {return QUrl( "qrc:/Checkmark.svg" );}
@@ -454,6 +458,7 @@ class MMStyle: public QObject
     QUrl remoteImageLoadErrorIcon() const {return QUrl( "qrc:/RemoteImageLoadError.svg" );}
     QUrl mouthIcon() const {return QUrl( "qrc:/Mouth.svg" );}
     QUrl measurementToolIcon() const {return QUrl( "qrc:/Measure.svg" );}
+    QUrl networkIcon() const {return QUrl( "qrc:/Network.svg" );}
     QUrl closeShapeIcon() const {return QUrl( "qrc:/CloseShape.svg" );}
     QUrl naturalResourcesIcon() const {return QUrl( "qrc:/NaturalResources.svg" );}
     QUrl nextIcon() const {return QUrl( "qrc:/Next.svg" );}
@@ -530,8 +535,9 @@ class MMStyle: public QObject
     QUrl positionTrackingRunningImage() const {return QUrl( "qrc:/images/PositionTrackingRunning.svg" );}
     QUrl positionTrackingStartImage() const {return QUrl( "qrc:/images/PositionTrackingStart.svg" );}
     QUrl syncImage() const {return QUrl( "qrc:/images/SyncImage.svg" );}
-    QUrl externalGpsGreenImage() const {return QUrl( "qrc:/images/ExternalGpsGreen.svg" );}
     QUrl externalGpsRedImage() const {return QUrl( "qrc:/images/ExternalGpsRed.svg" );}
+    QUrl externalBluetoothGreenImage() const {return QUrl( "qrc:/images/ExternalBluetoothProvider.svg" );}
+    QUrl externalNetworkGreenImage() const {return QUrl( "qrc:/images/ExternalNetworkProvider.svg" );}
     QUrl negativeMMSymbolImage() const {return QUrl( "qrc:/images/NegativeMMSymbol.svg" );}
     QUrl positiveMMSymbolImage() const {return QUrl( "qrc:/images/PositiveMMSymbol.svg" );}
     QUrl neutralMMSymbolImage() const {return QUrl( "qrc:/images/NeutralMMSymbol.svg" );}
diff --git a/app/position/providers/networkpositionprovider.cpp b/app/position/providers/networkpositionprovider.cpp
index b2b552e65..d7abb3627 100644
--- a/app/position/providers/networkpositionprovider.cpp
+++ b/app/position/providers/networkpositionprovider.cpp
@@ -73,8 +73,8 @@ void NetworkPositionProvider::closeProvider()
 {
   mTcpSocket->close();
   mUdpSocket->close();
-  if ( mTcpSocket) mTcpSocket->disconnect();
-  if ( mUdpSocket) mUdpSocket->disconnect();
+  if ( mTcpSocket ) mTcpSocket->disconnect();
+  if ( mUdpSocket ) mUdpSocket->disconnect();
 
   mUdpReconnectTimer.stop();
   mReconnectTimer.stop();
diff --git a/app/qml/CMakeLists.txt b/app/qml/CMakeLists.txt
index d9662b019..a2697371d 100644
--- a/app/qml/CMakeLists.txt
+++ b/app/qml/CMakeLists.txt
@@ -119,9 +119,11 @@ set(MM_QML
     form/editors/MMFormValueMapEditor.qml
     form/editors/MMFormValueRelationEditor.qml
     gps/MMAddPositionProviderDrawer.qml
-    gps/MMBluetoothConnectionDrawer.qml
+    gps/MMExternalProviderConnectionDrawer.qml
     gps/MMGpsDataDrawer.qml
+    gps/MMNetworkProviderDrawer.qml
     gps/MMPositionProviderPage.qml
+    gps/MMProviderTypeDrawer.qml
     gps/MMStakeoutDrawer.qml
     gps/MMMeasureDrawer.qml
     gps/MMSelectionDrawer.qml
diff --git a/app/qml/account/components/MMIconCheckBoxHorizontal.qml b/app/qml/account/components/MMIconCheckBoxHorizontal.qml
index cd3a02452..f9327bb18 100644
--- a/app/qml/account/components/MMIconCheckBoxHorizontal.qml
+++ b/app/qml/account/components/MMIconCheckBoxHorizontal.qml
@@ -17,21 +17,25 @@ CheckBox {
   id: control
 
   property string sourceIcon: ""
+  property string description: ""
+  property bool showBorder: false
   property bool small: false
 
-  height: (control.small ? 50 : 80) * __dp
+  height: (description !== "" ? 96 : (control.small ? 50 : 80)) * __dp
+
+  leftPadding: (description !== "" ? iconBgRectangle.x : 0) + iconBgRectangle.width + 30 * __dp
+  rightPadding: 20 * __dp
 
   indicator: Rectangle {
     id: iconBgRectangle
-    width: (control.small ? 24 : 40) * __dp
-    height: (control.small ? 24 : 40) * __dp
+    width: (control.small ? 24 : (control.description !== "" ? 50 : 40)) * __dp
+    height: (control.small ? 24 : (control.description !== "" ? 50 : 40)) * __dp
     x: 20 * __dp
     y: control.height / 2 - height / 2
     radius: width / 2
     color: control.checked ? __style.polarColor : __style.lightGreenColor
 
     MMIcon {
-      id: icon
       size: control.small ? __style.icon16 : __style.icon24
       anchors.centerIn: parent
       source: control.sourceIcon
@@ -39,18 +43,49 @@ CheckBox {
     }
   }
 
-  contentItem: Text {
-    text: control.text
-    font: __style.t3
-    color: control.checked ? __style.polarColor : __style.nightColor
-    elide: Text.ElideRight
-    verticalAlignment: Text.AlignVCenter
-    leftPadding: control.indicator.width + 30 * __dp
-    rightPadding: 20 * __dp
+  contentItem: Item {
+    implicitWidth: titleText.implicitWidth
+
+    Text {
+      id: titleText
+      visible: control.description === ""
+      width: parent.width
+      height: parent.height
+      text: control.text
+      font: __style.t3
+      color: control.checked ? __style.polarColor : __style.nightColor
+      elide: Text.ElideRight
+      verticalAlignment: Text.AlignVCenter
+    }
+
+    Column {
+      id: textColumn
+      visible: control.description !== ""
+      anchors.verticalCenter: parent.verticalCenter
+      width: parent.width
+      spacing: 10 * __dp
+
+      Text {
+        width: parent.width
+        text: control.text
+        font: __style.t3
+        color: control.checked ? __style.polarColor : __style.nightColor
+        elide: Text.ElideRight
+      }
+
+      Text {
+        width: parent.width
+        text: control.description
+        font: __style.p6
+        color: control.checked ? __style.polarColor : __style.nightColor
+        elide: Text.ElideRight
+      }
+    }
   }
 
   background: Rectangle {
     radius: __style.radius12
-    color: control.checked ? __style.forestColor: __style.polarColor
+    color: control.checked ? __style.forestColor : __style.polarColor
+    border.color: showBorder ? ( control.checked ? __style.transparentColor : __style.mediumGreenColor ) : __style.transparentColor
   }
 }
diff --git a/app/qml/gps/MMAddPositionProviderDrawer.qml b/app/qml/gps/MMAddPositionProviderDrawer.qml
index ab4771bcf..5531a52ca 100644
--- a/app/qml/gps/MMAddPositionProviderDrawer.qml
+++ b/app/qml/gps/MMAddPositionProviderDrawer.qml
@@ -103,16 +103,30 @@ MMComponents.MMListDrawer {
     Column {
       width: ListView.view.width
 
-      spacing: 0
+      spacing: __style.spacing16
 
       MMComponents.MMListSpacer { height: __style.margin40 }
 
+      Image {
+        anchors.horizontalCenter: parent.horizontalCenter
+
+        source: __style.mmSymbolImage
+
+        width: 32 * __dp
+        height: 32 * __dp
+
+        fillMode: Image.PreserveAspectFit
+      }
+
       MMComponents.MMText {
         width: parent.width
 
-        text: qsTr( "Looking for devices" ) + "..."
+        text: qsTr( "Looking for more devices" ) + "..."
 
         font: __style.t3
+        color: __style.forestColor
+
+        horizontalAlignment: Text.AlignHCenter
       }
     }
   }
diff --git a/app/qml/gps/MMBluetoothConnectionDrawer.qml b/app/qml/gps/MMExternalProviderConnectionDrawer.qml
similarity index 75%
rename from app/qml/gps/MMBluetoothConnectionDrawer.qml
rename to app/qml/gps/MMExternalProviderConnectionDrawer.qml
index 64d5c9af4..92e113bfc 100644
--- a/app/qml/gps/MMBluetoothConnectionDrawer.qml
+++ b/app/qml/gps/MMExternalProviderConnectionDrawer.qml
@@ -19,6 +19,7 @@ import "../components" as MMComponents
 MMComponents.MMDrawer {
   id: root
 
+  property string providerType: ""
   property var positionProvider: PositionKit.positionProvider
   property string howToConnectGPSLink: __inputHelp.howToConnectGPSLink
 
@@ -33,11 +34,18 @@ MMComponents.MMDrawer {
     {
       return qsTr( "Connected" )
     }
-    else
+    else if ( rootstate.state === "fail")
     {
-      // either NoConnection or WaitingToReconnect
       return qsTr( "Failed to connect to" ) + " " + ( root.positionProvider ? root.positionProvider.name() : "" )
     }
+    else
+    {
+      if( root.providerType === "bluetooth")
+        return qsTr( "We were not able to connect to the specified device. Please make sure your device is powered on and can be connected to.")
+      else if (root.providerType === "network")
+        // either NoConnection or WaitingToReconnect
+        return qsTr( "We were not able to connect to the specified IP address. Please try again later." )
+    }
   }
 
   property string connectingSuffixAnimation: ""
@@ -45,7 +53,10 @@ MMComponents.MMDrawer {
   property string descriptionText: {
     if ( rootstate.state === "working" )
     {
-      return qsTr( "You might be asked to pair your device during this process." )
+      if( root.providerType === "bluetooth")
+        return qsTr( "You might be asked to pair your device during this process." )
+      else if( root.providerType === "network")
+        return qsTr( "This might take a while..." )
     }
     else if ( rootstate.state === "success" )
     {
@@ -59,7 +70,10 @@ MMComponents.MMDrawer {
 
     else
     {
-      return qsTr( "We were not able to connect to the specified device. Please make sure your device is powered on and can be connected to." )
+      if( root.providerType === "bluetooth")
+        return qsTr( "We were not able to connect to the specified device. Please make sure your device is powered on and can be connected to." )
+      else if( root.providerType === "network")
+        return qsTr( "We were not able to connect to the specified IP address. Please try again later." )
     }
   }
 
@@ -69,7 +83,10 @@ MMComponents.MMDrawer {
       return __style.externalGpsRedImage
     }
     else {
-      return __style.externalGpsGreenImage
+      if( root.providerType === "bluetooth" )
+        return __style.externalBluetoothGreenImage
+      else if (root.providerType === "network")
+        return __style.externalNetworkGreenImage
     }
   }
 
diff --git a/app/qml/gps/MMNetworkProviderDrawer.qml b/app/qml/gps/MMNetworkProviderDrawer.qml
new file mode 100644
index 000000000..d5632fdec
--- /dev/null
+++ b/app/qml/gps/MMNetworkProviderDrawer.qml
@@ -0,0 +1,119 @@
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+import QtQuick
+
+import "../components" as MMComponents
+import "../inputs" as MMInputs
+
+MMComponents.MMDrawer {
+  id: root
+
+  signal confirmed( string alias, string deviceAddress )
+
+  drawerHeader.title: qsTr( "Network connection" )
+  drawerHeader.titleFont: __style.t2
+
+  drawerContent: Column {
+    width: parent.width
+    spacing: __style.spacing20
+
+    MMComponents.MMText {
+      width: parent.width
+
+      text: qsTr( "External receivers can be connected via network in iOS devices. Some of the known devices that support network connection (TCP or UDP) are EOS and Emlid." )
+
+      font: __style.p5
+      color: __style.nightColor
+
+      wrapMode: Text.Wrap
+      horizontalAlignment: Text.AlignJustify
+    }
+
+    MMInputs.MMTextInput {
+      id: ipAddressInput
+
+      width: parent.width
+      textFieldBackground.color: __style.lightGreenColor
+
+      title: qsTr( "IP address" )
+      placeholderText: qsTr( "localhost" )
+
+      onTextEdited: errorMsg = ""
+    }
+
+    MMInputs.MMTextInput {
+      id: portInput
+
+      width: parent.width
+      textFieldBackground.color: __style.lightGreenColor
+
+      title: qsTr( "Port" )
+      placeholderText: qsTr( "1234" )
+
+      textField.inputMethodHints: Qt.ImhDigitsOnly
+
+      onTextEdited: errorMsg = ""
+    }
+
+    MMInputs.MMTextInput {
+      id: aliasInput
+
+      width: parent.width
+      textFieldBackground.color: __style.lightGreenColor
+
+      title: qsTr( "Receiver nickname (optional)" )
+      placeholderText: qsTr( "Green device" )
+    }
+
+    MMComponents.MMButton {
+      width: parent.width
+
+      text: qsTr( "Confirm" )
+
+      onClicked: {
+        const ip = ipAddressInput.text.trim()
+        const port = portInput.text.trim()
+
+        const ipv4Regex = /^((25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\.){3}(25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)$/
+        const hostnameRegex = /^[a-zA-Z0-9]([a-zA-Z0-9\-\.]*[a-zA-Z0-9])?$/
+
+        if ( ip === "" ) {
+          ipAddressInput.errorMsg = qsTr( "IP address is required" )
+        }
+        else if ( !ipv4Regex.test( ip ) && !hostnameRegex.test( ip ) ) {
+          ipAddressInput.errorMsg = qsTr( "Enter a valid IP address or hostname" )
+        }
+        else {
+          ipAddressInput.errorMsg = ""
+        }
+
+        const portNum = parseInt( port )
+        if ( port === "" ) {
+          portInput.errorMsg = qsTr( "Port is required" )
+        }
+        else if ( !/^\d+$/.test( port ) || portNum < 1 || portNum > 65535 ) {
+          portInput.errorMsg = qsTr( "Enter a valid port (1–65535)" )
+        }
+        else {
+          portInput.errorMsg = ""
+        }
+
+        if ( ipAddressInput.errorMsg !== "" || portInput.errorMsg !== "" ) {
+          return
+        }
+
+        const deviceAddress = ip + ":" + port
+
+        root.confirmed( aliasInput.text, deviceAddress )
+        root.close()
+      }
+    }
+  }
+}
diff --git a/app/qml/gps/MMPositionProviderPage.qml b/app/qml/gps/MMPositionProviderPage.qml
index 550636f18..471e48ba6 100644
--- a/app/qml/gps/MMPositionProviderPage.qml
+++ b/app/qml/gps/MMPositionProviderPage.qml
@@ -8,16 +8,12 @@
  ***************************************************************************/
 
 import QtQuick
-import QtQml.Models
-import QtQuick.Controls
-import QtQuick.Dialogs
 
 import mm 1.0 as MM
 import MMInput
 
 import "../components" as MMComponents
 import "../dialogs" as MMDialogs
-import "../inputs" as MMInputs
 
 MMComponents.MMPage {
   id: root
@@ -35,8 +31,6 @@ MMComponents.MMPage {
 
       property bool showTopTitle: visibleArea.yPosition * height > ( headerItem.contentHeight / 2 )
 
-      visible: __haveBluetooth
-
       width: parent.width
       height: parent.height
 
@@ -96,7 +90,7 @@ MMComponents.MMPage {
           if ( ListView.section === "internal" ) {
             let ix = providersModel.index( index + 1, 0 )
             let type = providersModel.data( ix, MM.PositionProvidersModel.ProviderType )
-            if ( type.includes("external") ) return false
+            if ( type.includes( "external" ) ) return false
           }
 
           return true
@@ -137,98 +131,36 @@ MMComponents.MMPage {
 
       text: qsTr( "Connect new receiver" )
 
-      onClicked: providerTypeDrawer.open()
-    }
-
-    MMComponents.MMListDrawer {
-      id: providerTypeDrawer
-
-      drawerHeader.title: qsTr("Pick the correct provider type")
-      drawerHeader.titleFont: __style.t2
-
-      list.model: ListModel {
-        ListElement {
-          name: qsTr( "Bluetooth provider" )
-          type: "bluetooth"
-        }
-        ListElement {
-          name: qsTr( "Network provider" )
-          type: "network"
+      onClicked: {
+        if ( __haveBluetooth ) {
+          providerTypeDrawer.open()
         }
-      }
-
-      list.delegate: MMComponents.MMListDelegate {
-        required property string name
-        required property string type
-
-        text: name
-        onClicked: {
-          providerTypeDrawer.close()
-          if (type === "bluetooth") {
-            bluetoothDiscoveryLoader.active = true
-          }
-          else if (type === "network"){
-            networkProviderInfoDrawer.open()
-          }
+        else {
+          networkProviderDrawer.open()
         }
       }
     }
 
-    MMComponents.MMDrawerDialog {
-      id: networkProviderInfoDrawer
-
-      title: qsTr("Network provider setup")
-      imageSource: __style.externalGpsGreenImage
-      description: qsTr( "To connect to the external device please specify the IP address and port below." )
-      primaryButton.text: qsTr( "Confirm" )
-      primaryButton.type: MMComponents.MMButton.Primary
-
-      additionalContent: Column {
-        width: parent.width
-        spacing: __style.spacing20
-
-        MMInputs.MMTextInput {
-          id: aliasInput
-
-          width: parent.width
-          textFieldBackground.color: __style.lightGreenColor
-
-          title: qsTr("Device alias")
-          placeholderText: qsTr("Green device")
-        }
-
-        MMInputs.MMTextInput {
-          id: ipAddressInput
-
-          width: parent.width
-          textFieldBackground.color: __style.lightGreenColor
-
-          title: qsTr("IP address")
-          placeholderText: qsTr("localhost")
-        }
-
-        MMInputs.MMTextInput {
-          id: portInput
-
-          width: parent.width
-          textFieldBackground.color: __style.lightGreenColor
-
-          title: qsTr("Port")
-          placeholderText: qsTr("1234")
-        }
-      }
+    MMProviderTypeDrawer {
+      id: providerTypeDrawer
 
-      onPrimaryButtonClicked: function() {
-        close()
+      onBluetoothSelected: bluetoothDiscoveryLoader.active = true
+      onNetworkSelected: networkProviderDrawer.open()
+    }
 
-        const deviceAddress = ipAddressInput.text + ":" + portInput.text
-        PositionKit.positionProvider = PositionKit.constructProvider( "external_ip", deviceAddress, aliasInput.text )
+    MMNetworkProviderDrawer {
+      id: networkProviderDrawer
 
-        providersModel.addProvider( aliasInput.text, deviceAddress, "external_ip" )
+      onConfirmed: function( alias, deviceAddress ) {
+        PositionKit.positionProvider = PositionKit.constructProvider( "external_ip", deviceAddress, alias )
+        providersModel.addProvider( alias, deviceAddress, "external_ip" )
+        connectingDialogLoaderNetwork.open()
       }
     }
 
     MMComponents.MMMessage {
+      id: infoMessage
+
       visible: !listview.visible
       width: parent.width
       anchors.centerIn: parent
@@ -236,10 +168,10 @@ MMComponents.MMPage {
       image: __style.externalGpsRedImage
       title: qsTr( "Connecting to external receivers via bluetooth is not supported" )
       description: qsTr( "This function is not available on iOS. " +
-                        "Your hardware vendor may provide a custom " +
-                        "app that connects to the receiver and sets position. " +
-                        "The app will still think it is the internal GPS of " +
-                        "your phone/tablet." )
+                          "Your hardware vendor may provide a custom " +
+                          "app that connects to the receiver and sets position. " +
+                          "The app will still think it is the internal GPS of " +
+                          "your phone/tablet." )
       link: __inputHelp.howToConnectGPSLink
     }
 
@@ -252,7 +184,7 @@ MMComponents.MMPage {
       }
 
       onRemoveProvider: {
-        if (removeDialog.providerId === "") {
+        if ( removeDialog.providerId === "" ) {
           close()
           return
         }
@@ -273,7 +205,23 @@ MMComponents.MMPage {
       id: bluetoothDiscoveryLoader
 
       active: false
-      sourceComponent: bluetoothDiscoveryDrawerComponent
+      source: Qt.resolvedUrl( "MMAddPositionProviderDrawer.qml" )
+
+      onLoaded: item.open()
+    }
+
+    Connections {
+      target: bluetoothDiscoveryLoader.item
+
+      function onInitiatedConnectionTo( deviceAddress, deviceName ) {
+        PositionKit.positionProvider = PositionKit.constructProvider( "external_bt", deviceAddress, deviceName )
+        providersModel.addProvider( deviceName, deviceAddress, "external_bt" )
+        bluetoothDiscoveryLoader.item.list.model.discovering = false
+        bluetoothDiscoveryLoader.item.close()
+        connectingDialogLoader.open()
+      }
+
+      function onClosed() { bluetoothDiscoveryLoader.active = false }
     }
 
     Loader {
@@ -281,44 +229,49 @@ MMComponents.MMPage {
 
       active: false
       asynchronous: true
-      sourceComponent: connectionToSavedProviderDialogComponent
+      source: Qt.resolvedUrl( "MMExternalProviderConnectionDrawer.qml" )
+
+      onLoaded: {
+        item.providerType = "bluetooth"
+        item.open()
+      }
 
       function open() {
         active = true
         focus = true
       }
     }
-  }
 
-  Component {
-    id: bluetoothDiscoveryDrawerComponent
+    Connections {
+      target: connectingDialogLoader.item
+
+      function onClosed() { connectingDialogLoader.active = false }
+      function onFailure() { PositionKit.positionProvider = PositionKit.constructProvider( "internal", "devicegps", "" ) }
+    }
 
-    MMAddPositionProviderDrawer {
-      onInitiatedConnectionTo: function ( deviceAddress, deviceName ) {
-        __positionKit.positionProvider = __positionKit.constructProvider( "external_bt", deviceAddress, deviceName )
+    Loader {
+      id: connectingDialogLoaderNetwork
 
-        providersModel.addProvider( deviceName, deviceAddress, "external_bt" )
-        list.model.discovering = false
-        close()
+      active: false
+      asynchronous: true
+      source: Qt.resolvedUrl( "MMExternalProviderConnectionDrawer.qml" )
 
-        connectingDialogLoader.open()
+      onLoaded: {
+        item.providerType = "network"
+        item.open()
       }
-      onClosed: bluetoothDiscoveryLoader.active = false
 
-      Component.onCompleted: open()
+      function open() {
+        active = true
+        focus = true
+      }
     }
-  }
 
-  Component {
-    id: connectionToSavedProviderDialogComponent
+    Connections {
+      target: connectingDialogLoaderNetwork.item
 
-    MMBluetoothConnectionDrawer {
-      onClosed: connectingDialogLoader.active = false
-
-      // revert position provider back to internal provider
-      onFailure: PositionKit.positionProvider = PositionKit.constructProvider( "internal", "devicegps", "" )
-
-      Component.onCompleted: open()
+      function onClosed() { connectingDialogLoaderNetwork.active = false }
+      function onFailure() { PositionKit.positionProvider = PositionKit.constructProvider( "internal", "devicegps", "" ) }
     }
   }
 
@@ -346,5 +299,8 @@ MMComponents.MMPage {
     if ( type === "external_bt" ) {
       connectingDialogLoader.open()
     }
+    else if ( type === "external_ip" ) {
+      connectingDialogLoaderNetwork.open()
+    }
   }
 }
diff --git a/app/qml/gps/MMProviderTypeDrawer.qml b/app/qml/gps/MMProviderTypeDrawer.qml
new file mode 100644
index 000000000..af281397e
--- /dev/null
+++ b/app/qml/gps/MMProviderTypeDrawer.qml
@@ -0,0 +1,102 @@
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+import QtQuick
+
+import "../components" as MMComponents
+import "../account/components" as MMAccountComponents
+
+MMComponents.MMListDrawer {
+  id: root
+
+  property string selectedProviderType: ""
+
+  signal bluetoothSelected()
+  signal networkSelected()
+
+  drawerHeader.title: qsTr( "Connect new receiver" )
+  drawerHeader.titleFont: __style.t2
+
+  onOpened: root.selectedProviderType = ""
+
+  list.model: ListModel {
+    id: providerTypeModel
+
+    Component.onCompleted: {
+      providerTypeModel.append( [
+        { name: qsTr( "Bluetooth" ), description: qsTr( "Connect via Bluetooth" ), type: "bluetooth", icon: __style.bluetoothIcon },
+        { name: qsTr( "Network" ), description: qsTr( "Connect via IP address" ), type: "network", icon: __style.networkIcon }
+      ] )
+    }
+  }
+
+  list.header: MMComponents.MMText {
+    width: ListView.view.width
+
+    text: qsTr( "This function is not available on iOS. Your hardware vendor may provide a custom app that connects to the receiver and sets position. Mergin Maps will still think it is the internal GPS of your phone/tablet." )
+
+    font: __style.p5
+    color: __style.nightColor
+
+    wrapMode: Text.Wrap
+    bottomPadding: __style.margin16
+  }
+
+  list.delegate: Item {
+    width: ListView.view.width
+    height: checkbox.height + __style.margin12
+
+    MMAccountComponents.MMIconCheckBoxHorizontal {
+      id: checkbox
+
+      width: parent.width
+      showBorder: true
+      sourceIcon: model.icon
+      text: model.name
+      description: model.description
+      checked: root.selectedProviderType === model.type
+
+      onClicked: {
+        if ( root.selectedProviderType === model.type ) {
+          root.selectedProviderType = ""
+        }
+        else {
+          root.selectedProviderType = model.type
+        }
+      }
+    }
+  }
+
+  list.footer: Item {
+    width: ListView.view.width
+    height: continueButton.height + __style.margin20
+
+    MMComponents.MMButton {
+      id: continueButton
+
+      width: parent.width
+      anchors.top: parent.top
+      anchors.topMargin: __style.margin8
+
+      text: qsTr( "Continue" )
+      enabled: root.selectedProviderType !== ""
+
+      onClicked: {
+        root.close()
+
+        if ( root.selectedProviderType === "bluetooth" ) {
+          root.bluetoothSelected()
+        }
+        else if ( root.selectedProviderType === "network" ) {
+          root.networkSelected()
+        }
+      }
+    }
+  }
+}
diff --git a/gallery/qml.qrc b/gallery/qml.qrc
index 9d82ad2d8..a8a055cbe 100644
--- a/gallery/qml.qrc
+++ b/gallery/qml.qrc
@@ -140,7 +140,7 @@
         <file>../app/qml/settings/components/MMSettingsInput.qml</file>
         <file>../app/qml/settings/components/MMSettingsDropdown.qml</file>
         <file>../app/qml/settings/components/MMSettingsSwitch.qml</file>
-        <file>../app/qml/gps/MMBluetoothConnectionDrawer.qml</file>
+        <file>../app/qml/gps/MMExternalProviderConnectionDrawer.qml</file>
         <file>../app/qml/gps/MMGpsDataDrawer.qml</file>
         <file>../app/qml/gps/components/MMGpsDataText.qml</file>
         <file>../app/qml/dialogs/MMSyncFailedDialog.qml</file>
diff --git a/gallery/qml/pages/ChecksPage.qml b/gallery/qml/pages/ChecksPage.qml
index 9e097a4b1..11afacbb4 100644
--- a/gallery/qml/pages/ChecksPage.qml
+++ b/gallery/qml/pages/ChecksPage.qml
@@ -90,9 +90,11 @@ Column {
 
       MMAccountComponents.MMIconCheckBoxHorizontal {
         checked: true
+        width: 300 * __dp
         sourceIcon: __style.redditIcon
         text: "Reddit"
-        small: true
+        description: "This is a small description to check the functionality of this component"
+        small: false
       }
     }
   }
diff --git a/gallery/qml/pages/DrawerPage.qml b/gallery/qml/pages/DrawerPage.qml
index e3400a423..47a0aab1f 100644
--- a/gallery/qml/pages/DrawerPage.qml
+++ b/gallery/qml/pages/DrawerPage.qml
@@ -59,7 +59,7 @@ Page {
       }
 
       Button {
-        text: "MMBluetoothConnectionDrawer"
+        text: "MMExternalProviderConnectionDrawer"
         onClicked: {
           bluetoothConnectionDrawer.positionProvider.state = PositionProvider.Connecting
           bluetoothConnectionTimer.start()
@@ -197,8 +197,9 @@ Page {
     }
   }
 
-  MMBluetoothConnectionDrawer {
+  MMExternalProviderConnectionDrawer {
     id: bluetoothConnectionDrawer
+    providerType: "bluetooth"
 
     howToConnectGPSLink: "www.merginmaps.com"
     positionProvider: QtObject {
diff --git a/gallery/qml/pages/ImagesPage.qml b/gallery/qml/pages/ImagesPage.qml
index ed931d11b..59bd68133 100644
--- a/gallery/qml/pages/ImagesPage.qml
+++ b/gallery/qml/pages/ImagesPage.qml
@@ -38,7 +38,8 @@ ScrollView {
         Column { Image { source: __style.positionTrackingRunningImage } Text { text: "positionTrackingRunningImage" } }
         Column { Image { source: __style.noMapThemesImage } Text { text: "noMapThemesImage" } }
         Column { Image { source: __style.syncImage } Text { text: "syncImage" } }
-        Column { Image { source: __style.externalGpsGreenImage } Text { text: "externalGpsGreenImage" } }
+        Column { Image { source: __style.externalBluetoothGreenImage } Text { text: "externalBluetoothGreenImage" } }
+        Column { Image { source: __style.externalNetworkGreenImage } Text { text: "externalNetworkGreenImage" } }
         Column { Image { source: __style.externalGpsRedImage } Text { text: "externalGpsRedImage" } }
         Column { Image { source: __style.reachedDataLimitImage } Text { text: "reachedDataLimitImage" } }
         Column { Image { source: __style.positiveMMSymbolImage } Text { text: "positiveMMSymbolImage" } }

From 66e9bffef86847be9392ca25616f4f1ad8ffc82d Mon Sep 17 00:00:00 2001
From: Gabriel Bolbotina <bolbotinagabriel@gmail.com>
Date: Thu, 12 Mar 2026 15:35:00 +0200
Subject: [PATCH 17/30] Fixed rebase conflicts

---
 app/position/positionkit.cpp                       | 8 ++++----
 app/position/providers/bluetoothpositionprovider.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/position/positionkit.cpp b/app/position/positionkit.cpp
index ee55ed6f1..19685c80a 100644
--- a/app/position/positionkit.cpp
+++ b/app/position/positionkit.cpp
@@ -153,7 +153,7 @@ AbstractPositionProvider *PositionKit::constructProvider( const QString &type, c
   // type == internal
   if ( id == QStringLiteral( "simulated" ) )
   {
-    AbstractPositionProvider *provider = new SimulatedPositionProvider();
+    AbstractPositionProvider *provider = new SimulatedPositionProvider( *mPositionTransformer );
     QQmlEngine::setObjectOwnership( provider, QQmlEngine::CppOwnership );
     return provider;
   }
@@ -167,12 +167,12 @@ AbstractPositionProvider *PositionKit::constructProvider( const QString &type, c
       // TODO: inform user + use AndroidPositionProvider::fusedErrorString() output?
 
       // fallback to the default - at this point the Qt Positioning implementation
-      AbstractPositionProvider *provider = new InternalPositionProvider();
+      AbstractPositionProvider *provider = new InternalPositionProvider( *mPositionTransformer );
       QQmlEngine::setObjectOwnership( provider, QQmlEngine::CppOwnership );
       return provider;
     }
     __android_log_print( ANDROID_LOG_INFO, "CPP", "MAKE PROVIDER %d", fused );
-    AbstractPositionProvider *provider = new AndroidPositionProvider( fused );
+    AbstractPositionProvider *provider = new AndroidPositionProvider( fused, *mPositionTransformer );
     QQmlEngine::setObjectOwnership( provider, QQmlEngine::CppOwnership );
     return provider;
   }
@@ -180,7 +180,7 @@ AbstractPositionProvider *PositionKit::constructProvider( const QString &type, c
 
   // id == devicegps
   {
-    AbstractPositionProvider *provider = new InternalPositionProvider();
+    AbstractPositionProvider *provider = new InternalPositionProvider( *mPositionTransformer );
     QQmlEngine::setObjectOwnership( provider, QQmlEngine::CppOwnership );
     return provider;
   }
diff --git a/app/position/providers/bluetoothpositionprovider.h b/app/position/providers/bluetoothpositionprovider.h
index ad60d19a9..8797c8ec1 100644
--- a/app/position/providers/bluetoothpositionprovider.h
+++ b/app/position/providers/bluetoothpositionprovider.h
@@ -34,7 +34,7 @@ class BluetoothPositionProvider : public AbstractPositionProvider
     };
 
   public:
-    BluetoothPositionProvider( const QString &addr, const QString &name, QObject *parent = nullptr );
+    BluetoothPositionProvider( const QString &addr, const QString &name, PositionTransformer &positionTransformer, QObject *parent = nullptr );
     ~BluetoothPositionProvider() override;
 
     void startUpdates() override;

From 314f3216bf25c2738a39fb8d3bb8c3124d302676 Mon Sep 17 00:00:00 2001
From: Gabriel Bolbotina <bolbotinagabriel@gmail.com>
Date: Mon, 16 Mar 2026 16:20:39 +0200
Subject: [PATCH 18/30] Modified message Added ip address getter for network
 provider Changed provider constructor to make iOS device connect to external
 IP provider

---
 app/position/positionkit.cpp                  |  8 +--
 .../providers/networkpositionprovider.cpp     | 15 +++-
 .../providers/networkpositionprovider.h       |  1 +
 .../MMExternalProviderConnectionDrawer.qml    | 68 ++++++++++++-------
 4 files changed, 60 insertions(+), 32 deletions(-)

diff --git a/app/position/positionkit.cpp b/app/position/positionkit.cpp
index 19685c80a..509144c80 100644
--- a/app/position/positionkit.cpp
+++ b/app/position/positionkit.cpp
@@ -128,18 +128,14 @@ QString PositionKit::positionProviderName() const
 AbstractPositionProvider *PositionKit::constructProvider( const QString &type, const QString &id, const QString &name )
 {
   QString providerType( type );
-
-  // set internal provider for platforms that do not support reading bluetooth serial
-#ifndef HAVE_BLUETOOTH
-  providerType = QStringLiteral( "internal" );
-#endif
-
   if ( providerType == QStringLiteral( "external_bt" ) )
   {
 #ifdef HAVE_BLUETOOTH
     AbstractPositionProvider *provider = new BluetoothPositionProvider( id, name, *mPositionTransformer );
     QQmlEngine::setObjectOwnership( provider, QQmlEngine::CppOwnership );
     return provider;
+#else
+    providerType = QStringLiteral( "internal" );
 #endif
   }
 
diff --git a/app/position/providers/networkpositionprovider.cpp b/app/position/providers/networkpositionprovider.cpp
index d7abb3627..e7363d6ea 100644
--- a/app/position/providers/networkpositionprovider.cpp
+++ b/app/position/providers/networkpositionprovider.cpp
@@ -125,11 +125,17 @@ void NetworkPositionProvider::positionUpdateReceived()
     mUdpReconnectTimer.stop();
   }
 
+  const QByteArray rawNmeaData = socket->readAll();
+
+  if ( rawNmeaData.isEmpty() || !rawNmeaData.contains( '$' ) )
+  {
+    return;
+  }
+
   // if by any chance we showed wrong message in the status like "no connection", fix it here
   // we know the connection is working because we just received data from the device
   setState( tr( "Connected" ), State::Connected );
 
-  const QByteArray rawNmeaData = socket->readAll();
   const QString nmeaData( rawNmeaData );
   const QgsGpsInformation gpsInfo = mNmeaParser.parseNmeaString( nmeaData );
   GeoPosition transformedPosition = mPositionTransformer->processNetworkPosition( GeoPosition::fromQgsGpsInformation( gpsInfo ) );
@@ -184,6 +190,11 @@ void NetworkPositionProvider::reconnectTimeout()
   }
 }
 
+QString NetworkPositionProvider::getIpAddress() const
+{
+  return mTargetAddress;
+}
+
 void NetworkPositionProvider::reconnect()
 {
   mReconnectTimer.stop();
@@ -191,6 +202,8 @@ void NetworkPositionProvider::reconnect()
   setState( tr( "Reconnecting" ), State::Connecting );
 
   stopUpdates();
+  mReconnectTimer.stop();
+
   startUpdates();
 }
 
diff --git a/app/position/providers/networkpositionprovider.h b/app/position/providers/networkpositionprovider.h
index 9d4bc080f..3c87ddbbf 100644
--- a/app/position/providers/networkpositionprovider.h
+++ b/app/position/providers/networkpositionprovider.h
@@ -37,6 +37,7 @@ class NetworkPositionProvider : public AbstractPositionProvider
     void startUpdates() override;
     void stopUpdates() override;
     void closeProvider() override;
+    Q_INVOKABLE QString getIpAddress() const; // returns the IP address we try to connect/ are connected to
 
   public slots:
     // processes the received nmea data and emits new position
diff --git a/app/qml/gps/MMExternalProviderConnectionDrawer.qml b/app/qml/gps/MMExternalProviderConnectionDrawer.qml
index 92e113bfc..f3f0b9041 100644
--- a/app/qml/gps/MMExternalProviderConnectionDrawer.qml
+++ b/app/qml/gps/MMExternalProviderConnectionDrawer.qml
@@ -24,27 +24,44 @@ MMComponents.MMDrawer {
   property string howToConnectGPSLink: __inputHelp.howToConnectGPSLink
 
   property string titleText: {
-    if ( rootstate.state === "working" )
+    if ( root.providerType === "network" )
     {
-      if ( !root.positionProvider ) return ""
-      if ( root.positionProvider.name() ) return qsTr( "Connecting to" ) + " " + root.positionProvider.name() + connectingSuffixAnimation
-      return qsTr( "Connecting" ) + connectingSuffixAnimation
-    }
-    else if ( rootstate.state === "success" )
-    {
-      return qsTr( "Connected" )
+      if ( rootstate.state === "working" )
+      {
+        if ( !root.positionProvider ) return ""
+        if ( root.positionProvider.getIpAddress() ) return qsTr( "Connecting to" ) + " " + root.positionProvider.getIpAddress() + connectingSuffixAnimation
+        return qsTr( "Connecting" ) + connectingSuffixAnimation
+      }
+      else if ( rootstate.state === "success" )
+      {
+        return qsTr( "Connected" )
+      }
+      else if ( rootstate.state === "fail" )
+      {
+        return qsTr( "Failed to connect to" ) + " " + ( root.positionProvider ? root.positionProvider.getIpAddress() : "" )
+      }
+      else return qsTr( "We were not able to connect to the specified IP address. Please try again later." )
     }
-    else if ( rootstate.state === "fail")
+    else if ( root.providerType === "bluetooth" )
     {
-      return qsTr( "Failed to connect to" ) + " " + ( root.positionProvider ? root.positionProvider.name() : "" )
-    }
-    else
-    {
-      if( root.providerType === "bluetooth")
-        return qsTr( "We were not able to connect to the specified device. Please make sure your device is powered on and can be connected to.")
-      else if (root.providerType === "network")
-        // either NoConnection or WaitingToReconnect
-        return qsTr( "We were not able to connect to the specified IP address. Please try again later." )
+      if ( rootstate.state === "working" )
+      {
+        if ( !root.positionProvider ) return ""
+        if ( root.positionProvider.name() ) return qsTr( "Connecting to" ) + " " + root.positionProvider.name() + connectingSuffixAnimation
+        return qsTr( "Connecting" ) + connectingSuffixAnimation
+      }
+      else if ( rootstate.state === "success" )
+      {
+        return qsTr( "Connected" )
+      }
+      else if ( rootstate.state === "fail" )
+      {
+        return qsTr( "Failed to connect to" ) + " " + ( root.positionProvider ? root.positionProvider.name() : "" )
+      }
+      else
+      {
+        if ( root.providerType === "bluetooth" ) return qsTr( "We were not able to connect to the specified device. Please make sure your device is powered on and can be connected to." )
+      }
     }
   }
 
@@ -53,9 +70,9 @@ MMComponents.MMDrawer {
   property string descriptionText: {
     if ( rootstate.state === "working" )
     {
-      if( root.providerType === "bluetooth")
+      if ( root.providerType === "bluetooth" )
         return qsTr( "You might be asked to pair your device during this process." )
-      else if( root.providerType === "network")
+      else if ( root.providerType === "network" )
         return qsTr( "This might take a while..." )
     }
     else if ( rootstate.state === "success" )
@@ -70,9 +87,9 @@ MMComponents.MMDrawer {
 
     else
     {
-      if( root.providerType === "bluetooth")
+      if ( root.providerType === "bluetooth" )
         return qsTr( "We were not able to connect to the specified device. Please make sure your device is powered on and can be connected to." )
-      else if( root.providerType === "network")
+      else if ( root.providerType === "network" )
         return qsTr( "We were not able to connect to the specified IP address. Please try again later." )
     }
   }
@@ -82,10 +99,11 @@ MMComponents.MMDrawer {
     {
       return __style.externalGpsRedImage
     }
-    else {
-      if( root.providerType === "bluetooth" )
+    else
+    {
+      if ( root.providerType === "bluetooth" )
         return __style.externalBluetoothGreenImage
-      else if (root.providerType === "network")
+      else if ( root.providerType === "network" )
         return __style.externalNetworkGreenImage
     }
   }

From db4dfae437270f634a5546c26f7c01d0a008ca65 Mon Sep 17 00:00:00 2001
From: Gabriel Bolbotina <bolbotinagabriel@gmail.com>
Date: Thu, 26 Mar 2026 14:52:52 +0200
Subject: [PATCH 19/30] Updated text descriptions Added hyperlink Modified the
 getIPAddress method Enhanced visuals

---
 .../providers/networkpositionprovider.cpp     |  2 +-
 .../providers/networkpositionprovider.h       |  2 +-
 app/qml/gps/MMAddPositionProviderDrawer.qml   | 49 ++++++++++++-------
 .../MMExternalProviderConnectionDrawer.qml    | 10 ++--
 app/qml/gps/MMNetworkProviderDrawer.qml       | 11 +++--
 app/qml/gps/MMProviderTypeDrawer.qml          | 36 +++++++++-----
 6 files changed, 70 insertions(+), 40 deletions(-)

diff --git a/app/position/providers/networkpositionprovider.cpp b/app/position/providers/networkpositionprovider.cpp
index e7363d6ea..983b8a679 100644
--- a/app/position/providers/networkpositionprovider.cpp
+++ b/app/position/providers/networkpositionprovider.cpp
@@ -192,7 +192,7 @@ void NetworkPositionProvider::reconnectTimeout()
 
 QString NetworkPositionProvider::getIpAddress() const
 {
-  return mTargetAddress;
+  return mTargetAddress + ":" + QString::number( mTargetPort );
 }
 
 void NetworkPositionProvider::reconnect()
diff --git a/app/position/providers/networkpositionprovider.h b/app/position/providers/networkpositionprovider.h
index 3c87ddbbf..e87c1f36a 100644
--- a/app/position/providers/networkpositionprovider.h
+++ b/app/position/providers/networkpositionprovider.h
@@ -37,7 +37,7 @@ class NetworkPositionProvider : public AbstractPositionProvider
     void startUpdates() override;
     void stopUpdates() override;
     void closeProvider() override;
-    Q_INVOKABLE QString getIpAddress() const; // returns the IP address we try to connect/ are connected to
+    Q_INVOKABLE QString getIpAddress() const; // returns the IP address and the port we try to connect/ are connected to
 
   public slots:
     // processes the received nmea data and emits new position
diff --git a/app/qml/gps/MMAddPositionProviderDrawer.qml b/app/qml/gps/MMAddPositionProviderDrawer.qml
index 5531a52ca..65ccf97f1 100644
--- a/app/qml/gps/MMAddPositionProviderDrawer.qml
+++ b/app/qml/gps/MMAddPositionProviderDrawer.qml
@@ -21,7 +21,9 @@ MMComponents.MMListDrawer {
   signal initiatedConnectionTo( string deviceAddress, string deviceName )
 
   showFullScreen: true
-  drawerHeader.title: qsTr( "Connect to bluetooth device" )
+  drawerHeader.title: qsTr( "Bluetooth Connection" )
+
+  list.height: root.drawerContentAvailableHeight
 
   list.model: MM.BluetoothDiscoveryModel {
     id: btModel
@@ -97,36 +99,49 @@ MMComponents.MMListDrawer {
     }
   }
 
+  // footer
   Component {
     id: discoveringMessageComponent
 
-    Column {
+    Item {
       width: ListView.view.width
+      height: Math.max( contentColumn.implicitHeight,
+                        ListView.view.height - ( ListView.view.contentHeight - height ) )
 
-      spacing: __style.spacing16
-
-      MMComponents.MMListSpacer { height: __style.margin40 }
+      Column {
+        id: contentColumn
 
-      Image {
+        anchors.bottom: parent.bottom
         anchors.horizontalCenter: parent.horizontalCenter
 
-        source: __style.mmSymbolImage
+        width: parent.width
+        spacing: __style.spacing16
 
-        width: 32 * __dp
-        height: 32 * __dp
+        Image {
+          anchors.horizontalCenter: parent.horizontalCenter
 
-        fillMode: Image.PreserveAspectFit
-      }
+          source: __style.mmSymbolImage
 
-      MMComponents.MMText {
-        width: parent.width
+          width: 32 * __dp
+          height: 32 * __dp
 
-        text: qsTr( "Looking for more devices" ) + "..."
+          fillMode: Image.PreserveAspectFit
+        }
 
-        font: __style.t3
-        color: __style.forestColor
+        MMComponents.MMListSpacer { height: __style.margin20 }
+
+        MMComponents.MMText {
+          width: parent.width
+
+          text: qsTr( "Scanning for devices" ) + "..."
+
+          font: __style.t3
+          color: __style.forestColor
+
+          horizontalAlignment: Text.AlignHCenter
+        }
 
-        horizontalAlignment: Text.AlignHCenter
+        MMComponents.MMListSpacer { height: __style.margin20 }
       }
     }
   }
diff --git a/app/qml/gps/MMExternalProviderConnectionDrawer.qml b/app/qml/gps/MMExternalProviderConnectionDrawer.qml
index f3f0b9041..eec55a508 100644
--- a/app/qml/gps/MMExternalProviderConnectionDrawer.qml
+++ b/app/qml/gps/MMExternalProviderConnectionDrawer.qml
@@ -29,8 +29,7 @@ MMComponents.MMDrawer {
       if ( rootstate.state === "working" )
       {
         if ( !root.positionProvider ) return ""
-        if ( root.positionProvider.getIpAddress() ) return qsTr( "Connecting to" ) + " " + root.positionProvider.getIpAddress() + connectingSuffixAnimation
-        return qsTr( "Connecting" ) + connectingSuffixAnimation
+        return qsTr( "Connecting to external receiver" )
       }
       else if ( rootstate.state === "success" )
       {
@@ -47,7 +46,7 @@ MMComponents.MMDrawer {
       if ( rootstate.state === "working" )
       {
         if ( !root.positionProvider ) return ""
-        if ( root.positionProvider.name() ) return qsTr( "Connecting to" ) + " " + root.positionProvider.name() + connectingSuffixAnimation
+        if ( root.positionProvider.name() ) return qsTr( "Connecting to" ) + " " + root.positionProvider.name()
         return qsTr( "Connecting" ) + connectingSuffixAnimation
       }
       else if ( rootstate.state === "success" )
@@ -73,7 +72,8 @@ MMComponents.MMDrawer {
       if ( root.providerType === "bluetooth" )
         return qsTr( "You might be asked to pair your device during this process." )
       else if ( root.providerType === "network" )
-        return qsTr( "This might take a while..." )
+      if ( root.positionProvider.getIpAddress() ) return qsTr( "Connecting to" ) + " " + root.positionProvider.getIpAddress() + ". You can close this panel, the app will continue in the background."
+      return qsTr( "Connecting" ) + connectingSuffixAnimation
     }
     else if ( rootstate.state === "success" )
     {
@@ -136,7 +136,7 @@ MMComponents.MMDrawer {
     state: "working"
   }
 
-  drawerBottomMargin: __style.margin20
+  drawerBottomMargin: __style.margin40
   drawerContent: MMComponents.MMScrollView {
 
     width: parent.width
diff --git a/app/qml/gps/MMNetworkProviderDrawer.qml b/app/qml/gps/MMNetworkProviderDrawer.qml
index d5632fdec..9e23c56a6 100644
--- a/app/qml/gps/MMNetworkProviderDrawer.qml
+++ b/app/qml/gps/MMNetworkProviderDrawer.qml
@@ -26,14 +26,17 @@ MMComponents.MMDrawer {
 
     MMComponents.MMText {
       width: parent.width
-
-      text: qsTr( "External receivers can be connected via network in iOS devices. Some of the known devices that support network connection (TCP or UDP) are EOS and Emlid." )
-
+       
+      text: qsTr( "Enter the IP address and port for your receiver. You can find these in your manufacturer's app. TCP and UDP connections are supported. Optionally, add a nickname to tell your receivers apart." )
       font: __style.p5
       color: __style.nightColor
 
       wrapMode: Text.Wrap
       horizontalAlignment: Text.AlignJustify
+
+      onLinkActivated: function( link ) {
+        Qt.openUrlExternally( link )
+      }
     }
 
     MMInputs.MMTextInput {
@@ -42,7 +45,7 @@ MMComponents.MMDrawer {
       width: parent.width
       textFieldBackground.color: __style.lightGreenColor
 
-      title: qsTr( "IP address" )
+      title: qsTr( "IP Address" )
       placeholderText: qsTr( "localhost" )
 
       onTextEdited: errorMsg = ""
diff --git a/app/qml/gps/MMProviderTypeDrawer.qml b/app/qml/gps/MMProviderTypeDrawer.qml
index af281397e..2a5527609 100644
--- a/app/qml/gps/MMProviderTypeDrawer.qml
+++ b/app/qml/gps/MMProviderTypeDrawer.qml
@@ -30,23 +30,35 @@ MMComponents.MMListDrawer {
 
     Component.onCompleted: {
       providerTypeModel.append( [
-        { name: qsTr( "Bluetooth" ), description: qsTr( "Connect via Bluetooth" ), type: "bluetooth", icon: __style.bluetoothIcon },
-        { name: qsTr( "Network" ), description: qsTr( "Connect via IP address" ), type: "network", icon: __style.networkIcon }
+        { name: qsTr( "Bluetooth" ), description: qsTr( "Bad Elf, Emlid, Juniper, marXact and more" ), type: "bluetooth", icon: __style.bluetoothIcon },
+        { name: qsTr( "Network" ), description: qsTr( "Emlid RS, EOS and more" ), type: "network", icon: __style.networkIcon }
       ] )
     }
   }
 
   list.header: MMComponents.MMText {
-    width: ListView.view.width
-
-    text: qsTr( "This function is not available on iOS. Your hardware vendor may provide a custom app that connects to the receiver and sets position. Mergin Maps will still think it is the internal GPS of your phone/tablet." )
-
-    font: __style.p5
-    color: __style.nightColor
-
-    wrapMode: Text.Wrap
-    bottomPadding: __style.margin16
-  }
+      width: ListView.view.width
+       
+      text: __inputUtils.htmlLink(
+                   qsTr( "External receivers use different connection methods depending on the manufacturer. Select a connection type below, or %1check our documentation%2 for supported devices and setup instructions." ),
+                   __style.nightColor,
+                   __inputHelp.howToConnectGPSLink,
+                   "",
+                   true,
+                   false
+                 )
+      font: __style.p5
+      color: __style.nightColor
+      textFormat: Text.RichText
+
+      wrapMode: Text.Wrap
+      horizontalAlignment: Text.AlignJustify
+      bottomPadding: __style.margin16
+
+      onLinkActivated: function( link ) {
+        Qt.openUrlExternally( link )
+      }
+    }
 
   list.delegate: Item {
     width: ListView.view.width

From d29547887779058a724cb2cc77184339d52f2f22 Mon Sep 17 00:00:00 2001
From: Gabriel Bolbotina <bolbotinagabriel@gmail.com>
Date: Thu, 2 Apr 2026 16:25:05 +0300
Subject: [PATCH 20/30] Modified the external device description in position
 provider drawer fIxed gps data button alignment Corrected some QML warnings
 for the position kit

---
 app/qml/gps/MMGpsDataDrawer.qml        | 418 +++++++++++++------------
 app/qml/gps/MMPositionProviderPage.qml |  15 +-
 app/qml/map/MMMapController.qml        |   4 +-
 3 files changed, 232 insertions(+), 205 deletions(-)

diff --git a/app/qml/gps/MMGpsDataDrawer.qml b/app/qml/gps/MMGpsDataDrawer.qml
index ad4456e8c..3265edc86 100644
--- a/app/qml/gps/MMGpsDataDrawer.qml
+++ b/app/qml/gps/MMGpsDataDrawer.qml
@@ -22,328 +22,344 @@ MMComponents.MMDrawer {
   property var mapSettings
 
   property bool showReceiversButton: true
+  readonly property real reservedButtonSpace: __style.spacing20 + manageButton.implicitHeight + __style.safeAreaBottom + __style.margin8
 
   signal manageReceiversClicked()
 
   drawerHeader.title: qsTr( "GPS info" )
 
+  drawerBottomMargin: 0
 
-  drawerContent: MMComponents.MMScrollView {
+  drawerContent: Item {
 
     width: parent.width
-    height: root.maxHeightHit ? root.drawerContentAvailableHeight : contentHeight
+    height: root.maxHeightHit ? root.drawerContentAvailableHeight
+                              : ( scrollView.contentHeight + reservedButtonSpace )
 
-    Column {
-      width: parent.width
+    MMComponents.MMScrollView {
+      id: scrollView
 
-      spacing: __style.spacing40
+      width: parent.width
+      height: root.maxHeightHit ? ( parent.height - reservedButtonSpace)
+                                 : contentHeight
 
-      Item {
+      Column {
         width: parent.width
-        height: datagrid.implicitHeight
 
-        Rectangle {
-          // horizontal line after each row in the grid
-          anchors {
-            fill: datagrid
-            bottomMargin: datagrid.children[0].height
+        Item {
+          width: parent.width
+          height: datagrid.implicitHeight
+
+          Rectangle {
+            // horizontal line after each row in the grid
+            anchors {
+              fill: datagrid
+              bottomMargin: datagrid.children[0].height
+            }
+            color: __style.greyColor
           }
-          color: __style.greyColor
-        }
 
-        Grid {
-          id: datagrid
+          Grid {
+            id: datagrid
 
-          width: parent.width
-          columns:  2
+            width: parent.width
+            columns:  2
 
-          rowSpacing: __style.margin1
+            rowSpacing: __style.margin1
 
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
 
-            title: qsTr( "Source" )
-            value: PositionKit.positionProvider ? PositionKit.positionProviderName : qsTr( "No receiver" )
+              title: qsTr( "Source" )
+              value: PositionKit.positionProvider ? PositionKit.positionProviderName : qsTr( "No receiver" )
 
-            alignmentRight: Positioner.index % 2 === 1
-          }
+              alignmentRight: Positioner.index % 2 === 1
+            }
 
-          MMGpsComponents.MMGpsDataText {
-            id: statusCell
+            MMGpsComponents.MMGpsDataText {
+              id: statusCell
 
-            width: parent.width / 2
+              width: parent.width / 2
 
-            visible: __positionKit.positionProvider && __positionKit.positionProvider.type().includes("external")
+              visible: PositionKit.positionProvider && PositionKit.positionProvider.type().includes("external")
 
-            title: qsTr( "Status" )
-            value: PositionKit.positionProvider ? PositionKit.positionProvider.stateMessage : ""
+              title: qsTr( "Status" )
+              value: PositionKit.positionProvider ? PositionKit.positionProvider.stateMessage : ""
 
-            alignmentRight: Positioner.index % 2 === 1
-          }
+              alignmentRight: Positioner.index % 2 === 1
+            }
 
-          Rectangle { // placeholder cell to keep long/lat in one line
-            width: parent.width
-            height: statusCell.height
+            Rectangle { // placeholder cell to keep long/lat in one line
+              width: parent.width
+              height: statusCell.height
 
-            color: __style.polarColor
-            visible: !statusCell.visible
-          }
+              color: __style.polarColor
+              visible: !statusCell.visible
+            }
+
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
+
+              title: qsTr( "Longitude")
+              value: {
+                if ( !PositionKit.hasPosition || Number.isNaN( PositionKit.longitude ) ) {
+                  return qsTr( "N/A" )
+                }
 
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
+                let coordParts = internal.coordinatesInDegrees.split(", ")
+                if ( coordParts.length > 1 )
+                  return coordParts[1]
 
-            title: qsTr( "Longitude")
-            value: {
-              if ( !PositionKit.hasPosition || Number.isNaN( PositionKit.longitude ) ) {
                 return qsTr( "N/A" )
               }
 
-              let coordParts = internal.coordinatesInDegrees.split(", ")
-              if ( coordParts.length > 1 )
-                return coordParts[1]
-
-              return qsTr( "N/A" )
+              alignmentRight: Positioner.index % 2 === 1
             }
 
-            alignmentRight: Positioner.index % 2 === 1
-          }
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
+
+              title: qsTr( "Latitude" )
+              value: {
+                if ( !PositionKit.hasPosition || Number.isNaN( PositionKit.latitude ) ) {
+                  return qsTr( "N/A" )
+                }
 
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
+                let coordParts = internal.coordinatesInDegrees.split(", ")
+                if ( coordParts.length > 1 )
+                  return coordParts[0]
 
-            title: qsTr( "Latitude" )
-            value: {
-              if ( !PositionKit.hasPosition || Number.isNaN( PositionKit.latitude ) ) {
                 return qsTr( "N/A" )
               }
 
-              let coordParts = internal.coordinatesInDegrees.split(", ")
-              if ( coordParts.length > 1 )
-                return coordParts[0]
-
-              return qsTr( "N/A" )
+              alignmentRight: Positioner.index % 2 === 1
             }
 
-            alignmentRight: Positioner.index % 2 === 1
-          }
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
 
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
+              title: qsTr( "X" )
+              value: {
+                if ( !PositionKit.hasPosition || Number.isNaN( mapPositioning.mapPosition.x ) ) {
+                  return qsTr( "N/A" )
+                }
 
-            title: qsTr( "X" )
-            value: {
-              if ( !PositionKit.hasPosition || Number.isNaN( mapPositioning.mapPosition.x ) ) {
-                return qsTr( "N/A" )
+                __inputUtils.formatNumber( mapPositioning.mapPosition.x, 2 )
               }
 
-              __inputUtils.formatNumber( mapPositioning.mapPosition.x, 2 )
+              alignmentRight: Positioner.index % 2 === 1
             }
 
-            alignmentRight: Positioner.index % 2 === 1
-          }
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
 
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
+              title: qsTr( "Y" )
+              value: {
+                if ( !PositionKit.hasPosition || Number.isNaN( mapPositioning.mapPosition.y ) ) {
+                  return qsTr( "N/A" )
+                }
 
-            title: qsTr( "Y" )
-            value: {
-              if ( !PositionKit.hasPosition || Number.isNaN( mapPositioning.mapPosition.y ) ) {
-                return qsTr( "N/A" )
+                __inputUtils.formatNumber( mapPositioning.mapPosition.y, 2 )
               }
 
-              __inputUtils.formatNumber( mapPositioning.mapPosition.y, 2 )
+              alignmentRight: Positioner.index % 2 === 1
             }
 
-            alignmentRight: Positioner.index % 2 === 1
-          }
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
 
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
+              title: qsTr( "Horizontal accuracy" )
+              value: {
+                if ( !PositionKit.hasPosition || PositionKit.horizontalAccuracy < 0 ) {
+                  return qsTr( "N/A" )
+                }
 
-            title: qsTr( "Horizontal accuracy" )
-            value: {
-              if ( !PositionKit.hasPosition || PositionKit.horizontalAccuracy < 0 ) {
-                return qsTr( "N/A" )
+                __inputUtils.formatNumber( PositionKit.horizontalAccuracy, 2 ) + " m"
               }
 
-              __inputUtils.formatNumber( PositionKit.horizontalAccuracy, 2 ) + " m"
+              alignmentRight: Positioner.index % 2 === 1
             }
 
-            alignmentRight: Positioner.index % 2 === 1
-          }
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
 
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
+              title: qsTr( "Vertical accuracy" )
+              value: {
+                if ( !PositionKit.hasPosition || PositionKit.verticalAccuracy < 0 ) {
+                  return qsTr( "N/A" )
+                }
 
-            title: qsTr( "Vertical accuracy" )
-            value: {
-              if ( !PositionKit.hasPosition || PositionKit.verticalAccuracy < 0 ) {
-                return qsTr( "N/A" )
+                __inputUtils.formatNumber( PositionKit.verticalAccuracy, 2 ) + " m"
               }
 
-              __inputUtils.formatNumber( PositionKit.verticalAccuracy, 2 ) + " m"
+              alignmentRight: Positioner.index % 2 === 1
             }
 
-            alignmentRight: Positioner.index % 2 === 1
-          }
-
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
 
-            title: qsTr( "Altitude" )
-            value: {
-              if ( !PositionKit.hasPosition || Number.isNaN( PositionKit.altitude ) ) {
-                return qsTr( "N/A" )
+              title: qsTr( "Altitude" )
+              value: {
+                if ( !PositionKit.hasPosition || Number.isNaN( PositionKit.altitude ) ) {
+                  return qsTr( "N/A" )
+                }
+                __inputUtils.formatNumber( PositionKit.altitude, 2 ) + " m"
               }
-              __inputUtils.formatNumber( PositionKit.altitude, 2 ) + " m"
+
+              alignmentRight: Positioner.index % 2 === 1
+              desc: PositionKit.positionCrs3DGeoidModelName().length > 0 ? qsTr("Orthometric height, using %1 geoid").arg(PositionKit.positionCrs3DGeoidModelName()) : qsTr("Elevation using unspecified grid")
             }
 
-            alignmentRight: Positioner.index % 2 === 1
-            desc: PositionKit.positionCrs3DGeoidModelName().length > 0 ? qsTr("Orthometric height, using %1 geoid").arg(PositionKit.positionCrs3DGeoidModelName()) : qsTr("Elevation using unspecified grid")
-          }
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
 
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
+              title: qsTr( "Fix quality" )
+              value: {
+                if ( !PositionKit.hasPosition ) {
+                  return qsTr( "N/A" )
+                }
 
-            title: qsTr( "Fix quality" )
-            value: {
-              if ( !PositionKit.hasPosition ) {
-                return qsTr( "N/A" )
+                PositionKit.fix
               }
 
-              PositionKit.fix
+              visible: PositionKit.positionProvider && PositionKit.positionProvider.type().includes("external")
+
+              alignmentRight: Positioner.index % 2 === 1
             }
 
-            visible: __positionKit.positionProvider && __positionKit.positionProvider.type().includes("external")
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
 
-            alignmentRight: Positioner.index % 2 === 1
-          }
+              title: qsTr( "Satellites (in use/view)" )
+              value: {
+                if ( PositionKit.satellitesUsed < 0 || PositionKit.satellitesVisible < 0 )
+                {
+                  return qsTr( "N/A" )
+                }
 
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
-
-            title: qsTr( "Satellites (in use/view)" )
-            value: {
-              if ( PositionKit.satellitesUsed < 0 || PositionKit.satellitesVisible < 0 )
-              {
-                return qsTr( "N/A" )
+                  PositionKit.satellitesUsed + "/" + PositionKit.satellitesVisible
               }
 
-                PositionKit.satellitesUsed + "/" + PositionKit.satellitesVisible
+              alignmentRight: Positioner.index % 2 === 1
             }
 
-            alignmentRight: Positioner.index % 2 === 1
-          }
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
 
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
+              title: qsTr( "HDOP" )
+              value: {
+                if ( !PositionKit.hasPosition || PositionKit.hdop < 0 ) {
+                  return qsTr( "N/A" )
+                }
 
-            title: qsTr( "HDOP" )
-            value: {
-              if ( !PositionKit.hasPosition || PositionKit.hdop < 0 ) {
-                return qsTr( "N/A" )
+                __inputUtils.formatNumber( PositionKit.hdop, 2 )
               }
 
-              __inputUtils.formatNumber( PositionKit.hdop, 2 )
+              visible: PositionKit.positionProvider && PositionKit.positionProvider.type().includes("external")
+
+              alignmentRight: Positioner.index % 2 === 1
             }
 
-            visible: __positionKit.positionProvider && __positionKit.positionProvider.type().includes("external")
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
 
-            alignmentRight: Positioner.index % 2 === 1
-          }
+              title: qsTr( "VDOP" )
+              value: {
+                if ( !PositionKit.hasPosition || PositionKit.vdop < 0 ) {
+                  return qsTr( "N/A" )
+                }
 
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
-
-            title: qsTr( "VDOP" )
-            value: {
-              if ( !PositionKit.hasPosition || PositionKit.vdop < 0 ) {
-                return qsTr( "N/A" )
+                __inputUtils.formatNumber( PositionKit.vdop, 2 )
               }
 
-              __inputUtils.formatNumber( PositionKit.vdop, 2 )
-            }
+              visible: PositionKit.positionProvider && PositionKit.positionProvider.type().includes("external")
 
-            visible: __positionKit.positionProvider && __positionKit.positionProvider.type().includes("external")
+              alignmentRight: Positioner.index % 2 === 1
+            }
 
-            alignmentRight: Positioner.index % 2 === 1
-          }
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
 
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
+              title: qsTr( "PDOP" )
+              value: {
+                if ( !PositionKit.hasPosition || PositionKit.pdop < 0 ) {
+                  return qsTr( "N/A" )
+                }
 
-            title: qsTr( "PDOP" )
-            value: {
-              if ( !PositionKit.hasPosition || PositionKit.pdop < 0 ) {
-                return qsTr( "N/A" )
+                __inputUtils.formatNumber( PositionKit.pdop, 2 )
               }
 
-              __inputUtils.formatNumber( PositionKit.pdop, 2 )
+              visible: PositionKit.positionProvider && PositionKit.positionProvider.type().includes("external")
+
+              alignmentRight: Positioner.index % 2 === 1
             }
 
-            visible: __positionKit.positionProvider && __positionKit.positionProvider.type().includes("external")
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
 
-            alignmentRight: Positioner.index % 2 === 1
-          }
+              title: qsTr( "Speed" )
+              value: {
+                if ( !PositionKit.hasPosition || PositionKit.speed < 0 ) {
+                  return qsTr( "N/A" )
+                }
 
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
-
-            title: qsTr( "Speed" )
-            value: {
-              if ( !PositionKit.hasPosition || PositionKit.speed < 0 ) {
-                return qsTr( "N/A" )
+                __inputUtils.formatNumber( PositionKit.speed, 2 ) + " km/h"
               }
 
-              __inputUtils.formatNumber( PositionKit.speed, 2 ) + " km/h"
+              alignmentRight: Positioner.index % 2 === 1
             }
 
-            alignmentRight: Positioner.index % 2 === 1
-          }
-
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
 
-            title: qsTr( "Last Fix" )
-            value: PositionKit.lastRead.toLocaleTimeString( Qt.locale() ) || qsTr( "N/A" )
+              title: qsTr( "Last Fix" )
+              value: PositionKit.lastRead.toLocaleTimeString( Qt.locale() ) || qsTr( "N/A" )
 
-            alignmentRight: Positioner.index % 2 === 1
-          }
+              alignmentRight: Positioner.index % 2 === 1
+            }
 
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
 
-            title: qsTr( "GPS antenna height" )
-            value: AppSettings.gpsAntennaHeight > 0 ? __inputUtils.formatNumber(AppSettings.gpsAntennaHeight, 3) + " m" : qsTr( "Not set" )
+              title: qsTr( "GPS antenna height" )
+              value: AppSettings.gpsAntennaHeight > 0 ? __inputUtils.formatNumber(AppSettings.gpsAntennaHeight, 3) + " m" : qsTr( "Not set" )
 
-            alignmentRight: Positioner.index % 2 === 1
-          }
+              alignmentRight: Positioner.index % 2 === 1
+            }
 
-          MMGpsComponents.MMGpsDataText {
-            width: parent.width / 2
+            MMGpsComponents.MMGpsDataText {
+              width: parent.width / 2
 
-            title: qsTr( "Geoid separation" )
-            value: {
-              if ( !PositionKit.hasPosition || Number.isNaN( PositionKit.geoidSeparation ) ) {
-                return qsTr( "N/A" )
+              title: qsTr( "Geoid separation" )
+              value: {
+                if ( !PositionKit.hasPosition || Number.isNaN( PositionKit.geoidSeparation ) ) {
+                  return qsTr( "N/A" )
+                }
+                __inputUtils.formatNumber( PositionKit.geoidSeparation, 2 ) + " m"
               }
-              __inputUtils.formatNumber( PositionKit.geoidSeparation, 2 ) + " m"
-            }
-            visible: __positionKit.positionProvider && __positionKit.positionProvider.type().includes("external")
+              visible: PositionKit.positionProvider && PositionKit.positionProvider.type().includes("external")
 
-            alignmentRight: Positioner.index % 2 === 1
+              alignmentRight: Positioner.index % 2 === 1
+            }
           }
         }
       }
+    }
 
-      MMComponents.MMButton {
-        width: parent.width
+    MMComponents.MMButton {
+      id: manageButton
+
+      width: parent.width
 
-        visible: root.showReceiversButton
+      visible: root.showReceiversButton
 
-        text: qsTr( "Manage GPS receivers" )
-        onClicked: root.manageReceiversClicked()
+      anchors {
+        bottom: parent.bottom
+        bottomMargin: __style.safeAreaBottom + __style.margin8
       }
+
+      text: qsTr( "Manage GPS receivers" )
+      onClicked: root.manageReceiversClicked()
     }
   }
 
diff --git a/app/qml/gps/MMPositionProviderPage.qml b/app/qml/gps/MMPositionProviderPage.qml
index 471e48ba6..c808939aa 100644
--- a/app/qml/gps/MMPositionProviderPage.qml
+++ b/app/qml/gps/MMPositionProviderPage.qml
@@ -76,8 +76,19 @@ MMComponents.MMPage {
           }
         }
 
-        text: model.ProviderName ? model.ProviderName : qsTr( "Unknown device" )
-        secondaryText: listdelegate.isActive ? PositionKit.positionProvider.stateMessage : model.ProviderDescription
+        text: {
+          if ( model.ProviderName ) return model.ProviderName
+          if ( model.ProviderType === "external_ip" ) return qsTr( "Network device" )
+          return qsTr( "Unknown device" )
+        }
+        secondaryText: {
+          if ( listdelegate.isActive ) {
+            if ( model.ProviderType === "external_ip" )
+              return PositionKit.positionProvider.stateMessage + " - " + PositionKit.positionProvider.getIpAddress()
+            return PositionKit.positionProvider.stateMessage
+          }
+          return model.ProviderDescription
+        }
 
         rightContent: MMComponents.MMRoundButton {
           visible: model.ProviderType !== "internal"
diff --git a/app/qml/map/MMMapController.qml b/app/qml/map/MMMapController.qml
index 6766d3f32..a9d5f8be2 100644
--- a/app/qml/map/MMMapController.qml
+++ b/app/qml/map/MMMapController.qml
@@ -679,7 +679,7 @@ Item {
           visible: {
             if ( root.mapExtentOffset > 0 && root.state !== "stakeout" ) return false
 
-            if ( __positionKit.positionProvider && __positionKit.positionProvider.type().includes("external") ) {
+            if ( PositionKit.positionProvider && PositionKit.positionProvider.type().includes("external") ) {
               // for external receivers we want to show gps panel and accuracy button
               // even when the GPS receiver is not sending position data
               return true
@@ -699,7 +699,7 @@ Item {
             {
               return ""
             }
-            else if ( __positionKit.positionProvider.type().includes("external") )
+            else if ( PositionKit.positionProvider.type().includes("external") )
             {
               if ( PositionKit.positionProvider.state === MM.PositionProvider.Connecting )
               {

From 3eb777d7dc5cc1311829cb35616b47716fe6cae0 Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Tue, 28 Apr 2026 14:11:40 +0200
Subject: [PATCH 21/30] Fix minor UI things

---
 app/qml/gps/MMNetworkProviderDrawer.qml | 13 +++++++++++--
 app/qml/gps/MMProviderTypeDrawer.qml    |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/qml/gps/MMNetworkProviderDrawer.qml b/app/qml/gps/MMNetworkProviderDrawer.qml
index 9e23c56a6..943a962d7 100644
--- a/app/qml/gps/MMNetworkProviderDrawer.qml
+++ b/app/qml/gps/MMNetworkProviderDrawer.qml
@@ -72,7 +72,7 @@ MMComponents.MMDrawer {
       textFieldBackground.color: __style.lightGreenColor
 
       title: qsTr( "Receiver nickname (optional)" )
-      placeholderText: qsTr( "Green device" )
+      placeholderText: qsTr( "External receiver" )
     }
 
     MMComponents.MMButton {
@@ -114,9 +114,18 @@ MMComponents.MMDrawer {
 
         const deviceAddress = ip + ":" + port
 
-        root.confirmed( aliasInput.text, deviceAddress )
+        root.confirmed( aliasInput.text.trim(), deviceAddress )
+        ipAddressInput.textField.clear()
+        portInput.textField.clear()
+        aliasInput.textField.clear()
         root.close()
       }
     }
   }
+
+  onClosed: {
+    ipAddressInput.textField.clear()
+    portInput.textField.clear()
+    aliasInput.textField.clear()
+  }
 }
diff --git a/app/qml/gps/MMProviderTypeDrawer.qml b/app/qml/gps/MMProviderTypeDrawer.qml
index 2a5527609..60137d62f 100644
--- a/app/qml/gps/MMProviderTypeDrawer.qml
+++ b/app/qml/gps/MMProviderTypeDrawer.qml
@@ -31,7 +31,7 @@ MMComponents.MMListDrawer {
     Component.onCompleted: {
       providerTypeModel.append( [
         { name: qsTr( "Bluetooth" ), description: qsTr( "Bad Elf, Emlid, Juniper, marXact and more" ), type: "bluetooth", icon: __style.bluetoothIcon },
-        { name: qsTr( "Network" ), description: qsTr( "Emlid RS, EOS and more" ), type: "network", icon: __style.networkIcon }
+        { name: qsTr( "Network (TCP, UDP)" ), description: qsTr( "Emlid RS, EOS and more" ), type: "network", icon: __style.networkIcon }
       ] )
     }
   }

From 005f0558ddbefdea47222329dcf5a2ee1bbf6131 Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Tue, 28 Apr 2026 15:36:27 +0200
Subject: [PATCH 22/30] Fix cpp check

---
 app/position/providers/networkpositionprovider.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/position/providers/networkpositionprovider.cpp b/app/position/providers/networkpositionprovider.cpp
index 983b8a679..2ed7d9950 100644
--- a/app/position/providers/networkpositionprovider.cpp
+++ b/app/position/providers/networkpositionprovider.cpp
@@ -71,10 +71,16 @@ void NetworkPositionProvider::stopUpdates()
 
 void NetworkPositionProvider::closeProvider()
 {
-  mTcpSocket->close();
-  mUdpSocket->close();
-  if ( mTcpSocket ) mTcpSocket->disconnect();
-  if ( mUdpSocket ) mUdpSocket->disconnect();
+  if ( mTcpSocket )
+  {
+    mTcpSocket->close();
+    mTcpSocket->disconnect();
+  }
+  if ( mUdpSocket )
+  {
+    mUdpSocket->close();
+    mUdpSocket->disconnect();
+  }
 
   mUdpReconnectTimer.stop();
   mReconnectTimer.stop();

From 23685570f9d952141886a4c12efe7f269b5c3255 Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Tue, 28 Apr 2026 17:52:48 +0200
Subject: [PATCH 23/30] Add unique default names for network position providers

---
 app/inpututils.cpp                      | 23 ++++++++++++++++++++
 app/inpututils.h                        | 13 +++++++++++
 app/position/positionkit.cpp            | 12 +++++++++-
 app/qml/gps/MMNetworkProviderDrawer.qml |  2 +-
 app/qml/gps/MMPositionProviderPage.qml  |  3 +--
 app/test/testutilsfunctions.cpp         | 29 +++++++++++++++++++++++++
 app/test/testutilsfunctions.h           |  1 +
 7 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/app/inpututils.cpp b/app/inpututils.cpp
index 855e5b2c2..ff416949a 100644
--- a/app/inpututils.cpp
+++ b/app/inpututils.cpp
@@ -2105,6 +2105,29 @@ void InputUtils::updateQgisFormats( const QByteArray &output )
 #endif
 }
 
+QString InputUtils::getUniqueString( const QString &newString, const QStringList &existingStrings )
+{
+  const QRegularExpression regex( QStringLiteral( R"(^(.*)\((\d+)\)$)" ) );
+  QString uniqueString( newString.trimmed() );
+  int i = 1;
+  while ( existingStrings.contains( uniqueString ) )
+  {
+    // if the string ends with "(x)" where x is integer number replace it in place
+    auto regexMatch = regex.match( uniqueString );
+    if ( regexMatch.hasMatch() )
+    {
+      i = regexMatch.captured( 2 ).toInt() + 1;
+      uniqueString = QStringLiteral( "%1 (%2)" ).arg( regexMatch.captured( 1 ).trimmed(), QString::number( i ) );
+    }
+    else
+    {
+      uniqueString = QStringLiteral( "%1 (%2)" ).arg( newString.trimmed(), QString::number( i ) );
+    }
+    i++;
+  }
+  return uniqueString;
+}
+
 bool InputUtils::rescaleImage( const QString &path, QgsProject *activeProject )
 {
   int quality = activeProject->readNumEntry( QStringLiteral( "Mergin" ), QStringLiteral( "PhotoQuality" ), 0 );
diff --git a/app/inpututils.h b/app/inpututils.h
index d94e1803e..adda3cb60 100644
--- a/app/inpututils.h
+++ b/app/inpututils.h
@@ -662,6 +662,19 @@ class InputUtils: public QObject
      */
     static void updateQgisFormats( const QByteArray &output );
 
+    /**
+     * From received string checks occurrences in existingStrings and returns first next unique option. Appends " (i)"
+     * behind received string or replaces it if it exists, where i is the smallest possible number starting from 1 if
+     * appending and next smallest if replacing.
+     *  "lutra"         -> "lutra (1)"
+     *  "lutra (256)"   -> "lutra (257)"
+     *  "    lutra    " -> "lutra (1)"
+     * \param newString  wanted string
+     * \param existingStrings QStringList of possible similar values
+     * \return unique variant of wanted string
+     */
+    static QString getUniqueString( const QString &newString, const QStringList &existingStrings );
+
   public slots:
     void onQgsLogMessageReceived( const QString &message, const QString &tag, Qgis::MessageLevel level );
 
diff --git a/app/position/positionkit.cpp b/app/position/positionkit.cpp
index 509144c80..49a3d7aff 100644
--- a/app/position/positionkit.cpp
+++ b/app/position/positionkit.cpp
@@ -141,7 +141,17 @@ AbstractPositionProvider *PositionKit::constructProvider( const QString &type, c
 
   if ( providerType == QStringLiteral( "external_ip" ) )
   {
-    AbstractPositionProvider *provider = new NetworkPositionProvider( id, name, *mPositionTransformer );
+    QString providerName( name );
+    if ( providerName.isEmpty() )
+    {
+      QStringList providerNames;
+      for ( const QVariant &provider : mAppSettings->savedPositionProviders() )
+      {
+        providerNames << provider.toStringList().at( 0 );
+      }
+      providerName = InputUtils::getUniqueString( tr( "Network device" ), providerNames );
+    }
+    AbstractPositionProvider *provider = new NetworkPositionProvider( id, providerName, *mPositionTransformer );
     QQmlEngine::setObjectOwnership( provider, QQmlEngine::CppOwnership );
     return provider;
   }
diff --git a/app/qml/gps/MMNetworkProviderDrawer.qml b/app/qml/gps/MMNetworkProviderDrawer.qml
index 943a962d7..c9dba8d93 100644
--- a/app/qml/gps/MMNetworkProviderDrawer.qml
+++ b/app/qml/gps/MMNetworkProviderDrawer.qml
@@ -115,10 +115,10 @@ MMComponents.MMDrawer {
         const deviceAddress = ip + ":" + port
 
         root.confirmed( aliasInput.text.trim(), deviceAddress )
+        root.close()
         ipAddressInput.textField.clear()
         portInput.textField.clear()
         aliasInput.textField.clear()
-        root.close()
       }
     }
   }
diff --git a/app/qml/gps/MMPositionProviderPage.qml b/app/qml/gps/MMPositionProviderPage.qml
index c808939aa..79305c397 100644
--- a/app/qml/gps/MMPositionProviderPage.qml
+++ b/app/qml/gps/MMPositionProviderPage.qml
@@ -78,7 +78,6 @@ MMComponents.MMPage {
 
         text: {
           if ( model.ProviderName ) return model.ProviderName
-          if ( model.ProviderType === "external_ip" ) return qsTr( "Network device" )
           return qsTr( "Unknown device" )
         }
         secondaryText: {
@@ -164,7 +163,7 @@ MMComponents.MMPage {
 
       onConfirmed: function( alias, deviceAddress ) {
         PositionKit.positionProvider = PositionKit.constructProvider( "external_ip", deviceAddress, alias )
-        providersModel.addProvider( alias, deviceAddress, "external_ip" )
+        providersModel.addProvider( PositionKit.positionProvider.name(), deviceAddress, "external_ip" )
         connectingDialogLoaderNetwork.open()
       }
     }
diff --git a/app/test/testutilsfunctions.cpp b/app/test/testutilsfunctions.cpp
index 556f0d3ac..2a55d201b 100644
--- a/app/test/testutilsfunctions.cpp
+++ b/app/test/testutilsfunctions.cpp
@@ -1047,3 +1047,32 @@ void TestUtilsFunctions::testSanitizePath()
   InputUtils::sanitizePath( str );
   QCOMPARE( str, QStringLiteral( "C:/project name/project.qgz" ) );
 }
+
+void TestUtilsFunctions::testUniqueString()
+{
+  const QStringList similarStrings( {QStringLiteral( "lutra" ), QStringLiteral( "lutra (1)" ), QStringLiteral( "lutra (256)" ), QStringLiteral( "lutra (257)" )} );
+
+  const QString testString1( QStringLiteral( "lutra" ) );
+  QString result = InputUtils::getUniqueString( testString1, similarStrings );
+  QCOMPARE( result, QStringLiteral( "lutra (2)" ) );
+
+  const QString testString2( QStringLiteral( "lutra            " ) );
+  result = InputUtils::getUniqueString( testString2, similarStrings );
+  QCOMPARE( result, QStringLiteral( "lutra (2)" ) );
+
+  const QString testString3( QStringLiteral( "            lutra" ) );
+  result = InputUtils::getUniqueString( testString3, similarStrings );
+  QCOMPARE( result, QStringLiteral( "lutra (2)" ) );
+
+  const QString testString4( QStringLiteral( "lutra (1)" ) );
+  result = InputUtils::getUniqueString( testString4, similarStrings );
+  QCOMPARE( result, QStringLiteral( "lutra (2)" ) );
+
+  const QString testString5( QStringLiteral( "lutra (256)" ) );
+  result = InputUtils::getUniqueString( testString5, similarStrings );
+  QCOMPARE( result, QStringLiteral( "lutra (258)" ) );
+
+  const QString testString6( QStringLiteral( "mulutram" ) );
+  result = InputUtils::getUniqueString( testString6, similarStrings );
+  QCOMPARE( result, QStringLiteral( "mulutram" ) );
+}
diff --git a/app/test/testutilsfunctions.h b/app/test/testutilsfunctions.h
index affe9437d..09839fecb 100644
--- a/app/test/testutilsfunctions.h
+++ b/app/test/testutilsfunctions.h
@@ -52,6 +52,7 @@ class TestUtilsFunctions: public QObject
     void testRelevantGeometryCenterToScreenCoordinates();
     void testIsValidEmail();
     void testSanitizePath();
+    void testUniqueString();
 
   private:
     void testFormatDuration( const QDateTime &t0, qint64 diffSecs, const QString &expectedResult );

From eafd434f846c635f9cc77045121b148c7c1298ee Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Wed, 29 Apr 2026 10:45:46 +0200
Subject: [PATCH 24/30] Fix position for local geoids

---
 app/position/providers/networkpositionprovider.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/position/providers/networkpositionprovider.cpp b/app/position/providers/networkpositionprovider.cpp
index 2ed7d9950..8499aa40f 100644
--- a/app/position/providers/networkpositionprovider.cpp
+++ b/app/position/providers/networkpositionprovider.cpp
@@ -146,7 +146,7 @@ void NetworkPositionProvider::positionUpdateReceived()
   const QgsGpsInformation gpsInfo = mNmeaParser.parseNmeaString( nmeaData );
   GeoPosition transformedPosition = mPositionTransformer->processNetworkPosition( GeoPosition::fromQgsGpsInformation( gpsInfo ) );
 
-  emit positionChanged( GeoPosition::fromQgsGpsInformation( gpsInfo ) );
+  emit positionChanged( transformedPosition );
 }
 
 void NetworkPositionProvider::socketStateChanged( const QAbstractSocket::SocketState state )

From 8a0438cfdf7cae497307ad9ad2e61074767d739d Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Wed, 29 Apr 2026 11:11:40 +0200
Subject: [PATCH 25/30] Fix crash on app exit

---
 .../providers/networkpositionprovider.cpp         | 15 ++++++++++-----
 app/position/providers/networkpositionprovider.h  |  1 +
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/position/providers/networkpositionprovider.cpp b/app/position/providers/networkpositionprovider.cpp
index 8499aa40f..c2095ebc7 100644
--- a/app/position/providers/networkpositionprovider.cpp
+++ b/app/position/providers/networkpositionprovider.cpp
@@ -69,21 +69,26 @@ void NetworkPositionProvider::stopUpdates()
   }
 }
 
+NetworkPositionProvider::~NetworkPositionProvider()
+{
+  NetworkPositionProvider::closeProvider();
+}
+
 void NetworkPositionProvider::closeProvider()
 {
+  mUdpReconnectTimer.stop();
+  mReconnectTimer.stop();
+
   if ( mTcpSocket )
   {
-    mTcpSocket->close();
     mTcpSocket->disconnect();
+    mTcpSocket->abort();
   }
   if ( mUdpSocket )
   {
-    mUdpSocket->close();
     mUdpSocket->disconnect();
+    mUdpSocket->abort();
   }
-
-  mUdpReconnectTimer.stop();
-  mReconnectTimer.stop();
 }
 
 void NetworkPositionProvider::positionUpdateReceived()
diff --git a/app/position/providers/networkpositionprovider.h b/app/position/providers/networkpositionprovider.h
index e87c1f36a..300823e65 100644
--- a/app/position/providers/networkpositionprovider.h
+++ b/app/position/providers/networkpositionprovider.h
@@ -33,6 +33,7 @@ class NetworkPositionProvider : public AbstractPositionProvider
 
   public:
     NetworkPositionProvider( const QString &addr, const QString &name, PositionTransformer &positionTransformer, QObject *parent = nullptr );
+    ~NetworkPositionProvider() override;
 
     void startUpdates() override;
     void stopUpdates() override;

From 1fb9741e5d06b0c39780c1002a213db8e9fd9873 Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Wed, 29 Apr 2026 15:49:54 +0200
Subject: [PATCH 26/30] Fix bug where we changed BT providers to IP on restart

---
 app/position/providers/positionprovidersmodel.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/position/providers/positionprovidersmodel.cpp b/app/position/providers/positionprovidersmodel.cpp
index c9a91b6ea..598b4b939 100644
--- a/app/position/providers/positionprovidersmodel.cpp
+++ b/app/position/providers/positionprovidersmodel.cpp
@@ -197,7 +197,8 @@ void PositionProvidersModel::setAppSettings( AppSettings *as )
         }
 
         PositionProvider provider;
-        const QString providerType = providerData[2].isNull() ? QStringLiteral( "external_bt" ) : QStringLiteral( "external_ip" );
+        // when migrating from older version where type wasn't saved we know it's bluetooth device
+        const QString providerType = providerData[2].isNull() ? QStringLiteral( "external_bt" ) : providerData[2].toString();
         const QString deviceDesc = providerType == QStringLiteral( "external_bt" ) ? tr( " Bluetooth device" ) : tr( " Network device" );
         provider.name = providerData[0].toString();
         provider.providerId = providerData[1].toString();

From 2051a18013f42f7a28ca49435cea3e25793984b8 Mon Sep 17 00:00:00 2001
From: Matej Bagar <matej.bagar@lutraconsulting.co.uk>
Date: Wed, 29 Apr 2026 21:11:16 +0200
Subject: [PATCH 27/30] Improve code

---
 app/position/positionkit.cpp                  | 107 ++++++++----------
 app/position/positionkit.h                    |   2 +-
 .../providers/networkpositionprovider.cpp     |   6 +-
 app/position/providers/nmeaparser.h           |   2 +-
 .../providers/positionprovidersmodel.cpp      |  20 ++--
 .../providers/positionprovidersmodel.h        |  17 ++-
 6 files changed, 72 insertions(+), 82 deletions(-)

diff --git a/app/position/positionkit.cpp b/app/position/positionkit.cpp
index 49a3d7aff..8484cdbc0 100644
--- a/app/position/positionkit.cpp
+++ b/app/position/positionkit.cpp
@@ -7,28 +7,26 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "position/positionkit.h"
+#include "positionkit.h"
+
+#include <QQmlEngine>
+
 #include "coreutils.h"
 #include "mmconfig.h"
-#include "qgis.h"
+#include "appsettings.h"
+#include "inpututils.h"
 
 #ifdef HAVE_BLUETOOTH
-#include "position/providers/bluetoothpositionprovider.h"
+#include "providers/bluetoothpositionprovider.h"
 #endif
-
-#include "position/providers/internalpositionprovider.h"
-#include "position/providers/simulatedpositionprovider.h"
+#include "providers/internalpositionprovider.h"
+#include "providers/simulatedpositionprovider.h"
 #include "providers/networkpositionprovider.h"
 #ifdef ANDROID
-#include "position/providers/androidpositionprovider.h"
+#include "providers/androidpositionprovider.h"
 #include <android/log.h>
 #endif
 
-#include "appsettings.h"
-#include "inpututils.h"
-
-#include <QQmlEngine>
-
 PositionKit::PositionKit( QObject *parent )
   : QObject( parent )
 {
@@ -127,19 +125,17 @@ QString PositionKit::positionProviderName() const
 
 AbstractPositionProvider *PositionKit::constructProvider( const QString &type, const QString &id, const QString &name )
 {
-  QString providerType( type );
-  if ( providerType == QStringLiteral( "external_bt" ) )
-  {
+
 #ifdef HAVE_BLUETOOTH
+  if ( type == QStringLiteral( "external_bt" ) )
+  {
     AbstractPositionProvider *provider = new BluetoothPositionProvider( id, name, *mPositionTransformer );
     QQmlEngine::setObjectOwnership( provider, QQmlEngine::CppOwnership );
     return provider;
-#else
-    providerType = QStringLiteral( "internal" );
-#endif
   }
+#endif
 
-  if ( providerType == QStringLiteral( "external_ip" ) )
+  if ( type == QStringLiteral( "external_ip" ) )
   {
     QString providerName( name );
     if ( providerName.isEmpty() )
@@ -156,7 +152,8 @@ AbstractPositionProvider *PositionKit::constructProvider( const QString &type, c
     return provider;
   }
 
-  // type == internal
+  // from this point type == internal
+
   if ( id == QStringLiteral( "simulated" ) )
   {
     AbstractPositionProvider *provider = new SimulatedPositionProvider( *mPositionTransformer );
@@ -192,12 +189,12 @@ AbstractPositionProvider *PositionKit::constructProvider( const QString &type, c
   }
 }
 
-AbstractPositionProvider *PositionKit::constructActiveProvider( AppSettings *appsettings )
+AbstractPositionProvider *PositionKit::constructActiveProvider( const AppSettings *appsettings )
 {
   if ( !appsettings )
     return nullptr;
 
-  QString providerId = appsettings->activePositionProviderId();
+  const QString &providerId = appsettings->activePositionProviderId();
 
   if ( providerId.isEmpty() ) // nothing has been written to qsettings
   {
@@ -209,45 +206,41 @@ AbstractPositionProvider *PositionKit::constructActiveProvider( AppSettings *app
       return constructProvider( QStringLiteral( "internal" ), QStringLiteral( "devicegps" ) );
 #endif
     }
-    else // desktop
-    {
-      return constructProvider( QStringLiteral( "internal" ), QStringLiteral( "simulated" ) );
-    }
+    // desktop
+    return constructProvider( QStringLiteral( "internal" ), QStringLiteral( "simulated" ) );
   }
-  else if ( providerId == QStringLiteral( "devicegps" ) || providerId == QStringLiteral( "simulated" ) ||
-            providerId == QStringLiteral( "android_fused" ) || providerId == QStringLiteral( "android_gps" ) )
+  if ( providerId == QStringLiteral( "devicegps" ) || providerId == QStringLiteral( "simulated" ) ||
+       providerId == QStringLiteral( "android_fused" ) || providerId == QStringLiteral( "android_gps" ) )
   {
     return constructProvider( QStringLiteral( "internal" ), providerId );
   }
-  else
-  {
-    // find name & type of the active provider
-    QString providerName;
-    // Migration from single external provider to multiple currently, missing type == bluetooth provider
-    QString providerType = QStringLiteral( "external_bt" );
-    QVariantList providers = appsettings->savedPositionProviders();
 
-    for ( const auto &provider : providers )
+  // find name & type of the active provider
+  QString providerName;
+  // Migration from single external provider to multiple currently, missing type == bluetooth provider
+  QString providerType = QStringLiteral( "external_bt" );
+  QVariantList providers = appsettings->savedPositionProviders();
+
+  for ( const QVariant &provider : providers )
+  {
+    QVariantList providerData = provider.toList();
+    if ( providerData.length() < 2 )
     {
-      QVariantList providerData = provider.toList();
-      if ( providerData.length() < 2 )
-      {
-        CoreUtils::log( QStringLiteral( "PositionKit" ), QStringLiteral( "Found provider with insufficient data" ) );
-        continue;
-      }
+      CoreUtils::log( QStringLiteral( "PositionKit" ), QStringLiteral( "Found provider with insufficient data" ) );
+      continue;
+    }
 
-      if ( providerData[1] == providerId )
+    if ( providerData[1] == providerId )
+    {
+      providerName = providerData[0].toString();
+      if ( !providerData.at( 2 ).isNull() )
       {
-        providerName = providerData[0].toString();
-        if ( !providerData.at( 2 ).isNull() )
-        {
-          providerType = providerData[2].toString();
-        }
+        providerType = providerData[2].toString();
       }
     }
-
-    return constructProvider( providerType, providerId, providerName );
   }
+
+  return constructProvider( providerType, providerId, providerName );
 }
 
 void PositionKit::parsePositionUpdate( const GeoPosition &newPosition )
@@ -427,7 +420,7 @@ void PositionKit::setSkipElevationTransformation( const bool skipElevationTransf
   mSkipElevationTransformation = skipElevationTransformation;
 }
 
-void PositionKit::appStateChanged( Qt::ApplicationState state )
+void PositionKit::appStateChanged( const Qt::ApplicationState state )
 {
   if ( state == Qt::ApplicationActive )
   {
@@ -469,9 +462,9 @@ double PositionKit::geoidSeparation() const
 QgsPoint PositionKit::positionCoordinate() const
 {
   if ( mPosition.hasValidPosition() )
-    return QgsPoint( mPosition.longitude, mPosition.latitude, mPosition.elevation );
+    return { mPosition.longitude, mPosition.latitude, mPosition.elevation };
 
-  return QgsPoint();
+  return {};
 }
 
 bool PositionKit::hasPosition() const
@@ -576,7 +569,7 @@ void PositionKit::setAppSettings( AppSettings *appSettings )
     mAppSettings = appSettings;
     if ( mAppSettings )
     {
-      QObject::connect( mAppSettings, &AppSettings::gpsAntennaHeightChanged, this, &PositionKit::antennaHeightChanged );
+      connect( mAppSettings, &AppSettings::gpsAntennaHeightChanged, this, &PositionKit::antennaHeightChanged );
     }
     emit appSettingsChanged();
     emit antennaHeightChanged();
@@ -589,8 +582,6 @@ double PositionKit::antennaHeight() const
   {
     return mAppSettings->gpsAntennaHeight();
   }
-  else
-  {
-    return 0;
-  }
+
+  return 0;
 }
diff --git a/app/position/positionkit.h b/app/position/positionkit.h
index b0ab11de9..6c9bc006f 100644
--- a/app/position/positionkit.h
+++ b/app/position/positionkit.h
@@ -137,7 +137,7 @@ class PositionKit : public QObject
     Q_INVOKABLE QString positionCrs3DGeoidModelName();
 
     Q_INVOKABLE AbstractPositionProvider *constructProvider( const QString &type, const QString &id, const QString &name = QString() );
-    Q_INVOKABLE AbstractPositionProvider *constructActiveProvider( AppSettings *appsettings );
+    Q_INVOKABLE AbstractPositionProvider *constructActiveProvider( const AppSettings *appsettings );
 
     AppSettings *appSettings() const;
     void setAppSettings( AppSettings *appSettings );
diff --git a/app/position/providers/networkpositionprovider.cpp b/app/position/providers/networkpositionprovider.cpp
index c2095ebc7..13708470f 100644
--- a/app/position/providers/networkpositionprovider.cpp
+++ b/app/position/providers/networkpositionprovider.cpp
@@ -12,13 +12,13 @@
 #include <QApplication>
 #include <QNetworkDatagram>
 
-static int ONE_SECOND_MS = 1000;
+constexpr int ONE_SECOND_MS = 1000;
 
 NetworkPositionProvider::NetworkPositionProvider( const QString &addr, const QString &name, PositionTransformer &positionTransformer, QObject *parent )
   : AbstractPositionProvider( addr, QStringLiteral( "external_ip" ), name, positionTransformer, parent ),
     mSecondsLeftToReconnect( ReconnectDelay::ShortDelay / ONE_SECOND_MS )
 {
-  const QStringList targetAddress = addr.split( ":" );
+  const QStringList targetAddress = addr.split( QStringLiteral( ":" ) );
   mTargetAddress = targetAddress.at( 0 );
   mTargetPort = targetAddress.at( 1 ).toInt();
 
@@ -203,7 +203,7 @@ void NetworkPositionProvider::reconnectTimeout()
 
 QString NetworkPositionProvider::getIpAddress() const
 {
-  return mTargetAddress + ":" + QString::number( mTargetPort );
+  return QStringLiteral( "%1:%2" ).arg( mTargetAddress, QString::number( mTargetPort ) );
 }
 
 void NetworkPositionProvider::reconnect()
diff --git a/app/position/providers/nmeaparser.h b/app/position/providers/nmeaparser.h
index fc47d7e82..b50f9f3b3 100644
--- a/app/position/providers/nmeaparser.h
+++ b/app/position/providers/nmeaparser.h
@@ -13,7 +13,7 @@
 #include <qgsnmeaconnection.h>
 
 /**
- * NmeaParser is a big hack how to reuse QGIS NmeaConnection function in order to (a) keep ownership of bluetooth
+ * NmeaParser is a big hack how to reuse QGIS NmeaConnection function in order to (a) keep ownership of bluetooth / TCP/UDP
  * socket, (b) do not have multiple unique_ptrs holding the same pointer and to avoid some possible crashes.
  *
  * Note: This way of reusing makes the parser highly dependent on QgsNmeaConnection class and any change inside the class
diff --git a/app/position/providers/positionprovidersmodel.cpp b/app/position/providers/positionprovidersmodel.cpp
index 598b4b939..0c6a02f95 100644
--- a/app/position/providers/positionprovidersmodel.cpp
+++ b/app/position/providers/positionprovidersmodel.cpp
@@ -19,7 +19,7 @@ PositionProvidersModel::PositionProvidersModel( QObject *parent ) : QAbstractLis
 {
   if ( !InputUtils::isMobilePlatform() )
   {
-    PositionProvider simulated( "Simulated provider", "Simulated position around point", "internal", "simulated" );
+    const PositionProvider simulated( "Simulated provider", "Simulated position around point", "internal", "simulated" );
 
     mProviders.push_front( simulated );
   }
@@ -74,20 +74,20 @@ QHash<int, QByteArray> PositionProvidersModel::roleNames() const
 
 int PositionProvidersModel::rowCount( const QModelIndex & ) const
 {
-  return mProviders.count();
+  return static_cast<int>( mProviders.count() );
 }
 
-QVariant PositionProvidersModel::data( const QModelIndex &index, int role ) const
+QVariant PositionProvidersModel::data( const QModelIndex &index, const int role ) const
 {
   if ( !index.isValid() )
-    return QVariant();
+    return {};
 
-  int row = index.row();
+  const int row = index.row();
 
   PositionProvider provider = mProviders.at( row );
 
   if ( row < 0 || row > mProviders.count() )
-    return QVariant();
+    return {};
 
   switch ( role )
   {
@@ -104,7 +104,7 @@ QVariant PositionProvidersModel::data( const QModelIndex &index, int role ) cons
       return provider.providerType;
 
     default:
-      return QVariant();
+      return {};
   }
 }
 
@@ -119,7 +119,7 @@ void PositionProvidersModel::removeProvider( const QString &providerId )
   if ( !mProviders.contains( toRemove ) )
     return;
 
-  int removeIndex = mProviders.indexOf( toRemove );
+  const int removeIndex = static_cast<int>( mProviders.indexOf( toRemove ) );
 
   beginRemoveRows( QModelIndex(), removeIndex, removeIndex );
 
@@ -149,7 +149,7 @@ void PositionProvidersModel::addProvider( const QString &name, const QString &pr
   if ( mProviders.contains( toAdd ) )
     return;
 
-  int addIndex = mProviders.count();
+  const int addIndex = static_cast<int>( mProviders.count() );
 
   beginInsertRows( QModelIndex(), addIndex, addIndex );
 
@@ -186,7 +186,7 @@ void PositionProvidersModel::setAppSettings( AppSettings *as )
 
     for ( int i = 0; i < providers.count(); ++i )
     {
-      if ( providers[i].type() == QVariant::List || providers[i].type() == QVariant::StringList )
+      if ( providers[i].typeId() == QMetaType::QVariantList || providers[i].typeId() == QMetaType::QStringList )
       {
         QVariantList providerData = providers[i].toList();
 
diff --git a/app/position/providers/positionprovidersmodel.h b/app/position/providers/positionprovidersmodel.h
index a05589504..6499038ed 100644
--- a/app/position/providers/positionprovidersmodel.h
+++ b/app/position/providers/positionprovidersmodel.h
@@ -10,7 +10,6 @@
 #ifndef POSITIONPROVIDERSMODEL_H
 #define POSITIONPROVIDERSMODEL_H
 
-#include <QObject>
 #include <qglobal.h>
 #include <QAbstractListModel>
 
@@ -21,8 +20,8 @@ struct PositionProvider
 {
   QString name;
   QString description;
-  QString providerType; // either internal or external
-  QString providerId; // holds BT address for external provider and simulated/internal for internal provider
+  QString providerType; // can be internal, external_bt, external_ip
+  QString providerId; // holds BT address or IP address for external providers and simulated/internal for internal providers
 
   bool operator==( const PositionProvider &other ) const
   {
@@ -38,7 +37,7 @@ struct PositionProvider
     : name( name ), description( desc ), providerType( type ), providerId( id )
   {}
 
-  PositionProvider() {}
+  PositionProvider() = default;
 };
 
 class PositionProvidersModel : public QAbstractListModel
@@ -50,14 +49,14 @@ class PositionProvidersModel : public QAbstractListModel
   public:
 
     explicit PositionProvidersModel( QObject *parent = nullptr );
-    virtual ~PositionProvidersModel();
+    ~PositionProvidersModel() override;
 
     enum DataRoles
     {
-      ProviderName = Qt::UserRole + 1, //! physical address of BT device
-      ProviderDescription,
-      ProviderId,
-      ProviderType // external (connected) / internal (device)
+      ProviderName = Qt::UserRole + 1, // name of bluetooth device or custom name for network device
+      ProviderDescription, // device address (IP/BT) + device type
+      ProviderId, // device address (IP/BT)
+      ProviderType // external_ip (connected) / external_bt (connected) / internal (device) / simulated (device)
     };
     Q_ENUM( DataRoles )
 

From a466c7b674177b0b8ee5e576d5f9235ff5327603 Mon Sep 17 00:00:00 2001
From: Gabriel Bolbotina <bolbotinagabriel@gmail.com>
Date: Tue, 5 May 2026 12:32:17 +0300
Subject: [PATCH 28/30] Fixed first round of review findings

---
 app/qml/CMakeLists.txt                        |   4 +-
 app/qml/account/MMHowYouFoundUsPage.qml       |   2 +-
 .../components/MMIconCheckBoxHorizontal.qml   |  60 +++-----
 ...awer.qml => MMBluetoothProviderDrawer.qml} |  11 +-
 .../MMExternalProviderConnectionDrawer.qml    | 142 ++++++------------
 app/qml/gps/MMGpsDataDrawer.qml               |   5 +-
 app/qml/gps/MMNetworkProviderDrawer.qml       |   8 +-
 app/qml/gps/MMPositionProviderPage.qml        |   6 +-
 app/qml/gps/MMProviderTypeDrawer.qml          |   5 +-
 gallery/qml.qrc                               |   2 +-
 gallery/qml/pages/ChecksPage.qml              |   8 +-
 11 files changed, 93 insertions(+), 160 deletions(-)
 rename app/qml/{account => }/components/MMIconCheckBoxHorizontal.qml (52%)
 rename app/qml/gps/{MMAddPositionProviderDrawer.qml => MMBluetoothProviderDrawer.qml} (94%)

diff --git a/app/qml/CMakeLists.txt b/app/qml/CMakeLists.txt
index 280d40a62..12b847168 100644
--- a/app/qml/CMakeLists.txt
+++ b/app/qml/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(MM_QML
-    account/components/MMIconCheckBoxHorizontal.qml
     account/components/MMIconCheckBoxVertical.qml
     account/components/MMAccountPageItem.qml
     account/components/MMWorkspaceDelegate.qml
@@ -26,6 +25,7 @@ set(MM_QML
     components/MMDrawerHeader.qml
     components/MMHlineText.qml
     components/MMIcon.qml
+    components/MMIconCheckBoxHorizontal.qml
     components/MMInfoBox.qml
     components/MMLine.qml
     components/MMListDelegate.qml
@@ -132,7 +132,7 @@ set(MM_QML
     form/editors/MMFormTextMultilineEditor.qml
     form/editors/MMFormValueMapEditor.qml
     form/editors/MMFormValueRelationEditor.qml
-    gps/MMAddPositionProviderDrawer.qml
+    gps/MMBluetoothProviderDrawer.qml
     gps/MMExternalProviderConnectionDrawer.qml
     gps/MMGpsDataDrawer.qml
     gps/MMNetworkProviderDrawer.qml
diff --git a/app/qml/account/MMHowYouFoundUsPage.qml b/app/qml/account/MMHowYouFoundUsPage.qml
index 66a84031e..dbc6cfe86 100644
--- a/app/qml/account/MMHowYouFoundUsPage.qml
+++ b/app/qml/account/MMHowYouFoundUsPage.qml
@@ -112,7 +112,7 @@ MMPage {
                NumberAnimation { properties: "x,y"; duration: 100 }
            }
 
-      delegate: MMAccountComponents.MMIconCheckBoxHorizontal {
+      delegate: MMIconCheckBoxHorizontal{
         x: model.submenu ? __style.margin20 : 0
         width: model.submenu ? ListView.view.width - __style.margin20 : ListView.view.width
 
diff --git a/app/qml/account/components/MMIconCheckBoxHorizontal.qml b/app/qml/components/MMIconCheckBoxHorizontal.qml
similarity index 52%
rename from app/qml/account/components/MMIconCheckBoxHorizontal.qml
rename to app/qml/components/MMIconCheckBoxHorizontal.qml
index f9327bb18..45dff5de6 100644
--- a/app/qml/account/components/MMIconCheckBoxHorizontal.qml
+++ b/app/qml/components/MMIconCheckBoxHorizontal.qml
@@ -11,81 +11,69 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Controls.Basic
 
-import "../../components"
-
 CheckBox {
   id: control
 
-  property string sourceIcon: ""
-  property string description: ""
+  property alias sourceIcon: icon.source
+  property alias description: descriptionText.text
   property bool showBorder: false
   property bool small: false
 
-  height: (description !== "" ? 96 : (control.small ? 50 : 80)) * __dp
+  readonly property int baseHeight: small ? 50 : 80
+
+  height: control.baseHeight * __dp
+  implicitWidth: leftPadding + titleText.implicitWidth + rightPadding
 
-  leftPadding: (description !== "" ? iconBgRectangle.x : 0) + iconBgRectangle.width + 30 * __dp
+  topPadding: Math.max(0, (height - contentColumn.implicitHeight) / 2)
+  bottomPadding: topPadding
+  leftPadding: iconBgRectangle.x + iconBgRectangle.width + 20 * __dp
   rightPadding: 20 * __dp
 
   indicator: Rectangle {
     id: iconBgRectangle
-    width: (control.small ? 24 : (control.description !== "" ? 50 : 40)) * __dp
-    height: (control.small ? 24 : (control.description !== "" ? 50 : 40)) * __dp
+    implicitWidth: (small ? 24 : 40) * __dp
+    implicitHeight: (small ? 24 : 40) * __dp
     x: 20 * __dp
     y: control.height / 2 - height / 2
     radius: width / 2
     color: control.checked ? __style.polarColor : __style.lightGreenColor
 
     MMIcon {
-      size: control.small ? __style.icon16 : __style.icon24
+      id: icon
+      size: small ? __style.icon16 : __style.icon24
       anchors.centerIn: parent
       source: control.sourceIcon
       color: __style.forestColor
     }
   }
 
-  contentItem: Item {
-    implicitWidth: titleText.implicitWidth
+  contentItem: Column {
+    id: contentColumn
+    spacing: 4 * __dp
 
     Text {
       id: titleText
-      visible: control.description === ""
       width: parent.width
-      height: parent.height
       text: control.text
       font: __style.t3
       color: control.checked ? __style.polarColor : __style.nightColor
       elide: Text.ElideRight
-      verticalAlignment: Text.AlignVCenter
     }
 
-    Column {
-      id: textColumn
-      visible: control.description !== ""
-      anchors.verticalCenter: parent.verticalCenter
+    Text {
+      id: descriptionText
+      visible: text !== ""
       width: parent.width
-      spacing: 10 * __dp
-
-      Text {
-        width: parent.width
-        text: control.text
-        font: __style.t3
-        color: control.checked ? __style.polarColor : __style.nightColor
-        elide: Text.ElideRight
-      }
-
-      Text {
-        width: parent.width
-        text: control.description
-        font: __style.p6
-        color: control.checked ? __style.polarColor : __style.nightColor
-        elide: Text.ElideRight
-      }
+      font: __style.p6
+      color: control.checked ? __style.polarColor : __style.nightColor
+      wrapMode: Text.Wrap
+      maximumLineCount: 2
     }
   }
 
   background: Rectangle {
     radius: __style.radius12
     color: control.checked ? __style.forestColor : __style.polarColor
-    border.color: showBorder ? ( control.checked ? __style.transparentColor : __style.mediumGreenColor ) : __style.transparentColor
+    border.color: showBorder && !control.checked ? __style.mediumGreenColor : __style.transparentColor
   }
 }
diff --git a/app/qml/gps/MMAddPositionProviderDrawer.qml b/app/qml/gps/MMBluetoothProviderDrawer.qml
similarity index 94%
rename from app/qml/gps/MMAddPositionProviderDrawer.qml
rename to app/qml/gps/MMBluetoothProviderDrawer.qml
index 65ccf97f1..1263b203b 100644
--- a/app/qml/gps/MMAddPositionProviderDrawer.qml
+++ b/app/qml/gps/MMBluetoothProviderDrawer.qml
@@ -10,7 +10,6 @@
 import QtCore
 import QtQuick
 import QtQuick.Controls
-
 import mm 1.0 as MM
 
 import "../components" as MMComponents
@@ -115,20 +114,19 @@ MMComponents.MMListDrawer {
         anchors.horizontalCenter: parent.horizontalCenter
 
         width: parent.width
-        spacing: __style.spacing16
 
         Image {
           anchors.horizontalCenter: parent.horizontalCenter
 
           source: __style.mmSymbolImage
 
-          width: 32 * __dp
-          height: 32 * __dp
+          width: __style.icon32 * __dp
+          height: __style.icon32 * __dp
 
           fillMode: Image.PreserveAspectFit
         }
 
-        MMComponents.MMListSpacer { height: __style.margin20 }
+        MMComponents.MMListSpacer { height: __style.margin16 }
 
         MMComponents.MMText {
           width: parent.width
@@ -140,8 +138,7 @@ MMComponents.MMListDrawer {
 
           horizontalAlignment: Text.AlignHCenter
         }
-
-        MMComponents.MMListSpacer { height: __style.margin20 }
+        MMComponents.MMListSpacer { height: __style.margin16 }
       }
     }
   }
diff --git a/app/qml/gps/MMExternalProviderConnectionDrawer.qml b/app/qml/gps/MMExternalProviderConnectionDrawer.qml
index eec55a508..928aba748 100644
--- a/app/qml/gps/MMExternalProviderConnectionDrawer.qml
+++ b/app/qml/gps/MMExternalProviderConnectionDrawer.qml
@@ -10,7 +10,6 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-
 import mm 1.0 as MM
 import MMInput
 
@@ -21,93 +20,9 @@ MMComponents.MMDrawer {
 
   property string providerType: ""
   property var positionProvider: PositionKit.positionProvider
-  property string howToConnectGPSLink: __inputHelp.howToConnectGPSLink
-
-  property string titleText: {
-    if ( root.providerType === "network" )
-    {
-      if ( rootstate.state === "working" )
-      {
-        if ( !root.positionProvider ) return ""
-        return qsTr( "Connecting to external receiver" )
-      }
-      else if ( rootstate.state === "success" )
-      {
-        return qsTr( "Connected" )
-      }
-      else if ( rootstate.state === "fail" )
-      {
-        return qsTr( "Failed to connect to" ) + " " + ( root.positionProvider ? root.positionProvider.getIpAddress() : "" )
-      }
-      else return qsTr( "We were not able to connect to the specified IP address. Please try again later." )
-    }
-    else if ( root.providerType === "bluetooth" )
-    {
-      if ( rootstate.state === "working" )
-      {
-        if ( !root.positionProvider ) return ""
-        if ( root.positionProvider.name() ) return qsTr( "Connecting to" ) + " " + root.positionProvider.name()
-        return qsTr( "Connecting" ) + connectingSuffixAnimation
-      }
-      else if ( rootstate.state === "success" )
-      {
-        return qsTr( "Connected" )
-      }
-      else if ( rootstate.state === "fail" )
-      {
-        return qsTr( "Failed to connect to" ) + " " + ( root.positionProvider ? root.positionProvider.name() : "" )
-      }
-      else
-      {
-        if ( root.providerType === "bluetooth" ) return qsTr( "We were not able to connect to the specified device. Please make sure your device is powered on and can be connected to." )
-      }
-    }
-  }
 
   property string connectingSuffixAnimation: ""
 
-  property string descriptionText: {
-    if ( rootstate.state === "working" )
-    {
-      if ( root.providerType === "bluetooth" )
-        return qsTr( "You might be asked to pair your device during this process." )
-      else if ( root.providerType === "network" )
-      if ( root.positionProvider.getIpAddress() ) return qsTr( "Connecting to" ) + " " + root.positionProvider.getIpAddress() + ". You can close this panel, the app will continue in the background."
-      return qsTr( "Connecting" ) + connectingSuffixAnimation
-    }
-    else if ( rootstate.state === "success" )
-    {
-      return ""
-    }
-    else if ( rootstate.state === "waitingToReconnect" )
-    {
-      return PositionKit.positionProvider.stateMessage + "<br><br>" +
-          qsTr( "You can close this message, we will try to repeatedly connect to your device." )
-    }
-
-    else
-    {
-      if ( root.providerType === "bluetooth" )
-        return qsTr( "We were not able to connect to the specified device. Please make sure your device is powered on and can be connected to." )
-      else if ( root.providerType === "network" )
-        return qsTr( "We were not able to connect to the specified IP address. Please try again later." )
-    }
-  }
-
-  property var imageSource: {
-    if ( rootstate.state === "fail" )
-    {
-      return __style.externalGpsRedImage
-    }
-    else
-    {
-      if ( root.providerType === "bluetooth" )
-        return __style.externalBluetoothGreenImage
-      else if ( root.providerType === "network" )
-        return __style.externalNetworkGreenImage
-    }
-  }
-
   signal success()
   signal failure()
 
@@ -118,18 +33,60 @@ MMComponents.MMDrawer {
       State {
         name: "working"
         when: root.positionProvider && root.positionProvider.state === MM.PositionProvider.Connecting
+        PropertyChanges {
+          target: message
+          image: root.providerType === "bluetooth" ? __style.externalBluetoothGreenImage : __style.externalNetworkGreenImage
+          title: root.providerType === "network"
+            ? qsTr( "Connecting to external receiver" )
+            : ( root.positionProvider.name()
+                ? qsTr( "Connecting to" ) + " " + root.positionProvider.name()
+                : qsTr( "Connecting" ) + root.connectingSuffixAnimation )
+          description: root.providerType === "bluetooth"
+            ? qsTr( "You might be asked to pair your device during this process." )
+            : ( root.positionProvider.getIpAddress()
+                ? qsTr( "Connecting to" ) + " " + root.positionProvider.getIpAddress() + qsTr( ". You can close this panel, the app will continue in the background." )
+                : qsTr( "Connecting" ) + root.connectingSuffixAnimation )
+          linkText: ""
+        }
       },
       State {
         name: "success"
         when: root.positionProvider && root.positionProvider.state === MM.PositionProvider.Connected
+        PropertyChanges {
+          target: message
+          image: root.providerType === "bluetooth" ? __style.externalBluetoothGreenImage : __style.externalNetworkGreenImage
+          title: qsTr( "Connected" )
+          description: ""
+          linkText: ""
+        }
       },
       State {
         name: "fail"
         when: !root.positionProvider || root.positionProvider.state === MM.PositionProvider.NoConnection
+        PropertyChanges {
+          target: message
+          image: __style.externalGpsRedImage
+          title: qsTr( "Failed to connect to" ) + " " + ( root.positionProvider
+            ? ( root.providerType === "network" ? root.positionProvider.getIpAddress() : root.positionProvider.name() )
+            : "" )
+          description: root.providerType === "bluetooth"
+            ? qsTr( "We were not able to connect to the specified device. Please make sure your device is powered on and can be connected to." )
+            : qsTr( "We were not able to connect to the specified IP address. Please try again later." )
+          linkText: qsTr( "Learn more" )
+        }
       },
       State {
         name: "waitingToReconnect"
-        when: !root.positionProvider || root.positionProvider.state === MM.PositionProvider.WaitingToReconnect
+        when: root.positionProvider && root.positionProvider.state === MM.PositionProvider.WaitingToReconnect
+        PropertyChanges {
+          target: message
+          image: root.providerType === "bluetooth" ? __style.externalBluetoothGreenImage : __style.externalNetworkGreenImage
+          title: root.providerType === "bluetooth"
+            ? qsTr( "We were not able to connect to the specified device. Please make sure your device is powered on and can be connected to." )
+            : qsTr( "We were not able to connect to the specified IP address. Please try again later." )
+          description: root.positionProvider.stateMessage + "<br><br>" + qsTr( "You can close this message, we will try to repeatedly connect to your device." )
+          linkText: qsTr( "Learn more" )
+        }
       }
     ]
 
@@ -143,13 +100,10 @@ MMComponents.MMDrawer {
     height: root.maxHeightHit ? root.drawerContentAvailableHeight : contentHeight
 
     MMComponents.MMMessage {
-      width: parent.width
+      id: message
 
-      image: root.imageSource
-      title: root.titleText
-      description: root.descriptionText
-      link: root.howToConnectGPSLink
-      linkText: ( rootstate.state === "working" || rootstate.state === "success" ) ? "" : qsTr( "Learn more" )
+      width: parent.width
+      link: __inputHelp.howToConnectGPSLink
     }
   }
 
@@ -159,9 +113,7 @@ MMComponents.MMDrawer {
     interval: 1500
     repeat: false
     running: rootstate.state === "success"
-    onTriggered: {
-      root.close()
-    }
+    onTriggered: root.close()
   }
 
   Timer {
diff --git a/app/qml/gps/MMGpsDataDrawer.qml b/app/qml/gps/MMGpsDataDrawer.qml
index 3265edc86..e14568956 100644
--- a/app/qml/gps/MMGpsDataDrawer.qml
+++ b/app/qml/gps/MMGpsDataDrawer.qml
@@ -9,7 +9,6 @@
 
 import QtQuick
 import QtQuick.Layouts
-
 import mm 1.0 as MM
 import MMInput
 
@@ -34,13 +33,13 @@ MMComponents.MMDrawer {
 
     width: parent.width
     height: root.maxHeightHit ? root.drawerContentAvailableHeight
-                              : ( scrollView.contentHeight + reservedButtonSpace )
+                              : ( scrollView.contentHeight + root.reservedButtonSpace )
 
     MMComponents.MMScrollView {
       id: scrollView
 
       width: parent.width
-      height: root.maxHeightHit ? ( parent.height - reservedButtonSpace)
+      height: root.maxHeightHit ? ( parent.height - root.reservedButtonSpace)
                                  : contentHeight
 
       Column {
diff --git a/app/qml/gps/MMNetworkProviderDrawer.qml b/app/qml/gps/MMNetworkProviderDrawer.qml
index c9dba8d93..aa87a3d86 100644
--- a/app/qml/gps/MMNetworkProviderDrawer.qml
+++ b/app/qml/gps/MMNetworkProviderDrawer.qml
@@ -57,8 +57,8 @@ MMComponents.MMDrawer {
       width: parent.width
       textFieldBackground.color: __style.lightGreenColor
 
-      title: qsTr( "Port" )
-      placeholderText: qsTr( "1234" )
+      title: "Port"
+      placeholderText: "1234"
 
       textField.inputMethodHints: Qt.ImhDigitsOnly
 
@@ -98,7 +98,7 @@ MMComponents.MMDrawer {
         }
 
         const portNum = parseInt( port )
-        if ( port === "" ) {
+        if ( !port ) {
           portInput.errorMsg = qsTr( "Port is required" )
         }
         else if ( !/^\d+$/.test( port ) || portNum < 1 || portNum > 65535 ) {
@@ -108,7 +108,7 @@ MMComponents.MMDrawer {
           portInput.errorMsg = ""
         }
 
-        if ( ipAddressInput.errorMsg !== "" || portInput.errorMsg !== "" ) {
+        if ( ipAddressInput.errorMsg || portInput.errorMsg ) {
           return
         }
 
diff --git a/app/qml/gps/MMPositionProviderPage.qml b/app/qml/gps/MMPositionProviderPage.qml
index 79305c397..c38829b91 100644
--- a/app/qml/gps/MMPositionProviderPage.qml
+++ b/app/qml/gps/MMPositionProviderPage.qml
@@ -169,8 +169,6 @@ MMComponents.MMPage {
     }
 
     MMComponents.MMMessage {
-      id: infoMessage
-
       visible: !listview.visible
       width: parent.width
       anchors.centerIn: parent
@@ -194,7 +192,7 @@ MMComponents.MMPage {
       }
 
       onRemoveProvider: {
-        if ( removeDialog.providerId === "" ) {
+        if ( !removeDialog.providerId ) {
           close()
           return
         }
@@ -215,7 +213,7 @@ MMComponents.MMPage {
       id: bluetoothDiscoveryLoader
 
       active: false
-      source: Qt.resolvedUrl( "MMAddPositionProviderDrawer.qml" )
+      source: Qt.resolvedUrl( "MMBluetoothProviderDrawer.qml" )
 
       onLoaded: item.open()
     }
diff --git a/app/qml/gps/MMProviderTypeDrawer.qml b/app/qml/gps/MMProviderTypeDrawer.qml
index 60137d62f..284b59c04 100644
--- a/app/qml/gps/MMProviderTypeDrawer.qml
+++ b/app/qml/gps/MMProviderTypeDrawer.qml
@@ -8,9 +8,8 @@
  ***************************************************************************/
 
 import QtQuick
-
+import QtQml.Models
 import "../components" as MMComponents
-import "../account/components" as MMAccountComponents
 
 MMComponents.MMListDrawer {
   id: root
@@ -64,7 +63,7 @@ MMComponents.MMListDrawer {
     width: ListView.view.width
     height: checkbox.height + __style.margin12
 
-    MMAccountComponents.MMIconCheckBoxHorizontal {
+    MMComponents.MMIconCheckBoxHorizontal{
       id: checkbox
 
       width: parent.width
diff --git a/gallery/qml.qrc b/gallery/qml.qrc
index 86382e3f3..ece26deed 100644
--- a/gallery/qml.qrc
+++ b/gallery/qml.qrc
@@ -40,6 +40,7 @@
         <file>../app/qml/components/MMPageHeader.qml</file>
         <file>../app/qml/components/MMDrawerHeader.qml</file>
         <file>../app/qml/components/MMLine.qml</file>
+        <file>../app/qml/components/MMIconCheckBoxHorizontal.qml</file>
         <file>../app/qml/components/MMIcon.qml</file>
         <file>../app/qml/components/MMLine.qml</file>
         <file>../app/qml/components/MMText.qml</file>
@@ -79,7 +80,6 @@
         <file>../app/qml/components/MMSingleClickMouseArea.qml</file>
         <file>../app/qml/components/MMNotificationBox.qml</file>
         <file>../app/qml/account/components/MMAccountPageItem.qml</file>
-        <file>../app/qml/account/components/MMIconCheckBoxHorizontal.qml</file>
         <file>../app/qml/account/components/MMIconCheckBoxVertical.qml</file>
         <file>../app/qml/account/components/MMWorkspaceDelegate.qml</file>
         <file>../app/qml/account/components/MMWorkspaceInvitationDelegate.qml</file>
diff --git a/gallery/qml/pages/ChecksPage.qml b/gallery/qml/pages/ChecksPage.qml
index 301fec071..8f33550ad 100644
--- a/gallery/qml/pages/ChecksPage.qml
+++ b/gallery/qml/pages/ChecksPage.qml
@@ -73,26 +73,26 @@ ScrollView {
       spacing: 10
       anchors.fill: parent
 
-      MMAccountComponents.MMIconCheckBoxHorizontal {
+      MMComponents.MMIconCheckBoxHorizontal{
         checked: false
         sourceIcon: __style.qgisIcon
         text: "QGIS website"
       }
 
-      MMAccountComponents.MMIconCheckBoxHorizontal {
+      MMComponents.MMIconCheckBoxHorizontal{
         checked: true
         sourceIcon: __style.qgisIcon
         text: "QGIS website"
       }
 
-      MMAccountComponents.MMIconCheckBoxHorizontal {
+      MMComponents.MMIconCheckBoxHorizontal{
         checked: false
         sourceIcon: __style.redditIcon
         text: "Reddit"
         small: true
       }
 
-      MMAccountComponents.MMIconCheckBoxHorizontal {
+      MMComponents.MMIconCheckBoxHorizontal{
         checked: true
         width: 300 * __dp
         sourceIcon: __style.redditIcon

From d9433cfe931fa8b1b4ec146a7320e5d6188ec061 Mon Sep 17 00:00:00 2001
From: Gabriel Bolbotina <bolbotinagabriel@gmail.com>
Date: Wed, 6 May 2026 09:12:58 +0300
Subject: [PATCH 29/30] Refactored Position provider page Implemented code
 review findings

---
 app/qml/components/MMListDelegate.qml   |   2 +-
 app/qml/gps/MMGpsDataDrawer.qml         |   8 +-
 app/qml/gps/MMNetworkProviderDrawer.qml |   7 +-
 app/qml/gps/MMPositionProviderPage.qml  | 104 ++++++++----------------
 app/qml/gps/MMProviderTypeDrawer.qml    |  83 ++++++++++---------
 gallery/qml/pages/ChecksPage.qml        |  11 +++
 6 files changed, 92 insertions(+), 123 deletions(-)

diff --git a/app/qml/components/MMListDelegate.qml b/app/qml/components/MMListDelegate.qml
index b7869968c..93c94cca0 100644
--- a/app/qml/components/MMListDelegate.qml
+++ b/app/qml/components/MMListDelegate.qml
@@ -42,7 +42,7 @@ Item {
 
   implicitWidth: ListView?.view?.width ?? 0 // in case ListView is injected as attached property (usually it is)
   implicitHeight: contentLayout.implicitHeight
-  height: visible ? implicitHeight : 0.1 // hide invisible items, for some reason setting 0 does not work ¯\_(ツ)_/¯
+  height: visible ? contentLayout.implicitHeight : 0.1 // hide invisible items, for some reason setting 0 does not work ¯\_(ツ)_/¯
 
   MouseArea {
     anchors.fill: contentLayout
diff --git a/app/qml/gps/MMGpsDataDrawer.qml b/app/qml/gps/MMGpsDataDrawer.qml
index e14568956..0d32e3930 100644
--- a/app/qml/gps/MMGpsDataDrawer.qml
+++ b/app/qml/gps/MMGpsDataDrawer.qml
@@ -21,25 +21,22 @@ MMComponents.MMDrawer {
   property var mapSettings
 
   property bool showReceiversButton: true
-  readonly property real reservedButtonSpace: __style.spacing20 + manageButton.implicitHeight + __style.safeAreaBottom + __style.margin8
 
   signal manageReceiversClicked()
 
   drawerHeader.title: qsTr( "GPS info" )
 
-  drawerBottomMargin: 0
-
   drawerContent: Item {
 
     width: parent.width
     height: root.maxHeightHit ? root.drawerContentAvailableHeight
-                              : ( scrollView.contentHeight + root.reservedButtonSpace )
+                              : ( scrollView.contentHeight + internal.reservedButtonSpace )
 
     MMComponents.MMScrollView {
       id: scrollView
 
       width: parent.width
-      height: root.maxHeightHit ? ( parent.height - root.reservedButtonSpace)
+      height: root.maxHeightHit ? ( parent.height - internal.reservedButtonSpace)
                                  : contentHeight
 
       Column {
@@ -373,5 +370,6 @@ MMComponents.MMDrawer {
     id: internal
 
     property string coordinatesInDegrees: __inputUtils.degreesString( PositionKit.positionCoordinate )
+    readonly property real reservedButtonSpace: __style.spacing20 + manageButton.implicitHeight + __style.safeAreaBottom + __style.margin8
   }
 }
diff --git a/app/qml/gps/MMNetworkProviderDrawer.qml b/app/qml/gps/MMNetworkProviderDrawer.qml
index aa87a3d86..0a7090d48 100644
--- a/app/qml/gps/MMNetworkProviderDrawer.qml
+++ b/app/qml/gps/MMNetworkProviderDrawer.qml
@@ -26,17 +26,12 @@ MMComponents.MMDrawer {
 
     MMComponents.MMText {
       width: parent.width
-       
       text: qsTr( "Enter the IP address and port for your receiver. You can find these in your manufacturer's app. TCP and UDP connections are supported. Optionally, add a nickname to tell your receivers apart." )
       font: __style.p5
       color: __style.nightColor
 
       wrapMode: Text.Wrap
       horizontalAlignment: Text.AlignJustify
-
-      onLinkActivated: function( link ) {
-        Qt.openUrlExternally( link )
-      }
     }
 
     MMInputs.MMTextInput {
@@ -87,7 +82,7 @@ MMComponents.MMDrawer {
         const ipv4Regex = /^((25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\.){3}(25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)$/
         const hostnameRegex = /^[a-zA-Z0-9]([a-zA-Z0-9\-\.]*[a-zA-Z0-9])?$/
 
-        if ( ip === "" ) {
+        if ( !ip ) {
           ipAddressInput.errorMsg = qsTr( "IP address is required" )
         }
         else if ( !ipv4Regex.test( ip ) && !hostnameRegex.test( ip ) ) {
diff --git a/app/qml/gps/MMPositionProviderPage.qml b/app/qml/gps/MMPositionProviderPage.qml
index c38829b91..bcc801e7f 100644
--- a/app/qml/gps/MMPositionProviderPage.qml
+++ b/app/qml/gps/MMPositionProviderPage.qml
@@ -18,7 +18,7 @@ import "../dialogs" as MMDialogs
 MMComponents.MMPage {
   id: root
 
-  pageHeader.title: listview.showTopTitle ? internal.pageTitle : ""
+  pageHeader.title: internal.pageTitle
 
   pageBottomMarginPolicy: MMComponents.MMPage.PaintBehindSystemBar
 
@@ -29,8 +29,6 @@ MMComponents.MMPage {
     MMComponents.MMListView {
       id: listview
 
-      property bool showTopTitle: visibleArea.yPosition * height > ( headerItem.contentHeight / 2 )
-
       width: parent.width
       height: parent.height
 
@@ -42,26 +40,13 @@ MMComponents.MMPage {
         appSettings: AppSettings
       }
 
-      header: MMComponents.MMText {
-        id: headerText
-
-        width: ListView.view.width
-
-        text: internal.pageTitle
-
-        font: __style.h3
-        color: __style.forestColor
-
-        wrapMode: Text.Wrap
-        maximumLineCount: 2
-
-        bottomPadding: __style.margin40
-      }
-
       delegate: MMComponents.MMListDelegate {
         id: listdelegate
 
-        property bool isActive: AppSettings.activePositionProviderId === model.ProviderId
+        required property var model
+        required property int index
+
+        property bool isActive: AppSettings.activePositionProviderId === listdelegate.model.ProviderId
 
         leftContent: MMComponents.MMRadioButton {
           checked: listdelegate.isActive
@@ -71,34 +56,34 @@ MMComponents.MMPage {
             anchors.fill: parent
             onClicked: function( mouse ) {
               mouse.accepted = true
-              root.constructProvider( model.ProviderType, model.ProviderId, model.ProviderName )
+              root.activateProvider( listdelegate.model.ProviderType, listdelegate.model.ProviderId, listdelegate.model.ProviderName )
             }
           }
         }
 
         text: {
-          if ( model.ProviderName ) return model.ProviderName
+          if ( listdelegate.model.ProviderName ) return listdelegate.model.ProviderName
           return qsTr( "Unknown device" )
         }
         secondaryText: {
           if ( listdelegate.isActive ) {
-            if ( model.ProviderType === "external_ip" )
+            if ( listdelegate.model.ProviderType === "external_ip" && typeof PositionKit.positionProvider.getIpAddress === "function" )
               return PositionKit.positionProvider.stateMessage + " - " + PositionKit.positionProvider.getIpAddress()
             return PositionKit.positionProvider.stateMessage
           }
-          return model.ProviderDescription
+          return listdelegate.model.ProviderDescription
         }
 
         rightContent: MMComponents.MMRoundButton {
-          visible: model.ProviderType !== "internal"
+          visible: listdelegate.model.ProviderType !== "internal"
           iconSource: __style.deleteIcon
-          onClicked: removeDialog.openDialog( model.ProviderId )
+          onClicked: removeDialog.openDialog( listdelegate.model.ProviderId )
         }
 
         hasLine: {
-          if ( index === ListView.view.count - 1 ) return false
+          if ( listdelegate.index === ListView.view.count - 1 ) return false
           if ( ListView.section === "internal" ) {
-            let ix = providersModel.index( index + 1, 0 )
+            let ix = providersModel.index( listdelegate.index + 1, 0 )
             let type = providersModel.data( ix, MM.PositionProvidersModel.ProviderType )
             if ( type.includes( "external" ) ) return false
           }
@@ -106,7 +91,7 @@ MMComponents.MMPage {
           return true
         }
 
-        onClicked: root.constructProvider( model.ProviderType, model.ProviderId, model.ProviderName )
+        onClicked: root.activateProvider( listdelegate.model.ProviderType, listdelegate.model.ProviderId, listdelegate.model.ProviderName )
       }
 
       section {
@@ -154,17 +139,17 @@ MMComponents.MMPage {
     MMProviderTypeDrawer {
       id: providerTypeDrawer
 
-      onBluetoothSelected: bluetoothDiscoveryLoader.active = true
-      onNetworkSelected: networkProviderDrawer.open()
+      onProviderSelected: function( providerType ) {
+        if ( providerType === "bluetooth" ) bluetoothDiscoveryLoader.active = true
+        else if ( providerType === "network" ) networkProviderDrawer.open()
+      }
     }
 
     MMNetworkProviderDrawer {
       id: networkProviderDrawer
 
       onConfirmed: function( alias, deviceAddress ) {
-        PositionKit.positionProvider = PositionKit.constructProvider( "external_ip", deviceAddress, alias )
-        providersModel.addProvider( PositionKit.positionProvider.name(), deviceAddress, "external_ip" )
-        connectingDialogLoaderNetwork.open()
+        root.activateProvider( "external_ip", deviceAddress, alias )
       }
     }
 
@@ -200,7 +185,7 @@ MMComponents.MMPage {
         if ( AppSettings.activePositionProviderId === removeDialog.providerId )
         {
           // we are removing an active provider, replace it with internal provider
-          root.constructProvider( "internal", "devicegps", qsTr( "Internal" ) )
+          root.activateProvider( "internal", "devicegps", qsTr( "Internal" ) )
         }
 
         providersModel.removeProvider( removeDialog.providerId )
@@ -213,7 +198,7 @@ MMComponents.MMPage {
       id: bluetoothDiscoveryLoader
 
       active: false
-      source: Qt.resolvedUrl( "MMBluetoothProviderDrawer.qml" )
+      sourceComponent: Component { MMBluetoothProviderDrawer {} }
 
       onLoaded: item.open()
     }
@@ -222,11 +207,9 @@ MMComponents.MMPage {
       target: bluetoothDiscoveryLoader.item
 
       function onInitiatedConnectionTo( deviceAddress, deviceName ) {
-        PositionKit.positionProvider = PositionKit.constructProvider( "external_bt", deviceAddress, deviceName )
-        providersModel.addProvider( deviceName, deviceAddress, "external_bt" )
         bluetoothDiscoveryLoader.item.list.model.discovering = false
         bluetoothDiscoveryLoader.item.close()
-        connectingDialogLoader.open()
+        root.activateProvider( "external_bt", deviceAddress, deviceName )
       }
 
       function onClosed() { bluetoothDiscoveryLoader.active = false }
@@ -235,16 +218,19 @@ MMComponents.MMPage {
     Loader {
       id: connectingDialogLoader
 
+      property string providerType: ""
+
       active: false
       asynchronous: true
-      source: Qt.resolvedUrl( "MMExternalProviderConnectionDrawer.qml" )
+      sourceComponent: Component { MMExternalProviderConnectionDrawer{} }
 
       onLoaded: {
-        item.providerType = "bluetooth"
+        item.providerType = connectingDialogLoader.providerType
         item.open()
       }
 
-      function open() {
+      function open( type ) {
+        providerType = type
         active = true
         focus = true
       }
@@ -254,32 +240,7 @@ MMComponents.MMPage {
       target: connectingDialogLoader.item
 
       function onClosed() { connectingDialogLoader.active = false }
-      function onFailure() { PositionKit.positionProvider = PositionKit.constructProvider( "internal", "devicegps", "" ) }
-    }
-
-    Loader {
-      id: connectingDialogLoaderNetwork
-
-      active: false
-      asynchronous: true
-      source: Qt.resolvedUrl( "MMExternalProviderConnectionDrawer.qml" )
-
-      onLoaded: {
-        item.providerType = "network"
-        item.open()
-      }
-
-      function open() {
-        active = true
-        focus = true
-      }
-    }
-
-    Connections {
-      target: connectingDialogLoaderNetwork.item
-
-      function onClosed() { connectingDialogLoaderNetwork.active = false }
-      function onFailure() { PositionKit.positionProvider = PositionKit.constructProvider( "internal", "devicegps", "" ) }
+      function onFailure() { root.activateProvider( "internal", "devicegps", "" ) }
     }
   }
 
@@ -289,7 +250,7 @@ MMComponents.MMPage {
     property string pageTitle: qsTr( "Manage GPS receivers" )
   }
 
-  function constructProvider( type, id, name ) {
+  function activateProvider( type, id, name ) {
     if ( type === "external_bt" ) {
       // Is bluetooth turned on?
       if ( !__inputUtils.isBluetoothTurnedOn() ) {
@@ -302,13 +263,14 @@ MMComponents.MMPage {
       return // do not construct the same provider again
     }
 
+    providersModel.addProvider( name, id, type )
     PositionKit.positionProvider = PositionKit.constructProvider( type, id, name )
 
     if ( type === "external_bt" ) {
-      connectingDialogLoader.open()
+      connectingDialogLoader.open( "bluetooth" )
     }
     else if ( type === "external_ip" ) {
-      connectingDialogLoaderNetwork.open()
+      connectingDialogLoader.open( "network" )
     }
   }
 }
diff --git a/app/qml/gps/MMProviderTypeDrawer.qml b/app/qml/gps/MMProviderTypeDrawer.qml
index 284b59c04..b03e540f7 100644
--- a/app/qml/gps/MMProviderTypeDrawer.qml
+++ b/app/qml/gps/MMProviderTypeDrawer.qml
@@ -6,7 +6,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-
+pragma ComponentBehavior: Bound
 import QtQuick
 import QtQml.Models
 import "../components" as MMComponents
@@ -14,15 +14,12 @@ import "../components" as MMComponents
 MMComponents.MMListDrawer {
   id: root
 
-  property string selectedProviderType: ""
-
-  signal bluetoothSelected()
-  signal networkSelected()
+  signal providerSelected( string providerType )
 
   drawerHeader.title: qsTr( "Connect new receiver" )
   drawerHeader.titleFont: __style.t2
 
-  onOpened: root.selectedProviderType = ""
+  onOpened: root.list.currentIndex = -1
 
   list.model: ListModel {
     id: providerTypeModel
@@ -36,49 +33,54 @@ MMComponents.MMListDrawer {
   }
 
   list.header: MMComponents.MMText {
-      width: ListView.view.width
-       
-      text: __inputUtils.htmlLink(
-                   qsTr( "External receivers use different connection methods depending on the manufacturer. Select a connection type below, or %1check our documentation%2 for supported devices and setup instructions." ),
-                   __style.nightColor,
-                   __inputHelp.howToConnectGPSLink,
-                   "",
-                   true,
-                   false
-                 )
-      font: __style.p5
-      color: __style.nightColor
-      textFormat: Text.RichText
-
-      wrapMode: Text.Wrap
-      horizontalAlignment: Text.AlignJustify
-      bottomPadding: __style.margin16
-
-      onLinkActivated: function( link ) {
-        Qt.openUrlExternally( link )
-      }
+    width: ListView.view.width
+    text: __inputUtils.htmlLink(
+               qsTr( "External receivers use different connection methods depending on the manufacturer. Select a connection type below, or %1check our documentation%2 for supported devices and setup instructions." ),
+               __style.nightColor,
+               __inputHelp.howToConnectGPSLink,
+               "",
+               true,
+               false
+             )
+    font: __style.p5
+    color: __style.nightColor
+    textFormat: Text.RichText
+
+    wrapMode: Text.Wrap
+    horizontalAlignment: Text.AlignJustify
+    bottomPadding: __style.margin16
+
+    onLinkActivated: function( link ) {
+      Qt.openUrlExternally( link )
     }
+  }
 
   list.delegate: Item {
+    required property string name
+    required property string description
+    required property string type
+    required property url icon
+    required property int index
+
     width: ListView.view.width
     height: checkbox.height + __style.margin12
 
-    MMComponents.MMIconCheckBoxHorizontal{
+    MMComponents.MMIconCheckBoxHorizontal {
       id: checkbox
 
       width: parent.width
       showBorder: true
-      sourceIcon: model.icon
-      text: model.name
-      description: model.description
-      checked: root.selectedProviderType === model.type
+      sourceIcon: parent.icon
+      text: parent.name
+      description: parent.description
+      checked: parent.ListView.isCurrentItem
 
       onClicked: {
-        if ( root.selectedProviderType === model.type ) {
-          root.selectedProviderType = ""
+        if ( parent.ListView.isCurrentItem ) {
+          parent.ListView.view.currentIndex = -1
         }
         else {
-          root.selectedProviderType = model.type
+          parent.ListView.view.currentIndex = parent.index
         }
       }
     }
@@ -96,16 +98,17 @@ MMComponents.MMListDrawer {
       anchors.topMargin: __style.margin8
 
       text: qsTr( "Continue" )
-      enabled: root.selectedProviderType !== ""
+      enabled: root.list.currentIndex !== -1
 
       onClicked: {
+        const providerType = providerTypeModel.get( root.list.currentIndex ).type
         root.close()
 
-        if ( root.selectedProviderType === "bluetooth" ) {
-          root.bluetoothSelected()
+        if ( providerType === "bluetooth" ) {
+          root.providerSelected("bluetooth")
         }
-        else if ( root.selectedProviderType === "network" ) {
-          root.networkSelected()
+        else if ( providerType === "network" ) {
+          root.providerSelected("network")
         }
       }
     }
diff --git a/gallery/qml/pages/ChecksPage.qml b/gallery/qml/pages/ChecksPage.qml
index 8f33550ad..7d14690c8 100644
--- a/gallery/qml/pages/ChecksPage.qml
+++ b/gallery/qml/pages/ChecksPage.qml
@@ -100,6 +100,17 @@ ScrollView {
         description: "This is a small description to check the functionality of this component"
         small: false
       }
+
+
+      MMComponents.MMIconCheckBoxHorizontal{
+        checked: false
+        width: 300 * __dp
+        sourceIcon: __style.redditIcon
+        text: "Internet provider mock"
+        description: "This is a small description to check the functionality of this component"
+        small: false
+        showBorder: true
+      }
     }
   }
 

From 3900d27564c93d3aab7510a9fe20668c134d80a3 Mon Sep 17 00:00:00 2001
From: Gabriel Bolbotina <bolbotinagabriel@gmail.com>
Date: Fri, 8 May 2026 09:47:36 +0300
Subject: [PATCH 30/30] Simplified QML according to the review findings

---
 app/qml/gps/MMGpsDataDrawer.qml         |  4 +--
 app/qml/gps/MMNetworkProviderDrawer.qml |  2 +-
 app/qml/gps/MMProviderTypeDrawer.qml    | 33 +++++++++----------------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/app/qml/gps/MMGpsDataDrawer.qml b/app/qml/gps/MMGpsDataDrawer.qml
index 0d32e3930..b375b29cd 100644
--- a/app/qml/gps/MMGpsDataDrawer.qml
+++ b/app/qml/gps/MMGpsDataDrawer.qml
@@ -351,7 +351,7 @@ MMComponents.MMDrawer {
 
       anchors {
         bottom: parent.bottom
-        bottomMargin: __style.safeAreaBottom + __style.margin8
+        bottomMargin: 0
       }
 
       text: qsTr( "Manage GPS receivers" )
@@ -370,6 +370,6 @@ MMComponents.MMDrawer {
     id: internal
 
     property string coordinatesInDegrees: __inputUtils.degreesString( PositionKit.positionCoordinate )
-    readonly property real reservedButtonSpace: __style.spacing20 + manageButton.implicitHeight + __style.safeAreaBottom + __style.margin8
+    readonly property real reservedButtonSpace: __style.spacing20 + manageButton.implicitHeight + __style.margin8
   }
 }
diff --git a/app/qml/gps/MMNetworkProviderDrawer.qml b/app/qml/gps/MMNetworkProviderDrawer.qml
index 0a7090d48..058766f7d 100644
--- a/app/qml/gps/MMNetworkProviderDrawer.qml
+++ b/app/qml/gps/MMNetworkProviderDrawer.qml
@@ -96,7 +96,7 @@ MMComponents.MMDrawer {
         if ( !port ) {
           portInput.errorMsg = qsTr( "Port is required" )
         }
-        else if ( !/^\d+$/.test( port ) || portNum < 1 || portNum > 65535 ) {
+        else if ( portNum < 1 || portNum > 65535 ) {
           portInput.errorMsg = qsTr( "Enter a valid port (1–65535)" )
         }
         else {
diff --git a/app/qml/gps/MMProviderTypeDrawer.qml b/app/qml/gps/MMProviderTypeDrawer.qml
index b03e540f7..d08181e1b 100644
--- a/app/qml/gps/MMProviderTypeDrawer.qml
+++ b/app/qml/gps/MMProviderTypeDrawer.qml
@@ -86,30 +86,21 @@ MMComponents.MMListDrawer {
     }
   }
 
-  list.footer: Item {
-    width: ListView.view.width
-    height: continueButton.height + __style.margin20
-
-    MMComponents.MMButton {
-      id: continueButton
-
-      width: parent.width
-      anchors.top: parent.top
-      anchors.topMargin: __style.margin8
+  list.footer: MMComponents.MMButton {
+    width: parent.width
 
-      text: qsTr( "Continue" )
-      enabled: root.list.currentIndex !== -1
+    text: qsTr( "Continue" )
+    enabled: root.list.currentIndex !== -1
 
-      onClicked: {
-        const providerType = providerTypeModel.get( root.list.currentIndex ).type
-        root.close()
+    onClicked: {
+      const providerType = providerTypeModel.get( root.list.currentIndex ).type
+      root.close()
 
-        if ( providerType === "bluetooth" ) {
-          root.providerSelected("bluetooth")
-        }
-        else if ( providerType === "network" ) {
-          root.providerSelected("network")
-        }
+      if ( providerType === "bluetooth" ) {
+        root.providerSelected("bluetooth")
+      }
+      else if ( providerType === "network" ) {
+        root.providerSelected("network")
       }
     }
   }