diff --git a/package-lock.json b/package-lock.json
index 7dde6594..b289fb43 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,7 @@
 				"@lexical/utils": "^0.34.0",
 				"@monaco-editor/react": "^4.7.0",
 				"@permaweb/aoconnect": "0.0.93",
-				"@permaweb/libs": "0.0.86",
+				"@permaweb/libs": "file:permaweb-libs-0.0.87.tgz",
 				"@stripe/react-stripe-js": "^3.5.1",
 				"@stripe/stripe-js": "^6.1.0",
 				"@wanderapp/connect": "^0.1.13",
@@ -132,9 +132,9 @@
 			}
 		},
 		"node_modules/@ardrive/turbo-sdk": {
-			"version": "1.40.2",
-			"resolved": "https://registry.npmjs.org/@ardrive/turbo-sdk/-/turbo-sdk-1.40.2.tgz",
-			"integrity": "sha512-f+6VCQSdPRWthLqzA6SY7mB1bMuCvxS58Sum2vKwto9t8NMM779y24FHkScfdlggG3u/bH6Re9pdTN7uKiH6Zg==",
+			"version": "1.41.0",
+			"resolved": "https://registry.npmjs.org/@ardrive/turbo-sdk/-/turbo-sdk-1.41.0.tgz",
+			"integrity": "sha512-GVaOPAKKUZQo7cB7Teinp8VpwdzlvoyUtvjkS0A6Ru/Iu5tCGcuGiY7weI9vbT1tUKJqPnJVqiH1fU+v0Ha2Ww==",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"@cosmjs/proto-signing": "^0.33.1",
@@ -2212,9 +2212,9 @@
 			}
 		},
 		"node_modules/@dha-team/arbundles/node_modules/elliptic/node_modules/bn.js": {
-			"version": "4.12.2",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
-			"integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+			"version": "4.12.3",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz",
+			"integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==",
 			"license": "MIT"
 		},
 		"node_modules/@dnd-kit/accessibility": {
@@ -5419,9 +5419,9 @@
 			}
 		},
 		"node_modules/@oclif/core": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/@oclif/core/-/core-4.8.0.tgz",
-			"integrity": "sha512-jteNUQKgJHLHFbbz806aGZqf+RJJ7t4gwF4MYa8fCwCxQ8/klJNWc0MvaJiBebk7Mc+J39mdlsB4XraaCKznFw==",
+			"version": "4.8.1",
+			"resolved": "https://registry.npmjs.org/@oclif/core/-/core-4.8.1.tgz",
+			"integrity": "sha512-07mq0vKCWNsB85ZHeBMlTAiO0KLFqHyAeRK3bD2K8CI1tX3tiwkWw1lZQZkiw8MUBrhxdROhMkYMY4Q0l7JHqA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5435,7 +5435,7 @@
 				"indent-string": "^4.0.0",
 				"is-wsl": "^2.2.0",
 				"lilconfig": "^3.1.3",
-				"minimatch": "^9.0.5",
+				"minimatch": "^10.2.1",
 				"semver": "^7.7.3",
 				"string-width": "^4.2.3",
 				"supports-color": "^8",
@@ -5448,27 +5448,40 @@
 				"node": ">=18.0.0"
 			}
 		},
+		"node_modules/@oclif/core/node_modules/balanced-match": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+			"integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "18 || 20 || >=22"
+			}
+		},
 		"node_modules/@oclif/core/node_modules/brace-expansion": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+			"version": "5.0.3",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
+			"integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"balanced-match": "^1.0.0"
+				"balanced-match": "^4.0.2"
+			},
+			"engines": {
+				"node": "18 || 20 || >=22"
 			}
 		},
 		"node_modules/@oclif/core/node_modules/minimatch": {
-			"version": "9.0.5",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+			"version": "10.2.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz",
+			"integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==",
 			"dev": true,
-			"license": "ISC",
+			"license": "BlueOak-1.0.0",
 			"dependencies": {
-				"brace-expansion": "^2.0.1"
+				"brace-expansion": "^5.0.2"
 			},
 			"engines": {
-				"node": ">=16 || 14 >=14.17"
+				"node": "18 || 20 || >=22"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/isaacs"
@@ -5553,9 +5566,9 @@
 			}
 		},
 		"node_modules/@permaweb/libs": {
-			"version": "0.0.86",
-			"resolved": "https://registry.npmjs.org/@permaweb/libs/-/libs-0.0.86.tgz",
-			"integrity": "sha512-UMyBZQ3ylvnEz+rhXeFw0fqfVvEJHDxKTrWmrZ+wNwAgFY21YvyJDlXGHTjAPx8k41PkYkl8Od9IVvoHxnA8Og==",
+			"version": "0.0.87",
+			"resolved": "file:permaweb-libs-0.0.87.tgz",
+			"integrity": "sha512-3fTHTSe1V4XJQ+SNp83J4LfhIt19a6OZaxZaTk9ehrD5n63qiw2pMAlvvfLt2Xz0oqIUHYTf4l74G++bG6vGJA==",
 			"license": "ISC",
 			"dependencies": {
 				"@dha-team/arbundles": "^1.0.3"
@@ -7142,9 +7155,9 @@
 			}
 		},
 		"node_modules/@rollup/rollup-android-arm-eabi": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.1.tgz",
-			"integrity": "sha512-A6ehUVSiSaaliTxai040ZpZ2zTevHYbvu/lDoeAteHI8QnaosIzm4qwtezfRg1jOYaUmnzLX1AOD6Z+UJjtifg==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.59.0.tgz",
+			"integrity": "sha512-upnNBkA6ZH2VKGcBj9Fyl9IGNPULcjXRlg0LLeaioQWueH30p6IXtJEbKAgvyv+mJaMxSm1l6xwDXYjpEMiLMg==",
 			"cpu": [
 				"arm"
 			],
@@ -7156,9 +7169,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-android-arm64": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.57.1.tgz",
-			"integrity": "sha512-dQaAddCY9YgkFHZcFNS/606Exo8vcLHwArFZ7vxXq4rigo2bb494/xKMMwRRQW6ug7Js6yXmBZhSBRuBvCCQ3w==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.59.0.tgz",
+			"integrity": "sha512-hZ+Zxj3SySm4A/DylsDKZAeVg0mvi++0PYVceVyX7hemkw7OreKdCvW2oQ3T1FMZvCaQXqOTHb8qmBShoqk69Q==",
 			"cpu": [
 				"arm64"
 			],
@@ -7170,9 +7183,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-darwin-arm64": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.57.1.tgz",
-			"integrity": "sha512-crNPrwJOrRxagUYeMn/DZwqN88SDmwaJ8Cvi/TN1HnWBU7GwknckyosC2gd0IqYRsHDEnXf328o9/HC6OkPgOg==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.59.0.tgz",
+			"integrity": "sha512-W2Psnbh1J8ZJw0xKAd8zdNgF9HRLkdWwwdWqubSVk0pUuQkoHnv7rx4GiF9rT4t5DIZGAsConRE3AxCdJ4m8rg==",
 			"cpu": [
 				"arm64"
 			],
@@ -7184,9 +7197,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-darwin-x64": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.57.1.tgz",
-			"integrity": "sha512-Ji8g8ChVbKrhFtig5QBV7iMaJrGtpHelkB3lsaKzadFBe58gmjfGXAOfI5FV0lYMH8wiqsxKQ1C9B0YTRXVy4w==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.59.0.tgz",
+			"integrity": "sha512-ZW2KkwlS4lwTv7ZVsYDiARfFCnSGhzYPdiOU4IM2fDbL+QGlyAbjgSFuqNRbSthybLbIJ915UtZBtmuLrQAT/w==",
 			"cpu": [
 				"x64"
 			],
@@ -7198,9 +7211,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-freebsd-arm64": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.57.1.tgz",
-			"integrity": "sha512-R+/WwhsjmwodAcz65guCGFRkMb4gKWTcIeLy60JJQbXrJ97BOXHxnkPFrP+YwFlaS0m+uWJTstrUA9o+UchFug==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.59.0.tgz",
+			"integrity": "sha512-EsKaJ5ytAu9jI3lonzn3BgG8iRBjV4LxZexygcQbpiU0wU0ATxhNVEpXKfUa0pS05gTcSDMKpn3Sx+QB9RlTTA==",
 			"cpu": [
 				"arm64"
 			],
@@ -7212,9 +7225,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-freebsd-x64": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.57.1.tgz",
-			"integrity": "sha512-IEQTCHeiTOnAUC3IDQdzRAGj3jOAYNr9kBguI7MQAAZK3caezRrg0GxAb6Hchg4lxdZEI5Oq3iov/w/hnFWY9Q==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.59.0.tgz",
+			"integrity": "sha512-d3DuZi2KzTMjImrxoHIAODUZYoUUMsuUiY4SRRcJy6NJoZ6iIqWnJu9IScV9jXysyGMVuW+KNzZvBLOcpdl3Vg==",
 			"cpu": [
 				"x64"
 			],
@@ -7226,9 +7239,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.57.1.tgz",
-			"integrity": "sha512-F8sWbhZ7tyuEfsmOxwc2giKDQzN3+kuBLPwwZGyVkLlKGdV1nvnNwYD0fKQ8+XS6hp9nY7B+ZeK01EBUE7aHaw==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.59.0.tgz",
+			"integrity": "sha512-t4ONHboXi/3E0rT6OZl1pKbl2Vgxf9vJfWgmUoCEVQVxhW6Cw/c8I6hbbu7DAvgp82RKiH7TpLwxnJeKv2pbsw==",
 			"cpu": [
 				"arm"
 			],
@@ -7240,9 +7253,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-arm-musleabihf": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.57.1.tgz",
-			"integrity": "sha512-rGfNUfn0GIeXtBP1wL5MnzSj98+PZe/AXaGBCRmT0ts80lU5CATYGxXukeTX39XBKsxzFpEeK+Mrp9faXOlmrw==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.59.0.tgz",
+			"integrity": "sha512-CikFT7aYPA2ufMD086cVORBYGHffBo4K8MQ4uPS/ZnY54GKj36i196u8U+aDVT2LX4eSMbyHtyOh7D7Zvk2VvA==",
 			"cpu": [
 				"arm"
 			],
@@ -7254,9 +7267,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-arm64-gnu": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.57.1.tgz",
-			"integrity": "sha512-MMtej3YHWeg/0klK2Qodf3yrNzz6CGjo2UntLvk2RSPlhzgLvYEB3frRvbEF2wRKh1Z2fDIg9KRPe1fawv7C+g==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.59.0.tgz",
+			"integrity": "sha512-jYgUGk5aLd1nUb1CtQ8E+t5JhLc9x5WdBKew9ZgAXg7DBk0ZHErLHdXM24rfX+bKrFe+Xp5YuJo54I5HFjGDAA==",
 			"cpu": [
 				"arm64"
 			],
