Merge branch 'main' into bugfix/video-audio-map

Author: WaDadidou

.eslintrc.js

@@ -177,5 +177,16 @@ module.exports = {
       },
       files: ["packages/components/navigation/**"],
     },
+    {
+      rules: {
+        "no-restricted-imports": [
+          "error",
+          {
+            patterns: [disallowScriptsImports],
+          },
+        ],
+      },
+      files: ["packages/dapp-root/**", "apps/**"],
+    },
   ],
 };

Root.tsx

@@ -0,0 +1,15 @@
+import { AppConfig } from "@/context/AppConfigProvider";
+import AppRoot from "@/dapp-root/App";
+
+const config: AppConfig = {
+  disableBuyTokensButton: true,
+  disableDAppStore: true,
+  forceNetworkList: ["gno-test5", "gno-portal"],
+  forceDAppsList: ["feed", "organizations"],
+  defaultNetworkId: "gno-test5",
+  homeScreen: "Feed",
+};
+
+export const App: React.FC = () => {
+  return <AppRoot config={config} />;
+};

apps/gno-dapp/App.tsx

@@ -0,0 +1,8 @@
+import { registerRootComponent } from "expo";
+
+import { App } from "./App";
+
+// registerRootComponent calls AppRegistry.registerComponent('main', () => App);
+// It also ensures that whether you load the app in Expo Go or in a native build,
+// the environment is set up appropriately
+registerRootComponent(App);

apps/gno-dapp/index.js

@@ -0,0 +1,9 @@
+[build]
+command = 'sed -i "s/teritori-dapp/gno-dapp/" package.json && npm i -g sharp-cli && npx expo-optimize && npx expo export -p web'
+publish = '/dist'
+[build.environment]
+NODE_OPTIONS = "--max_old_space_size=4096"
+[[redirects]]
+from = "/*"
+to = "/index.html"
+status = 200

apps/gno-dapp/netlify.toml

@@ -0,0 +1,11 @@
+import { AppConfig } from "@/context/AppConfigProvider";
+import AppRoot from "@/dapp-root/App";
+
+const config: AppConfig = {
+  defaultNetworkId: "teritori",
+  homeScreen: "Home",
+};
+
+export const App: React.FC = () => {
+  return <AppRoot config={config} />;
+};

apps/teritori-dapp/App.tsx

@@ -0,0 +1,8 @@
+import { registerRootComponent } from "expo";
+
+import { App } from "./App";
+
+// registerRootComponent calls AppRegistry.registerComponent('main', () => App);
+// It also ensures that whether you load the app in Expo Go or in a native build,
+// the environment is set up appropriately
+registerRootComponent(App);

apps/teritori-dapp/index.js

@@ -1,7 +1,7 @@
-KEY = teritori-test4-seed
+KEY = teritori
 BASE = teritori
-REMOTE = https://rpc.gno.land:443
-CHAIN_ID = portal-loop
+REMOTE = https://rpc.test5.gno.land
+CHAIN_ID = test5
 
 .PHONY: add_social_feeds_realm add_utf16_pkg add_ujson_pkg add_flags_index_pkg add_dao_interfaces_pkg add_social_feed all
 
@@ -21,7 +21,7 @@ add_social_feed:
 		-pkgpath "gno.land/r/${BASE}/social_feeds" \
 		-func="CreateFeed" \
 		-gas-fee="1000000ugnot" \
-		-gas-wanted="3000000" \
+		-gas-wanted="5000000" \
 		-remote="${REMOTE}" \
 		-chainid="${CHAIN_ID}" \
 		-broadcast \

netlify.toml renamed to apps/teritori-dapp/netlify.toml

@@ -103,7 +103,10 @@ func (h *Handler) handleExecuteReactPost(_ *Message, execMsg *wasmtypes.MsgExecu
 	}
 
 	userReactions := make(map[string]interface{})
-	post.UserReactions.Scan(&userReactions)
+	if err := json.Unmarshal(post.UserReactions, &userReactions); err != nil {
+		h.logger.Error("failed to unmarshal UserReactions", zap.String("data", string(post.UserReactions)), zap.Error(err))
+	}
+
 	var users []networks.UserID
 	reactedUsers, found := userReactions[reactPost.Icon]
 	if found {

gno/Makefile

@@ -171,8 +171,13 @@ func (s *FeedService) Posts(ctx context.Context, req *feedpb.PostsRequest) (*fee
 	posts := make([]*feedpb.Post, len(dbPostWithExtras))
 	for idx, dbPost := range dbPostWithExtras {
 		var reactions []*feedpb.Reaction
-		reactionsMap := map[string]interface{}{}
-		dbPost.UserReactions.Scan(&reactionsMap)
+
+		reactionsMap := make(map[string]interface{})
+		if err := json.Unmarshal(dbPost.UserReactions, &reactionsMap); err != nil {
+			s.conf.Logger.Error("failed to unmarshal UserReactions", zap.String("data", string(dbPost.UserReactions)), zap.Error(err))
+			continue
+		}
+
 		for icon, users := range reactionsMap {
 			ownState := false
 			if queryUserID != "" {