Merge remote-tracking branch 'origin/upstream/main'

web/berry/src/constants/ChannelConstants.js

@@ -68,7 +68,7 @@ export const CHANNEL_OPTIONS = {
   25: {
     key: 25,
     text: 'Moonshot AI',
-    value: 19,
+    value: 25,
     color: 'default'
   },
   23: {

web/berry/src/views/Token/component/EditModal.js

@@ -87,6 +87,8 @@ const EditModal = ({ open, tokenId, onCancel, onOk }) => {
   useEffect(() => {
     if (tokenId) {
       loadToken().then();
+    } else {
+      setInputs({...originInputs});
     }
   }, [tokenId]);