@@ -7268,9 +7281,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-arm64-musl": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.57.1.tgz",
-			"integrity": "sha512-1a/qhaaOXhqXGpMFMET9VqwZakkljWHLmZOX48R0I/YLbhdxr1m4gtG1Hq7++VhVUmf+L3sTAf9op4JlhQ5u1Q==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.59.0.tgz",
+			"integrity": "sha512-peZRVEdnFWZ5Bh2KeumKG9ty7aCXzzEsHShOZEFiCQlDEepP1dpUl/SrUNXNg13UmZl+gzVDPsiCwnV1uI0RUA==",
 			"cpu": [
 				"arm64"
 			],
@@ -7282,9 +7295,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-loong64-gnu": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.57.1.tgz",
-			"integrity": "sha512-QWO6RQTZ/cqYtJMtxhkRkidoNGXc7ERPbZN7dVW5SdURuLeVU7lwKMpo18XdcmpWYd0qsP1bwKPf7DNSUinhvA==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.59.0.tgz",
+			"integrity": "sha512-gbUSW/97f7+r4gHy3Jlup8zDG190AuodsWnNiXErp9mT90iCy9NKKU0Xwx5k8VlRAIV2uU9CsMnEFg/xXaOfXg==",
 			"cpu": [
 				"loong64"
 			],
@@ -7296,9 +7309,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-loong64-musl": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.57.1.tgz",
-			"integrity": "sha512-xpObYIf+8gprgWaPP32xiN5RVTi/s5FCR+XMXSKmhfoJjrpRAjCuuqQXyxUa/eJTdAE6eJ+KDKaoEqjZQxh3Gw==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.59.0.tgz",
+			"integrity": "sha512-yTRONe79E+o0FWFijasoTjtzG9EBedFXJMl888NBEDCDV9I2wGbFFfJQQe63OijbFCUZqxpHz1GzpbtSFikJ4Q==",
 			"cpu": [
 				"loong64"
 			],
@@ -7310,9 +7323,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-ppc64-gnu": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.57.1.tgz",
-			"integrity": "sha512-4BrCgrpZo4hvzMDKRqEaW1zeecScDCR+2nZ86ATLhAoJ5FQ+lbHVD3ttKe74/c7tNT9c6F2viwB3ufwp01Oh2w==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.59.0.tgz",
+			"integrity": "sha512-sw1o3tfyk12k3OEpRddF68a1unZ5VCN7zoTNtSn2KndUE+ea3m3ROOKRCZxEpmT9nsGnogpFP9x6mnLTCaoLkA==",
 			"cpu": [
 				"ppc64"
 			],
@@ -7324,9 +7337,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-ppc64-musl": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.57.1.tgz",
-			"integrity": "sha512-NOlUuzesGauESAyEYFSe3QTUguL+lvrN1HtwEEsU2rOwdUDeTMJdO5dUYl/2hKf9jWydJrO9OL/XSSf65R5+Xw==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.59.0.tgz",
+			"integrity": "sha512-+2kLtQ4xT3AiIxkzFVFXfsmlZiG5FXYW7ZyIIvGA7Bdeuh9Z0aN4hVyXS/G1E9bTP/vqszNIN/pUKCk/BTHsKA==",
 			"cpu": [
 				"ppc64"
 			],
@@ -7338,9 +7351,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-riscv64-gnu": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.57.1.tgz",
-			"integrity": "sha512-ptA88htVp0AwUUqhVghwDIKlvJMD/fmL/wrQj99PRHFRAG6Z5nbWoWG4o81Nt9FT+IuqUQi+L31ZKAFeJ5Is+A==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.59.0.tgz",
+			"integrity": "sha512-NDYMpsXYJJaj+I7UdwIuHHNxXZ/b/N2hR15NyH3m2qAtb/hHPA4g4SuuvrdxetTdndfj9b1WOmy73kcPRoERUg==",
 			"cpu": [
 				"riscv64"
 			],
@@ -7352,9 +7365,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-riscv64-musl": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.57.1.tgz",
-			"integrity": "sha512-S51t7aMMTNdmAMPpBg7OOsTdn4tySRQvklmL3RpDRyknk87+Sp3xaumlatU+ppQ+5raY7sSTcC2beGgvhENfuw==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.59.0.tgz",
+			"integrity": "sha512-nLckB8WOqHIf1bhymk+oHxvM9D3tyPndZH8i8+35p/1YiVoVswPid2yLzgX7ZJP0KQvnkhM4H6QZ5m0LzbyIAg==",
 			"cpu": [
 				"riscv64"
 			],
@@ -7366,9 +7379,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-s390x-gnu": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.57.1.tgz",
-			"integrity": "sha512-Bl00OFnVFkL82FHbEqy3k5CUCKH6OEJL54KCyx2oqsmZnFTR8IoNqBF+mjQVcRCT5sB6yOvK8A37LNm/kPJiZg==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.59.0.tgz",
+			"integrity": "sha512-oF87Ie3uAIvORFBpwnCvUzdeYUqi2wY6jRFWJAy1qus/udHFYIkplYRW+wo+GRUP4sKzYdmE1Y3+rY5Gc4ZO+w==",
 			"cpu": [
 				"s390x"
 			],
@@ -7380,9 +7393,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-x64-gnu": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.57.1.tgz",
-			"integrity": "sha512-ABca4ceT4N+Tv/GtotnWAeXZUZuM/9AQyCyKYyKnpk4yoA7QIAuBt6Hkgpw8kActYlew2mvckXkvx0FfoInnLg==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.59.0.tgz",
+			"integrity": "sha512-3AHmtQq/ppNuUspKAlvA8HtLybkDflkMuLK4DPo77DfthRb71V84/c4MlWJXixZz4uruIH4uaa07IqoAkG64fg==",
 			"cpu": [
 				"x64"
 			],
@@ -7394,9 +7407,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-x64-musl": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.57.1.tgz",
-			"integrity": "sha512-HFps0JeGtuOR2convgRRkHCekD7j+gdAuXM+/i6kGzQtFhlCtQkpwtNzkNj6QhCDp7DRJ7+qC/1Vg2jt5iSOFw==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.59.0.tgz",
+			"integrity": "sha512-2UdiwS/9cTAx7qIUZB/fWtToJwvt0Vbo0zmnYt7ED35KPg13Q0ym1g442THLC7VyI6JfYTP4PiSOWyoMdV2/xg==",
 			"cpu": [
 				"x64"
 			],
@@ -7408,9 +7421,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-openbsd-x64": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.57.1.tgz",
-			"integrity": "sha512-H+hXEv9gdVQuDTgnqD+SQffoWoc0Of59AStSzTEj/feWTBAnSfSD3+Dql1ZruJQxmykT/JVY0dE8Ka7z0DH1hw==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.59.0.tgz",
+			"integrity": "sha512-M3bLRAVk6GOwFlPTIxVBSYKUaqfLrn8l0psKinkCFxl4lQvOSz8ZrKDz2gxcBwHFpci0B6rttydI4IpS4IS/jQ==",
 			"cpu": [
 				"x64"
 			],
@@ -7422,9 +7435,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-openharmony-arm64": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.57.1.tgz",
-			"integrity": "sha512-4wYoDpNg6o/oPximyc/NG+mYUejZrCU2q+2w6YZqrAs2UcNUChIZXjtafAiiZSUc7On8v5NyNj34Kzj/Ltk6dQ==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.59.0.tgz",
+			"integrity": "sha512-tt9KBJqaqp5i5HUZzoafHZX8b5Q2Fe7UjYERADll83O4fGqJ49O1FsL6LpdzVFQcpwvnyd0i+K/VSwu/o/nWlA==",
 			"cpu": [
 				"arm64"
 			],
@@ -7436,9 +7449,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-win32-arm64-msvc": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.57.1.tgz",
-			"integrity": "sha512-O54mtsV/6LW3P8qdTcamQmuC990HDfR71lo44oZMZlXU4tzLrbvTii87Ni9opq60ds0YzuAlEr/GNwuNluZyMQ==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.59.0.tgz",
+			"integrity": "sha512-V5B6mG7OrGTwnxaNUzZTDTjDS7F75PO1ae6MJYdiMu60sq0CqN5CVeVsbhPxalupvTX8gXVSU9gq+Rx1/hvu6A==",
 			"cpu": [
 				"arm64"
 			],
@@ -7450,9 +7463,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-win32-ia32-msvc": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.57.1.tgz",
-			"integrity": "sha512-P3dLS+IerxCT/7D2q2FYcRdWRl22dNbrbBEtxdWhXrfIMPP9lQhb5h4Du04mdl5Woq05jVCDPCMF7Ub0NAjIew==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.59.0.tgz",
+			"integrity": "sha512-UKFMHPuM9R0iBegwzKF4y0C4J9u8C6MEJgFuXTBerMk7EJ92GFVFYBfOZaSGLu6COf7FxpQNqhNS4c4icUPqxA==",
 			"cpu": [
 				"ia32"
 			],
@@ -7464,9 +7477,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-win32-x64-gnu": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.57.1.tgz",
-			"integrity": "sha512-VMBH2eOOaKGtIJYleXsi2B8CPVADrh+TyNxJ4mWPnKfLB/DBUmzW+5m1xUrcwWoMfSLagIRpjUFeW5CO5hyciQ==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.59.0.tgz",
+			"integrity": "sha512-laBkYlSS1n2L8fSo1thDNGrCTQMmxjYY5G0WFWjFFYZkKPjsMBsgJfGf4TLxXrF6RyhI60L8TMOjBMvXiTcxeA==",
 			"cpu": [
 				"x64"
 			],
@@ -7478,9 +7491,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-win32-x64-msvc": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.57.1.tgz",
-			"integrity": "sha512-mxRFDdHIWRxg3UfIIAwCm6NzvxG0jDX/wBN6KsQFTvKFqqg9vTrWUE68qEjHt19A5wwx5X5aUi2zuZT7YR0jrA==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.59.0.tgz",
+			"integrity": "sha512-2HRCml6OztYXyJXAvdDXPKcawukWY2GpR5/nxKp4iBgiO3wcoEGkAaqctIbZcNB6KlUQBIqt8VYkNSj2397EfA==",
 			"cpu": [
 				"x64"
 			],
