fix: Merge branch 'main' into deployment

push-protocol · Dec 20, 2023 · 7adb464 · 7adb464
2 parents ea929e0 + 9c41c8d
commit 7adb464
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/contributing.md → CONTRIBUTING.md b/contributing.md → CONTRIBUTING.md
@@ -3,7 +3,7 @@
 ## Repo Setup
 
 ```
-git clone https://github.com/ethereum-push-notification-service/sdk.git
+git clone https://github.com/ethereum-push-notification-service/push-sdk.git
 
 cd sdk
 ```

diff --git 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 = ({
       <Section flex="1" alignSelf="center">
         <ModalConfirmButton
           onClick={() => {
-            // 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 && <Spinner size="30" color="#fff" />}

diff --git a/packages/uiweb/src/lib/components/chat/CreateGroup/AddWallets.tsx b/packages/uiweb/src/lib/components/chat/CreateGroup/AddWallets.tsx
@@ -23,7 +23,7 @@ interface AddWalletsInCreateGroupProps {
 }
 
 const AddWalletsInCreateGroup = ({ handlePrevious, onClose,groupInputDetails, groupEncryptionType, checked, criteriaStateManager, groupMembers, setGroupMembers }: AddWalletsInCreateGroupProps) => {
-    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"
             />
         </Section>
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     ## Repo Setup
     ```
-    git clone https://github.com/ethereum-push-notification-service/sdk.git
+    git clone https://github.com/ethereum-push-notification-service/push-sdk.git
     cd sdk
     ```
@@ Expand Down @@