Skip to content

Commit

Permalink
Adding seperate end-point for Solana (#1114)
Browse files Browse the repository at this point in the history 
* Use renovate for dependency updates (#1054)

1. Disable dependabot for normal dependency updates. Note the dependabot PRs will need to be manually closed, and the "security" dependabot PRs will continue.

2. Use renovateapp instead.

The renovate configuration included here is based on that from ads-serve, and:

a. waits for updates to have been published for 4 days before raising a PR - this both reduces churn and also avoids the 3 day period where npm-published entries can be "unpublished"
b. combines all minor and patch updates into a single PR

* removed as *[bot] is not accepted by AWS (#1055)

Signed-off-by: Ahmed Kamal <[email protected]>

* Update all non-major dependencies (#1057)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Pin dependencies (#1056)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update all non-major dependencies (#1063)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update Node.js to v18.16.1 (#1059)

* first mockup on dev2

* remove cluttered talk, add request payload

* change permission name from BAT-gating to balance as per spec sheet

* Renovate/all minor patch (#1062)

* Use renovate for dependency updates (#1054)

1. Disable dependabot for normal dependency updates. Note the dependabot PRs will need to be manually closed, and the "security" dependabot PRs will continue.

2. Use renovateapp instead.

The renovate configuration included here is based on that from ads-serve, and:

a. waits for updates to have been published for 4 days before raising a PR - this both reduces churn and also avoids the 3 day period where npm-published entries can be "unpublished"
b. combines all minor and patch updates into a single PR

* removed as *[bot] is not accepted by AWS (#1055)

Signed-off-by: Ahmed Kamal <[email protected]>

* Update all non-major dependencies

---------

Signed-off-by: Ahmed Kamal <[email protected]>
Co-authored-by: Graham Tackley <[email protected]>
Co-authored-by: Ahmed Kamal <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update Node.js to v18.16.1

---------

Signed-off-by: Ahmed Kamal <[email protected]>
Co-authored-by: David Suh <[email protected]>
Co-authored-by: David Suh <[email protected]>
Co-authored-by: Marshall T. Rose <[email protected]>
Co-authored-by: Graham Tackley <[email protected]>
Co-authored-by: Ahmed Kamal <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Revert "Update Node.js to v18.16.1 (#1059)"

This reverts commit 0dc1969.

* this is what should have happened (#1070)

* Update dependency react-i18next to v13 (#1060)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Address word-wrap audit warning (#1073)

Addresses: GHSA-j8xg-fqg3-53r7

* reduce impact of web3 dependencies on non-web3 users (#1066)

* dynamically loading ethers library

* syncing package-lock.json with main

* removed short-circuit code

* removed short-circuit code

* fixed dynamic hexilify for solana

* phantom fallback option in solana

* phantom wallet support for solana

* Pin dependency optionator to 0.9.3 (#1074)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Duplicate Fix For Update jest monorepo to v29 (major)  (#1082)

* testing changes by renovate

* testing changes by renovate

* Pin dependency jest-environment-jsdom to 29.5.0 (#1083)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update all non-major dependencies (#1080)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Marshall T. Rose <[email protected]>

* Update dependency i18next to v23.2.6 (#1084)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update all non-major dependencies (#1085)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix for high spam scores #1088 and lock wallet #1089

* fix for high spam scores #1088 and lock wallet #1089

* checkbox text fixed

* Fix for Inability to Deselect Avatar NFT without Selecting Another in Web3 Call (#1101)

* Fix for Inability to Deselect Avatar NFT without Selecting Another

* Adding a check-box to filter NFTs with high spam score (#1102)

* check-btn for filtering high spam score NFTs

* JP-translations added

* JP-translations added

* JP-translations added

* JP-translations added

* forcefully adding recording flag

* adding seperate end-point for solana

---------

Signed-off-by: Ahmed Kamal <[email protected]>
Co-authored-by: Graham Tackley <[email protected]>
Co-authored-by: Ahmed Kamal <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: David Suh <[email protected]>
Co-authored-by: David Suh <[email protected]>
Co-authored-by: Marshall T. Rose <[email protected]>
  • Loading branch information
@hadiamjad @tackley
@kim0 @renovate @dvdhs @mrose17
7 people authored Jul 12, 2023
1 parent d869850 commit d1154e9
Show file tree
Hide file tree
Showing 3 changed files with 161 additions and 44 deletions.
64 changes: 62 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,21 @@
"svgo-loader": "4.0.0",
"ts-loader": "9.4.4",
"typescript": "4.9.5",
"webpack-cli": "5.1.4",
"webpack": "5.88.1",
"webpack-cli": "5.1.4",
"ts-jest": "29.1.1",
"webpack-dev-server": "4.15.1"
},
"dependencies": {
"@emotion/react": "11.11.1",
"buffer": "6.0.3",
"@types/dom-screen-wake-lock": "1.0.1",
"buffer": "6.0.3",
"ethers": "6.6.2",
"i18next": "23.2.6",
"jest-environment-jsdom": "29.5.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-i18next": "13.0.1"
"react-i18next": "13.0.1",
"react-router-dom": "6.14.1"
}
}
134 changes: 95 additions & 39 deletions src/App.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { css } from "@emotion/react";
import { BrowserRouter as Router, Route, Routes } from "react-router-dom";
import React from "react";
import { GlobalStyles } from "./components/GlobalStyles";
import { InCall } from "./components/InCall";
Expand Down Expand Up @@ -53,46 +54,101 @@ export const App: React.FC = () => {
}

return (
<React.Fragment>
<GlobalStyles />
<Router>
<Routes>
<Route
path="/sol"
element={
<React.Fragment>
<GlobalStyles />

<div css={styles.container}>
<InCall
roomName={roomName ?? ""}
jwt={jwt ?? ""}
isMobile={browserProps.isMobile}
isCallReady={isCallReady}
isWeb3Call={isWeb3Call}
jitsiContext={jitsiContext}
<div css={styles.container}>
<InCall
roomName={roomName ?? ""}
jwt={jwt ?? ""}
isMobile={browserProps.isMobile}
isCallReady={isCallReady}
isWeb3Call={isWeb3Call}
jitsiContext={jitsiContext}
/>
{!isCallReady &&
(isWeb3Call && hasInitialRoom ? (
<JoinWeb3Call
roomName={roomName as string}
setJwt={setJwt}
jitsiContext={jitsiContext}
setJitsiContext={setJitsiContext}
web3Account={web3Account}
setWeb3Account={setWeb3Account}
/>
) : (
<WelcomeScreen
onStartCall={onStartCall}
notice={notice}
disabled={isEstablishingCall}
hasInitialRoomName={hasInitialRoom}
browser={browserProps}
isWeb3Call={isWeb3Call}
setIsWeb3Call={setIsWeb3Call}
web3Account={web3Account}
setWeb3Account={setWeb3Account}
setJwt={setJwt}
setRoomName={setRoomName}
jitsiContext={jitsiContext}
setJitsiContext={setJitsiContext}
/>
))}
</div>
</React.Fragment>
}
/>
{!isCallReady &&
(isWeb3Call && hasInitialRoom ? (
<JoinWeb3Call
roomName={roomName as string}
setJwt={setJwt}
jitsiContext={jitsiContext}
setJitsiContext={setJitsiContext}
web3Account={web3Account}
setWeb3Account={setWeb3Account}
/>
) : (
<WelcomeScreen
onStartCall={onStartCall}
notice={notice}
disabled={isEstablishingCall}
hasInitialRoomName={hasInitialRoom}
browser={browserProps}
isWeb3Call={isWeb3Call}
setIsWeb3Call={setIsWeb3Call}
web3Account={web3Account}
setWeb3Account={setWeb3Account}
setJwt={setJwt}
setRoomName={setRoomName}
jitsiContext={jitsiContext}
setJitsiContext={setJitsiContext}
/>
))}
</div>
</React.Fragment>
<Route
path="/"
element={
<React.Fragment>
<GlobalStyles />

<div css={styles.container}>
<InCall
roomName={roomName ?? ""}
jwt={jwt ?? ""}
isMobile={browserProps.isMobile}
isCallReady={isCallReady}
isWeb3Call={isWeb3Call}
jitsiContext={jitsiContext}
/>
{!isCallReady &&
(isWeb3Call && hasInitialRoom ? (
<JoinWeb3Call
roomName={roomName as string}
setJwt={setJwt}
jitsiContext={jitsiContext}
setJitsiContext={setJitsiContext}
web3Account={"ETH"}
setWeb3Account={setWeb3Account}
/>
) : (
<WelcomeScreen
onStartCall={onStartCall}
notice={notice}
disabled={isEstablishingCall}
hasInitialRoomName={hasInitialRoom}
browser={browserProps}
isWeb3Call={isWeb3Call}
setIsWeb3Call={setIsWeb3Call}
web3Account={"ETH"}
setWeb3Account={setWeb3Account}
setJwt={setJwt}
setRoomName={setRoomName}
jitsiContext={jitsiContext}
setJitsiContext={setJitsiContext}
/>
))}
</div>
</React.Fragment>
}
/>
</Routes>
</Router>
);
};

0 comments on commit d1154e9

Please sign in to comment.