Merge pull request #280 from gobitfly/rm-plankton

Remove plankton
gobitfly · Jun 5, 2024 · df3b67f · df3b67f
2 parents e78def4 + 34adbec
commit df3b67f
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 20 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -8,8 +8,8 @@ android {
         namespace "in.beaconcha.mobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 107
-        versionName "4.5.0"
+        versionCode 111
+        versionName "4.5.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/android/app/src/main/java/in/beaconcha/mobile/widget b/android/app/src/main/java/in/beaconcha/mobile/widget
diff --git a/src/app/pages/subscribe/subscribe.page.scss b/src/app/pages/subscribe/subscribe.page.scss
@@ -74,7 +74,7 @@ ion-label {
 }
 
 .package {
-	width: 25%;
+	width: 33.33%;
 	text-align: center;
 	display: inline-block;
 

diff --git a/src/app/pages/subscribe/subscribe.page.ts b/src/app/pages/subscribe/subscribe.page.ts
@@ -36,7 +36,7 @@ export class SubscribePage implements OnInit {
 		private flavor: FlavorUtils,
 		private api: ApiService
 	) {
-		this.selectedPackage = this.merchant.PACKAGES[2]
+		this.selectedPackage = this.merchant.PACKAGES[1]
 	}
 
 	ngOnInit() {

diff --git a/src/app/utils/MerchantUtils.ts b/src/app/utils/MerchantUtils.ts
@@ -35,6 +35,23 @@ const MAX_PRODUCT = 'whale'
 	providedIn: 'root',
 })
 export class MerchantUtils {
+	DEPRECATED_PACKAGES = [
+		{
+			name: 'Plankton',
+			price: '$1.99',
+			maxValidators: 100,
+			maxTestnetValidators: 100,
+			maxBeaconNodes: 1,
+			deviceMonitoringHours: 30 * 24,
+			deviceMonitorAlerts: true,
+			noAds: true,
+			widgets: false,
+			customTheme: false,
+			supportUs: true,
+			purchaseKey: 'plankton',
+		},
+	]
+
 	PACKAGES: Package[] = [
 		{
 			name: 'Free',
@@ -50,20 +67,6 @@ export class MerchantUtils {
 			supportUs: false,
 			purchaseKey: null,
 		},
-		{
-			name: 'Plankton',
-			price: '$1.99',
-			maxValidators: 100,
-			maxTestnetValidators: 100,
-			maxBeaconNodes: 1,
-			deviceMonitoringHours: 30 * 24,
-			deviceMonitorAlerts: true,
-			noAds: true,
-			widgets: false,
-			customTheme: false,
-			supportUs: true,
-			purchaseKey: 'plankton',
-		},
 		{
 			name: 'Goldfish',
 			price: '$4.99',
@@ -279,7 +282,7 @@ export class MerchantUtils {
 			valid: product.valid,
 			transaction: {
 				id: product.id,
-				receipt: isIOS ? product.transaction.appStoreReceipt : product.transaction.purchaseToken,
+				receipt: isIOS ? product.transaction.id : product.transaction.purchaseToken,
 				type: product.transaction.type,
 			},
 		}
@@ -367,6 +370,13 @@ export class MerchantUtils {
 				return current
 			}
 		}
+		for (let i = 0; i < this.DEPRECATED_PACKAGES.length; i++) {
+			const current = this.DEPRECATED_PACKAGES[i]
+			if (current.purchaseKey == name) {
+				return current
+			}
+		}
+
 		return null
 	}