@@ -10033,9 +10046,9 @@
 			}
 		},
 		"node_modules/@swc/helpers": {
-			"version": "0.5.18",
-			"resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.18.tgz",
-			"integrity": "sha512-TXTnIcNJQEKwThMMqBXsZ4VGAza6bvN4pa41Rkqoio6QBKMvo+5lexeTMScGCIxtzgQJzElcvIltani+adC5PQ==",
+			"version": "0.5.19",
+			"resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.19.tgz",
+			"integrity": "sha512-QamiFeIK3txNjgUTNppE6MiG3p7TdninpZu0E0PbqVh1a9FNLT2FRhisaa4NcaX52XVhA5l7Pk58Ft7Sqi/2sA==",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"tslib": "^2.8.0"
@@ -10193,9 +10206,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@types/lodash": {
-			"version": "4.17.23",
-			"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.23.tgz",
-			"integrity": "sha512-RDvF6wTulMPjrNdCoYRC8gNR880JNGT8uB+REUpC2Ns4pRqQJhGz90wh7rgdXDPpCczF3VGktDuFGVnz8zP7HA==",
+			"version": "4.17.24",
+			"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.24.tgz",
+			"integrity": "sha512-gIW7lQLZbue7lRSWEFql49QJJWThrTFFeIMJdp3eH4tKoxm1OvEPg02rm4wCCSHS0cL3/Fizimb35b7k8atwsQ==",
 			"license": "MIT"
 		},
 		"node_modules/@types/mdast": {
@@ -12038,9 +12051,9 @@
 			}
 		},
 		"node_modules/acorn": {
-			"version": "8.15.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-			"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+			"version": "8.16.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+			"integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -12079,9 +12092,9 @@
 			}
 		},
 		"node_modules/ajv": {
-			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"version": "6.14.0",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
+			"integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -12399,9 +12412,9 @@
 			}
 		},
 		"node_modules/asn1.js/node_modules/bn.js": {
-			"version": "4.12.2",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
-			"integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+			"version": "4.12.3",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz",
+			"integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==",
 			"license": "MIT"
 		},
 		"node_modules/assert": {
@@ -12637,12 +12650,15 @@
 			}
 		},
 		"node_modules/baseline-browser-mapping": {
-			"version": "2.9.19",
-			"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.19.tgz",
-			"integrity": "sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg==",
+			"version": "2.10.0",
+			"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.0.tgz",
+			"integrity": "sha512-lIyg0szRfYbiy67j9KN8IyeD7q7hcmqnJ1ddWmNt19ItGpNN64mnllmxUNFIOdOm6by97jlL6wfpTTJrmnjWAA==",
 			"license": "Apache-2.0",
 			"bin": {
-				"baseline-browser-mapping": "dist/cli.js"
+				"baseline-browser-mapping": "dist/cli.cjs"
+			},
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/bech32": {
@@ -12674,9 +12690,9 @@
 			}
 		},
 		"node_modules/bn.js": {
-			"version": "5.2.2",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.2.tgz",
-			"integrity": "sha512-v2YAxEmKaBLahNwE1mjp4WON6huMNeuDvagFZW+ASCuA/ku0bXR9hSMw0XpiqMoA3+rmnyck/tPRSFQkoC9Cuw==",
+			"version": "5.2.3",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.3.tgz",
+			"integrity": "sha512-EAcmnPkxpntVL+DS7bO1zhcZNvCkxqtkd0ZY53h06GNQ3DEkkGZ/gKgmDv6DdZQGj9BgfSPKtJJ7Dp1GPP8f7w==",
 			"license": "MIT"
 		},
 		"node_modules/borsh": {
@@ -13211,9 +13227,9 @@
 			}
 		},
 		"node_modules/caniuse-lite": {
-			"version": "1.0.30001770",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001770.tgz",
-			"integrity": "sha512-x/2CLQ1jHENRbHg5PSId2sXq1CIO1CISvwWAj027ltMVG2UNgW+w9oH2+HzgEIRFembL8bUlXtfbBHR1fCg2xw==",
+			"version": "1.0.30001774",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001774.tgz",
+			"integrity": "sha512-DDdwPGz99nmIEv216hKSgLD+D4ikHQHjBC/seF98N9CPqRX4M5mSxT9eTV6oyisnJcuzxtZy4n17yKKQYmYQOA==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -13690,9 +13706,9 @@
 			}
 		},
 		"node_modules/create-ecdh/node_modules/bn.js": {
-			"version": "4.12.2",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
-			"integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+			"version": "4.12.3",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz",
+			"integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -14130,9 +14146,9 @@
 			}
 		},
 		"node_modules/diffie-hellman/node_modules/bn.js": {
-			"version": "4.12.2",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
-			"integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+			"version": "4.12.3",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz",
+			"integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -14317,9 +14333,9 @@
 			}
 		},
 		"node_modules/electron-to-chromium": {
-			"version": "1.5.286",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.286.tgz",
-			"integrity": "sha512-9tfDXhJ4RKFNerfjdCcZfufu49vg620741MNs26a9+bhLThdB+plgMeou98CAaHu/WATj2iHOOHTp1hWtABj2A==",
+			"version": "1.5.302",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.302.tgz",
+			"integrity": "sha512-sM6HAN2LyK82IyPBpznDRqlTQAtuSaO+ShzFiWTvoMJLHyZ+Y39r8VMfHzwbU8MVBzQ4Wdn85+wlZl2TLGIlwg==",
 			"license": "ISC"
 		},
 		"node_modules/elliptic": {
@@ -14338,9 +14354,9 @@
 			}
 		},
 		"node_modules/elliptic/node_modules/bn.js": {
-			"version": "4.12.2",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
-			"integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+			"version": "4.12.3",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz",
+			"integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==",
 			"license": "MIT"
 		},
 		"node_modules/emoji-regex": {
@@ -15465,36 +15481,55 @@
 			}
 		},
 		"node_modules/filelist": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-			"integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.5.tgz",
+			"integrity": "sha512-ct/ckWBV/9Dg3MlvCXsLcSUyoWwv9mCKqlhLNB2DAuXR/NZolSXlQqP5dyy6guWlPXBhodZyZ5lGPQcbQDxrEQ==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
-				"minimatch": "^5.0.1"
+				"minimatch": "^10.2.1"
+			},
+			"engines": {
+				"node": "20 || >=22"
+			}
+		},
+		"node_modules/filelist/node_modules/balanced-match": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+			"integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "18 || 20 || >=22"
 			}
 		},
 		"node_modules/filelist/node_modules/brace-expansion": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+			"version": "5.0.3",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
+			"integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"balanced-match": "^1.0.0"
+				"balanced-match": "^4.0.2"
+			},
+			"engines": {
+				"node": "18 || 20 || >=22"
 			}
 		},
 		"node_modules/filelist/node_modules/minimatch": {
-			"version": "5.1.6",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-			"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+			"version": "10.2.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz",
+			"integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==",
 			"dev": true,
-			"license": "ISC",
+			"license": "BlueOak-1.0.0",
 			"dependencies": {
-				"brace-expansion": "^2.0.1"
+				"brace-expansion": "^5.0.2"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": "18 || 20 || >=22"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
 		"node_modules/fill-range": {
@@ -16116,9 +16151,9 @@
 			"license": "MIT"
 		},
 		"node_modules/hono": {
-			"version": "4.11.10",
-			"resolved": "https://registry.npmjs.org/hono/-/hono-4.11.10.tgz",
-			"integrity": "sha512-kyWP5PAiMooEvGrA9jcD3IXF7ATu8+o7B3KCbPXid5se52NPqnOpM/r9qeW2heMnOekF4kqR1fXJqCYeCLKrZg==",
+			"version": "4.12.1",
+			"resolved": "https://registry.npmjs.org/hono/-/hono-4.12.1.tgz",
+			"integrity": "sha512-hi9afu8g0lfJVLolxElAZGANCTTl6bewIdsRNhaywfP9K8BPf++F2z6OLrYGIinUwpRKzbZHMhPwvc0ZEpAwGw==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=16.9.0"
@@ -18196,9 +18231,9 @@
 			}
 		},
 		"node_modules/miller-rabin/node_modules/bn.js": {
-			"version": "4.12.2",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
-			"integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+			"version": "4.12.3",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz",
+			"integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -18262,9 +18297,9 @@
 			"license": "MIT"
 		},
 		"node_modules/minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.3.tgz",
+			"integrity": "sha512-M2GCs7Vk83NxkUyQV1bkABc4yxgz9kILhHImZiBPAZ9ybuvCb0/H7lEl5XvIg3g+9d4eNotkZA5IWwYl0tibaA==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -18285,11 +18320,11 @@
 			}
 		},
 		"node_modules/minipass": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+			"version": "7.1.3",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+			"integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
 			"dev": true,
-			"license": "ISC",
+			"license": "BlueOak-1.0.0",
 			"engines": {
 				"node": ">=16 || 14 >=14.17"
 			}
@@ -19083,9 +19118,9 @@
 			}
 		},
 		"node_modules/parse-asn1/node_modules/bn.js": {
-			"version": "4.12.2",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
-			"integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+			"version": "4.12.3",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz",
+			"integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -19133,9 +19168,9 @@
 			"license": "MIT"
 		},
 		"node_modules/path-scurry": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz",
