diff --git a/electron-react/src/middleware/middleware_api.js b/electron-react/src/middleware/middleware_api.js index 932e016601..cc44e61509 100644 --- a/electron-react/src/middleware/middleware_api.js +++ b/electron-react/src/middleware/middleware_api.js @@ -225,6 +225,16 @@ export const handle_message = (store, payload) => { store.dispatch(get_balance_for_wallet(wallet_id)); store.dispatch(get_transactions(wallet_id)); } + } else if (payload.command === "create_new_wallet") { + if (payload.data.success) { + store.dispatch(format_message("get_wallets", {})); + store.dispatch(createState(true, false)); + } + } else if (payload.command == "rl_set_user_info") { + if (payload.data.success) { + store.dispatch(format_message("get_wallets", {})); + store.dispatch(createState(true, false)); + } } else if (payload.command === "cc_set_name") { if (payload.data.success) { const wallet_id = payload.data.wallet_id; diff --git a/electron-react/src/modules/incoming_api.js b/electron-react/src/modules/incoming_api.js index 087f86622b..3cb3ede6ae 100644 --- a/electron-react/src/modules/incoming_api.js +++ b/electron-react/src/modules/incoming_api.js @@ -242,6 +242,16 @@ export const incomingReducer = (state = { ...initial_state }, action) => { state["send_transaction_result"] = message.data; return state; } + else if (command === "rl_set_user_info") { + const success = data.success; + console.log("RL SET USER INFO SUCCESS") + console.log(success) + } + else if (command === "create_new_wallet") { + const success = data.success; + console.log("RL CREATE WALLET SUCCESS") + console.log(success) + } return state; default: return state; diff --git a/electron-react/src/modules/message.js b/electron-react/src/modules/message.js index 271f8767fc..debca29442 100644 --- a/electron-react/src/modules/message.js +++ b/electron-react/src/modules/message.js @@ -513,6 +513,7 @@ export const create_rl_admin = (interval, limit, pubkey, amount) => { pubkey: pubkey, amount: amount }; + console.log("CREATE RL ADMIN ACTION: ", action) return action; }; @@ -523,6 +524,7 @@ export const create_rl_user = () => { wallet_type: "rl_wallet", rl_type: "user" }; + console.log("CREATE RL USER ACTION: ", action) return action; }; @@ -572,6 +574,7 @@ export const rl_set_user_info = (wallet_id, interval, limit, origin_id, admin_pu origin_id: origin_id, admin_pubkey: admin_pubkey }; + console.log("RL SET USER INFO ACTION: ", action) return action; }; diff --git a/electron-react/src/pages/RateLimitedWallet.js b/electron-react/src/pages/RateLimitedWallet.js index a15b18888c..08787dc0d0 100644 --- a/electron-react/src/pages/RateLimitedWallet.js +++ b/electron-react/src/pages/RateLimitedWallet.js @@ -163,6 +163,15 @@ const useStyles = makeStyles(theme => ({ paddingTop: theme.spacing(3), paddingBottom: theme.spacing(1) }, + inputLeft: { + marginLeft: theme.spacing(3), + height: 56 + }, + inputRight: { + marginRight: theme.spacing(3), + marginLeft: theme.spacing(6), + height: 56 + }, walletContainer: { marginBottom: theme.spacing(5) }, @@ -194,7 +203,7 @@ const useStyles = makeStyles(theme => ({ width: 50, overflowWrap: "break-word" /* Renamed property in CSS3 draft spec */ }, - amountField: { + leftField: { paddingRight: 20 } })); @@ -207,19 +216,24 @@ const IncompleteCard = props => { const data_parsed = JSON.parse(data); const pubkey = data_parsed["user_pubkey"] - console.log(pubkey) - function copy() { navigator.clipboard.writeText(pubkey); } var interval_input = null; var chiaper_input = null; - var origin_id = null; - var admin_pubkey = null; + var origin_id_input = null; + var admin_pubkey_input = null; function submit() { - dispatch(rl_set_user_info(id, interval_input, chiaper_input, origin_id, admin_pubkey)) + const user_sub_interval = interval_input.value; + const interval_value = parseInt(Number(user_sub_interval)); + const user_sub_chiaper = chiaper_input.value; + const chiaper_value = parseInt(Number(user_sub_chiaper)); + const user_sub_origin_id = origin_id_input.value; + const user_sub_admin_pubkey = admin_pubkey_input.value + console.log(id, interval_value, chiaper_value, user_sub_origin_id, user_sub_admin_pubkey) + dispatch(rl_set_user_info(id, interval_value, chiaper_value, user_sub_origin_id, user_sub_admin_pubkey)) } const classes = useStyles(); @@ -278,21 +292,21 @@ const IncompleteCard = props => {
- + Spending Interval Length - + Spendable Amount Per Interval
-
+
- + { inputRef={input => { interval_input = input; }} + className={classes.leftField} + margin="normal" label="Interval" /> - + { chiaper_input = input; @@ -341,7 +358,7 @@ const IncompleteCard = props => { color="secondary" fullWidth inputRef={input => { - origin_id = input; + origin_id_input = input; }} label="Origin ID" /> @@ -353,7 +370,7 @@ const IncompleteCard = props => { color="secondary" fullWidth inputRef={input => { - admin_pubkey = input; + admin_pubkey_input = input; }} label="Admin Pubkey" /> @@ -380,13 +397,14 @@ const IncompleteCard = props => { const RLDetailsCard = props => { var id = props.wallet_id; - const interval = useSelector(state => state.wallet_state.wallets[id].interval); - const limit = useSelector(state => state.wallet_state.wallets[id].limit); const data = useSelector(state => state.wallet_state.wallets[id].data); const data_parsed = JSON.parse(data); const type = data_parsed["type"] const user_pubkey = data_parsed["user_pubkey"] const admin_pubkey = data_parsed["admin_pubkey"] + const interval = data_parsed["interval"] + const limit = data_parsed["limit"] + const origin_id = data_parsed["rl_origin_id"] function user_copy() { navigator.clipboard.writeText(user_pubkey); @@ -396,6 +414,10 @@ const RLDetailsCard = props => { navigator.clipboard.writeText(admin_pubkey); } + function origin_copy() { + navigator.clipboard.writeText(origin_id); + } + const classes = useStyles(); if (type === "user") { return ( @@ -521,6 +543,32 @@ const RLDetailsCard = props => {
+ +
+ + + + + + + + +
+
@@ -798,7 +846,7 @@ const SendCard = props => { color="secondary" fullWidth disabled={sending_transaction} - className={classes.amountField} + className={classes.leftField} margin="normal" inputRef={input => { amount_input = input; diff --git a/electron-react/src/pages/createRLAdmin.js b/electron-react/src/pages/createRLAdmin.js index d3f1966312..3ac7dd8a03 100644 --- a/electron-react/src/pages/createRLAdmin.js +++ b/electron-react/src/pages/createRLAdmin.js @@ -128,11 +128,16 @@ export const CreateRLAdminWallet = () => { } dispatch(createState(true, true)); const interval = interval_input.value + const interval_value = parseInt(Number(interval)); const chiaper = chiaper_input.value + const chiaper_value = parseInt(Number(chiaper)); const userpubkey = userpubkey_input.value const amount = chia_to_mojo(amount_input.value); + const amount_value = parseInt(Number(amount)); var fee = chia_to_mojo(fee_input.value); - dispatch(create_rl_admin(interval, chiaper, userpubkey, amount)); + const fee_value = parseInt(Number(fee)); + console.log(interval_value, chiaper_value, userpubkey, amount_value) + dispatch(create_rl_admin(interval_value, chiaper_value, userpubkey, amount_value)); } return (