diff --git a/packages/examples/sdk-frontend-react/src/app/ChatUITest/ChatProfile.tsx b/packages/examples/sdk-frontend-react/src/app/ChatUITest/ChatProfile.tsx index 505158c71..274ae7b54 100644 --- a/packages/examples/sdk-frontend-react/src/app/ChatUITest/ChatProfile.tsx +++ b/packages/examples/sdk-frontend-react/src/app/ChatUITest/ChatProfile.tsx @@ -5,11 +5,11 @@ export const ChatProfileTest = () => { return (
Some component
} + chatId='0x455E5AA18469bC6ccEF49594645666C587A3a71B' +// chatId='36baf37e441fdd94e23406c6c716fc4e91a93a9ee68e070cd5b054534dbe09a6' style="Info" - /> + /> ) } diff --git a/packages/examples/sdk-frontend-react/src/app/ChatUITest/ChatViewComponent.tsx b/packages/examples/sdk-frontend-react/src/app/ChatUITest/ChatViewComponent.tsx index 60e28e587..c3ac5da4d 100644 --- a/packages/examples/sdk-frontend-react/src/app/ChatUITest/ChatViewComponent.tsx +++ b/packages/examples/sdk-frontend-react/src/app/ChatUITest/ChatViewComponent.tsx @@ -20,7 +20,7 @@ const ChatViewComponentTest = () => { console.log("BOIIII RETURNNNSSSSS")} chatId='0xf8250D363BD1F25f52F10C21188fe82c68C049c4' - + component={
Test
} limit={10} isConnected={true} groupInfoModalBackground={MODAL_BACKGROUND_TYPE.OVERLAY} diff --git a/packages/uiweb/src/lib/components/chat/ChatProfile/AddWalletContent.tsx b/packages/uiweb/src/lib/components/chat/ChatProfile/AddWalletContent.tsx index 536548606..0cd4f18ae 100644 --- a/packages/uiweb/src/lib/components/chat/ChatProfile/AddWalletContent.tsx +++ b/packages/uiweb/src/lib/components/chat/ChatProfile/AddWalletContent.tsx @@ -185,12 +185,12 @@ export const AddWalletContent = ({
{ - // console.log(groupMembers); onSubmit() }} isLoading={isLoading} memberListCount={memberList?.length > 0} theme={theme} + disabled={isLoading || groupMembers.length === 0} > {!isLoading && groupMembers ? (submitButtonTitle ? submitButtonTitle : 'Add To Group'): ''} {isLoading && } diff --git a/packages/uiweb/src/lib/components/chat/ChatProfile/ChatProfile.tsx b/packages/uiweb/src/lib/components/chat/ChatProfile/ChatProfile.tsx index e47d24135..d02c480e3 100644 --- a/packages/uiweb/src/lib/components/chat/ChatProfile/ChatProfile.tsx +++ b/packages/uiweb/src/lib/components/chat/ChatProfile/ChatProfile.tsx @@ -41,6 +41,7 @@ export const ChatProfile: React.FC = ({ style, groupInfoModalBackground = MODAL_BACKGROUND_TYPE.OVERLAY, groupInfoModalPositionType = MODAL_POSITION_TYPE.GLOBAL, + component=null, }) => { const theme = useContext(ThemeContext); const { account, env } = useChatData(); @@ -127,6 +128,11 @@ export const ChatProfile: React.FC = ({ margin="0 20px 0 auto" alignSelf="center" > + {(component && !groupInfo) && ( +
+ {component} +
+ )} {(groupInfo?.rules?.chat?.conditions || groupInfo?.rules?.entry?.conditions) && } {!!groupInfo?.isPublic && ( diff --git a/packages/uiweb/src/lib/components/chat/ChatViewComponent/ChatViewComponent.tsx b/packages/uiweb/src/lib/components/chat/ChatViewComponent/ChatViewComponent.tsx index 09cf1366f..3c8d43587 100644 --- a/packages/uiweb/src/lib/components/chat/ChatViewComponent/ChatViewComponent.tsx +++ b/packages/uiweb/src/lib/components/chat/ChatViewComponent/ChatViewComponent.tsx @@ -40,6 +40,7 @@ export const ChatViewComponent: React.FC = ( groupInfoModalPositionType = MODAL_POSITION_TYPE.GLOBAL, verificationFailModalBackground = MODAL_BACKGROUND_TYPE.OVERLAY, verificationFailModalPosition = MODAL_POSITION_TYPE.GLOBAL, + component=null } = options || {}; const { env, signer, account, pgpPrivateKey } = useChatData(); @@ -62,7 +63,7 @@ export const ChatViewComponent: React.FC = ( padding="13px" theme={theme} > - {chatProfile && } + {chatProfile && }
{ - const { createGatedGroup } = useCreateGatedGroup(); + const { createGatedGroup, loading } = useCreateGatedGroup(); const groupInfoToast = useToast(); const getEncryptionType = () => { if (groupEncryptionType === 'encrypted') { @@ -85,7 +85,7 @@ const AddWalletsInCreateGroup = ({ handlePrevious, onClose,groupInputDetails, gr memberList={groupMembers} handleMemberList={setGroupMembers} groupMembers={groupInputDetails.groupMembers} - isLoading={false} + isLoading={loading} modalHeader="Add Wallets" />
diff --git a/packages/uiweb/src/lib/components/chat/exportedTypes.ts b/packages/uiweb/src/lib/components/chat/exportedTypes.ts index dd4e7f7dc..3e14ff012 100644 --- a/packages/uiweb/src/lib/components/chat/exportedTypes.ts +++ b/packages/uiweb/src/lib/components/chat/exportedTypes.ts @@ -25,6 +25,7 @@ export interface IChatViewComponentProps { verificationFailModalBackground?: ModalBackgroundType; verificationFailModalPosition?: ModalPositionType; onVerificationFail?: () => void; + component?: React.ReactNode; } export interface IChatProfile { @@ -32,6 +33,7 @@ export interface IChatProfile { style: "Info" | "Preview"; groupInfoModalBackground?: ModalBackgroundType; groupInfoModalPositionType?: ModalPositionType; + component?: React.ReactNode; } export interface TwitterFeedReturnType {