fix: compute currentPage store property reference correctly

src/model/element-action.ts

@@ -201,9 +201,10 @@ export class ElementAction {
 
 	public getStoreProperty(): UserStoreProperty | undefined {
 		const storeAction = this.getStoreAction();
+		const actionPropId = storeAction && storeAction.getUserStorePropertyId();
 
-		if (storeAction && storeAction.getType() === Types.UserStoreActionType.SetPage) {
-			return this.userStore.getPageProperty();
+		if (actionPropId) {
+			return this.userStore.getPropertyById(actionPropId);
 		}
 
 		if (!this.storePropertyId) {

src/model/user-store-action/user-store-action.ts

@@ -92,6 +92,11 @@ export class UserStoreAction {
 		this.userStore = userStore;
 	}
 
+	@Mobx.action
+	public setUserStoreProperty(userStoreProperty: UserStoreProperty): void {
+		this.userStorePropertyId = userStoreProperty.getId();
+	}
+
 	public toJSON(): Types.SerializedUserStoreAction {
 		return {
 			model: Types.ModelName.UserStoreAction,

src/model/user-store-property/user-store-property.ts

@@ -113,6 +113,11 @@ export class UserStoreProperty {
 		this.concreteValue = value;
 	}
 
+	@Mobx.action
+	public setValueType(valueType: Types.UserStorePropertyValueType): void {
+		this.valueType = valueType;
+	}
+
 	public setProject(project: Project): void {
 		this.project = project;
 	}

src/model/user-store.ts

@@ -107,6 +107,8 @@ export class UserStore {
 			});
 		}
 
+		this.currentPageProperty.setValueType(Types.UserStorePropertyValueType.Page);
+
 		(init.properties || []).forEach(prop => this.addProperty(prop));
 
 		const actions = init.actions || [];
@@ -146,6 +148,12 @@ export class UserStore {
 
 		actions.forEach(action => this.addAction(action));
 
+		const switchPageAction = [...this.actions.values()].find(a => a.getName() === 'Switch Page');
+
+		if (switchPageAction) {
+			switchPageAction.setUserStoreProperty(this.currentPageProperty);
+		}
+
 		(init.references || []).forEach(reference => this.addReference(reference));
 
 		this.enhancer = init.enhancer;