-			"integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
+			"integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
 			"dev": true,
 			"license": "BlueOak-1.0.0",
 			"dependencies": {
@@ -19143,7 +19178,7 @@
 				"minipass": "^7.1.2"
 			},
 			"engines": {
-				"node": "20 || >=22"
+				"node": "18 || 20 || >=22"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/isaacs"
@@ -19570,9 +19605,9 @@
 			}
 		},
 		"node_modules/public-encrypt/node_modules/bn.js": {
-			"version": "4.12.2",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
-			"integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+			"version": "4.12.3",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz",
+			"integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -20501,9 +20536,9 @@
 			"license": "MIT"
 		},
 		"node_modules/rollup": {
-			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.57.1.tgz",
-			"integrity": "sha512-oQL6lgK3e2QZeQ7gcgIkS2YZPg5slw37hYufJ3edKlfQSGGm8ICoxswK15ntSzF/a8+h7ekRy7k7oWc3BQ7y8A==",
+			"version": "4.59.0",
+			"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.59.0.tgz",
+			"integrity": "sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -20517,31 +20552,31 @@
 				"npm": ">=8.0.0"
 			},
 			"optionalDependencies": {
-				"@rollup/rollup-android-arm-eabi": "4.57.1",
-				"@rollup/rollup-android-arm64": "4.57.1",
-				"@rollup/rollup-darwin-arm64": "4.57.1",
-				"@rollup/rollup-darwin-x64": "4.57.1",
-				"@rollup/rollup-freebsd-arm64": "4.57.1",
-				"@rollup/rollup-freebsd-x64": "4.57.1",
-				"@rollup/rollup-linux-arm-gnueabihf": "4.57.1",
-				"@rollup/rollup-linux-arm-musleabihf": "4.57.1",
-				"@rollup/rollup-linux-arm64-gnu": "4.57.1",
-				"@rollup/rollup-linux-arm64-musl": "4.57.1",
-				"@rollup/rollup-linux-loong64-gnu": "4.57.1",
-				"@rollup/rollup-linux-loong64-musl": "4.57.1",
-				"@rollup/rollup-linux-ppc64-gnu": "4.57.1",
-				"@rollup/rollup-linux-ppc64-musl": "4.57.1",
-				"@rollup/rollup-linux-riscv64-gnu": "4.57.1",
-				"@rollup/rollup-linux-riscv64-musl": "4.57.1",
-				"@rollup/rollup-linux-s390x-gnu": "4.57.1",
-				"@rollup/rollup-linux-x64-gnu": "4.57.1",
-				"@rollup/rollup-linux-x64-musl": "4.57.1",
-				"@rollup/rollup-openbsd-x64": "4.57.1",
-				"@rollup/rollup-openharmony-arm64": "4.57.1",
-				"@rollup/rollup-win32-arm64-msvc": "4.57.1",
-				"@rollup/rollup-win32-ia32-msvc": "4.57.1",
-				"@rollup/rollup-win32-x64-gnu": "4.57.1",
-				"@rollup/rollup-win32-x64-msvc": "4.57.1",
+				"@rollup/rollup-android-arm-eabi": "4.59.0",
+				"@rollup/rollup-android-arm64": "4.59.0",
+				"@rollup/rollup-darwin-arm64": "4.59.0",
+				"@rollup/rollup-darwin-x64": "4.59.0",
+				"@rollup/rollup-freebsd-arm64": "4.59.0",
+				"@rollup/rollup-freebsd-x64": "4.59.0",
+				"@rollup/rollup-linux-arm-gnueabihf": "4.59.0",
+				"@rollup/rollup-linux-arm-musleabihf": "4.59.0",
+				"@rollup/rollup-linux-arm64-gnu": "4.59.0",
+				"@rollup/rollup-linux-arm64-musl": "4.59.0",
+				"@rollup/rollup-linux-loong64-gnu": "4.59.0",
+				"@rollup/rollup-linux-loong64-musl": "4.59.0",
+				"@rollup/rollup-linux-ppc64-gnu": "4.59.0",
+				"@rollup/rollup-linux-ppc64-musl": "4.59.0",
+				"@rollup/rollup-linux-riscv64-gnu": "4.59.0",
+				"@rollup/rollup-linux-riscv64-musl": "4.59.0",
+				"@rollup/rollup-linux-s390x-gnu": "4.59.0",
+				"@rollup/rollup-linux-x64-gnu": "4.59.0",
+				"@rollup/rollup-linux-x64-musl": "4.59.0",
+				"@rollup/rollup-openbsd-x64": "4.59.0",
+				"@rollup/rollup-openharmony-arm64": "4.59.0",
+				"@rollup/rollup-win32-arm64-msvc": "4.59.0",
+				"@rollup/rollup-win32-ia32-msvc": "4.59.0",
+				"@rollup/rollup-win32-x64-gnu": "4.59.0",
+				"@rollup/rollup-win32-x64-msvc": "4.59.0",
 				"fsevents": "~2.3.2"
 			}
 		},
@@ -23240,26 +23275,26 @@
 			}
 		},
 		"node_modules/workbox-build/node_modules/balanced-match": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.3.tgz",
-			"integrity": "sha512-1pHv8LX9CpKut1Zp4EXey7Z8OfH11ONNH6Dhi2WDUt31VVZFXZzKwXcysBgqSumFCmR+0dqjMK5v5JiFHzi0+g==",
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+			"integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
-				"node": "20 || >=22"
+				"node": "18 || 20 || >=22"
 			}
 		},
 		"node_modules/workbox-build/node_modules/brace-expansion": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.2.tgz",
-			"integrity": "sha512-Pdk8c9poy+YhOgVWw1JNN22/HcivgKWwpxKq04M/jTmHyCZn12WPJebZxdjSa5TmBqISrUSgNYU3eRORljfCCw==",
+			"version": "5.0.3",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
+			"integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"balanced-match": "^4.0.2"
 			},
 			"engines": {
-				"node": "20 || >=22"
+				"node": "18 || 20 || >=22"
 			}
 		},
 		"node_modules/workbox-build/node_modules/estree-walker": {
@@ -23312,16 +23347,16 @@
 			}
 		},
 		"node_modules/workbox-build/node_modules/minimatch": {
-			"version": "10.2.1",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.1.tgz",
-			"integrity": "sha512-MClCe8IL5nRRmawL6ib/eT4oLyeKMGCghibcDWK+J0hh0Q8kqSdia6BvbRMVk6mPa6WqUa5uR2oxt6C5jd533A==",
+			"version": "10.2.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz",
+			"integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==",
 			"dev": true,
 			"license": "BlueOak-1.0.0",
 			"dependencies": {
 				"brace-expansion": "^5.0.2"
 			},
 			"engines": {
-				"node": "20 || >=22"
+				"node": "18 || 20 || >=22"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/isaacs"
@@ -23341,9 +23376,9 @@
 			}
 		},
 		"node_modules/workbox-build/node_modules/rollup": {
-			"version": "2.79.2",
-			"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
-			"integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
+			"version": "2.80.0",
+			"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.80.0.tgz",
+			"integrity": "sha512-cIFJOD1DESzpjOBl763Kp1AH7UE/0fcdHe6rZXUdQ9c50uvgigvW97u3IcSeBwOkgqL/PXPBktBCh0KEu5L8XQ==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
diff --git a/package.json b/package.json
index 5f62348e..77eff751 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
 		"@lexical/utils": "^0.34.0",
 		"@monaco-editor/react": "^4.7.0",
 		"@permaweb/aoconnect": "0.0.93",
-		"@permaweb/libs": "0.0.86",
+		"@permaweb/libs": "file:permaweb-libs-0.0.87.tgz",
 		"@stripe/react-stripe-js": "^3.5.1",
 		"@stripe/stripe-js": "^6.1.0",
 		"@wanderapp/connect": "^0.1.13",
diff --git a/permaweb-libs-0.0.87.tgz b/permaweb-libs-0.0.87.tgz
new file mode 100644
index 00000000..7df5b646
Binary files /dev/null and b/permaweb-libs-0.0.87.tgz differ
diff --git a/src/apps/editor/components/organisms/PostEditor/ArticleEditor/ArticlePost/ArticlePostCommentRules/ArticlePostCommentRules.tsx b/src/apps/editor/components/organisms/PostEditor/ArticleEditor/ArticlePost/ArticlePostCommentRules/ArticlePostCommentRules.tsx
index 7483c1bf..5eee0929 100644
--- a/src/apps/editor/components/organisms/PostEditor/ArticleEditor/ArticlePost/ArticlePostCommentRules/ArticlePostCommentRules.tsx
+++ b/src/apps/editor/components/organisms/PostEditor/ArticleEditor/ArticlePost/ArticlePostCommentRules/ArticlePostCommentRules.tsx
@@ -9,7 +9,8 @@ import { currentPostUpdate } from 'editor/store/post';
 import { Button } from 'components/atoms/Button';
 import { Checkbox } from 'components/atoms/Checkbox';
 import { FormField } from 'components/atoms/FormField';
-import { ICONS } from 'helpers/config';
+import { Select } from 'components/atoms/Select';
+import { ICONS, TIP_TOKEN_OPTIONS } from 'helpers/config';
 import { CommentRulesType, PortalUserType } from 'helpers/types';
 import { useArweaveProvider } from 'providers/ArweaveProvider';
 import { useLanguageProvider } from 'providers/LanguageProvider';
@@ -58,6 +59,20 @@ export default function ArticlePostCommentRules() {
 	}, [assetId, portalProvider.current?.assets, currentPost.data?.commentsId]);
 
 	const disabled = currentPost.editor?.loading?.active || !hasPermission;
