Merge remote-tracking branch 'origin/develop' into feature/ip_gw_connect

.github/workflows/publish-nym-vpn-android.yml

@@ -138,6 +138,7 @@ jobs:
           draft: false
           make_latest: ${{ inputs.release_type == 'release' }}
           prerelease: ${{ inputs.release_type != 'release' }}
+          target_commitish: ${{ github.sha }}
           files: |
             ${{ github.workspace }}/temp/*
 

.github/workflows/publish-nym-vpn-core.yml

@@ -186,7 +186,7 @@ jobs:
           echo 'EOF' >> $GITHUB_ENV
 
       - name: Publish release
-        if: ${{ inputs.publish == 'true' || inputs.publish == true || contains(env.TAG_NAME, 'nightly') }}
+        if: ${{ inputs.publish == 'true' || inputs.publish == true || contains(env.TAG_NAME, 'nightly') || github.event_name == 'push' }}
         run: |
           echo "Setting up the release notes"
           envsubst < "$GITHUB_WORKSPACE/.github/workflows/$NOTES_FILE" > "$RUNNER_TEMP/release-notes.md"

.pkg/linux/install

@@ -38,19 +38,19 @@ BI_MGT="$ITL$B_MGT"
 ####
 
 # AppImage
-app_tag=nym-vpn-app-v1.3.0-nectarine.2
-app_version=1.3.0-nectarine.2
+app_tag=nym-vpn-app-v1.3.0
+app_version=1.3.0
 appimage_url="https://github.com/nymtech/nym-vpn-client/releases/download/$app_tag/NymVPN_${app_version}_x64.AppImage"
 app_deb_url="https://github.com/nymtech/nym-vpn-client/releases/download/$app_tag/nym-vpn-app_${app_version}_amd64.deb"
 desktop_url="https://raw.githubusercontent.com/nymtech/nym-vpn-client/fb526935/nym-vpn-app/.pkg/app.desktop"
 icon_url="https://raw.githubusercontent.com/nymtech/nym-vpn-client/fb526935/nym-vpn-app/.pkg/icon.svg"
 
 # nym-vpnd
-vpnd_tag=nym-vpn-core-v1.3.0-beta.1
+vpnd_tag=nym-vpn-core-v1.3.1
 # ⚠ there are inconsistencies in the package version naming…
-vpnd_version=1.3.0-beta.1
-vpnd_deb_ver=1.3.0~beta.1
-vpnd_deb_ver_url=1.3.0.beta.1
+vpnd_version=1.3.1
+vpnd_deb_ver=$vpnd_version
+vpnd_deb_ver_url=$vpnd_version
 vpnd_raw_url="https://github.com/nymtech/nym-vpn-client/releases/download/$vpnd_tag/nym-vpn-core-v${vpnd_version}_linux_x86_64.tar.gz"
 vpnd_deb_url="https://github.com/nymtech/nym-vpn-client/releases/download/$vpnd_tag/nym-vpnd_${vpnd_deb_ver_url}_amd64.deb"
 unit_url="https://raw.githubusercontent.com/nymtech/nym-vpn-client/fb526935/nym-vpn-core/crates/nym-vpnd/.pkg/aur/nym-vpnd.service"

fastlane/metadata/android/en-US/title.txt

@@ -1 +1 @@
-NymVPN: Best Secure VPN by Nym
+NymVPN: Secure VPN by Nym

nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/common/animations/Pulse.kt

@@ -24,7 +24,7 @@ import androidx.compose.ui.unit.dp
 import net.nymtech.nymvpn.ui.theme.CustomColors
 
 @Composable
-fun Pulse(color: Color = CustomColors.disconnect) {
+fun Pulse(color: Color = CustomColors.pulse) {
 	MultiplePulsarEffect(pulsarColor = color) { modifier ->
 		Canvas(modifier = modifier.size(5.dp), onDraw = {
 			drawCircle(color = color)

nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/common/textbox/CustomTextField.kt

@@ -1,6 +1,7 @@
 package net.nymtech.nymvpn.ui.common.textbox
 
 import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsFocusedAsState
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
@@ -12,6 +13,7 @@ import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.SolidColor
@@ -42,6 +44,8 @@ fun CustomTextField(
 	enabled: Boolean = true,
 ) {
 	val interactionSource = remember { MutableInteractionSource() }
+	val isFocused by interactionSource.collectIsFocusedAsState()
+
 	val space = " "
 	BasicTextField(
 		value = value,
@@ -63,7 +67,7 @@ fun CustomTextField(
 		OutlinedTextFieldDefaults.DecorationBox(
 			value = space + value,
 			innerTextField = {
-				if (value.isEmpty()) {
+				if (value.isEmpty() && !isFocused) {
 					if (placeholder != null) {
 						placeholder()
 					}

nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/screens/main/MainScreen.kt

@@ -428,7 +428,7 @@ fun MainScreen(appViewModel: AppViewModel, appUiState: AppUiState, autoStart: Bo
 									color = MaterialTheme.colorScheme.background,
 								)
 							},
-							color = MaterialTheme.colorScheme.secondary,
+							color = CustomColors.disconnect,
 						)
 					}
 

nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/theme/Color.kt

@@ -54,7 +54,8 @@ object CustomColors {
 	val statusRedLight = Color(0xFFF3CAC8)
 	val statusDefaultDark = Color(0xFF313033).copy(alpha = 0.16f)
 	val statusDefaultLight = Color(0xFF625B71).copy(alpha = 0.16f)
-	val disconnect = Color(0xFF7075FF)
+	val pulse = Color(0xFF7075FF)
+	val disconnect = Color(0xFFE02C4D)
 	val error = Color(0xFFE33B5A)
 	val snackBarBackgroundColor = Color(0xFF484649)
 	val snackbarTextColor = Color(0xFFE7E7E7)