Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging deployment #1295

Merged
merged 32 commits into from
Nov 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
d373a90
YieldFarming HarvestPaginated test 1
abhishek-01k Aug 31, 2023
f154a52
HarvestPaginated function done
abhishek-01k Sep 4, 2023
3f42d82
Harvest Paginated function
abhishek-01k Sep 7, 2023
1dfe0ec
Harvestpaginated UI done with functionality
abhishek-01k Sep 11, 2023
e814a8a
Unstake Paginated function done
abhishek-01k Sep 27, 2023
a22c0a8
Improved text on the modal
abhishek-01k Sep 27, 2023
b2c1faa
added creategroup component from ui-web
KlausMikhaelson Oct 11, 2023
a219a4a
Merge pull request #1275 from ethereum-push-notification-service/feat…
0xNilesh Oct 13, 2023
28d9972
Merge branch 'dev-deployment' into uiweb-creategroup
0xNilesh Oct 13, 2023
e53dba6
Merge pull request #1276 from ethereum-push-notification-service/uiwe…
0xNilesh Oct 13, 2023
1f54fd0
Updated uiweb version
0xNilesh Oct 13, 2023
cffce33
Updated uiweb version
0xNilesh Oct 16, 2023
0a4ac55
Updated uiweb version
0xNilesh Oct 16, 2023
bf2c806
Updated restapi version
0xNilesh Oct 16, 2023
b7e9fc6
Updated restapi version
0xNilesh Oct 16, 2023
c4f044a
Chore/swap token modal fix (#1278)
0xNilesh Oct 16, 2023
7762117
Fixed all the issue and also added batchSize and maxgasFees
abhishek-01k Oct 19, 2023
b8a5bfa
Fixed the epoch number display issue
abhishek-01k Oct 26, 2023
2cdb09c
Updated with main branch
abhishek-01k Oct 26, 2023
1d13050
Updated with main branch
abhishek-01k Oct 26, 2023
afd8fac
Merge branch 'staging-deployment' into fix/rendering-issue
0xNilesh Oct 27, 2023
d87cf74
Merge pull request #1286 from ethereum-push-notification-service/fix/…
0xNilesh Oct 27, 2023
0535b98
Merge pull request #1287 from ethereum-push-notification-service/unst…
0xNilesh Oct 27, 2023
63556b2
Resolved merge conflicts
0xNilesh Oct 27, 2023
aef6919
Updated uiweb to latest alpha version
0xNilesh Oct 27, 2023
7dde4cc
fixed invalid signature issue and updated uiweb package
KlausMikhaelson Nov 1, 2023
258851c
Merge branch 'staging-deployment' into uiweb-creategroup
0xNilesh Nov 2, 2023
2c99055
Merge pull request #1289 from ethereum-push-notification-service/uiwe…
0xNilesh Nov 2, 2023
5d23135
Refactor/nfs ticker (#1290)
0xNilesh Nov 3, 2023
9d50983
Enabled decimal range and ticker in notif settings
0xNilesh Nov 6, 2023
ceaf577
Updated restapi package
0xNilesh Nov 6, 2023
005c9d1
Merge main
0xNilesh Nov 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/components/SendNotifications.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ function SendNotifications() {
const [nfInfo, setNFInfo] = useState('');
const [nfSettingIndex, setNFSettingIndex] = useState('');
const [delegateeOptions, setDelegateeOptions] = useState([]);
const [nfSliderValue, setNfSliderValue] = useState(0);

const channelDetailsFromBackend = useMemo(() => {
if (delegatees) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ import { fetchInbox } from 'helpers/w2w/user';
import { profilePicture } from 'config/W2WConfig';
import { useAccount, useDeviceWidthCheck } from 'hooks';
import { device } from 'config/Globals';
import { CreateGroupModal } from "@pushprotocol/uiweb";
import { ChatUIProvider } from '@pushprotocol/uiweb';


export const CreateGroupModalContent = ({ onClose, onConfirm: createGroup, toastObject }: ModalInnerComponentType) => {
const [createGroupState, setCreateGroupState] = React.useState<number>(1);
Expand All @@ -40,6 +43,7 @@ export const CreateGroupModalContent = ({ onClose, onConfirm: createGroup, toast
const createGroupToast = useToast();
const isMobile = useDeviceWidthCheck(600);


const handlePrevious = () => {
setCreateGroupState(1);
};
Expand Down Expand Up @@ -133,34 +137,8 @@ export const CreateGroupModalContent = ({ onClose, onConfirm: createGroup, toast
};
return (
<ThemeProvider theme={themes}>
<ModalContainer createGroupState={createGroupState}>

{createGroupState == 1 && (
<GroupDetailsContent
groupNameData={groupNameData}
groupDescriptionData={groupDescriptionData}
groupImageData={groupImageData}
groupTypeObject={groupTypeObject}
handleGroupNameData={setGroupNameData}
handleGroupDescriptionData={setGroupDescriptionData}
handleGroupImageData={setGroupImageData}
handleGroupTypeObject={setGroupTypeObject}
handleCreateGroupState={setCreateGroupState}
handlePrevious={handlePrevious}
handleClose={handleClose}
/>
)}
{createGroupState == 2 && (
<AddWalletContent
onSubmit={handleCreateGroup}
memberList={memberList}
handleMemberList={setMemberList}
isLoading={isLoading}
handlePrevious={handlePrevious}
handleClose={handleClose}
title={"Create Group"}
/>
)}
<ModalContainer>
<CreateGroupModal onClose={() => handleClose()} />
</ModalContainer>
</ThemeProvider>
);
Expand Down
19 changes: 15 additions & 4 deletions src/modules/chat/ChatModule.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { VideoCallContext } from 'contexts/VideoCallContext';
import { caip10ToWallet } from 'helpers/w2w';
import * as w2wHelper from 'helpers/w2w/';
import { checkIfGroup, rearrangeMembers } from 'helpers/w2w/groupChat';
import { useAccount, useDeviceWidthCheck, useSDKSocket } from 'hooks';
import { useAccount,useDeviceWidthCheck, useSDKSocket } from 'hooks';
import useModalBlur, { MODAL_POSITION } from 'hooks/useModalBlur';
import useToast from 'hooks/useToast';
import ChatBoxSection from 'sections/chat/ChatBoxSection';
Expand All @@ -43,6 +43,7 @@ import { checkIfIntent, getUpdatedChatAndIntent, getUpdatedGroupInfo } from 'hel
import { appConfig } from 'config';
import GLOBALS, { device, globalsMargin } from 'config/Globals';
import { fetchIntent } from 'helpers/w2w/user';
import { ChatUIProvider } from '@pushprotocol/uiweb';

export const ToastPosition: ToastOptions = {
position: 'top-right',
Expand All @@ -58,8 +59,8 @@ export const Context = React.createContext<AppContext | null>(null);

// Create Header
function Chat({ chatid }) {
const { account, chainId } = useAccount();
const { getUser, connectedUser, setConnectedUser, blockedLoading, setBlockedLoading, displayQR, setDisplayQR } =
const { account, chainId, provider } = useAccount();
const { getUser, pgpPvtKey,connectedUser, setConnectedUser, blockedLoading, setBlockedLoading, displayQR, setDisplayQR } =
useContext(ChatUserContext);
const { videoCallData } = useContext(VideoCallContext);

Expand All @@ -77,6 +78,7 @@ function Chat({ chatid }) {
const [activeTab, setCurrentTab] = useState<number>(0);
const [userShouldBeSearched, setUserShouldBeSearched] = useState<boolean>(false);
const [filteredUserData, setFilteredUserData] = useState<User[]>([]);
const [signerData, setSignerData] = useState();

const isMobile = useDeviceWidthCheck(600);
const queryClient = new QueryClient({});
Expand Down Expand Up @@ -274,11 +276,14 @@ const getUpdatedGroup = async(groupInfo) => {
showModal: showCreateGroupModal,
ModalComponent: CreateGroupModalComponent,
} = useModalBlur();
// const { pgpPvtKey } = useContext<any>(ChatUserContext);


const connectUser = async (): Promise<void> => {
const caip10:string = w2wHelper.walletToCAIP10({account});

const signer = await provider.getSigner();
setSignerData(signer);
console.log(signer, 'kkkk')

if(connectedUser?.wallets?.toLowerCase() !== caip10?.toLowerCase()){
await getUser();
Expand Down Expand Up @@ -392,8 +397,13 @@ const getUpdatedGroup = async(groupInfo) => {
}
};

useEffect(() => {
console.log(account, connectedUser?.privateKey, "kkkk")
}, [account, connectedUser?.privateKey])

return (
<Container>
<ChatUIProvider signer={signerData} env={appConfig?.appEnv} account={account} pgpPrivateKey={pgpPvtKey}>
<ItemHV2 ref={containerRef}>
{!isLoading ? (
<QueryClientProvider client={queryClient}>
Expand Down Expand Up @@ -513,6 +523,7 @@ const getUpdatedGroup = async(groupInfo) => {
/>
)}
</ItemHV2>
</ChatUIProvider>
</Container>
);
}
Expand Down