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

PLT-7225 set api call for config json needed for dynamic setting of m… #16

Merged
merged 3 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions src/components/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ import Payouts from './Payouts';
import ToastMessage from './ToastMessage';
import { Navigate } from 'react-router-dom';

const App: React.FC = () => {
interface AppProps extends React.PropsWithChildren<{}> {
runtimeURL: string;
}

const App: React.FC<AppProps> = ({runtimeURL}) => {

const hasSelectedAWalletExtension = localStorage.getItem('walletProvider');
const [toasts, setToasts] = useState<any[]>([]);

Expand All @@ -23,7 +28,7 @@ const App: React.FC = () => {
<Router>
<Routes>
<Route path="/" element={hasSelectedAWalletExtension ? <Navigate to="/payouts" /> : <Landing setAndShowToast={setAndShowToast} />} />
<Route path="/payouts" element={hasSelectedAWalletExtension ? <Payouts setAndShowToast={setAndShowToast} /> : <Navigate to="/" />} />
<Route path="/payouts" element={hasSelectedAWalletExtension ? <Payouts setAndShowToast={setAndShowToast} runtimeURL={runtimeURL} /> : <Navigate to="/" />} />
</Routes>
<div className="toast-container position-fixed bottom-0 end-0 p-3">
{toasts.map(toast => (
Expand Down
29 changes: 22 additions & 7 deletions src/components/Payouts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import './Payouts.scss';
import { formatAssets, intersperse, shortViewTxOutRef } from './Format';
import { SupportedWallet } from '@marlowe.io/wallet/browser';

const runtimeURL = `${process.env.MARLOWE_RUNTIME_WEB_URL}`;
const marloweScanURL = `${process.env.MARLOWE_SCAN_URL}`;
type PayoutsProps = {
setAndShowToast: (title: string, message: any, isDanger: boolean) => void
runtimeURL: string
};

const Payouts: React.FC<PayoutsProps> = ({ setAndShowToast }) => {
const Payouts: React.FC<PayoutsProps> = ({ setAndShowToast, runtimeURL }) => {
const navigate = useNavigate();
const selectedAWalletExtension = localStorage.getItem('walletProvider');
if (!selectedAWalletExtension) { navigate('/'); }
Expand Down Expand Up @@ -66,11 +66,26 @@ const Payouts: React.FC<PayoutsProps> = ({ setAndShowToast }) => {

useEffect(() => {
const fetchData = async () => {
const runtimeLifecycleParameters : BrowserRuntimeLifecycleOptions = { runtimeURL:runtimeURL, walletName:selectedAWalletExtension as SupportedWallet}
const runtimeLifecycle = await mkRuntimeLifecycle(runtimeLifecycleParameters).then((a) => {setRuntimeLifecycle(a);return a})
await runtimeLifecycle.wallet.getChangeAddress().then((changeAddress : AddressBech32) => setChangeAddress(unAddressBech32(changeAddress) ))
await runtimeLifecycle.payouts.available().then(setAvailablePayouts)
await runtimeLifecycle.payouts.withdrawn().then(setWithdrawnPayouts)
const runtimeLifecycleParameters: BrowserRuntimeLifecycleOptions = {
runtimeURL: runtimeURL,
walletName: selectedAWalletExtension as SupportedWallet,
};
const runtimeLifecycle = await mkRuntimeLifecycle(runtimeLifecycleParameters).then(
(a) => {
setRuntimeLifecycle(a);
return a;
}
);
await runtimeLifecycle.wallet
.getChangeAddress()
.then((changeAddress: AddressBech32) =>
setChangeAddress(unAddressBech32(changeAddress))
);
await runtimeLifecycle.payouts
.available()
.then(setAvailablePayouts);
await runtimeLifecycle.payouts.withdrawn().then(setWithdrawnPayouts);

}

fetchData()
Expand Down
18 changes: 17 additions & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@ import 'bootstrap/dist/css/bootstrap.min.css';
import 'bootstrap/dist/js/bootstrap.bundle.min.js';
import './styles/main.scss';

let runtimeURL = process.env.MARLOWE_RUNTIME_WEB_URL;
await fetch(`/config.json`).then(async (res) => {
if (res.status === 200) {
const { marloweWebServerUrl } = await res.json();
if (!!marloweWebServerUrl) {
runtimeURL = marloweWebServerUrl;
}
}
});

const hasValidRuntimeInstance = runtimeURL !== undefined && runtimeURL !== null && runtimeURL !== '' && runtimeURL.startsWith('http');

// 2) Get a reference to the div with ID root
const el = document.getElementById('root');

Expand All @@ -19,4 +31,8 @@ if (!el) {
const root = ReactDOM.createRoot(el);

// 4) Show the component on the screen
root.render(<App />);
if (hasValidRuntimeInstance && runtimeURL) {
root.render(<App runtimeURL={runtimeURL} />);
} else {
alert("Missing valid config.json file with marloweWebServerUrl OR env keys are not set")
}