Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ android {
applicationId 'ca.psiphon.conduit'
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 80
versionName "2.1.2"
versionCode 81
versionName "2.1.3"
}
signingConfigs {
if (hasCustomKeystoreProperties) {
Expand Down
6 changes: 3 additions & 3 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"expo": {
"name": "conduit",
"slug": "conduit",
"version": "2.1.2",
"version": "2.1.3",
"orientation": "portrait",
"scheme": "ca.psiphon.conduit",
"userInterfaceStyle": "automatic",
"newArchEnabled": true,
"ios": {
"supportsTablet": true,
"bundleIdentifier": "ca.psiphon.conduit",
"buildNumber": "31",
"buildNumber": "32",
"deploymentTarget": "15.1",
"icon": "./assets/images/conduit-launcher.png",
"infoPlist": {
Expand All @@ -19,7 +19,7 @@
},
"android": {
"package": "ca.psiphon.conduit",
"versionCode": 80,
"versionCode": 81,
"permissions": [
"android.permission.POST_NOTIFICATIONS",
"com.android.vending.BILLING"
Expand Down
5 changes: 5 additions & 0 deletions assets/images/icons/delete-account.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions assets/images/icons/sign-out.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions assets/images/icons/subscription-active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions assets/images/icons/subscription-expired.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions assets/images/icons/subscription-renews.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/icons/subscription.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ios/conduit/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>2.1.2</string>
<string>2.1.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -33,7 +33,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>31</string>
<string>32</string>
<key>ExpoLocalization_supportsRTL</key>
<true/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
1 change: 1 addition & 0 deletions src/app/(app)/_layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export default function AppLayout() {
<Stack.Screen name="hosted-setup" />
<Stack.Screen name="hosted-dashboard" />
<Stack.Screen name="settings" />
<Stack.Screen name="account" />
<Stack.Screen name="sso-callback" />
</Stack>
</View>
Expand Down
62 changes: 62 additions & 0 deletions src/app/(app)/account.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*
* Copyright (c) 2026, Psiphon Inc.
* All rights reserved.
*
* 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 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
import { Canvas, LinearGradient, Rect, vec } from "@shopify/react-native-skia";
import React from "react";
import { ScrollView, View, useWindowDimensions } from "react-native";

import { HostedConduitAccountPage } from "@/src/components/HostedConduitAccountPage";
import { SafeAreaView } from "@/src/components/SafeAreaView";
import { APP_MAX_CONTENT_WIDTH } from "@/src/constants";

export default function AccountScreen() {
const win = useWindowDimensions();

return (
<View style={{ flex: 1 }}>
<Canvas
style={{
position: "absolute",
width: win.width,
height: win.height,
}}
>
<Rect x={0} y={0} width={win.width} height={win.height}>
<LinearGradient
start={vec(0, win.height)}
end={vec(0, 0)}
colors={["#FCDFD7", "#F0E0EB", "#E8DFF2", "#FFFFFF"]}
positions={[0.08, 0.19, 0.33, 0.78]}
/>
</Rect>
</Canvas>
<SafeAreaView includeBottomInset={false}>
<ScrollView
contentContainerStyle={{
flexGrow: 1,
width: "100%",
maxWidth: APP_MAX_CONTENT_WIDTH,
alignSelf: "center",
}}
>
<HostedConduitAccountPage />
</ScrollView>
</SafeAreaView>
</View>
);
}
Loading
Loading