Skip to content

Commit f7a5e50

Browse files
committed
Merge branch 'develop' of github.com:tloncorp/landscape-apps into develop
2 parents 45df6b4 + a6ec78c commit f7a5e50

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

apps/tlon-mobile/android/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ android {
8888
targetSdkVersion rootProject.ext.targetSdkVersion
8989
compileSdk rootProject.ext.compileSdkVersion
9090
versionCode 108
91-
versionName "5.3.0"
91+
versionName "5.3.1"
9292

9393
buildConfigField("boolean", "REACT_NATIVE_UNSTABLE_USE_RUNTIME_SCHEDULER_ALWAYS", (findProperty("reactNative.unstable_useRuntimeSchedulerAlways") ?: true).toString())
9494
}

apps/tlon-mobile/ios/Landscape.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1467,7 +1467,7 @@
14671467
"$(inherited)",
14681468
"@executable_path/Frameworks",
14691469
);
1470-
MARKETING_VERSION = 5.3.0;
1470+
MARKETING_VERSION = 5.3.1;
14711471
OTHER_LDFLAGS = (
14721472
"$(inherited)",
14731473
"-ObjC",
@@ -1505,7 +1505,7 @@
15051505
"$(inherited)",
15061506
"@executable_path/Frameworks",
15071507
);
1508-
MARKETING_VERSION = 5.3.0;
1508+
MARKETING_VERSION = 5.3.1;
15091509
OTHER_LDFLAGS = (
15101510
"$(inherited)",
15111511
"-ObjC",
@@ -1729,7 +1729,7 @@
17291729
"$(inherited)",
17301730
"@executable_path/Frameworks",
17311731
);
1732-
MARKETING_VERSION = 5.3.0;
1732+
MARKETING_VERSION = 5.3.1;
17331733
OTHER_LDFLAGS = (
17341734
"$(inherited)",
17351735
"-ObjC",
@@ -1772,7 +1772,7 @@
17721772
"$(inherited)",
17731773
"@executable_path/Frameworks",
17741774
);
1775-
MARKETING_VERSION = 5.3.0;
1775+
MARKETING_VERSION = 5.3.1;
17761776
OTHER_LDFLAGS = (
17771777
"$(inherited)",
17781778
"-ObjC",

packages/shared/src/store/sync.ts

+10
Original file line numberDiff line numberDiff line change
@@ -1175,6 +1175,16 @@ export const handleDiscontinuity = async () => {
11751175
};
11761176

11771177
export const handleChannelStatusChange = async (status: ChannelStatus) => {
1178+
// Since Eyre doesn't send a response body when opening an event
1179+
// source request, the reconnect request won't resolve until we get a new fact
1180+
// or a heartbeat. We call this method to manually trigger a fact -- anything
1181+
// that does so would work.
1182+
//
1183+
// Eyre issue is fixed in this PR, https://github.com/urbit/urbit/pull/7080,
1184+
// we should remove this hack once 410 is rolled out.
1185+
if (status === 'reconnecting') {
1186+
api.checkExistingUserInviteLink();
1187+
}
11781188
updateSession({ channelStatus: status });
11791189
};
11801190

tm-alpha-desk/desk.docket-0

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
info+'Start, host, and cultivate communities. Own your communications, organize your resources, and share documents. Tlon is a decentralized platform that offers a full, communal suite of tools for messaging, writing and sharing media with others.'
33
color+0xde.dede
44
image+'https://bootstrap.urbit.org/tlon.svg?v=1'
5-
glob-http+['https://bootstrap.urbit.org/glob-0v3.912bl.l8gfh.5o5vf.qrnuo.7k7p9.glob' 0v3.912bl.l8gfh.5o5vf.qrnuo.7k7p9]
5+
glob-http+['https://bootstrap.urbit.org/glob-0v5.caei3.ico7k.o61is.b46u1.nnnci.glob' 0v5.caei3.ico7k.o61is.b46u1.nnnci]
66
base+'tm-alpha'
77
version+[1 0 0]
88
website+'https://tlon.io'

0 commit comments

Comments
 (0)