+	const tipTokenOptions = TIP_TOKEN_OPTIONS.map((token) => ({
+		id: token.tokenAddress,
+		label: token.label,
+	}));
+	const selectedTipAssetId = currentPost.data.commentRules?.tipAssetId ?? '';
+	const hasSelectedPreset = tipTokenOptions.some((option) => option.id === selectedTipAssetId);
+	const tipAssetSelectOptions =
+		!selectedTipAssetId || hasSelectedPreset
+			? tipTokenOptions
+			: [{ id: selectedTipAssetId, label: `Custom token (${selectedTipAssetId.slice(0, 8)}...)` }, ...tipTokenOptions];
+	const activeTipAssetOption =
+		tipAssetSelectOptions.find((option) => option.id === selectedTipAssetId) ||
+		tipTokenOptions.find((option) => option.label.toUpperCase() === 'AR') ||
+		tipTokenOptions[0];
 
 	// Load existing rules when component mounts
 	React.useEffect(() => {
@@ -68,13 +83,28 @@ export default function ArticlePostCommentRules() {
 		permawebProvider.libs
 			.getRules({ commentsId })
 			.then((rules: any) => {
+				console.log('[comment-rules] fetched rules raw:', {
+					commentsId,
+					rules,
+				});
 				if (rules) {
 					const requireProfileThumbnail = rules.requireProfileThumbnail ?? rules.RequireProfileThumbnail;
+					const enableTipping = rules.enableTipping ?? rules.EnableTipping;
+					const requireTipToComment = rules.requireTipToComment ?? rules.RequireTipToComment;
+					const showPaidTab = rules.showPaidTab ?? rules.ShowPaidTab;
+					const highlightPaidComments = rules.highlightPaidComments ?? rules.HighlightPaidComments;
 					const normalizedRules: CommentRulesType = {
 						profileAgeRequired: rules.profileAgeRequired ?? rules.ProfileAgeRequired,
 						mutedWords: rules.mutedWords ?? rules.MutedWords,
 						requireProfileThumbnail: requireProfileThumbnail === 'true' || requireProfileThumbnail === true,
+						enableTipping: enableTipping === 'true' || enableTipping === true,
+						requireTipToComment: requireTipToComment === 'true' || requireTipToComment === true,
+						tipAssetId: rules.tipAssetId ?? rules.TipAssetId ?? '',
+						minTipAmount: rules.minTipAmount ?? rules.MinTipAmount ?? '0',
+						showPaidTab: showPaidTab === 'true' || showPaidTab === true,
+						highlightPaidComments: highlightPaidComments === 'true' || highlightPaidComments === true,
 					};
+					console.log('[comment-rules] normalized rules from process:', normalizedRules);
 					handleCurrentPostUpdate({ field: 'commentRules', value: normalizedRules });
 				}
 				setHasLoaded(true);
@@ -89,10 +119,21 @@ export default function ArticlePostCommentRules() {
 	}, [commentsId, permawebProvider.libs, hasLoaded, hasPermission]);
 
 	const handleRuleChange = (field: keyof CommentRulesType, value: any) => {
-		const updatedRules = {
+		const updatedRules: CommentRulesType = {
 			...currentPost.data.commentRules,
 			[field]: value,
 		};
+		// Ensure tipping always has a token selected so updates do not fail server-side.
+		if (field === 'enableTipping' && value === true && !updatedRules.tipAssetId) {
+			updatedRules.tipAssetId = activeTipAssetOption?.id || 'AR';
+		}
+		if (field === 'enableTipping') {
+			console.log('[comment-rules] enableTipping changed:', {
+				prev: currentPost.data.commentRules?.enableTipping,
+				next: value,
+				tipAssetIdAfterChange: updatedRules.tipAssetId,
+			});
+		}
 		handleCurrentPostUpdate({ field: 'commentRules', value: updatedRules });
 	};
 
@@ -130,13 +171,43 @@ export default function ArticlePostCommentRules() {
 		if (commentsId && arProvider.wallet && portalProvider.current?.id && currentPost.data.commentRules) {
 			setUpdating(true);
 			try {
+				const normalizedTipAssetId =
+					currentPost.data.commentRules.enableTipping && !(currentPost.data.commentRules.tipAssetId || '').trim()
+						? activeTipAssetOption?.id || 'AR'
+						: currentPost.data.commentRules.tipAssetId ?? '';
+				const normalizedRulesForState: CommentRulesType = {
+					profileAgeRequired: currentPost.data.commentRules.profileAgeRequired ?? 0,
+					mutedWords: currentPost.data.commentRules.mutedWords ?? [],
+					requireProfileThumbnail: !!currentPost.data.commentRules.requireProfileThumbnail,
+					enableTipping: !!currentPost.data.commentRules.enableTipping,
+					requireTipToComment: !!currentPost.data.commentRules.requireTipToComment,
+					tipAssetId: normalizedTipAssetId,
+					minTipAmount: currentPost.data.commentRules.minTipAmount ?? '0',
+					showPaidTab: !!currentPost.data.commentRules.showPaidTab,
+					highlightPaidComments: !!currentPost.data.commentRules.highlightPaidComments,
+				};
 				const rulesToSend = {
-					ProfileAgeRequired: currentPost.data.commentRules.profileAgeRequired ?? 0,
-					MutedWords: currentPost.data.commentRules.mutedWords ?? [],
-					RequireProfileThumbnail: !!currentPost.data.commentRules.requireProfileThumbnail,
+					ProfileAgeRequired: normalizedRulesForState.profileAgeRequired ?? 0,
+					MutedWords: normalizedRulesForState.mutedWords ?? [],
+					RequireProfileThumbnail: !!normalizedRulesForState.requireProfileThumbnail,
+					EnableTipping: !!normalizedRulesForState.enableTipping,
+					RequireTipToComment: !!normalizedRulesForState.requireTipToComment,
+					TipAssetId: normalizedRulesForState.tipAssetId ?? '',
+					MinTipAmount: normalizedRulesForState.minTipAmount ?? '0',
+					ShowPaidTab: !!normalizedRulesForState.showPaidTab,
+					HighlightPaidComments: !!normalizedRulesForState.highlightPaidComments,
 				};
+				console.log('[comment-rules] saving rules payload:', {
+					commentsId,
+					portalId: portalProvider.current.id,
+					rulesToSend,
+				});
 
-				await permawebProvider.libs.sendMessage({
+				// Keep local state in sync with normalized payload used for persistence.
+				handleCurrentPostUpdate({ field: 'commentRules', value: normalizedRulesForState });
+
+				// Update rules via portal forwarding (canonical Run-Action format).
+				const forwardResult = await permawebProvider.libs.sendMessage({
 					processId: portalProvider.current.id,
 					wallet: arProvider.wallet,
 					action: 'Run-Action',
@@ -145,11 +216,29 @@ export default function ArticlePostCommentRules() {
 						{ name: 'Forward-Action', value: 'Update-Rules' },
 					],
 					data: { Input: rulesToSend },
+					returnResult: true,
+				});
+				console.log('[comment-rules] forwarded updateRules result:', forwardResult);
+				const hadUpdateRulesError = (forwardResult?.Messages || []).some((message: any) => {
+					const tags = message?.Tags || [];
+					const actionTag = tags.find((tag: any) => tag?.name === 'Action')?.value;
+					return actionTag === 'Update-Rules-Error';
 				});
+				if (hadUpdateRulesError) {
+					const errorTag = (forwardResult?.Messages || [])
+						.flatMap((message: any) => message?.Tags || [])
+						.find((tag: any) => tag?.name === 'Error')?.value;
+					throw new Error(errorTag || 'Update-Rules-Error');
+				}
 
 				addNotification(`${language?.commentRulesUpdated || 'Comment rules updated'}!`, 'success');
 			} catch (e: any) {
 				console.error('Error updating comment rules:', e);
+				console.error('[comment-rules] save failed context:', {
+					commentsId,
+					portalId: portalProvider.current?.id,
+					currentRules: currentPost.data.commentRules,
+				});
 				addNotification(e.message ?? language?.errorUpdatingCommentRules, 'warning');
 			}
 			setUpdating(false);
@@ -176,6 +265,7 @@ export default function ArticlePostCommentRules() {
 	const mutedWords = currentPost.data.commentRules?.mutedWords || [];
 	const profileAgeRequired = currentPost.data.commentRules?.profileAgeRequired || 0;
 	const profileAgeDays = Math.floor(profileAgeRequired / (24 * 60 * 60 * 1000));
+	const tippingEnabled = currentPost.data.commentRules?.enableTipping ?? false;
 
 	return (
 		<S.Wrapper>
@@ -269,6 +359,109 @@ export default function ArticlePostCommentRules() {
 					)}
 				</S.TagsWrapper>
 			</S.Section>
+
+			<S.SectionDivider />
+
+			<S.Section>
+				<S.RuleItem>
+					<S.RuleLabel>{language?.enableTipping || 'Enable Tipping'}</S.RuleLabel>
+					<Checkbox
+						checked={tippingEnabled}
+						handleSelect={() => handleRuleChange('enableTipping', !tippingEnabled)}
+						disabled={disabled || updating}
+					/>
+				</S.RuleItem>
+				<S.RuleDescription>
+					{language?.enableTippingDescription || 'Allow users to attach tips to their comments'}
+				</S.RuleDescription>
+			</S.Section>
+
+			{tippingEnabled && (
+				<>
+					<S.Section>
+						<S.RuleItem>
+							<S.RuleLabel>{language?.requireTipToComment || 'Require Tip to Comment'}</S.RuleLabel>
+							<Checkbox
+								checked={currentPost.data.commentRules?.requireTipToComment ?? false}
+								handleSelect={() =>
+									handleRuleChange('requireTipToComment', !currentPost.data.commentRules?.requireTipToComment)
+								}
+								disabled={disabled || updating}
+							/>
+						</S.RuleItem>
+						<S.RuleDescription>
+							{language?.requireTipToCommentDescription || 'Users must attach a tip to post a comment'}
+						</S.RuleDescription>
+					</S.Section>
+
+					<S.Section>
+						<Select
+							label={language?.tipAssetId || 'Tip Asset ID'}
+							activeOption={activeTipAssetOption}
+							setActiveOption={(option) => handleRuleChange('tipAssetId', option.id)}
+							options={tipAssetSelectOptions}
+							disabled={disabled || updating}
+						/>
+						<S.RuleDescription>
+							{language?.tipAssetIdDescription || 'Select the token used for comment tips'}
+						</S.RuleDescription>
+					</S.Section>
+
+					<S.Section>
+						<FormField
+							label={language?.minTipAmount || 'Minimum Tip Amount'}
+							placeholder={'0'}
+							value={currentPost.data.commentRules?.minTipAmount ?? '0'}
+							onChange={(e) => handleRuleChange('minTipAmount', e.target.value)}
+							onKeyDown={(e) => {
+								if (e.key === 'Enter') {
+									e.preventDefault();
+									e.nativeEvent.stopImmediatePropagation();
+								}
+							}}
+							disabled={disabled || updating}
+							invalid={{ status: false, message: null }}
+							hideErrorMessage
+							sm
+							noMargin
+						/>
+						<S.RuleDescription>
+							{language?.minTipAmountDescription || 'Minimum tip amount in base units'}
+						</S.RuleDescription>
+					</S.Section>
+
+					<S.Section>
+						<S.RuleItem>
+							<S.RuleLabel>{language?.showPaidTab || 'Show Paid Tab'}</S.RuleLabel>
+							<Checkbox
+								checked={currentPost.data.commentRules?.showPaidTab ?? false}
+								handleSelect={() => handleRuleChange('showPaidTab', !currentPost.data.commentRules?.showPaidTab)}
+								disabled={disabled || updating}
+							/>
+						</S.RuleItem>
+						<S.RuleDescription>
+							{language?.showPaidTabDescription || 'Show a separate tab for paid/tipped comments'}
+						</S.RuleDescription>
+					</S.Section>
+
+					<S.Section>
+						<S.RuleItem>
+							<S.RuleLabel>{language?.highlightPaidComments || 'Highlight Paid Comments'}</S.RuleLabel>
+							<Checkbox
+								checked={currentPost.data.commentRules?.highlightPaidComments ?? false}
+								handleSelect={() =>
+									handleRuleChange('highlightPaidComments', !currentPost.data.commentRules?.highlightPaidComments)
+								}
+								disabled={disabled || updating}
+							/>
+						</S.RuleItem>
+						<S.RuleDescription>
+							{language?.highlightPaidCommentsDescription || 'Show top paid comments in a highlighted strip'}
+						</S.RuleDescription>
+					</S.Section>
+				</>
+			)}
+
 			<S.ActionWrapper>
 				<Button
 					type={'alt1'}
diff --git a/src/apps/editor/components/organisms/PostEditor/ArticleEditor/ArticlePost/ArticlePostCommentRules/styles.ts b/src/apps/editor/components/organisms/PostEditor/ArticleEditor/ArticlePost/ArticlePostCommentRules/styles.ts
index c72b2120..08f56c19 100644
--- a/src/apps/editor/components/organisms/PostEditor/ArticleEditor/ArticlePost/ArticlePostCommentRules/styles.ts
+++ b/src/apps/editor/components/organisms/PostEditor/ArticleEditor/ArticlePost/ArticlePostCommentRules/styles.ts
@@ -91,6 +91,13 @@ export const Tag = styled.div`
 	}
 `;
 
+export const SectionDivider = styled.hr`
+	width: 100%;
+	border: none;
+	border-top: 1px solid ${(props) => props.theme.colors.border.primary};
+	margin: 0;
+`;
+
 export const HeaderWrapper = styled.div`
 	width: 100%;
 	display: flex;
diff --git a/src/apps/engine/builder/blocks/comments/comment/index.tsx b/src/apps/engine/builder/blocks/comments/comment/index.tsx
index 89485e6f..5646b3fe 100644
--- a/src/apps/engine/builder/blocks/comments/comment/index.tsx
+++ b/src/apps/engine/builder/blocks/comments/comment/index.tsx
@@ -48,8 +48,14 @@ export default function Comment(props: any) {
 		prevReplyCountRef.current = currentReplyCount;
 	}, [data]);
 
-	const userIsAdmin = ['Admin'].some((r) => user?.roles?.includes(r));
-	const userIsModerator = ['Moderator'].some((r) => user?.roles?.includes(r));
+	const userRoles = React.useMemo(() => {
+		if (Array.isArray(user?.roles)) return user.roles;
+		if (typeof user?.roles === 'string') return [user.roles];
+		return [];
+	}, [user?.roles]);
+
+	const userIsAdmin = userRoles.includes('Admin');
+	const userIsModerator = userRoles.includes('Moderator');
 	// const userIsContributor = ['Contributor'].some((r) => user?.roles?.includes(r));
 
 	const commentAuthorPortalUser = portal?.Users?.find((u: any) => u.address === commentData.creator);
@@ -282,13 +288,15 @@ export default function Comment(props: any) {
 		}
 	}
 
+	const isPaidComment = !!commentData.tipReceiptId;
+
 	if (!commentData) return null;
-	const hasModPermission = user?.owner && user?.roles && ['Admin', 'Moderator'].some((r) => user.roles?.includes(r));
+	const hasModPermission = !!user?.owner && ['Admin', 'Moderator'].some((r) => userRoles.includes(r));
 	if (commentData.status !== 'active' && !hasModPermission) return null;
 
 	return (
 		<>
-			<S.Comment $level={level} $status={commentData.status}>
+			<S.Comment $level={level} $status={commentData.status} $isPaid={isPaidComment}>
 				{(isUpdating || isEditSubmitting) && (
 					<S.LoadingOverlay>
 						<S.Spinner />
@@ -346,6 +354,11 @@ export default function Comment(props: any) {
 								Blocked User
 							</S.HiddenIndicator>
 						)}
+						{isPaidComment && commentData.tipAmount && (
+							<S.PaidIndicator>
+								{commentData.tipAmount} {commentData.tipAssetSymbol || 'Tip'}
+							</S.PaidIndicator>
+						)}
 						<S.Date>
 							{!commentData?.dateCreated ? (
 								<Placeholder />
diff --git a/src/apps/engine/builder/blocks/comments/comment/styles.ts b/src/apps/engine/builder/blocks/comments/comment/styles.ts
index f17a7cda..022ca5e8 100644
--- a/src/apps/engine/builder/blocks/comments/comment/styles.ts
+++ b/src/apps/engine/builder/blocks/comments/comment/styles.ts
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-export const Comment = styled.div<{ $level: number; $status?: string }>`
+export const Comment = styled.div<{ $level: number; $status?: string; $isPaid?: boolean }>`
 	position: relative;
 	display: flex;
 	gap: 10px;
@@ -12,21 +12,21 @@ export const Comment = styled.div<{ $level: number; $status?: string }>`
 	box-shadow: ${(props) =>
 		props?.$status === 'active' || !props?.$status ? '0 4px 10px rgba(0, 0, 0, 0.4)' : '0 1px 4px rgba(0, 0, 0, 0.4)'};
 
-	${(props) =>
-		props?.$status !== 'active' &&
-		props?.$status &&
-		`
-		&::before {
-			content: '';
-			position: absolute;
-			left: 0;
-			top: 0;
-			bottom: 0;
-			width: 4px;
-			background: #e74c3c;
-			border-radius: var(--border-radius) 0 0 var(--border-radius);
-		}
-	`}
+	&::before {
+		content: '';
+		position: absolute;
+		left: 0;
+		top: 0;
+		bottom: 0;
+		width: 4px;
+		border-radius: var(--border-radius) 0 0 var(--border-radius);
+		${(props) =>
+			props?.$status !== 'active' && props?.$status
+				? `background: #e74c3c;`
+				: props?.$isPaid
+				? `background: #f39c12;`
+				: `background: transparent;`}
+	}
 `;
 
 export const Content = styled.div`
@@ -265,6 +265,30 @@ export const PinnedIndicator = styled.div`
 	}
 `;
 
+export const PaidIndicator = styled.div`
+	display: inline-flex;
+	align-items: center;
+	gap: 4px;
+	background: rgba(243, 156, 18, 0.2);
+	color: #f39c12;
+	padding: 2px 8px;
+	border-radius: var(--border-radius);
+	font-size: 11px;
+	font-weight: 600;
+
+	div {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	svg {
+		width: 14px;
+		height: 14px;
+		fill: #f39c12;
+	}
+`;
+
 export const ReplyEditor = styled.div<{ $level: number }>`
 	margin-left: ${(props) => `${props.$level * 40}px`};
 	margin-top: -20px;
diff --git a/src/apps/engine/builder/blocks/comments/commentAdd/index.tsx b/src/apps/engine/builder/blocks/comments/commentAdd/index.tsx
index 1b9ca7f9..ae5c9156 100644
--- a/src/apps/engine/builder/blocks/comments/commentAdd/index.tsx
+++ b/src/apps/engine/builder/blocks/comments/commentAdd/index.tsx
@@ -10,8 +10,11 @@ import { PlainTextPlugin } from '@lexical/react/LexicalPlainTextPlugin';
 import Avatar from 'engine/components/avatar';
 import ModalPortal from 'engine/components/modalPortal';
 import ProfileEditor from 'engine/components/profileEditor';
+import TipModal from 'engine/components/tipModal';
 import { useCommentRules } from 'engine/hooks/comments';
 import { useProfile } from 'engine/hooks/profiles';
+import { useTokenTip } from 'engine/hooks/useTokenTip';
+import { useEngineNotifications } from 'engine/providers/notificationProvider';
 import { usePortalProvider } from 'engine/providers/portalProvider';
 import {
 	$createParagraphNode,
@@ -24,9 +27,9 @@ import {
 	TextNode,
 } from 'lexical';
 
-import { ICONS } from 'helpers/config';
+import { ICONS, TIP_TOKEN_OPTIONS } from 'helpers/config';
+import { TipToken, toBaseUnits } from 'helpers/tokens';
 import { useArweaveProvider } from 'providers/ArweaveProvider';
-import { useLanguageProvider } from 'providers/LanguageProvider';
 import { usePermawebProvider } from 'providers/PermawebProvider';
 
 import EmojiPicker from './emojiPicker';
@@ -48,10 +51,11 @@ function CommentEditorContent(props: any) {
 	} = props;
 	const [editor] = useLexicalComposerContext();
 	const arProvider = useArweaveProvider();
-	const languageProvider = useLanguageProvider();
 	const { profile, libs } = usePermawebProvider();
 	const { portal, portalId } = usePortalProvider();
 	const { profile: portalProfile } = useProfile(portalId);
+	const { addNotification } = useEngineNotifications();
+	const { sendTip } = useTokenTip();
 	const [canSend, setCanSend] = React.useState(false);
 	const [editorText, setEditorText] = React.useState(initialContent || '');
 	const [isSubmitting, setIsSubmitting] = React.useState(false);
@@ -61,7 +65,47 @@ function CommentEditorContent(props: any) {
 	const [showProfileManage, setShowProfileManage] = React.useState(false);
 	const { rules } = useCommentRules(commentsId);
 	const [ruleError, setRuleError] = React.useState<string | null>(null);
-	const language = languageProvider.object?.[languageProvider.current] ?? null;
+	const [tipError, setTipError] = React.useState<string | null>(null);
+	const [showTipModal, setShowTipModal] = React.useState(false);
+	const [tipModalSubmitting, setTipModalSubmitting] = React.useState(false);
+	const [pendingCommentContent, setPendingCommentContent] = React.useState('');
+
+	const tippingEnabled = rules?.enableTipping && !isEditMode;
+	const tipRequired = tippingEnabled && rules?.requireTipToComment;
+	const configuredTipToken = React.useMemo<TipToken>(() => {
+		const tipAssetId = (rules?.tipAssetId || '').trim();
+		if (!tipAssetId || tipAssetId === 'AR') {
+			return { type: 'AR', symbol: 'AR', decimals: 12 };
+		}
+
+		const presetToken = TIP_TOKEN_OPTIONS.find((token) => token.tokenAddress === tipAssetId);
+		if (presetToken) {
+			return {
+				type: presetToken.tokenType,
+				symbol: presetToken.tokenSymbol || presetToken.label,
+				decimals: Number(presetToken.tokenDecimals ?? 12),
+				processId: presetToken.tokenType === 'AO' ? presetToken.tokenAddress : undefined,
+			};
+		}
+
+		return {
+			type: 'AO',
+			symbol: 'AO',
+			decimals: 12,
+			processId: tipAssetId,
+		};
+	}, [rules?.tipAssetId]);
+	const tipModalTokens = React.useMemo(
+		() => [
+			{
+				id: `${configuredTipToken.type}:${configuredTipToken.symbol}:${configuredTipToken.processId || 'AR'}`,
+				symbol: configuredTipToken.symbol,
+			},
+		],
+		[configuredTipToken]
+	);
+	const selectedTipTokenId = tipModalTokens[0]?.id || '';
+
 	React.useEffect(() => {
 		if (initialContent && isEditMode) {
 			editor.update(() => {
@@ -115,6 +159,98 @@ function CommentEditorContent(props: any) {
 		);
 	}, [editor, canSend]);
 
+	const validateTipAmount = (amount: string): string | null => {
+		if (!amount || amount.trim() === '' || amount === '0') {
+			return 'A tip is required to comment.';
+		}
+
+		const minTip = parseFloat(rules?.minTipAmount || '0');
+		const currentTip = parseFloat(amount);
+
+		if (isNaN(currentTip) || currentTip <= 0) {
+			return 'Please enter a valid tip amount.';
+		}
+
+		if (minTip > 0 && currentTip < minTip) {
+			return `Minimum tip amount is ${rules.minTipAmount}.`;
+		}
+
+		return null;
+	};
+
+	const finalizeCommentSubmission = (comment: string) => {
+		editor.update(() => {
+			const root = $getRoot();
+			root.clear();
+		});
+		setEditorText('');
+		setCanSend(false);
+		setTipError(null);
+		setPendingCommentContent('');
+
+		window.dispatchEvent(
+			new CustomEvent('commentAdded', {
+				detail: { comment, commentsId },
+			})
+		);
+
+		if (onCommentAdded && comment) {
+			onCommentAdded(comment);
+		}
+	};
+
+	const buildTipTags = (tipReceiptId?: string, tipAmount?: string) => {
+		const tags = [];
+		if (tipReceiptId) {
+			tags.push({ name: 'Tip-Receipt-Id', value: tipReceiptId });
+		}
+		if (rules?.tipAssetId) {
+			tags.push({ name: 'TipAssetId', value: rules.tipAssetId });
+		}
+		if (tipAmount) {
+			tags.push({ name: 'Tip-Amount', value: tipAmount });
+		}
+		return tags;
+	};
+
+	const submitNewComment = async (plainText: string, tipReceiptId?: string, tipAmount?: string) => {
+		let comment;
+		const tipTags = buildTipTags(tipReceiptId, tipAmount);
+
+		if (postAsPortal && portalId) {
+			const tags = [
+				{ name: 'Forward-To', value: commentsId },
+				{ name: 'Forward-Action', value: 'Add-Comment' },
+			];
+
+			if (parentId) {
+				tags.push({ name: 'Parent-Id', value: parentId });
+			}
+
+			tags.push(...tipTags);
+
+			const zoneCommentId = await libs.sendMessage({
+				processId: portalId,
+				wallet: arProvider.wallet,
+				action: 'Run-Action',
+				tags: tags,
+				data: { Input: plainText },
+			});
+
+			comment = zoneCommentId;
+		} else {
+			comment = await libs.createComment({
+				commentsId,
+				parentId,
+				content: plainText,
+				tipReceiptId,
+				tags: tipTags.filter((tag: any) => tag.name !== 'Tip-Receipt-Id'),
+			});
+		}
+
+		finalizeCommentSubmission(comment);
+	};
+
 	const handleSubmit = async () => {
 		if (!profile?.id) {
 			setShowProfileManage(true);
@@ -138,6 +274,19 @@ function CommentEditorContent(props: any) {
 		if (!plainText) return;
 		if (!isEditMode && checkForDuplicate(plainText)) return;
 
+		if (!isEditMode && tippingEnabled) {
+			if (!rules?.tipAssetId) {
+				setTipError('Tip token is not configured for this post.');
+				return;
+			}
+			if (tipRequired) {
+				setTipError(null);
+			}
+			setPendingCommentContent(plainText);
+			setShowTipModal(true);
+			return;
+		}
+
 		setIsSubmitting(true);
 		onSubmittingChange?.(true);
 		try {
@@ -151,57 +300,72 @@ function CommentEditorContent(props: any) {
 					onCommentAdded(plainText);
 				}
 			} else {
-				let comment;
+				await submitNewComment(plainText);
+			}
+		} catch (err: any) {
+			console.error('Failed to save comment:', err);
+			const msg = err?.message || String(err);
+			if (msg.includes('Tip-Receipt-Id') || msg.includes('TipAssetId') || msg.includes('below minimum')) {
+				setTipError(msg);
+			} else {
+				setRuleError(msg);
+			}
+		} finally {
+			setIsSubmitting(false);
+			onSubmittingChange?.(false);
+		}
+	};
 
-				if (postAsPortal && portalId) {
-					const tags = [
-						{ name: 'Forward-To', value: commentsId },
-						{ name: 'Forward-Action', value: 'Add-Comment' },
-					];
+	const handleTipConfirm = async (amount: string) => {
+		if (!pendingCommentContent.trim()) {
+			setTipError('Comment text is missing. Please try again.');
+			setShowTipModal(false);
+			return;
+		}
 
-					if (parentId) {
-						tags.push({ name: 'Parent-Id', value: parentId });
-					}
+		const tipValidationError = validateTipAmount(amount);
+		if (tipValidationError) {
+			setTipError(tipValidationError);
+			return;
+		}
 
-					const zoneCommentId = await libs.sendMessage({
-						processId: portalId,
-						wallet: arProvider.wallet,
-						action: 'Run-Action',
-						tags: tags,
-						data: { Input: plainText },
-					});
-
-					comment = zoneCommentId;
-				} else {
-					comment = await libs.createComment({
-						commentsId,
-						parentId,
-						content: plainText,
-					});
-				}
+		if (!sendTip) {
+			setTipError('Tip flow is unavailable right now.');
+			return;
+		}
 
-				// Clear the editor after successful submission
-				editor.update(() => {
-					const root = $getRoot();
-					root.clear();
+		setIsSubmitting(true);
+		setTipModalSubmitting(true);
+		onSubmittingChange?.(true);
+		try {
+			if (
+				configuredTipToken.type === 'AO' &&
+				configuredTipToken.processId &&
+				!postAsPortal &&
+				typeof libs?.tipAndCreateComment === 'function'
+			) {
+				const quantity = toBaseUnits(amount, configuredTipToken.decimals);
+				const result = await libs.tipAndCreateComment({
+					tipAssetId: configuredTipToken.processId,
+					commentsId,
+					quantity,
+					content: pendingCommentContent,
+					parentId,
 				});
-				setEditorText('');
-				setCanSend(false);
-
-				window.dispatchEvent(
-					new CustomEvent('commentAdded', {
-						detail: { comment, commentsId },
-					})
-				);
-
-				if (onCommentAdded && comment) {
-					onCommentAdded(comment);
-				}
+				finalizeCommentSubmission(result?.commentTxId);
+			} else {
+				const tipReceiptId = await sendTip(commentsId, amount, 'post', undefined, configuredTipToken);
+				await submitNewComment(pendingCommentContent, tipReceiptId, amount);
 			}
-		} catch (error) {
-			console.error('Failed to save comment:', error);
+			addNotification(`Tip sent and comment posted successfully.`, 'success');
+			setShowTipModal(false);
+		} catch (err: any) {
+			console.error('Failed to tip and post comment:', err);
+			const msg = err?.message || String(err);
+			setTipError(msg);
 		} finally {
 			setIsSubmitting(false);
+			setTipModalSubmitting(false);
 			onSubmittingChange?.(false);
 		}
 	};
@@ -272,6 +436,7 @@ function CommentEditorContent(props: any) {
 	return (
 		<>
 			{ruleError && <S.RuleError>{ruleError}</S.RuleError>}
+			{tipError && <S.RuleError>{tipError}</S.RuleError>}
 			<S.Editor onClick={handleEditorClick}>
 				{portalId && !isEditMode && roles && (roles.includes('Admin') || roles.includes('Moderator')) && (
 					<S.AuthorSelector ref={dropdownRef}>
@@ -323,6 +488,20 @@ function CommentEditorContent(props: any) {
 				</S.Actions>
 			</S.Editor>
 
+			{showTipModal && (
+				<TipModal
+					isOpen={showTipModal}
+					onClose={() => {
+						if (tipModalSubmitting) return;
+						setShowTipModal(false);
+					}}
+					onConfirm={handleTipConfirm}
+					tokens={tipModalTokens}
+					selectedTokenId={selectedTipTokenId}
+					onSelectToken={() => {}}
+				/>
+			)}
+
 			<OnChangePlugin onChange={handleEditorChange} />
 			<HistoryPlugin />
 			{showProfileManage && (
diff --git a/src/apps/engine/builder/blocks/comments/commentAdd/styles.ts b/src/apps/engine/builder/blocks/comments/commentAdd/styles.ts
index 0c82b268..93ff1655 100644
--- a/src/apps/engine/builder/blocks/comments/commentAdd/styles.ts
+++ b/src/apps/engine/builder/blocks/comments/commentAdd/styles.ts
@@ -386,3 +386,41 @@ export const RuleError = styled.div`
 	align-items: center;
 	gap: 8px;
 `;
+
+export const TipAttachment = styled.div`
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	padding: 6px 10px;
+	background: rgba(243, 156, 18, 0.1);
+	border: 1px solid rgba(243, 156, 18, 0.25);
+	border-radius: var(--border-radius);
+	margin-top: 6px;
+`;
+
+export const TipInput = styled.input`
+	flex: 1;
+	background: rgba(var(--color-text), 0.08);
+	border: 1px solid rgba(243, 156, 18, 0.3);
+	border-radius: var(--border-radius);
+	color: rgba(var(--color-text), 1);
+	font-size: var(--font-size-normal);
+	padding: 6px 10px;
+	outline: none;
+	min-width: 0;
+
+	&::placeholder {
+		color: rgba(var(--color-text), 0.4);
+	}
+
+	&:focus {
+		border-color: #f39c12;
+	}
+`;
+
+export const TipRequired = styled.span`
+	color: #f39c12;
+	font-size: 11px;
+	font-weight: 600;
+	white-space: nowrap;
+`;
diff --git a/src/apps/engine/builder/blocks/comments/index.tsx b/src/apps/engine/builder/blocks/comments/index.tsx
index 9a763404..11c4a66f 100644
--- a/src/apps/engine/builder/blocks/comments/index.tsx
+++ b/src/apps/engine/builder/blocks/comments/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { defaultThemes } from 'engine/defaults/theme.defaults';
 import { initThemes } from 'engine/helpers/themes';
-import { useComments } from 'engine/hooks/comments';
+import { useCommentRules, useComments, usePaidComments } from 'engine/hooks/comments';
 import { usePortalProvider } from 'engine/providers/portalProvider';
 
 import Comment from './comment';
@@ -11,8 +11,22 @@ import * as S from './styles';
 export default function Comments(props: any) {
 	const { preview, commentsId, postAuthorId } = props;
 	const { portal } = usePortalProvider();
+	const mockTippedCommentsEnabled = React.useMemo(() => {
+		if (!import.meta.env.DEV || typeof window === 'undefined') return false;
+
+		const fromSearch = new URLSearchParams(window.location.search).get('mockTippedComments');
+		if (fromSearch === '1') return true;
+
+		const hashQuery = window.location.hash.includes('?') ? window.location.hash.split('?')[1] : '';
+		const fromHash = new URLSearchParams(hashQuery).get('mockTippedComments');
+		return fromHash === '1';
+	}, []);
 	const Themes = preview ? defaultThemes : portal?.Themes;
 	const { comments: fetchedComments } = useComments(commentsId);
+	const { rules } = useCommentRules(commentsId);
+	const { paidComments } = usePaidComments(commentsId);
+
+	const [activeTab, setActiveTab] = React.useState<'all' | 'paid'>('all');
 
 	const organizeComments = React.useCallback((commentsList: any[]) => {
 		if (!commentsList || commentsList.length === 0) return [];
@@ -52,7 +66,42 @@ export default function Comments(props: any) {
 		return [...pinnedComments, ...rootComments];
 	}, []);
 
-	const comments = React.useMemo(() => organizeComments(fetchedComments), [fetchedComments, organizeComments]);
+	const mockTippedComment = React.useMemo(
+		() => ({
+			id: `mock-tipped-comment-${commentsId || 'default'}`,
+			parentId: null,
+			depth: 0,
+			status: 'active',
+			content: '[Mock] This is how a tipped comment will look in the feed.',
+			creator: postAuthorId || portal?.Id || commentsId || 'mock-creator',
+			dateCreated: Date.now() - 60 * 1000,
+			tipReceiptId: `mock-tip-receipt-${commentsId || 'default'}`,
+			tipAmount: '2.5',
+			tipAssetSymbol: 'AR',
+		}),
+		[commentsId, postAuthorId, portal?.Id]
+	);
+
+	const commentsForDisplay = React.useMemo(() => {
+		if (!mockTippedCommentsEnabled) return fetchedComments;
+		const hasMockComment = (fetchedComments || []).some((comment: any) => comment.id === mockTippedComment.id);
+		return hasMockComment ? fetchedComments : [mockTippedComment, ...(fetchedComments || [])];
+	}, [fetchedComments, mockTippedCommentsEnabled, mockTippedComment]);
+
+	const paidCommentsForDisplay = React.useMemo(() => {
+		if (!mockTippedCommentsEnabled) return paidComments;
+		const hasMockPaidComment = (paidComments || []).some((comment: any) => comment.id === mockTippedComment.id);
+		return hasMockPaidComment ? paidComments : [mockTippedComment, ...(paidComments || [])];
+	}, [mockTippedCommentsEnabled, mockTippedComment, paidComments]);
+
+	const comments = React.useMemo(() => organizeComments(commentsForDisplay), [commentsForDisplay, organizeComments]);
+
+	const showTabs = (rules?.showPaidTab && rules?.enableTipping) || mockTippedCommentsEnabled;
+	const showHighlightStrip =
+		(rules?.highlightPaidComments && rules?.enableTipping && paidCommentsForDisplay.length > 0) ||
+		mockTippedCommentsEnabled;
+
+	const displayComments = activeTab === 'paid' ? paidCommentsForDisplay : comments;
 
 	React.useEffect(() => {
 		if (preview) {
@@ -65,9 +114,34 @@ export default function Comments(props: any) {
 		<S.Comments>
 			<h2>Comments</h2>
 			<CommentAdd commentsId={commentsId} />
+
+			{showHighlightStrip && (
+				<S.HighlightStrip>
+					{paidCommentsForDisplay.slice(0, 10).map((comment: any, index: number) => (
+						<S.HighlightCard key={`highlight-${comment.id}-${index}`}>
+							<S.HighlightAmount>
+								{comment.tipAmount} {comment.tipAssetSymbol || 'Tip'}
+							</S.HighlightAmount>
+							<S.HighlightContent>{comment.content}</S.HighlightContent>
+						</S.HighlightCard>
+					))}
+				</S.HighlightStrip>
+			)}
+
+			{showTabs && (
+				<S.TabBar>
+					<S.Tab $active={activeTab === 'all'} onClick={() => setActiveTab('all')}>
+						All
+					</S.Tab>
+					<S.Tab $active={activeTab === 'paid'} onClick={() => setActiveTab('paid')}>
+						Paid
+					</S.Tab>
+				</S.TabBar>
+			)}
+
 			<S.CommentList>
-				{comments &&
-					comments.map((comment: any, index: number) => {
+				{displayComments &&
+					displayComments.map((comment: any, index: number) => {
 						return (
 							<Comment
 								key={`${comment.id}-${index}`}
diff --git a/src/apps/engine/builder/blocks/comments/styles.ts b/src/apps/engine/builder/blocks/comments/styles.ts
index a8403a19..9580ba8d 100644
--- a/src/apps/engine/builder/blocks/comments/styles.ts
+++ b/src/apps/engine/builder/blocks/comments/styles.ts
@@ -34,3 +34,76 @@ export const CommentList = styled.div`
 	flex-direction: column;
 	gap: 20px;
 `;
+
+export const TabBar = styled.div`
+	display: flex;
+	gap: 0;
+	border-bottom: 1px solid rgba(var(--color-text), 0.1);
+`;
+
+export const Tab = styled.button<{ $active: boolean }>`
+	background: ${(props) => (props.$active ? 'rgba(var(--color-text), 0.08)' : 'transparent')};
+	border: none;
+	border-bottom: 2px solid ${(props) => (props.$active ? 'rgba(var(--color-primary), 1)' : 'transparent')};
+	color: rgba(var(--color-text), ${(props) => (props.$active ? '1' : '0.6')});
+	font-size: var(--font-size-normal);
+	font-weight: 600;
+	padding: 8px 16px;
+	cursor: pointer;
+	transition: all 0.2s;
+
+	&:hover {
+		color: rgba(var(--color-text), 1);
+		background: rgba(var(--color-text), 0.05);
+	}
+`;
+
+export const HighlightStrip = styled.div`
+	display: flex;
+	gap: 12px;
+	overflow-x: auto;
+	padding: 4px 0;
+	scrollbar-width: thin;
+	scrollbar-color: rgba(var(--color-text), 0.2) transparent;
+
+	&::-webkit-scrollbar {
+		height: 4px;
+	}
+
+	&::-webkit-scrollbar-track {
+		background: transparent;
+	}
+
+	&::-webkit-scrollbar-thumb {
+		background: rgba(var(--color-text), 0.2);
+		border-radius: 2px;
+	}
+`;
+
+export const HighlightCard = styled.div`
+	flex-shrink: 0;
+	background: var(--color-card-background);
+	border: 1px solid rgba(243, 156, 18, 0.3);
+	border-left: 3px solid #f39c12;
+	border-radius: var(--border-radius);
+	padding: 8px 12px;
+	min-width: 180px;
+	max-width: 260px;
+	box-shadow: 0 2px 6px rgba(0, 0, 0, 0.2);
+`;
+
+export const HighlightAmount = styled.div`
+	color: #f39c12;
+	font-size: 11px;
+	font-weight: 700;
+	margin-bottom: 4px;
+`;
+
+export const HighlightContent = styled.div`
+	color: rgba(var(--color-text), 0.8);
+	font-size: var(--font-size-small);
+	line-height: 1.4;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+`;
diff --git a/src/apps/engine/hooks/comments.tsx b/src/apps/engine/hooks/comments.tsx
index d619cb4c..28900978 100644
--- a/src/apps/engine/hooks/comments.tsx
+++ b/src/apps/engine/hooks/comments.tsx
@@ -66,6 +66,55 @@ export const useComments = (rootId: any, root: boolean = false) => {
 	return { comments, isLoading, error };
 };
 
+export const usePaidComments = (commentsId: any) => {
+	const { libs } = usePermawebProvider();
+	const [paidComments, setPaidComments] = React.useState<any[]>([]);
+	const [isLoading, setIsLoading] = React.useState(false);
+	const [error, setError] = React.useState(null);
+	const [refetchTrigger, setRefetchTrigger] = React.useState(0);
+
+	React.useEffect(() => {
+		if (!commentsId || !libs?.getPaidComments) {
+			setPaidComments([]);
+			return;
+		}
+
+		setIsLoading(true);
+		setError(null);
+
+		libs
+			.getPaidComments({ commentsId })
+			.then((fetched: any) => {
+				const sorted = (fetched || []).sort((a: any, b: any) => {
+					const aAmount = parseFloat(a.tipAmount || '0');
+					const bAmount = parseFloat(b.tipAmount || '0');
+					return bAmount - aAmount;
+				});
+				setPaidComments(sorted);
+			})
+			.catch((err: any) => {
+				console.error('Error fetching paid comments:', err);
+				setError(err);
+				setPaidComments([]);
+			})
+			.finally(() => {
+				setIsLoading(false);
+			});
+	}, [commentsId, libs, refetchTrigger]);
+
+	React.useEffect(() => {
+		const handleCommentAdded = (e: any) => {
+			if (e.detail.commentsId === commentsId) {
+				setRefetchTrigger((prev) => prev + 1);
+			}
+		};
+		window.addEventListener('commentAdded', handleCommentAdded);
+		return () => window.removeEventListener('commentAdded', handleCommentAdded);
+	}, [commentsId]);
+
+	return { paidComments, isLoading, error };
+};
+
 export const useCommentRules = (commentsId: string) => {
 	const { libs } = usePermawebProvider();
 	const [rules, setRules] = React.useState<any>(null);
@@ -81,10 +130,20 @@ export const useCommentRules = (commentsId: string) => {
 			.then((fetchedRules: any) => {
 				if (fetchedRules) {
 					const requireProfileThumbnail = fetchedRules.requireProfileThumbnail ?? fetchedRules.RequireProfileThumbnail;
+					const enableTipping = fetchedRules.enableTipping ?? fetchedRules.EnableTipping;
+					const requireTipToComment = fetchedRules.requireTipToComment ?? fetchedRules.RequireTipToComment;
+					const showPaidTab = fetchedRules.showPaidTab ?? fetchedRules.ShowPaidTab;
+					const highlightPaidComments = fetchedRules.highlightPaidComments ?? fetchedRules.HighlightPaidComments;
 					const normalizedRules = {
 						profileAgeRequired: fetchedRules.profileAgeRequired ?? fetchedRules.ProfileAgeRequired,
 						mutedWords: fetchedRules.mutedWords ?? fetchedRules.MutedWords,
 						requireProfileThumbnail: requireProfileThumbnail === 'true' || requireProfileThumbnail === true,
+						enableTipping: enableTipping === 'true' || enableTipping === true,
+						requireTipToComment: requireTipToComment === 'true' || requireTipToComment === true,
+						tipAssetId: fetchedRules.tipAssetId ?? fetchedRules.TipAssetId ?? '',
+						minTipAmount: fetchedRules.minTipAmount ?? fetchedRules.MinTipAmount ?? '0',
+						showPaidTab: showPaidTab === 'true' || showPaidTab === true,
+						highlightPaidComments: highlightPaidComments === 'true' || highlightPaidComments === true,
 					};
 					setRules(normalizedRules);
 				}
diff --git a/src/helpers/config.ts b/src/helpers/config.ts
index a0723534..dee3d750 100644
--- a/src/helpers/config.ts
+++ b/src/helpers/config.ts
@@ -21,9 +21,9 @@ import { ICONS, ICONS_SOCIAL } from './config/icons';
 export { ICONS, ICONS_SOCIAL };
 
 export const AO_NODE = {
-	url: 'https://hb.portalinto.com',
+	url: 'https://push.forward.computer',
 	authority: 'a5ZMUKbGClAsKzB4SHDYrwkOZZHIIfpbaxrmKwUHCe8',
-	scheduler: 'n_XZJhUnmldNFo4dhajoPZWhBXuJk-OcQr5JQ49c4Zo',
+	scheduler: 'YUsEnCSlxvOMxRd1qG6rkaPwMgi3xOorfDfYJoMDndA',
 };
 
 export const TIP_TOKEN_OPTIONS = [
diff --git a/src/helpers/types.ts b/src/helpers/types.ts
index a4f90dd5..e3449253 100644
--- a/src/helpers/types.ts
+++ b/src/helpers/types.ts
@@ -74,6 +74,12 @@ export type CommentRulesType = {
 	profileAgeRequired?: number;
 	mutedWords?: string[];
 	requireProfileThumbnail?: boolean;
+	enableTipping?: boolean;
+	requireTipToComment?: boolean;
+	tipAssetId?: string;
+	minTipAmount?: string;
+	showPaidTab?: boolean;
+	highlightPaidComments?: boolean;
 };
 
 export type PortalAssetPostReduxType = {