update

ios/AppDelegate.mm

@@ -250,7 +250,7 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
   //  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
-#if DEBUG
+#if DEBUGaaa
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
 #else
   return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];

ios/hola.xcodeproj/project.pbxproj

@@ -580,7 +580,7 @@
 				CODE_SIGN_ENTITLEMENTS = hola/hola.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 134;
+				CURRENT_PROJECT_VERSION = 135;
 				DEVELOPMENT_TEAM = GPMXAZ9G5N;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = hola/Info.plist;
@@ -613,7 +613,7 @@
 				CODE_SIGN_ENTITLEMENTS = hola/hola.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 134;
+				CURRENT_PROJECT_VERSION = 135;
 				DEVELOPMENT_TEAM = GPMXAZ9G5N;
 				INFOPLIST_FILE = hola/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

ios/hola/Info.plist

@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>134</string>
+	<string>135</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

src/features/daynight/DayNightSwiper.tsx

@@ -36,7 +36,7 @@ export default function DayNightSwiper(props: { count: number, schedule: any, ho
         getLatestLocation()
     }
 
-    global.updateSwiper = ()=>{
+    global.updateSwiper = () => {
         getLatestLocation()
     }
 
@@ -102,21 +102,21 @@ export default function DayNightSwiper(props: { count: number, schedule: any, ho
                     }
                 }
 
-                if (sunrise && item.sunrise_ts) {
+                if (sunrise && item.sunrise_ts && item.push) {
                     list.push({
                         channel_id: 'REMINDER_SUN',
                         category_id: 'REMINDER_SUN_RISE',
-                        title: `Sunrise at ${dayjs(item.sunrise_ts).format('HH:mm')}`,
-                        body: `Daylight lasts ${dayDuration}.`,
+                        title: item.push.sunrise_title,
+                        body: item.push.sunrise_body,
                         timestamp: item.sunrise_ts
                     })
                 }
-                if (sunset && item.sunset_ts) {
+                if (sunset && item.sunset_ts && item.push) {
                     list.push({
                         channel_id: 'REMINDER_SUN',
                         category_id: 'REMINDER_SUN_SET',
-                        title: `Sunset at ${dayjs(item.sunset_ts).format('HH:mm')}`,
-                        body: `The night lasts ${nightDuration}.`,
+                        title: item.push.sunset_title,
+                        body: item.push.sunset_body,
                         timestamp: item.sunset_ts
                     })
                 }
@@ -124,8 +124,8 @@ export default function DayNightSwiper(props: { count: number, schedule: any, ho
                     list.push({
                         channel_id: 'REMINDER_SUN',
                         category_id: 'REMINDER_SUN_SOLAR_NOON',
-                        title: `Solar Noon at ${dayjs(item.solar_noon_ts).format('HH:mm')}`,
-                        body: 'The Sun is currently at its highest point in the sky for the day.',
+                        title: item.push.solar_noon_title,
+                        body: item.push.solar_noon_body,
                         timestamp: item.solar_noon_ts
                     })
                 }
@@ -133,11 +133,11 @@ export default function DayNightSwiper(props: { count: number, schedule: any, ho
         }
         if (process.env.TARO_ENV == 'rn') {
             var Jto = require('react-native').NativeModules.NativeBridge;
-            if (list.length==0){
+            if (list.length == 0) {
                 return
             }
             if (kIsIOS) {
-                
+
                 Jto.addSunPush(list)
             }
             else {

src/pages/clock/ClockMain.tsx

@@ -608,10 +608,10 @@ export default function Page() {
         const start = new Date().getTime()
         var timer = setInterval(() => {
             userAccess().then(res => {
-                if ((res as any).member.subscription_status == 'ACTIVE_RENEWING' || (new Date().getTime() - start) >= 3 * 60 * 1000) {
+                if ((res as any).member.subscription_status == 'ACTIVE_RENEWING' ||
+                    (new Date().getTime() - start) >= 3 * 60 * 1000) {
                     clearInterval(timer)
                 }
-                console.log('9527')
                 dispatch(setAccessData(res))
                 setAccess(res)
             })