Merge branch 'main' into main
This commit is contained in:
		@@ -3,13 +3,11 @@ import { mauve, mauveDark, purple, purpleDark } from '@radix-ui/colors'
 | 
			
		||||
import { useTheme } from 'next-themes'
 | 
			
		||||
import { styled } from '../stitches.config'
 | 
			
		||||
import dynamic from 'next/dynamic'
 | 
			
		||||
import type { Props } from 'react-select'
 | 
			
		||||
import type { Props, StylesConfig } from 'react-select'
 | 
			
		||||
const SelectInput = dynamic(() => import('react-select'), { ssr: false })
 | 
			
		||||
const CreatableSelectInput = dynamic(() => import('react-select/creatable'), { ssr: false })
 | 
			
		||||
 | 
			
		||||
// eslint-disable-next-line react/display-name
 | 
			
		||||
const Select = forwardRef<any, Props>((props, ref) => {
 | 
			
		||||
  const { theme } = useTheme()
 | 
			
		||||
  const isDark = theme === 'dark'
 | 
			
		||||
const getColors = (isDark: boolean) => {
 | 
			
		||||
  const colors: any = {
 | 
			
		||||
    // primary: pink.pink9,
 | 
			
		||||
    active: isDark ? purpleDark.purple9 : purple.purple9,
 | 
			
		||||
@@ -30,15 +28,17 @@ const Select = forwardRef<any, Props>((props, ref) => {
 | 
			
		||||
  }
 | 
			
		||||
  colors.outline = colors.background
 | 
			
		||||
  colors.selected = colors.secondary
 | 
			
		||||
  return (
 | 
			
		||||
    <SelectInput
 | 
			
		||||
      ref={ref}
 | 
			
		||||
      menuPosition={props.menuPosition || 'fixed'}
 | 
			
		||||
      styles={{
 | 
			
		||||
  return colors
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const getStyles = (isDark: boolean) => {
 | 
			
		||||
  const colors = getColors(isDark)
 | 
			
		||||
  const styles: StylesConfig = {
 | 
			
		||||
    container: provided => {
 | 
			
		||||
      return {
 | 
			
		||||
        ...provided,
 | 
			
		||||
            position: 'relative'
 | 
			
		||||
        position: 'relative',
 | 
			
		||||
        width: '100%'
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    singleValue: provided => ({
 | 
			
		||||
@@ -107,16 +107,57 @@ const Select = forwardRef<any, Props>((props, ref) => {
 | 
			
		||||
    dropdownIndicator: (provided, state) => {
 | 
			
		||||
      return {
 | 
			
		||||
        ...provided,
 | 
			
		||||
        padding: 6,
 | 
			
		||||
        color: state.isFocused ? colors.border : colors.secondary,
 | 
			
		||||
        ':hover': {
 | 
			
		||||
          color: colors.border
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    clearIndicator: provided => {
 | 
			
		||||
      return {
 | 
			
		||||
        ...provided,
 | 
			
		||||
        padding: 6,
 | 
			
		||||
        color: colors.secondary,
 | 
			
		||||
        ':hover': {
 | 
			
		||||
          color: colors.border
 | 
			
		||||
        }
 | 
			
		||||
      }}
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
  return styles
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// eslint-disable-next-line react/display-name
 | 
			
		||||
const Select = forwardRef<any, Props>((props, ref) => {
 | 
			
		||||
  const { theme } = useTheme()
 | 
			
		||||
  const isDark = theme === 'dark'
 | 
			
		||||
  const styles = getStyles(isDark)
 | 
			
		||||
  return (
 | 
			
		||||
    <SelectInput
 | 
			
		||||
      ref={ref}
 | 
			
		||||
      menuPosition={props.menuPosition || 'fixed'}
 | 
			
		||||
      styles={styles}
 | 
			
		||||
      {...props}
 | 
			
		||||
    />
 | 
			
		||||
  )
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
// eslint-disable-next-line react/display-name
 | 
			
		||||
const Creatable = forwardRef<any, Props>((props, ref) => {
 | 
			
		||||
  const { theme } = useTheme()
 | 
			
		||||
  const isDark = theme === 'dark'
 | 
			
		||||
  const styles = getStyles(isDark)
 | 
			
		||||
  return (
 | 
			
		||||
    <CreatableSelectInput
 | 
			
		||||
      ref={ref}
 | 
			
		||||
      formatCreateLabel={label => `Enter "${label}"`}
 | 
			
		||||
      menuPosition={props.menuPosition || 'fixed'}
 | 
			
		||||
      styles={styles}
 | 
			
		||||
      {...props}
 | 
			
		||||
    />
 | 
			
		||||
  )
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
export default styled(Select, {})
 | 
			
		||||
export const CreatableSelect = styled(Creatable, {})
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										71
									
								
								components/Sequence.tsx
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										71
									
								
								components/Sequence.tsx
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,71 @@
 | 
			
		||||
import { FC, useCallback, useState } from 'react'
 | 
			
		||||
import state from '../state'
 | 
			
		||||
import { Flex, Input, Button } from '.'
 | 
			
		||||
import fetchAccountInfo from '../utils/accountInfo'
 | 
			
		||||
import { useSnapshot } from 'valtio'
 | 
			
		||||
 | 
			
		||||
interface AccountSequenceProps {
 | 
			
		||||
  address?: string
 | 
			
		||||
}
 | 
			
		||||
const AccountSequence: FC<AccountSequenceProps> = ({ address }) => {
 | 
			
		||||
  const { accounts } = useSnapshot(state)
 | 
			
		||||
  const account = accounts.find(acc => acc.address === address)
 | 
			
		||||
  const [isLoading, setIsLoading] = useState(false)
 | 
			
		||||
  const setSequence = useCallback(
 | 
			
		||||
    (sequence: number) => {
 | 
			
		||||
      const acc = state.accounts.find(acc => acc.address == address)
 | 
			
		||||
      if (!acc) return
 | 
			
		||||
      acc.sequence = sequence
 | 
			
		||||
    },
 | 
			
		||||
    [address]
 | 
			
		||||
  )
 | 
			
		||||
  const handleUpdateSequence = useCallback(
 | 
			
		||||
    async (silent?: boolean) => {
 | 
			
		||||
      if (!account) return
 | 
			
		||||
      setIsLoading(true)
 | 
			
		||||
 | 
			
		||||
      const info = await fetchAccountInfo(account.address, { silent })
 | 
			
		||||
      if (info) {
 | 
			
		||||
        setSequence(info.Sequence)
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      setIsLoading(false)
 | 
			
		||||
    },
 | 
			
		||||
    [account, setSequence]
 | 
			
		||||
  )
 | 
			
		||||
  const disabled = !account
 | 
			
		||||
  return (
 | 
			
		||||
    <Flex row align="center" fluid>
 | 
			
		||||
      <Input
 | 
			
		||||
        placeholder="Account sequence"
 | 
			
		||||
        value={account?.sequence || ""}
 | 
			
		||||
        disabled={!account}
 | 
			
		||||
        type="number"
 | 
			
		||||
        readOnly={true}
 | 
			
		||||
      />
 | 
			
		||||
      <Button
 | 
			
		||||
        size="xs"
 | 
			
		||||
        variant="primary"
 | 
			
		||||
        type="button"
 | 
			
		||||
        outline
 | 
			
		||||
        disabled={disabled}
 | 
			
		||||
        isDisabled={disabled}
 | 
			
		||||
        isLoading={isLoading}
 | 
			
		||||
        css={{
 | 
			
		||||
          background: '$backgroundAlt',
 | 
			
		||||
          position: 'absolute',
 | 
			
		||||
          right: '$2',
 | 
			
		||||
          fontSize: '$xs',
 | 
			
		||||
          cursor: 'pointer',
 | 
			
		||||
          alignContent: 'center',
 | 
			
		||||
          display: 'flex'
 | 
			
		||||
        }}
 | 
			
		||||
        onClick={() => handleUpdateSequence()}
 | 
			
		||||
      >
 | 
			
		||||
        Update
 | 
			
		||||
      </Button>
 | 
			
		||||
    </Flex>
 | 
			
		||||
  )
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export default AccountSequence
 | 
			
		||||
@@ -21,6 +21,7 @@ import { prepareDeployHookTx, sha256 } from '../state/actions/deployHook'
 | 
			
		||||
import estimateFee from '../utils/estimateFee'
 | 
			
		||||
import { getParameters, getInvokeOptions, transactionOptions, SetHookData } from '../utils/setHook'
 | 
			
		||||
import { capitalize } from '../utils/helpers'
 | 
			
		||||
import AccountSequence from './Sequence'
 | 
			
		||||
 | 
			
		||||
export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
 | 
			
		||||
  ({ accountAddress }) => {
 | 
			
		||||
@@ -190,6 +191,10 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
 | 
			
		||||
                    onChange={(acc: any) => setSelectedAccount(acc)}
 | 
			
		||||
                  />
 | 
			
		||||
                </Box>
 | 
			
		||||
                <Box css={{ width: '100%', position: 'relative' }}>
 | 
			
		||||
                  <Label>Sequence</Label>
 | 
			
		||||
                  <AccountSequence address={selectedAccount?.value} />
 | 
			
		||||
                </Box>
 | 
			
		||||
                <Box css={{ width: '100%' }}>
 | 
			
		||||
                  <Label>Invoke on transactions</Label>
 | 
			
		||||
                  <Controller
 | 
			
		||||
 
 | 
			
		||||
@@ -20,6 +20,7 @@ import { TxUI } from './ui'
 | 
			
		||||
import { default as _estimateFee } from '../../utils/estimateFee'
 | 
			
		||||
import toast from 'react-hot-toast'
 | 
			
		||||
import { combineFlags, extractFlags, transactionFlags } from '../../state/constants/flags'
 | 
			
		||||
import { SetHookData, toHex } from '../../utils/setHook'
 | 
			
		||||
 | 
			
		||||
export interface TransactionProps {
 | 
			
		||||
  header: string
 | 
			
		||||
@@ -40,20 +41,40 @@ const Transaction: FC<TransactionProps> = ({ header, state: txState, ...props })
 | 
			
		||||
 | 
			
		||||
  const prepareOptions = useCallback(
 | 
			
		||||
    (state: Partial<TransactionState> = txState) => {
 | 
			
		||||
      const { selectedTransaction, selectedDestAccount, selectedAccount, txFields, selectedFlags } =
 | 
			
		||||
        state
 | 
			
		||||
      const {
 | 
			
		||||
        selectedTransaction,
 | 
			
		||||
        selectedAccount,
 | 
			
		||||
        txFields,
 | 
			
		||||
        selectedFlags,
 | 
			
		||||
        hookParameters,
 | 
			
		||||
        memos
 | 
			
		||||
      } = state
 | 
			
		||||
 | 
			
		||||
      const TransactionType = selectedTransaction?.value || null
 | 
			
		||||
      const Destination = selectedDestAccount?.value || txFields?.Destination
 | 
			
		||||
      const Account = selectedAccount?.value || null
 | 
			
		||||
      const Flags = combineFlags(selectedFlags?.map(flag => flag.value)) || txFields?.Flags
 | 
			
		||||
      const HookParameters = Object.entries(hookParameters || {}).reduce<
 | 
			
		||||
        SetHookData['HookParameters']
 | 
			
		||||
      >((acc, [_, { label, value }]) => {
 | 
			
		||||
        return acc.concat({
 | 
			
		||||
          HookParameter: { HookParameterName: toHex(label), HookParameterValue: value }
 | 
			
		||||
        })
 | 
			
		||||
      }, [])
 | 
			
		||||
      const Memos = memos
 | 
			
		||||
        ? Object.entries(memos).reduce<SetHookData['Memos']>((acc, [_, { format, data, type }]) => {
 | 
			
		||||
            return acc?.concat({
 | 
			
		||||
              Memo: { MemoData: data, MemoFormat: toHex(format), MemoType: toHex(type) }
 | 
			
		||||
            })
 | 
			
		||||
          }, [])
 | 
			
		||||
        : undefined
 | 
			
		||||
 | 
			
		||||
      return prepareTransaction({
 | 
			
		||||
        ...txFields,
 | 
			
		||||
        HookParameters,
 | 
			
		||||
        Flags,
 | 
			
		||||
        TransactionType,
 | 
			
		||||
        Destination,
 | 
			
		||||
        Account
 | 
			
		||||
        Account,
 | 
			
		||||
        Memos
 | 
			
		||||
      })
 | 
			
		||||
    },
 | 
			
		||||
    [txState]
 | 
			
		||||
@@ -69,15 +90,29 @@ const Transaction: FC<TransactionProps> = ({ header, state: txState, ...props })
 | 
			
		||||
    }
 | 
			
		||||
  }, [selectedAccount?.value, selectedTransaction?.value, setState, txIsLoading])
 | 
			
		||||
 | 
			
		||||
  const getJsonString = useCallback(
 | 
			
		||||
    (state?: Partial<TransactionState>) =>
 | 
			
		||||
      JSON.stringify(prepareOptions?.(state) || {}, null, editorSettings.tabSize),
 | 
			
		||||
    [editorSettings.tabSize, prepareOptions]
 | 
			
		||||
  )
 | 
			
		||||
 | 
			
		||||
  const saveEditorState = useCallback(
 | 
			
		||||
    (value: string = '', transactionType?: string) => {
 | 
			
		||||
      const pTx = prepareState(value, transactionType)
 | 
			
		||||
      if (pTx) {
 | 
			
		||||
        pTx.editorValue = getJsonString(pTx)
 | 
			
		||||
        return setState(pTx)
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    [getJsonString, setState]
 | 
			
		||||
  )
 | 
			
		||||
 | 
			
		||||
  const submitTest = useCallback(async () => {
 | 
			
		||||
    let st: TransactionState | undefined
 | 
			
		||||
    const tt = txState.selectedTransaction?.value
 | 
			
		||||
    if (viewType === 'json') {
 | 
			
		||||
      // save the editor state first
 | 
			
		||||
      const pst = prepareState(editorValue || '', tt)
 | 
			
		||||
      if (!pst) return
 | 
			
		||||
 | 
			
		||||
      st = setState(pst)
 | 
			
		||||
      st = saveEditorState(editorValue, tt)
 | 
			
		||||
      if (!st) return
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    const account = accounts.find(acc => acc.address === selectedAccount?.value)
 | 
			
		||||
@@ -90,11 +125,12 @@ const Transaction: FC<TransactionProps> = ({ header, state: txState, ...props })
 | 
			
		||||
        throw Error('Account must be selected from imported accounts!')
 | 
			
		||||
      }
 | 
			
		||||
      const options = prepareOptions(st)
 | 
			
		||||
 | 
			
		||||
      const fields = getTxFields(options.TransactionType)
 | 
			
		||||
      if (fields.Destination && !options.Destination) {
 | 
			
		||||
        throw Error('Destination account is required!')
 | 
			
		||||
      // delete unnecessary fields
 | 
			
		||||
      Object.keys(options).forEach(field => {
 | 
			
		||||
        if (!options[field]) {
 | 
			
		||||
          delete options[field]
 | 
			
		||||
        }
 | 
			
		||||
      })
 | 
			
		||||
 | 
			
		||||
      await sendTransaction(account, options, { logPrefix })
 | 
			
		||||
    } catch (error) {
 | 
			
		||||
@@ -108,23 +144,18 @@ const Transaction: FC<TransactionProps> = ({ header, state: txState, ...props })
 | 
			
		||||
    }
 | 
			
		||||
    setState({ txIsLoading: false })
 | 
			
		||||
  }, [
 | 
			
		||||
    txState.selectedTransaction?.value,
 | 
			
		||||
    viewType,
 | 
			
		||||
    accounts,
 | 
			
		||||
    txIsDisabled,
 | 
			
		||||
    setState,
 | 
			
		||||
    header,
 | 
			
		||||
    saveEditorState,
 | 
			
		||||
    editorValue,
 | 
			
		||||
    txState,
 | 
			
		||||
    selectedAccount?.value,
 | 
			
		||||
    prepareOptions
 | 
			
		||||
  ])
 | 
			
		||||
 | 
			
		||||
  const getJsonString = useCallback(
 | 
			
		||||
    (state?: Partial<TransactionState>) =>
 | 
			
		||||
      JSON.stringify(prepareOptions?.(state) || {}, null, editorSettings.tabSize),
 | 
			
		||||
    [editorSettings.tabSize, prepareOptions]
 | 
			
		||||
  )
 | 
			
		||||
 | 
			
		||||
  const resetState = useCallback(
 | 
			
		||||
    (transactionType: SelectOption | undefined = defaultTransactionType) => {
 | 
			
		||||
      const fields = getTxFields(transactionType?.value)
 | 
			
		||||
@@ -134,13 +165,6 @@ const Transaction: FC<TransactionProps> = ({ header, state: txState, ...props })
 | 
			
		||||
        selectedTransaction: transactionType
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      if (fields.Destination !== undefined) {
 | 
			
		||||
        nwState.selectedDestAccount = null
 | 
			
		||||
        fields.Destination = ''
 | 
			
		||||
      } else {
 | 
			
		||||
        fields.Destination = undefined
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      if (transactionType?.value && transactionFlags[transactionType?.value] && fields.Flags) {
 | 
			
		||||
        nwState.selectedFlags = extractFlags(transactionType.value, fields.Flags)
 | 
			
		||||
        fields.Flags = undefined
 | 
			
		||||
@@ -177,11 +201,21 @@ const Transaction: FC<TransactionProps> = ({ header, state: txState, ...props })
 | 
			
		||||
    [accounts, prepareOptions, setState, txState]
 | 
			
		||||
  )
 | 
			
		||||
 | 
			
		||||
  const switchToJson = useCallback(() => {
 | 
			
		||||
    const editorValue = getJsonString()
 | 
			
		||||
    setState({ viewType: 'json', editorValue })
 | 
			
		||||
  }, [getJsonString, setState])
 | 
			
		||||
 | 
			
		||||
  const switchToUI = useCallback(() => {
 | 
			
		||||
    setState({ viewType: 'ui' })
 | 
			
		||||
  }, [setState])
 | 
			
		||||
 | 
			
		||||
  return (
 | 
			
		||||
    <Box css={{ position: 'relative', height: 'calc(100% - 28px)' }} {...props}>
 | 
			
		||||
      {viewType === 'json' ? (
 | 
			
		||||
        <TxJson
 | 
			
		||||
          getJsonString={getJsonString}
 | 
			
		||||
          saveEditorState={saveEditorState}
 | 
			
		||||
          header={header}
 | 
			
		||||
          state={txState}
 | 
			
		||||
          setState={setState}
 | 
			
		||||
@@ -189,6 +223,7 @@ const Transaction: FC<TransactionProps> = ({ header, state: txState, ...props })
 | 
			
		||||
        />
 | 
			
		||||
      ) : (
 | 
			
		||||
        <TxUI
 | 
			
		||||
          switchToJson={switchToJson}
 | 
			
		||||
          state={txState}
 | 
			
		||||
          resetState={resetState}
 | 
			
		||||
          setState={setState}
 | 
			
		||||
@@ -209,8 +244,8 @@ const Transaction: FC<TransactionProps> = ({ header, state: txState, ...props })
 | 
			
		||||
        <Button
 | 
			
		||||
          onClick={() => {
 | 
			
		||||
            if (viewType === 'ui') {
 | 
			
		||||
              setState({ viewType: 'json' })
 | 
			
		||||
            } else setState({ viewType: 'ui' })
 | 
			
		||||
              switchToJson()
 | 
			
		||||
            } else switchToUI()
 | 
			
		||||
          }}
 | 
			
		||||
          outline
 | 
			
		||||
        >
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
import { FC, useCallback, useEffect, useMemo, useState } from 'react'
 | 
			
		||||
import { FC, useCallback, useEffect, useState } from 'react'
 | 
			
		||||
import { useSnapshot } from 'valtio'
 | 
			
		||||
import state, { prepareState, transactionsData, TransactionState } from '../../state'
 | 
			
		||||
import state, { transactionsData, TransactionState } from '../../state'
 | 
			
		||||
import Text from '../Text'
 | 
			
		||||
import { Flex, Link } from '..'
 | 
			
		||||
import { showAlert } from '../../state/actions/showAlert'
 | 
			
		||||
@@ -11,27 +11,27 @@ import Monaco from '../Monaco'
 | 
			
		||||
import type monaco from 'monaco-editor'
 | 
			
		||||
 | 
			
		||||
interface JsonProps {
 | 
			
		||||
  getJsonString?: (state?: Partial<TransactionState>) => string
 | 
			
		||||
  getJsonString: (st?: Partial<TransactionState>) => string
 | 
			
		||||
  saveEditorState: (val?: string, tt?: string) => TransactionState | undefined
 | 
			
		||||
  header?: string
 | 
			
		||||
  setState: (pTx?: Partial<TransactionState> | undefined) => void
 | 
			
		||||
  state: TransactionState
 | 
			
		||||
  estimateFee?: () => Promise<string | undefined>
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export const TxJson: FC<JsonProps> = ({ getJsonString, state: txState, header, setState }) => {
 | 
			
		||||
export const TxJson: FC<JsonProps> = ({
 | 
			
		||||
  getJsonString,
 | 
			
		||||
  state: txState,
 | 
			
		||||
  header,
 | 
			
		||||
  setState,
 | 
			
		||||
  saveEditorState
 | 
			
		||||
}) => {
 | 
			
		||||
  const { editorSettings, accounts } = useSnapshot(state)
 | 
			
		||||
  const { editorValue, estimatedFee } = txState
 | 
			
		||||
  const { editorValue, estimatedFee, editorIsSaved } = txState
 | 
			
		||||
  const [currTxType, setCurrTxType] = useState<string | undefined>(
 | 
			
		||||
    txState.selectedTransaction?.value
 | 
			
		||||
  )
 | 
			
		||||
 | 
			
		||||
  useEffect(() => {
 | 
			
		||||
    setState({
 | 
			
		||||
      editorValue: getJsonString?.()
 | 
			
		||||
    })
 | 
			
		||||
    // eslint-disable-next-line react-hooks/exhaustive-deps
 | 
			
		||||
  }, [])
 | 
			
		||||
 | 
			
		||||
  useEffect(() => {
 | 
			
		||||
    const parsed = parseJSON(editorValue)
 | 
			
		||||
    if (!parsed) return
 | 
			
		||||
@@ -44,29 +44,19 @@ export const TxJson: FC<JsonProps> = ({ getJsonString, state: txState, header, s
 | 
			
		||||
    }
 | 
			
		||||
  }, [editorValue])
 | 
			
		||||
 | 
			
		||||
  const saveState = (value: string, transactionType?: string) => {
 | 
			
		||||
    const tx = prepareState(value, transactionType)
 | 
			
		||||
    if (tx) {
 | 
			
		||||
      setState(tx)
 | 
			
		||||
      setState({
 | 
			
		||||
        editorValue: getJsonString?.(tx)
 | 
			
		||||
      })
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  const discardChanges = () => {
 | 
			
		||||
    showAlert('Confirm', {
 | 
			
		||||
      body: 'Are you sure to discard these changes?',
 | 
			
		||||
      confirmText: 'Yes',
 | 
			
		||||
      onCancel: () => {},
 | 
			
		||||
      onConfirm: () => setState({ editorValue: getJsonString?.() })
 | 
			
		||||
      onConfirm: () => setState({ editorValue: getJsonString() })
 | 
			
		||||
    })
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  const onExit = (value: string) => {
 | 
			
		||||
    const options = parseJSON(value)
 | 
			
		||||
    if (options) {
 | 
			
		||||
      saveState(value, currTxType)
 | 
			
		||||
      saveEditorState(value, currTxType)
 | 
			
		||||
      return
 | 
			
		||||
    }
 | 
			
		||||
    showAlert('Error!', {
 | 
			
		||||
@@ -163,8 +153,6 @@ export const TxJson: FC<JsonProps> = ({ getJsonString, state: txState, header, s
 | 
			
		||||
    })
 | 
			
		||||
  }, [getSchemas, monacoInst])
 | 
			
		||||
 | 
			
		||||
  const hasUnsaved = useMemo(() => editorValue !== getJsonString?.(), [editorValue, getJsonString])
 | 
			
		||||
 | 
			
		||||
  return (
 | 
			
		||||
    <Monaco
 | 
			
		||||
      rootProps={{
 | 
			
		||||
@@ -174,7 +162,7 @@ export const TxJson: FC<JsonProps> = ({ getJsonString, state: txState, header, s
 | 
			
		||||
      id={header}
 | 
			
		||||
      height="100%"
 | 
			
		||||
      value={editorValue}
 | 
			
		||||
      onChange={val => setState({ editorValue: val })}
 | 
			
		||||
      onChange={val => setState({ editorValue: val, editorIsSaved: false })}
 | 
			
		||||
      onMount={(editor, monaco) => {
 | 
			
		||||
        editor.updateOptions({
 | 
			
		||||
          minimap: { enabled: false },
 | 
			
		||||
@@ -190,12 +178,12 @@ export const TxJson: FC<JsonProps> = ({ getJsonString, state: txState, header, s
 | 
			
		||||
        model?.onWillDispose(() => onExit(model.getValue()))
 | 
			
		||||
      }}
 | 
			
		||||
      overlay={
 | 
			
		||||
        hasUnsaved ? (
 | 
			
		||||
        !editorIsSaved ? (
 | 
			
		||||
          <Flex row align="center" css={{ fontSize: '$xs', color: '$textMuted', ml: 'auto' }}>
 | 
			
		||||
            <Text muted small>
 | 
			
		||||
              This file has unsaved changes.
 | 
			
		||||
            </Text>
 | 
			
		||||
            <Link css={{ ml: '$1' }} onClick={() => saveState(editorValue || '', currTxType)}>
 | 
			
		||||
            <Link css={{ ml: '$1' }} onClick={() => saveEditorState(editorValue, currTxType)}>
 | 
			
		||||
              save
 | 
			
		||||
            </Link>
 | 
			
		||||
            <Link css={{ ml: '$1' }} onClick={discardChanges}>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,34 +1,43 @@
 | 
			
		||||
import { FC, useCallback, useEffect, useMemo, useState } from 'react'
 | 
			
		||||
import { FC, ReactNode, useCallback, useEffect, useState } from 'react'
 | 
			
		||||
import Container from '../Container'
 | 
			
		||||
import Flex from '../Flex'
 | 
			
		||||
import Input from '../Input'
 | 
			
		||||
import Select from '../Select'
 | 
			
		||||
import Select, { CreatableSelect } from '../Select'
 | 
			
		||||
import Text from '../Text'
 | 
			
		||||
import {
 | 
			
		||||
  SelectOption,
 | 
			
		||||
  TransactionState,
 | 
			
		||||
  transactionsOptions,
 | 
			
		||||
  TxFields,
 | 
			
		||||
  getTxFields,
 | 
			
		||||
  defaultTransactionType
 | 
			
		||||
} from '../../state/transactions'
 | 
			
		||||
import { useSnapshot } from 'valtio'
 | 
			
		||||
import state from '../../state'
 | 
			
		||||
import { streamState } from '../DebugStream'
 | 
			
		||||
import { Button } from '..'
 | 
			
		||||
import { Box, Button } from '..'
 | 
			
		||||
import Textarea from '../Textarea'
 | 
			
		||||
import { getFlags } from '../../state/constants/flags'
 | 
			
		||||
import { Plus, Trash } from 'phosphor-react'
 | 
			
		||||
import AccountSequence from '../Sequence'
 | 
			
		||||
import { capitalize, typeIs } from '../../utils/helpers'
 | 
			
		||||
 | 
			
		||||
interface UIProps {
 | 
			
		||||
  setState: (pTx?: Partial<TransactionState> | undefined) => TransactionState | undefined
 | 
			
		||||
  resetState: (tt?: SelectOption) => TransactionState | undefined
 | 
			
		||||
  state: TransactionState
 | 
			
		||||
  estimateFee?: (...arg: any) => Promise<string | undefined>
 | 
			
		||||
  switchToJson: () => void
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export const TxUI: FC<UIProps> = ({ state: txState, setState, resetState, estimateFee }) => {
 | 
			
		||||
export const TxUI: FC<UIProps> = ({
 | 
			
		||||
  state: txState,
 | 
			
		||||
  setState,
 | 
			
		||||
  resetState,
 | 
			
		||||
  estimateFee,
 | 
			
		||||
  switchToJson
 | 
			
		||||
}) => {
 | 
			
		||||
  const { accounts } = useSnapshot(state)
 | 
			
		||||
  const { selectedAccount, selectedDestAccount, selectedTransaction, txFields, selectedFlags } =
 | 
			
		||||
  const { selectedAccount, selectedTransaction, txFields, selectedFlags, hookParameters, memos } =
 | 
			
		||||
    txState
 | 
			
		||||
 | 
			
		||||
  const accountOptions: SelectOption[] = accounts.map(acc => ({
 | 
			
		||||
@@ -36,13 +45,6 @@ export const TxUI: FC<UIProps> = ({ state: txState, setState, resetState, estima
 | 
			
		||||
    value: acc.address
 | 
			
		||||
  }))
 | 
			
		||||
 | 
			
		||||
  const destAccountOptions: SelectOption[] = accounts
 | 
			
		||||
    .map(acc => ({
 | 
			
		||||
      label: acc.name,
 | 
			
		||||
      value: acc.address
 | 
			
		||||
    }))
 | 
			
		||||
    .filter(acc => acc.value !== selectedAccount?.value)
 | 
			
		||||
 | 
			
		||||
  const flagsOptions: SelectOption[] = Object.entries(
 | 
			
		||||
    getFlags(selectedTransaction?.value) || {}
 | 
			
		||||
  ).map(([label, value]) => ({
 | 
			
		||||
@@ -71,6 +73,22 @@ export const TxUI: FC<UIProps> = ({ state: txState, setState, resetState, estima
 | 
			
		||||
    [setState, txFields]
 | 
			
		||||
  )
 | 
			
		||||
 | 
			
		||||
  const setRawField = useCallback(
 | 
			
		||||
    (field: keyof TxFields, type: string, value: any) => {
 | 
			
		||||
      // TODO $type should be a narrowed type
 | 
			
		||||
      setState({
 | 
			
		||||
        txFields: {
 | 
			
		||||
          ...txFields,
 | 
			
		||||
          [field]: {
 | 
			
		||||
            $type: type,
 | 
			
		||||
            $value: value
 | 
			
		||||
          }
 | 
			
		||||
        }
 | 
			
		||||
      })
 | 
			
		||||
    },
 | 
			
		||||
    [setState, txFields]
 | 
			
		||||
  )
 | 
			
		||||
 | 
			
		||||
  const handleEstimateFee = useCallback(
 | 
			
		||||
    async (state?: TransactionState, silent?: boolean) => {
 | 
			
		||||
      setFeeLoading(true)
 | 
			
		||||
@@ -94,8 +112,6 @@ export const TxUI: FC<UIProps> = ({ state: txState, setState, resetState, estima
 | 
			
		||||
    [handleEstimateFee, resetState, setState]
 | 
			
		||||
  )
 | 
			
		||||
 | 
			
		||||
  const switchToJson = () => setState({ viewType: 'json' })
 | 
			
		||||
 | 
			
		||||
  // default tx
 | 
			
		||||
  useEffect(() => {
 | 
			
		||||
    if (selectedTransaction?.value) return
 | 
			
		||||
@@ -105,22 +121,23 @@ export const TxUI: FC<UIProps> = ({ state: txState, setState, resetState, estima
 | 
			
		||||
    }
 | 
			
		||||
  }, [handleChangeTxType, selectedTransaction?.value])
 | 
			
		||||
 | 
			
		||||
  const fields = useMemo(
 | 
			
		||||
    () => getTxFields(selectedTransaction?.value),
 | 
			
		||||
    [selectedTransaction?.value]
 | 
			
		||||
  )
 | 
			
		||||
 | 
			
		||||
  const richFields = ['TransactionType', 'Account']
 | 
			
		||||
  if (fields.Destination !== undefined) {
 | 
			
		||||
    richFields.push('Destination')
 | 
			
		||||
  }
 | 
			
		||||
  const richFields = ['TransactionType', 'Account', 'HookParameters', 'Memos']
 | 
			
		||||
 | 
			
		||||
  if (flagsOptions.length) {
 | 
			
		||||
    richFields.push('Flags')
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  const otherFields = Object.keys(txFields).filter(k => !richFields.includes(k)) as [keyof TxFields]
 | 
			
		||||
  const amountOptions = [
 | 
			
		||||
    { label: 'XRP', value: 'xrp' },
 | 
			
		||||
    { label: 'Token', value: 'token' }
 | 
			
		||||
  ] as const
 | 
			
		||||
 | 
			
		||||
  const defaultTokenAmount = {
 | 
			
		||||
    value: '0',
 | 
			
		||||
    currency: '',
 | 
			
		||||
    issuer: ''
 | 
			
		||||
  }
 | 
			
		||||
  return (
 | 
			
		||||
    <Container
 | 
			
		||||
      css={{
 | 
			
		||||
@@ -130,94 +147,32 @@ export const TxUI: FC<UIProps> = ({ state: txState, setState, resetState, estima
 | 
			
		||||
      }}
 | 
			
		||||
    >
 | 
			
		||||
      <Flex column fluid css={{ height: '100%', overflowY: 'auto', pr: '$1' }}>
 | 
			
		||||
        <Flex
 | 
			
		||||
          row
 | 
			
		||||
          fluid
 | 
			
		||||
          css={{
 | 
			
		||||
            justifyContent: 'flex-end',
 | 
			
		||||
            alignItems: 'center',
 | 
			
		||||
            mb: '$3',
 | 
			
		||||
            mt: '1px',
 | 
			
		||||
            pr: '1px'
 | 
			
		||||
          }}
 | 
			
		||||
        >
 | 
			
		||||
          <Text muted css={{ mr: '$3' }}>
 | 
			
		||||
            Transaction type:{' '}
 | 
			
		||||
          </Text>
 | 
			
		||||
        <TxField label="Transaction type">
 | 
			
		||||
          <Select
 | 
			
		||||
            instanceId="transactionsType"
 | 
			
		||||
            placeholder="Select transaction type"
 | 
			
		||||
            options={transactionsOptions}
 | 
			
		||||
            hideSelectedOptions
 | 
			
		||||
            css={{ width: '70%' }}
 | 
			
		||||
            value={selectedTransaction}
 | 
			
		||||
            onChange={(tt: any) => handleChangeTxType(tt)}
 | 
			
		||||
          />
 | 
			
		||||
        </Flex>
 | 
			
		||||
        <Flex
 | 
			
		||||
          row
 | 
			
		||||
          fluid
 | 
			
		||||
          css={{
 | 
			
		||||
            justifyContent: 'flex-end',
 | 
			
		||||
            alignItems: 'center',
 | 
			
		||||
            mb: '$3',
 | 
			
		||||
            pr: '1px'
 | 
			
		||||
          }}
 | 
			
		||||
        >
 | 
			
		||||
          <Text muted css={{ mr: '$3' }}>
 | 
			
		||||
            Account:{' '}
 | 
			
		||||
          </Text>
 | 
			
		||||
        </TxField>
 | 
			
		||||
        <TxField label="Account">
 | 
			
		||||
          <Select
 | 
			
		||||
            instanceId="from-account"
 | 
			
		||||
            placeholder="Select your account"
 | 
			
		||||
            css={{ width: '70%' }}
 | 
			
		||||
            options={accountOptions}
 | 
			
		||||
            value={selectedAccount}
 | 
			
		||||
            onChange={(acc: any) => handleSetAccount(acc)} // TODO make react-select have correct types for acc
 | 
			
		||||
          />
 | 
			
		||||
        </Flex>
 | 
			
		||||
        {richFields.includes('Destination') && (
 | 
			
		||||
          <Flex
 | 
			
		||||
            row
 | 
			
		||||
            fluid
 | 
			
		||||
            css={{
 | 
			
		||||
              justifyContent: 'flex-end',
 | 
			
		||||
              alignItems: 'center',
 | 
			
		||||
              mb: '$3',
 | 
			
		||||
              pr: '1px'
 | 
			
		||||
            }}
 | 
			
		||||
          >
 | 
			
		||||
            <Text muted css={{ mr: '$3', textAlign: 'end' }}>
 | 
			
		||||
              Destination account:{' '}
 | 
			
		||||
            </Text>
 | 
			
		||||
            <Select
 | 
			
		||||
              instanceId="to-account"
 | 
			
		||||
              placeholder="Select the destination account"
 | 
			
		||||
              css={{ width: '70%' }}
 | 
			
		||||
              options={destAccountOptions}
 | 
			
		||||
              value={selectedDestAccount}
 | 
			
		||||
              isClearable
 | 
			
		||||
              onChange={(acc: any) => setState({ selectedDestAccount: acc })}
 | 
			
		||||
            />
 | 
			
		||||
          </Flex>
 | 
			
		||||
        )}
 | 
			
		||||
        </TxField>
 | 
			
		||||
        <TxField label="Sequence">
 | 
			
		||||
          <AccountSequence address={selectedAccount?.value} />
 | 
			
		||||
        </TxField>
 | 
			
		||||
        {richFields.includes('Flags') && (
 | 
			
		||||
          <Flex
 | 
			
		||||
            row
 | 
			
		||||
            fluid
 | 
			
		||||
            css={{
 | 
			
		||||
              justifyContent: 'flex-end',
 | 
			
		||||
              alignItems: 'center',
 | 
			
		||||
              mb: '$3',
 | 
			
		||||
              pr: '1px'
 | 
			
		||||
            }}
 | 
			
		||||
          >
 | 
			
		||||
            <Text muted css={{ mr: '$3' }}>
 | 
			
		||||
              Flags:{' '}
 | 
			
		||||
            </Text>
 | 
			
		||||
          <TxField label="Flags">
 | 
			
		||||
            <Select
 | 
			
		||||
              isClearable
 | 
			
		||||
              css={{ width: '70%' }}
 | 
			
		||||
              instanceId="flags"
 | 
			
		||||
              placeholder="Select flags to apply"
 | 
			
		||||
              menuPosition="fixed"
 | 
			
		||||
@@ -229,41 +184,139 @@ export const TxUI: FC<UIProps> = ({ state: txState, setState, resetState, estima
 | 
			
		||||
                selectedFlags ? selectedFlags.length >= flagsOptions.length - 1 : false
 | 
			
		||||
              }
 | 
			
		||||
            />
 | 
			
		||||
          </Flex>
 | 
			
		||||
          </TxField>
 | 
			
		||||
        )}
 | 
			
		||||
        {otherFields.map(field => {
 | 
			
		||||
          let _value = txFields[field]
 | 
			
		||||
 | 
			
		||||
          let value: string | undefined
 | 
			
		||||
          if (typeof _value === 'object') {
 | 
			
		||||
            if (_value.$type === 'json' && typeof _value.$value === 'object') {
 | 
			
		||||
          if (typeIs(_value, 'object')) {
 | 
			
		||||
            if (_value.$type === 'json' && typeIs(_value.$value, ['object', 'array'])) {
 | 
			
		||||
              value = JSON.stringify(_value.$value, null, 2)
 | 
			
		||||
            } else {
 | 
			
		||||
              value = _value.$value.toString()
 | 
			
		||||
              value = _value.$value?.toString()
 | 
			
		||||
            }
 | 
			
		||||
          } else {
 | 
			
		||||
            value = _value?.toString()
 | 
			
		||||
          }
 | 
			
		||||
 | 
			
		||||
          const isXrp = typeof _value === 'object' && _value.$type === 'xrp'
 | 
			
		||||
          const isAccount = typeIs(_value, 'object') && _value.$type === 'account'
 | 
			
		||||
          const isXrpAmount = typeIs(_value, 'object') && _value.$type === 'amount.xrp'
 | 
			
		||||
          const isTokenAmount = typeIs(_value, 'object') && _value.$type === 'amount.token'
 | 
			
		||||
          const isJson = typeof _value === 'object' && _value.$type === 'json'
 | 
			
		||||
          const isFee = field === 'Fee'
 | 
			
		||||
          let rows = isJson ? (value?.match(/\n/gm)?.length || 0) + 1 : undefined
 | 
			
		||||
          if (rows && rows > 5) rows = 5
 | 
			
		||||
          let tokenAmount = defaultTokenAmount
 | 
			
		||||
          if (isTokenAmount && typeIs(_value, 'object') && typeIs(_value.$value, 'object')) {
 | 
			
		||||
            tokenAmount = {
 | 
			
		||||
              value: _value.$value.value,
 | 
			
		||||
              currency: _value.$value.currency,
 | 
			
		||||
              issuer: _value.$value.issuer
 | 
			
		||||
            }
 | 
			
		||||
          }
 | 
			
		||||
 | 
			
		||||
          if (isXrpAmount || isTokenAmount) {
 | 
			
		||||
            return (
 | 
			
		||||
            <Flex column key={field} css={{ mb: '$2', pr: '1px' }}>
 | 
			
		||||
              <TxField key={field} label={field}>
 | 
			
		||||
                <Flex fluid css={{ alignItems: 'center' }}>
 | 
			
		||||
                  {isTokenAmount ? (
 | 
			
		||||
                    <Flex
 | 
			
		||||
                row
 | 
			
		||||
                      fluid
 | 
			
		||||
                      row
 | 
			
		||||
                      align="center"
 | 
			
		||||
                      justify="space-between"
 | 
			
		||||
                      css={{ position: 'relative' }}
 | 
			
		||||
                    >
 | 
			
		||||
                      {/*  <Input
 | 
			
		||||
                        type="text"
 | 
			
		||||
                        placeholder="Issuer"
 | 
			
		||||
                        value={tokenAmount.issuer}
 | 
			
		||||
                        onChange={e =>
 | 
			
		||||
                          setRawField(field, 'amount.token', {
 | 
			
		||||
                            ...tokenAmount,
 | 
			
		||||
                            issuer: e.target.value
 | 
			
		||||
                          })
 | 
			
		||||
                        }
 | 
			
		||||
                      /> */}
 | 
			
		||||
                      <Input
 | 
			
		||||
                        type="text"
 | 
			
		||||
                        value={tokenAmount.currency}
 | 
			
		||||
                        placeholder="Currency"
 | 
			
		||||
                        onChange={e => {
 | 
			
		||||
                          setRawField(field, 'amount.token', {
 | 
			
		||||
                            ...tokenAmount,
 | 
			
		||||
                            currency: e.target.value
 | 
			
		||||
                          })
 | 
			
		||||
                        }}
 | 
			
		||||
                      />
 | 
			
		||||
                      <Input
 | 
			
		||||
                        css={{ mx: '$1' }}
 | 
			
		||||
                        type="number"
 | 
			
		||||
                        value={tokenAmount.value}
 | 
			
		||||
                        placeholder="Value"
 | 
			
		||||
                        onChange={e => {
 | 
			
		||||
                          setRawField(field, 'amount.token', {
 | 
			
		||||
                            ...tokenAmount,
 | 
			
		||||
                            value: e.target.value
 | 
			
		||||
                          })
 | 
			
		||||
                        }}
 | 
			
		||||
                      />
 | 
			
		||||
                      <Box css={{ width: '50%' }}>
 | 
			
		||||
                        <CreatableAccount
 | 
			
		||||
                          value={tokenAmount.issuer}
 | 
			
		||||
                          field={'Issuer' as any}
 | 
			
		||||
                          placeholder="Issuer"
 | 
			
		||||
                          setField={(_, value = '') => {
 | 
			
		||||
                            setRawField(field, 'amount.token', {
 | 
			
		||||
                              ...tokenAmount,
 | 
			
		||||
                              issuer: value
 | 
			
		||||
                            })
 | 
			
		||||
                          }}
 | 
			
		||||
                        />
 | 
			
		||||
                      </Box>
 | 
			
		||||
                    </Flex>
 | 
			
		||||
                  ) : (
 | 
			
		||||
                    <Input
 | 
			
		||||
                      css={{ flex: 'inherit' }}
 | 
			
		||||
                      type="number"
 | 
			
		||||
                      value={value}
 | 
			
		||||
                      onChange={e => handleSetField(field, e.target.value)}
 | 
			
		||||
                    />
 | 
			
		||||
                  )}
 | 
			
		||||
                  <Box
 | 
			
		||||
                    css={{
 | 
			
		||||
                  justifyContent: 'flex-end',
 | 
			
		||||
                  alignItems: 'center',
 | 
			
		||||
                  position: 'relative'
 | 
			
		||||
                      ml: '$2',
 | 
			
		||||
                      width: '150px'
 | 
			
		||||
                    }}
 | 
			
		||||
                  >
 | 
			
		||||
                <Text muted css={{ mr: '$3' }}>
 | 
			
		||||
                  {field + (isXrp ? ' (XRP)' : '')}:{' '}
 | 
			
		||||
                </Text>
 | 
			
		||||
                    <Select
 | 
			
		||||
                      instanceId="currency-type"
 | 
			
		||||
                      options={amountOptions}
 | 
			
		||||
                      value={isXrpAmount ? amountOptions['0'] : amountOptions['1']}
 | 
			
		||||
                      onChange={(e: any) => {
 | 
			
		||||
                        const opt = e as typeof amountOptions[number]
 | 
			
		||||
                        if (opt.value === 'xrp') {
 | 
			
		||||
                          setRawField(field, 'amount.xrp', '0')
 | 
			
		||||
                        } else {
 | 
			
		||||
                          setRawField(field, 'amount.token', defaultTokenAmount)
 | 
			
		||||
                        }
 | 
			
		||||
                      }}
 | 
			
		||||
                    />
 | 
			
		||||
                  </Box>
 | 
			
		||||
                </Flex>
 | 
			
		||||
              </TxField>
 | 
			
		||||
            )
 | 
			
		||||
          }
 | 
			
		||||
          if (isAccount) {
 | 
			
		||||
            return (
 | 
			
		||||
              <TxField key={field} label={field}>
 | 
			
		||||
                <CreatableAccount value={value} field={field} setField={handleSetField} />
 | 
			
		||||
              </TxField>
 | 
			
		||||
            )
 | 
			
		||||
          }
 | 
			
		||||
          return (
 | 
			
		||||
            <TxField key={field} label={field}>
 | 
			
		||||
              {isJson ? (
 | 
			
		||||
                <Textarea
 | 
			
		||||
                  rows={rows}
 | 
			
		||||
@@ -271,7 +324,6 @@ export const TxUI: FC<UIProps> = ({ state: txState, setState, resetState, estima
 | 
			
		||||
                  spellCheck={false}
 | 
			
		||||
                  onChange={switchToJson}
 | 
			
		||||
                  css={{
 | 
			
		||||
                      width: '70%',
 | 
			
		||||
                    flex: 'inherit',
 | 
			
		||||
                    resize: 'vertical'
 | 
			
		||||
                  }}
 | 
			
		||||
@@ -298,7 +350,6 @@ export const TxUI: FC<UIProps> = ({ state: txState, setState, resetState, estima
 | 
			
		||||
                      : undefined
 | 
			
		||||
                  }
 | 
			
		||||
                  css={{
 | 
			
		||||
                      width: '70%',
 | 
			
		||||
                    flex: 'inherit',
 | 
			
		||||
                    '-moz-appearance': 'textfield',
 | 
			
		||||
                    '&::-webkit-outer-spin-button': {
 | 
			
		||||
@@ -333,11 +384,200 @@ export const TxUI: FC<UIProps> = ({ state: txState, setState, resetState, estima
 | 
			
		||||
                  Suggest
 | 
			
		||||
                </Button>
 | 
			
		||||
              )}
 | 
			
		||||
              </Flex>
 | 
			
		||||
            </Flex>
 | 
			
		||||
            </TxField>
 | 
			
		||||
          )
 | 
			
		||||
        })}
 | 
			
		||||
        <TxField multiLine label="Hook parameters">
 | 
			
		||||
          <Flex column fluid>
 | 
			
		||||
            {Object.entries(hookParameters).map(([id, { label, value }]) => (
 | 
			
		||||
              <Flex column key={id} css={{ mb: '$2' }}>
 | 
			
		||||
                <Flex row>
 | 
			
		||||
                  <Input
 | 
			
		||||
                    placeholder="Parameter name"
 | 
			
		||||
                    value={label}
 | 
			
		||||
                    onChange={e => {
 | 
			
		||||
                      setState({
 | 
			
		||||
                        hookParameters: {
 | 
			
		||||
                          ...hookParameters,
 | 
			
		||||
                          [id]: { label: e.target.value, value }
 | 
			
		||||
                        }
 | 
			
		||||
                      })
 | 
			
		||||
                    }}
 | 
			
		||||
                  />
 | 
			
		||||
                  <Input
 | 
			
		||||
                    css={{ mx: '$2' }}
 | 
			
		||||
                    placeholder="Value (hex-quoted)"
 | 
			
		||||
                    value={value}
 | 
			
		||||
                    onChange={e => {
 | 
			
		||||
                      setState({
 | 
			
		||||
                        hookParameters: {
 | 
			
		||||
                          ...hookParameters,
 | 
			
		||||
                          [id]: { label, value: e.target.value }
 | 
			
		||||
                        }
 | 
			
		||||
                      })
 | 
			
		||||
                    }}
 | 
			
		||||
                  />
 | 
			
		||||
                  <Button
 | 
			
		||||
                    onClick={() => {
 | 
			
		||||
                      const { [id]: _, ...rest } = hookParameters
 | 
			
		||||
                      setState({ hookParameters: rest })
 | 
			
		||||
                    }}
 | 
			
		||||
                    variant="destroy"
 | 
			
		||||
                  >
 | 
			
		||||
                    <Trash weight="regular" size="16px" />
 | 
			
		||||
                  </Button>
 | 
			
		||||
                </Flex>
 | 
			
		||||
              </Flex>
 | 
			
		||||
            ))}
 | 
			
		||||
            <Button
 | 
			
		||||
              outline
 | 
			
		||||
              fullWidth
 | 
			
		||||
              type="button"
 | 
			
		||||
              onClick={() => {
 | 
			
		||||
                const id = Object.keys(hookParameters).length
 | 
			
		||||
                setState({
 | 
			
		||||
                  hookParameters: { ...hookParameters, [id]: { label: '', value: '' } }
 | 
			
		||||
                })
 | 
			
		||||
              }}
 | 
			
		||||
            >
 | 
			
		||||
              <Plus size="16px" />
 | 
			
		||||
              Add Hook Parameter
 | 
			
		||||
            </Button>
 | 
			
		||||
          </Flex>
 | 
			
		||||
        </TxField>
 | 
			
		||||
        <TxField multiLine label="Memos">
 | 
			
		||||
          <Flex column fluid>
 | 
			
		||||
            {Object.entries(memos).map(([id, memo]) => (
 | 
			
		||||
              <Flex column key={id} css={{ mb: '$2' }}>
 | 
			
		||||
                <Flex
 | 
			
		||||
                  row
 | 
			
		||||
                  css={{
 | 
			
		||||
                    flexWrap: 'wrap',
 | 
			
		||||
                    width: '100%'
 | 
			
		||||
                  }}
 | 
			
		||||
                >
 | 
			
		||||
                  <Input
 | 
			
		||||
                    placeholder="Memo type"
 | 
			
		||||
                    value={memo.type}
 | 
			
		||||
                    onChange={e => {
 | 
			
		||||
                      setState({
 | 
			
		||||
                        memos: {
 | 
			
		||||
                          ...memos,
 | 
			
		||||
                          [id]: { ...memo, type: e.target.value }
 | 
			
		||||
                        }
 | 
			
		||||
                      })
 | 
			
		||||
                    }}
 | 
			
		||||
                  />
 | 
			
		||||
                  <Input
 | 
			
		||||
                    placeholder="Data (hex-quoted)"
 | 
			
		||||
                    css={{ mx: '$2' }}
 | 
			
		||||
                    value={memo.data}
 | 
			
		||||
                    onChange={e => {
 | 
			
		||||
                      setState({
 | 
			
		||||
                        memos: {
 | 
			
		||||
                          ...memos,
 | 
			
		||||
                          [id]: { ...memo, data: e.target.value }
 | 
			
		||||
                        }
 | 
			
		||||
                      })
 | 
			
		||||
                    }}
 | 
			
		||||
                  />
 | 
			
		||||
                  <Input
 | 
			
		||||
                    placeholder="Format"
 | 
			
		||||
                    value={memo.format}
 | 
			
		||||
                    onChange={e => {
 | 
			
		||||
                      setState({
 | 
			
		||||
                        memos: {
 | 
			
		||||
                          ...memos,
 | 
			
		||||
                          [id]: { ...memo, format: e.target.value }
 | 
			
		||||
                        }
 | 
			
		||||
                      })
 | 
			
		||||
                    }}
 | 
			
		||||
                  />
 | 
			
		||||
                  <Button
 | 
			
		||||
                    css={{ ml: '$2' }}
 | 
			
		||||
                    onClick={() => {
 | 
			
		||||
                      const { [id]: _, ...rest } = memos
 | 
			
		||||
                      setState({ memos: rest })
 | 
			
		||||
                    }}
 | 
			
		||||
                    variant="destroy"
 | 
			
		||||
                  >
 | 
			
		||||
                    <Trash weight="regular" size="16px" />
 | 
			
		||||
                  </Button>
 | 
			
		||||
                </Flex>
 | 
			
		||||
              </Flex>
 | 
			
		||||
            ))}
 | 
			
		||||
            <Button
 | 
			
		||||
              outline
 | 
			
		||||
              fullWidth
 | 
			
		||||
              type="button"
 | 
			
		||||
              onClick={() => {
 | 
			
		||||
                const id = Object.keys(memos).length
 | 
			
		||||
                setState({
 | 
			
		||||
                  memos: { ...memos, [id]: { data: '', format: '', type: '' } }
 | 
			
		||||
                })
 | 
			
		||||
              }}
 | 
			
		||||
            >
 | 
			
		||||
              <Plus size="16px" />
 | 
			
		||||
              Add Memo
 | 
			
		||||
            </Button>
 | 
			
		||||
          </Flex>
 | 
			
		||||
        </TxField>
 | 
			
		||||
      </Flex>
 | 
			
		||||
    </Container>
 | 
			
		||||
  )
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export const CreatableAccount: FC<{
 | 
			
		||||
  value: string | undefined
 | 
			
		||||
  field: keyof TxFields
 | 
			
		||||
  placeholder?: string
 | 
			
		||||
  setField: (field: keyof TxFields, value: string, opFields?: TxFields) => void
 | 
			
		||||
}> = ({ value, field, setField, placeholder }) => {
 | 
			
		||||
  const { accounts } = useSnapshot(state)
 | 
			
		||||
  const accountOptions: SelectOption[] = accounts.map(acc => ({
 | 
			
		||||
    label: acc.name,
 | 
			
		||||
    value: acc.address
 | 
			
		||||
  }))
 | 
			
		||||
  const label = accountOptions.find(a => a.value === value)?.label || value
 | 
			
		||||
  const val = {
 | 
			
		||||
    value,
 | 
			
		||||
    label
 | 
			
		||||
  }
 | 
			
		||||
  placeholder = placeholder || `${capitalize(field)} account`
 | 
			
		||||
  return (
 | 
			
		||||
    <CreatableSelect
 | 
			
		||||
      isClearable
 | 
			
		||||
      instanceId={field}
 | 
			
		||||
      placeholder={placeholder}
 | 
			
		||||
      options={accountOptions}
 | 
			
		||||
      value={value ? val : undefined}
 | 
			
		||||
      onChange={(acc: any) => setField(field, acc?.value)}
 | 
			
		||||
    />
 | 
			
		||||
  )
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export const TxField: FC<{ label: string; children: ReactNode; multiLine?: boolean }> = ({
 | 
			
		||||
  label,
 | 
			
		||||
  children,
 | 
			
		||||
  multiLine = false
 | 
			
		||||
}) => {
 | 
			
		||||
  return (
 | 
			
		||||
    <Flex
 | 
			
		||||
      row
 | 
			
		||||
      fluid
 | 
			
		||||
      css={{
 | 
			
		||||
        justifyContent: 'flex-end',
 | 
			
		||||
        alignItems: multiLine ? 'flex-start' : 'center',
 | 
			
		||||
        position: 'relative',
 | 
			
		||||
        mb: '$2',
 | 
			
		||||
        mt: '1px',
 | 
			
		||||
        pr: '1px'
 | 
			
		||||
      }}
 | 
			
		||||
    >
 | 
			
		||||
      <Text muted css={{ mr: '$3', mt: multiLine ? '$2' : 0 }}>
 | 
			
		||||
        {label}:{' '}
 | 
			
		||||
      </Text>
 | 
			
		||||
      <Flex css={{ width: '70%', alignItems: 'center' }}>{children}</Flex>
 | 
			
		||||
    </Flex>
 | 
			
		||||
  )
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,10 @@
 | 
			
		||||
  {
 | 
			
		||||
    "TransactionType": "AccountDelete",
 | 
			
		||||
    "Account": "rWYkbWkCeg8dP6rXALnjgZSjjLyih5NXm",
 | 
			
		||||
    "Destination": "rPT1Sjq2YGrBMTttX4GZHjKu9dyfzbpAYe",
 | 
			
		||||
    "Destination": {
 | 
			
		||||
      "$type": "account",
 | 
			
		||||
      "$value": ""
 | 
			
		||||
    },
 | 
			
		||||
    "DestinationTag": 13,
 | 
			
		||||
    "Fee": "2000000",
 | 
			
		||||
    "Sequence": 2470665,
 | 
			
		||||
@@ -28,7 +31,11 @@
 | 
			
		||||
    "TransactionType": "CheckCash",
 | 
			
		||||
    "Amount": {
 | 
			
		||||
      "$value": "100",
 | 
			
		||||
      "$type": "xrp"
 | 
			
		||||
      "$type": "amount.xrp"
 | 
			
		||||
    },
 | 
			
		||||
    "DeliverMin": {
 | 
			
		||||
      "$value": "",
 | 
			
		||||
      "$type": "amount.xrp"
 | 
			
		||||
    },
 | 
			
		||||
    "CheckID": "838766BA2B995C00744175F69A1B11E32C3DBC40E64801A4056FCBD657F57334",
 | 
			
		||||
    "Fee": "12"
 | 
			
		||||
@@ -36,7 +43,10 @@
 | 
			
		||||
  {
 | 
			
		||||
    "TransactionType": "CheckCreate",
 | 
			
		||||
    "Account": "rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo",
 | 
			
		||||
    "Destination": "rfkE1aSy9G8Upk4JssnwBxhEv5p4mn2KTy",
 | 
			
		||||
    "Destination": {
 | 
			
		||||
      "$type": "account",
 | 
			
		||||
      "$value": ""
 | 
			
		||||
    },
 | 
			
		||||
    "SendMax": "100000000",
 | 
			
		||||
    "Expiration": 570113521,
 | 
			
		||||
    "InvoiceID": "6F1DFD1D0FE8A32E40E1F2C05CF1C15545BAB56B617F9C6C2D63A6B704BEF59B",
 | 
			
		||||
@@ -54,7 +64,10 @@
 | 
			
		||||
  {
 | 
			
		||||
    "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
 | 
			
		||||
    "TransactionType": "EscrowCancel",
 | 
			
		||||
    "Owner": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
 | 
			
		||||
    "Owner": {
 | 
			
		||||
      "$type": "account",
 | 
			
		||||
      "$value": ""
 | 
			
		||||
    },
 | 
			
		||||
    "OfferSequence": 7,
 | 
			
		||||
    "Fee": "10"
 | 
			
		||||
  },
 | 
			
		||||
@@ -63,9 +76,12 @@
 | 
			
		||||
    "TransactionType": "EscrowCreate",
 | 
			
		||||
    "Amount": {
 | 
			
		||||
      "$value": "100",
 | 
			
		||||
      "$type": "xrp"
 | 
			
		||||
      "$type": "amount.xrp"
 | 
			
		||||
    },
 | 
			
		||||
    "Destination": {
 | 
			
		||||
      "$type": "account",
 | 
			
		||||
      "$value": ""
 | 
			
		||||
    },
 | 
			
		||||
    "Destination": "rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW",
 | 
			
		||||
    "CancelAfter": 533257958,
 | 
			
		||||
    "FinishAfter": 533171558,
 | 
			
		||||
    "Condition": "A0258020E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855810100",
 | 
			
		||||
@@ -76,12 +92,66 @@
 | 
			
		||||
  {
 | 
			
		||||
    "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
 | 
			
		||||
    "TransactionType": "EscrowFinish",
 | 
			
		||||
    "Owner": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
 | 
			
		||||
    "Owner": {
 | 
			
		||||
      "$type": "account",
 | 
			
		||||
      "$value": ""
 | 
			
		||||
    },
 | 
			
		||||
    "OfferSequence": 7,
 | 
			
		||||
    "Condition": "A0258020E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855810100",
 | 
			
		||||
    "Fulfillment": "A0028000",
 | 
			
		||||
    "Fee": "10"
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    "TransactionType": "NFTokenMint",
 | 
			
		||||
    "Account": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B",
 | 
			
		||||
    "Fee": "10",
 | 
			
		||||
    "NFTokenTaxon": 0,
 | 
			
		||||
    "URI": "697066733A2F2F516D614374444B5A4656767666756676626479346573745A626851483744586831364354707631686F776D424779"
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    "TransactionType": "NFTokenBurn",
 | 
			
		||||
    "Account": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B",
 | 
			
		||||
    "Fee": "10",
 | 
			
		||||
    "NFTokenID": "000B013A95F14B0044F78A264E41713C64B5F89242540EE208C3098E00000D65"
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    "TransactionType": "NFTokenAcceptOffer",
 | 
			
		||||
    "Account": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B",
 | 
			
		||||
    "Fee": "10",
 | 
			
		||||
    "NFTokenSellOffer": "A2FA1A9911FE2AEF83DAB05F437768E26A301EF899BD31EB85E704B3D528FF18",
 | 
			
		||||
    "NFTokenBuyOffer": "4AAAEEA76E3C8148473CB3840CE637676E561FB02BD4CA22CA59729EA815B862",
 | 
			
		||||
    "NFTokenBrokerFee": "10"
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    "TransactionType": "NFTokenCancelOffer",
 | 
			
		||||
    "Account": "ra5nK24KXen9AHvsdFTKHSANinZseWnPcX",
 | 
			
		||||
    "Fee": "10",
 | 
			
		||||
    "NFTokenOffers": {
 | 
			
		||||
      "$type": "json",
 | 
			
		||||
      "$value": [
 | 
			
		||||
        "4AAAEEA76E3C8148473CB3840CE637676E561FB02BD4CA22CA59729EA815B862"
 | 
			
		||||
      ]
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    "TransactionType": "NFTokenCreateOffer",
 | 
			
		||||
    "Account": "rs8jBmmfpwgmrSPgwMsh7CvKRmRt1JTVSX",
 | 
			
		||||
    "NFTokenID": "000100001E962F495F07A990F4ED55ACCFEEF365DBAA76B6A048C0A200000007",
 | 
			
		||||
    "Amount": {
 | 
			
		||||
      "$value": "100",
 | 
			
		||||
      "$type": "amount.xrp"
 | 
			
		||||
    },
 | 
			
		||||
    "Flags": "1",
 | 
			
		||||
    "Destination": {
 | 
			
		||||
      "$type": "account",
 | 
			
		||||
      "$value": ""
 | 
			
		||||
    },
 | 
			
		||||
    "Owner": {
 | 
			
		||||
      "$type": "account",
 | 
			
		||||
      "$value": ""
 | 
			
		||||
    },
 | 
			
		||||
    "Fee": "10"
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    "TransactionType": "OfferCancel",
 | 
			
		||||
    "Account": "ra5nK24KXen9AHvsdFTKHSANinZseWnPcX",
 | 
			
		||||
@@ -98,19 +168,29 @@
 | 
			
		||||
    "Flags": "0",
 | 
			
		||||
    "LastLedgerSequence": 7108682,
 | 
			
		||||
    "Sequence": 8,
 | 
			
		||||
    "TakerGets": "6000000",
 | 
			
		||||
    "Amount": {
 | 
			
		||||
      "$value": "100",
 | 
			
		||||
      "$type": "xrp"
 | 
			
		||||
    "TakerGets": {
 | 
			
		||||
      "$type": "amount.xrp",
 | 
			
		||||
      "$value": "6000000"
 | 
			
		||||
    },
 | 
			
		||||
    "TakerPays": {
 | 
			
		||||
      "$type": "amount.token",
 | 
			
		||||
      "$value": {
 | 
			
		||||
        "currency": "GKO",
 | 
			
		||||
        "issuer": "ruazs5h1qEsqpke88pcqnaseXdm6od2xc",
 | 
			
		||||
        "value": "2"
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    "TransactionType": "Payment",
 | 
			
		||||
    "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
 | 
			
		||||
    "Destination": "ra5nK24KXen9AHvsdFTKHSANinZseWnPcX",
 | 
			
		||||
    "Destination": {
 | 
			
		||||
      "$type": "account",
 | 
			
		||||
      "$value": ""
 | 
			
		||||
    },
 | 
			
		||||
    "Amount": {
 | 
			
		||||
      "$value": "100",
 | 
			
		||||
      "$type": "xrp"
 | 
			
		||||
      "$type": "amount.xrp"
 | 
			
		||||
    },
 | 
			
		||||
    "Fee": "12",
 | 
			
		||||
    "Flags": "2147483648",
 | 
			
		||||
@@ -121,9 +201,12 @@
 | 
			
		||||
    "TransactionType": "PaymentChannelCreate",
 | 
			
		||||
    "Amount": {
 | 
			
		||||
      "$value": "100",
 | 
			
		||||
      "$type": "xrp"
 | 
			
		||||
      "$type": "amount.xrp"
 | 
			
		||||
    },
 | 
			
		||||
    "Destination": {
 | 
			
		||||
      "$type": "account",
 | 
			
		||||
      "$value": ""
 | 
			
		||||
    },
 | 
			
		||||
    "Destination": "rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW",
 | 
			
		||||
    "SettleDelay": 86400,
 | 
			
		||||
    "PublicKey": "32D2471DB72B27E3310F355BB33E339BF26F8392D5A93D3BC0FC3B566612DA0F0A",
 | 
			
		||||
    "CancelAfter": 533171558,
 | 
			
		||||
@@ -137,7 +220,7 @@
 | 
			
		||||
    "Channel": "C1AE6DDDEEC05CF2978C0BAD6FE302948E9533691DC749DCDD3B9E5992CA6198",
 | 
			
		||||
    "Amount": {
 | 
			
		||||
      "$value": "200",
 | 
			
		||||
      "$type": "xrp"
 | 
			
		||||
      "$type": "amount.xrp"
 | 
			
		||||
    },
 | 
			
		||||
    "Expiration": 543171558,
 | 
			
		||||
    "Fee": "10"
 | 
			
		||||
@@ -193,7 +276,7 @@
 | 
			
		||||
    "Flags": "262144",
 | 
			
		||||
    "LastLedgerSequence": 8007750,
 | 
			
		||||
    "LimitAmount": {
 | 
			
		||||
      "$type": "json",
 | 
			
		||||
      "$type": "amount.token",
 | 
			
		||||
      "$value": {
 | 
			
		||||
        "currency": "USD",
 | 
			
		||||
        "issuer": "rsP3mgGb2tcYUrxiLFiHJiQXhsziegtwBc",
 | 
			
		||||
@@ -204,6 +287,10 @@
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    "TransactionType": "Invoke",
 | 
			
		||||
    "Destination": {
 | 
			
		||||
      "$type": "account",
 | 
			
		||||
      "$value": ""
 | 
			
		||||
    },
 | 
			
		||||
    "Fee": "12"
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,6 @@
 | 
			
		||||
import toast from 'react-hot-toast'
 | 
			
		||||
import state, { FaucetAccountRes } from '../index'
 | 
			
		||||
import fetchAccountInfo from '../../utils/accountInfo';
 | 
			
		||||
 | 
			
		||||
export const names = [
 | 
			
		||||
  'Alice',
 | 
			
		||||
@@ -35,26 +36,23 @@ export const addFaucetAccount = async (name?: string, showToast: boolean = false
 | 
			
		||||
  })
 | 
			
		||||
  const json: FaucetAccountRes | { error: string } = await res.json()
 | 
			
		||||
  if ('error' in json) {
 | 
			
		||||
    if (showToast) {
 | 
			
		||||
    if (!showToast) return;
 | 
			
		||||
    return toast.error(json.error, { id: toastId })
 | 
			
		||||
    } else {
 | 
			
		||||
      return
 | 
			
		||||
    }
 | 
			
		||||
  } else {
 | 
			
		||||
    if (showToast) {
 | 
			
		||||
      toast.success('New account created', { id: toastId })
 | 
			
		||||
  }
 | 
			
		||||
  const currNames = state.accounts.map(acc => acc.name)
 | 
			
		||||
  const info = await fetchAccountInfo(json.address, { silent: true })
 | 
			
		||||
  state.accounts.push({
 | 
			
		||||
    name: name || names.filter(name => !currNames.includes(name))[0],
 | 
			
		||||
    xrp: (json.xrp || 0 * 1000000).toString(),
 | 
			
		||||
    address: json.address,
 | 
			
		||||
    secret: json.secret,
 | 
			
		||||
      sequence: 1,
 | 
			
		||||
    sequence: info?.Sequence || 1,
 | 
			
		||||
    hooks: [],
 | 
			
		||||
    isLoading: false,
 | 
			
		||||
    version: '2'
 | 
			
		||||
  })
 | 
			
		||||
  if (showToast) {
 | 
			
		||||
    toast.success('New account created', { id: toastId })
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -14,11 +14,4 @@ export const deleteAccount = (addr?: string) => {
 | 
			
		||||
      if (!acc) return
 | 
			
		||||
      acc.label = acc.value
 | 
			
		||||
    })
 | 
			
		||||
  transactionsState.transactions
 | 
			
		||||
    .filter(t => t.state.selectedDestAccount?.value === addr)
 | 
			
		||||
    .forEach(t => {
 | 
			
		||||
      const acc = t.state.selectedDestAccount
 | 
			
		||||
      if (!acc) return
 | 
			
		||||
      acc.label = acc.value
 | 
			
		||||
    })
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@ import calculateHookOn, { TTS } from '../../utils/hookOnCalculator'
 | 
			
		||||
import { Link } from '../../components'
 | 
			
		||||
import { ref } from 'valtio'
 | 
			
		||||
import estimateFee from '../../utils/estimateFee'
 | 
			
		||||
import { SetHookData } from '../../utils/setHook'
 | 
			
		||||
import { SetHookData, toHex } from '../../utils/setHook'
 | 
			
		||||
import ResultLink from '../../components/ResultLink'
 | 
			
		||||
import { xrplSend } from './xrpl-client'
 | 
			
		||||
 | 
			
		||||
@@ -18,13 +18,6 @@ export const sha256 = async (string: string) => {
 | 
			
		||||
  return hashHex
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function toHex(str: string) {
 | 
			
		||||
  var result = ''
 | 
			
		||||
  for (var i = 0; i < str.length; i++) {
 | 
			
		||||
    result += str.charCodeAt(i).toString(16)
 | 
			
		||||
  }
 | 
			
		||||
  return result.toUpperCase()
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function arrayBufferToHex(arrayBuffer?: ArrayBuffer | null) {
 | 
			
		||||
  if (!arrayBuffer) {
 | 
			
		||||
 
 | 
			
		||||
@@ -10,7 +10,6 @@ interface TransactionOptions {
 | 
			
		||||
  TransactionType: string
 | 
			
		||||
  Account?: string
 | 
			
		||||
  Fee?: string
 | 
			
		||||
  Destination?: string
 | 
			
		||||
  [index: string]: any
 | 
			
		||||
}
 | 
			
		||||
interface OtherOptions {
 | 
			
		||||
@@ -31,6 +30,10 @@ export const sendTransaction = async (
 | 
			
		||||
    ...opts
 | 
			
		||||
  }
 | 
			
		||||
  const { logPrefix = '' } = options || {}
 | 
			
		||||
  state.transactionLogs.push({
 | 
			
		||||
    type: 'log',
 | 
			
		||||
    message: `${logPrefix}${JSON.stringify(tx, null, 2)}`
 | 
			
		||||
  })
 | 
			
		||||
  try {
 | 
			
		||||
    const signedAccount = derive.familySeed(account.secret)
 | 
			
		||||
    const { signedTransaction } = sign(tx, signedAccount)
 | 
			
		||||
 
 | 
			
		||||
@@ -5,35 +5,55 @@ import state from '.'
 | 
			
		||||
import { showAlert } from '../state/actions/showAlert'
 | 
			
		||||
import { parseJSON } from '../utils/json'
 | 
			
		||||
import { extractFlags, getFlags } from './constants/flags'
 | 
			
		||||
import { fromHex } from '../utils/setHook'
 | 
			
		||||
import { typeIs } from '../utils/helpers'
 | 
			
		||||
 | 
			
		||||
export type SelectOption = {
 | 
			
		||||
  value: string
 | 
			
		||||
  label: string
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export type HookParameters = {
 | 
			
		||||
  [key: string]: SelectOption
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export type Memos = {
 | 
			
		||||
  [key: string]: {
 | 
			
		||||
    type: string
 | 
			
		||||
    format: string
 | 
			
		||||
    data: string
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export interface TransactionState {
 | 
			
		||||
  selectedTransaction: SelectOption | null
 | 
			
		||||
  selectedAccount: SelectOption | null
 | 
			
		||||
  selectedDestAccount: SelectOption | null
 | 
			
		||||
  selectedFlags: SelectOption[] | null
 | 
			
		||||
  hookParameters: HookParameters
 | 
			
		||||
  memos: Memos
 | 
			
		||||
  txIsLoading: boolean
 | 
			
		||||
  txIsDisabled: boolean
 | 
			
		||||
  txFields: TxFields
 | 
			
		||||
  viewType: 'json' | 'ui'
 | 
			
		||||
  editorValue?: string
 | 
			
		||||
  editorIsSaved: boolean
 | 
			
		||||
  estimatedFee?: string
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const commonFields = ['TransactionType', 'Account', 'Sequence', "HookParameters"] as const;
 | 
			
		||||
 | 
			
		||||
export type TxFields = Omit<
 | 
			
		||||
  Partial<typeof transactionsData[0]>,
 | 
			
		||||
  'Account' | 'Sequence' | 'TransactionType'
 | 
			
		||||
  typeof commonFields[number]
 | 
			
		||||
>
 | 
			
		||||
 | 
			
		||||
export const defaultTransaction: TransactionState = {
 | 
			
		||||
  selectedTransaction: null,
 | 
			
		||||
  selectedAccount: null,
 | 
			
		||||
  selectedDestAccount: null,
 | 
			
		||||
  selectedFlags: null,
 | 
			
		||||
  hookParameters: {},
 | 
			
		||||
  memos: {},
 | 
			
		||||
  editorIsSaved: true,
 | 
			
		||||
  txIsLoading: false,
 | 
			
		||||
  txIsDisabled: false,
 | 
			
		||||
  txFields: {},
 | 
			
		||||
@@ -109,46 +129,51 @@ export const modifyTxState = (
 | 
			
		||||
  return tx.state
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// state to tx options
 | 
			
		||||
export const prepareTransaction = (data: any) => {
 | 
			
		||||
  let options = { ...data }
 | 
			
		||||
 | 
			
		||||
  Object.keys(options).forEach(field => {
 | 
			
		||||
    let _value = options[field]
 | 
			
		||||
    // convert xrp
 | 
			
		||||
    if (_value && typeof _value === 'object' && _value.$type === 'xrp') {
 | 
			
		||||
      if (+_value.$value) {
 | 
			
		||||
        options[field] = (+_value.$value * 1000000 + '') as any
 | 
			
		||||
    if (!typeIs(_value, 'object')) return
 | 
			
		||||
    // amount.xrp
 | 
			
		||||
    if (_value.$type === 'amount.xrp') {
 | 
			
		||||
      if (_value.$value) {
 | 
			
		||||
        options[field] = (+(_value as any).$value * 1000000 + '')
 | 
			
		||||
      } else {
 | 
			
		||||
        options[field] = undefined // 👇 💀
 | 
			
		||||
        options[field] = ""
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
    // handle type: `json`
 | 
			
		||||
    if (_value && typeof _value === 'object' && _value.$type === 'json') {
 | 
			
		||||
      if (typeof _value.$value === 'object') {
 | 
			
		||||
    // amount.token
 | 
			
		||||
    if (_value.$type === 'amount.token') {
 | 
			
		||||
      if (typeIs(_value.$value, 'string')) {
 | 
			
		||||
        options[field] = parseJSON(_value.$value)
 | 
			
		||||
      } else if (typeIs(_value.$value, 'object')) {
 | 
			
		||||
        options[field] = _value.$value
 | 
			
		||||
      } else {
 | 
			
		||||
        try {
 | 
			
		||||
          options[field] = JSON.parse(_value.$value)
 | 
			
		||||
        } catch (error) {
 | 
			
		||||
          const message = `Input error for json field '${field}': ${error instanceof Error ? error.message : ''
 | 
			
		||||
            }`
 | 
			
		||||
          console.error(message)
 | 
			
		||||
          options[field] = _value.$value
 | 
			
		||||
        options[field] = undefined
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
    // account
 | 
			
		||||
    if (_value.$type === 'account') {
 | 
			
		||||
      options[field] = (_value.$value as any)?.toString() || ""
 | 
			
		||||
    }
 | 
			
		||||
    // json
 | 
			
		||||
    if (_value.$type === 'json') {
 | 
			
		||||
      const val = _value.$value;
 | 
			
		||||
      let res: any = val;
 | 
			
		||||
      if (typeIs(val, ["object", "array"])) {
 | 
			
		||||
        options[field] = res
 | 
			
		||||
      } else if (typeIs(val, "string") && (res = parseJSON(val))) {
 | 
			
		||||
        options[field] = res;
 | 
			
		||||
      } else {
 | 
			
		||||
        options[field] = res;
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
    // delete unnecessary fields
 | 
			
		||||
    if (!options[field]) {
 | 
			
		||||
      delete options[field]
 | 
			
		||||
    }
 | 
			
		||||
  })
 | 
			
		||||
 | 
			
		||||
  return options
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// editor value to state
 | 
			
		||||
export const prepareState = (value: string, transactionType?: string) => {
 | 
			
		||||
  const options = parseJSON(value)
 | 
			
		||||
  if (!options) {
 | 
			
		||||
@@ -158,7 +183,7 @@ export const prepareState = (value: string, transactionType?: string) => {
 | 
			
		||||
    return
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  const { Account, TransactionType, Destination, ...rest } = options
 | 
			
		||||
  const { Account, TransactionType, HookParameters, Memos, ...rest } = options
 | 
			
		||||
  let tx: Partial<TransactionState> = {}
 | 
			
		||||
  const schema = getTxFields(transactionType)
 | 
			
		||||
 | 
			
		||||
@@ -188,25 +213,23 @@ export const prepareState = (value: string, transactionType?: string) => {
 | 
			
		||||
    tx.selectedTransaction = null
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  if (schema.Destination !== undefined) {
 | 
			
		||||
    const dest = state.accounts.find(acc => acc.address === Destination)
 | 
			
		||||
    if (dest) {
 | 
			
		||||
      tx.selectedDestAccount = {
 | 
			
		||||
        label: dest.name,
 | 
			
		||||
        value: dest.address
 | 
			
		||||
  if (HookParameters && HookParameters instanceof Array) {
 | 
			
		||||
    tx.hookParameters = HookParameters.reduce<TransactionState["hookParameters"]>((acc, cur, idx) => {
 | 
			
		||||
      const param = { label: fromHex(cur.HookParameter?.HookParameterName || ""), value: cur.HookParameter?.HookParameterValue || "" }
 | 
			
		||||
      acc[idx] = param;
 | 
			
		||||
      return acc;
 | 
			
		||||
    }, {})
 | 
			
		||||
  }
 | 
			
		||||
    } else if (Destination) {
 | 
			
		||||
      tx.selectedDestAccount = {
 | 
			
		||||
        label: Destination,
 | 
			
		||||
        value: Destination
 | 
			
		||||
      }
 | 
			
		||||
    } else {
 | 
			
		||||
      tx.selectedDestAccount = null
 | 
			
		||||
    }
 | 
			
		||||
  } else if (Destination) {
 | 
			
		||||
    rest.Destination = Destination
 | 
			
		||||
 | 
			
		||||
  if (Memos && Memos instanceof Array) {
 | 
			
		||||
    tx.memos = Memos.reduce<TransactionState["memos"]>((acc, cur, idx) => {
 | 
			
		||||
      const memo = { data: cur.Memo?.MemoData || "", type: fromHex(cur.Memo?.MemoType || ""), format: fromHex(cur.Memo?.MemoFormat || "") }
 | 
			
		||||
      acc[idx] = memo;
 | 
			
		||||
      return acc;
 | 
			
		||||
    }, {})
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
  if (getFlags(TransactionType) && rest.Flags) {
 | 
			
		||||
    const flags = extractFlags(TransactionType, rest.Flags)
 | 
			
		||||
 | 
			
		||||
@@ -217,17 +240,31 @@ export const prepareState = (value: string, transactionType?: string) => {
 | 
			
		||||
  Object.keys(rest).forEach(field => {
 | 
			
		||||
    const value = rest[field]
 | 
			
		||||
    const schemaVal = schema[field as keyof TxFields]
 | 
			
		||||
    const isXrp =
 | 
			
		||||
      typeof value !== 'object' &&
 | 
			
		||||
      schemaVal &&
 | 
			
		||||
      typeof schemaVal === 'object' &&
 | 
			
		||||
      schemaVal.$type === 'xrp'
 | 
			
		||||
    if (isXrp) {
 | 
			
		||||
 | 
			
		||||
    const isAmount = schemaVal &&
 | 
			
		||||
      typeIs(schemaVal, "object") &&
 | 
			
		||||
      schemaVal.$type.startsWith('amount.');
 | 
			
		||||
    const isAccount = schemaVal &&
 | 
			
		||||
      typeIs(schemaVal, "object") &&
 | 
			
		||||
      schemaVal.$type.startsWith("account");
 | 
			
		||||
 | 
			
		||||
    if (isAmount && ["number", "string"].includes(typeof value)) {
 | 
			
		||||
      rest[field] = {
 | 
			
		||||
        $type: 'xrp',
 | 
			
		||||
        $type: 'amount.xrp', // TODO narrow typed $type.
 | 
			
		||||
        $value: +value / 1000000 // ! maybe use bigint?
 | 
			
		||||
      }
 | 
			
		||||
    } else if (typeof value === 'object') {
 | 
			
		||||
    } else if (isAmount && typeof value === 'object') {
 | 
			
		||||
      rest[field] = {
 | 
			
		||||
        $type: 'amount.token',
 | 
			
		||||
        $value: value
 | 
			
		||||
      }
 | 
			
		||||
    } else if (isAccount) {
 | 
			
		||||
      rest[field] = {
 | 
			
		||||
        $type: "account",
 | 
			
		||||
        $value: value?.toString() || ""
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
    else if (typeof value === 'object') {
 | 
			
		||||
      rest[field] = {
 | 
			
		||||
        $type: 'json',
 | 
			
		||||
        $value: value
 | 
			
		||||
@@ -236,6 +273,7 @@ export const prepareState = (value: string, transactionType?: string) => {
 | 
			
		||||
  })
 | 
			
		||||
 | 
			
		||||
  tx.txFields = rest
 | 
			
		||||
  tx.editorIsSaved = true;
 | 
			
		||||
 | 
			
		||||
  return tx
 | 
			
		||||
}
 | 
			
		||||
@@ -246,12 +284,12 @@ export const getTxFields = (tt?: string) => {
 | 
			
		||||
  if (!txFields) return {}
 | 
			
		||||
 | 
			
		||||
  let _txFields = Object.keys(txFields)
 | 
			
		||||
    .filter(key => !['TransactionType', 'Account', 'Sequence'].includes(key))
 | 
			
		||||
    .filter(key => !commonFields.includes(key as any))
 | 
			
		||||
    .reduce<TxFields>((tf, key) => ((tf[key as keyof TxFields] = (txFields as any)[key]), tf), {})
 | 
			
		||||
  return _txFields
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export { transactionsData }
 | 
			
		||||
export { transactionsData, commonFields }
 | 
			
		||||
 | 
			
		||||
export const transactionsOptions = transactionsData.map(tx => ({
 | 
			
		||||
  value: tx.TransactionType,
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										31
									
								
								utils/accountInfo.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										31
									
								
								utils/accountInfo.ts
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,31 @@
 | 
			
		||||
import toast from 'react-hot-toast'
 | 
			
		||||
 | 
			
		||||
import { xrplSend } from '../state/actions/xrpl-client'
 | 
			
		||||
 | 
			
		||||
interface AccountInfo {
 | 
			
		||||
    Account: string,
 | 
			
		||||
    Sequence: number,
 | 
			
		||||
    Flags: number,
 | 
			
		||||
    Balance?: string,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const fetchAccountInfo = async (
 | 
			
		||||
    address: string,
 | 
			
		||||
    opts: { silent?: boolean } = {}
 | 
			
		||||
): Promise<AccountInfo | undefined> => {
 | 
			
		||||
    try {
 | 
			
		||||
        const res = await xrplSend({
 | 
			
		||||
            id: `hooks-builder-req-info-${address}`,
 | 
			
		||||
            command: 'account_info',
 | 
			
		||||
            account: address
 | 
			
		||||
        })
 | 
			
		||||
        return res.account_data;
 | 
			
		||||
    } catch (err) {
 | 
			
		||||
        if (!opts.silent) {
 | 
			
		||||
            console.error(err)
 | 
			
		||||
            toast.error('Could not fetch account info!')
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export default fetchAccountInfo
 | 
			
		||||
@@ -24,6 +24,9 @@ const estimateFee = async (
 | 
			
		||||
    const { signedTransaction } = sign(copyTx, keypair)
 | 
			
		||||
 | 
			
		||||
    const res = await xrplSend({ command: 'fee', tx_blob: signedTransaction })
 | 
			
		||||
    if (res.error) {
 | 
			
		||||
      throw new Error(`[${res.error}] ${res.error_exception}.`);
 | 
			
		||||
    }
 | 
			
		||||
    if (res && res.drops) {
 | 
			
		||||
      return res.drops
 | 
			
		||||
    }
 | 
			
		||||
@@ -31,7 +34,8 @@ const estimateFee = async (
 | 
			
		||||
  } catch (err) {
 | 
			
		||||
    if (!opts.silent) {
 | 
			
		||||
      console.error(err)
 | 
			
		||||
      toast.error('Cannot estimate fee.') // ? Some better msg
 | 
			
		||||
      const msg = err instanceof Error ? err.message : 'Error estimating fee!';
 | 
			
		||||
      toast.error(msg);
 | 
			
		||||
    }
 | 
			
		||||
    return null
 | 
			
		||||
  }
 | 
			
		||||
 
 | 
			
		||||
@@ -19,3 +19,17 @@ export const getFileExtention = (filename?: string): string | undefined => {
 | 
			
		||||
  const ext = (filename.includes('.') && filename.split('.').pop()) || undefined
 | 
			
		||||
  return ext
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
type Type = "array" | "undefined" | "object" | "string" | "number" | "bigint" | "boolean" | "symbol" | "function"
 | 
			
		||||
type obj = Record<string | number | symbol, unknown>
 | 
			
		||||
type arr = unknown[]
 | 
			
		||||
 | 
			
		||||
export const typeIs = <T extends Type>(arg: any, t: T | T[]): arg is unknown & (T extends "array" ? arr : T extends "undefined" ? undefined | null : T extends "object" ? obj : T extends "string" ? string : T extends "number" ? number : T extends "bigint" ? bigint : T extends "boolean" ? boolean : T extends "symbol" ? symbol : T extends "function" ? Function : never) => {
 | 
			
		||||
  const types = Array.isArray(t) ? t : [t]
 | 
			
		||||
  return types.includes(typeOf(arg) as T);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export const typeOf = (arg: any): Type => {
 | 
			
		||||
  const type = arg instanceof Array ? 'array' : arg === null ? 'undefined' : typeof arg
 | 
			
		||||
  return type;
 | 
			
		||||
}
 | 
			
		||||
@@ -1,9 +1,8 @@
 | 
			
		||||
import { typeIs, typeOf } from './helpers'
 | 
			
		||||
 | 
			
		||||
export const extractSchemaProps = <O extends object>(obj: O) =>
 | 
			
		||||
  Object.entries(obj).reduce((prev, [key, val]) => {
 | 
			
		||||
    const typeOf = <T>(arg: T) =>
 | 
			
		||||
      arg instanceof Array ? 'array' : arg === null ? 'undefined' : typeof arg
 | 
			
		||||
 | 
			
		||||
    const value = typeOf(val) === 'object' && '$type' in val && '$value' in val ? val?.$value : val
 | 
			
		||||
    const value = typeIs(val, "object") && '$type' in val && '$value' in val ? val?.$value : val
 | 
			
		||||
    const type = typeOf(value)
 | 
			
		||||
 | 
			
		||||
    let schema: any = {
 | 
			
		||||
@@ -12,19 +11,19 @@ export const extractSchemaProps = <O extends object>(obj: O) =>
 | 
			
		||||
      default: value
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (typeOf(value) === 'array') {
 | 
			
		||||
    if (typeIs(value, "array")) {
 | 
			
		||||
      const item = value[0] // TODO merge other item schema's into one
 | 
			
		||||
      if (typeOf(item) !== 'object') {
 | 
			
		||||
      if (typeIs(item, "object")) {
 | 
			
		||||
        schema.items = {
 | 
			
		||||
          type: 'object',
 | 
			
		||||
          properties: extractSchemaProps(item),
 | 
			
		||||
          default: item
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
      // TODO support primitive-value arrays
 | 
			
		||||
      // TODO primitive-value arrays
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (typeOf(value) === 'object') {
 | 
			
		||||
    if (typeIs(value, "object")) {
 | 
			
		||||
      schema.properties = extractSchemaProps(value)
 | 
			
		||||
    }
 | 
			
		||||
    return {
 | 
			
		||||
 
 | 
			
		||||
@@ -20,6 +20,13 @@ export type SetHookData = {
 | 
			
		||||
    }
 | 
			
		||||
    $metaData?: any
 | 
			
		||||
  }[]
 | 
			
		||||
  Memos?: {
 | 
			
		||||
    Memo: {
 | 
			
		||||
      MemoType: string,
 | 
			
		||||
      MemoData: string
 | 
			
		||||
      MemoFormat: string
 | 
			
		||||
    }
 | 
			
		||||
  }[]
 | 
			
		||||
  // HookGrants: {
 | 
			
		||||
  //   HookGrant: {
 | 
			
		||||
  //     Authorize: string;
 | 
			
		||||
@@ -67,3 +74,20 @@ export const getInvokeOptions = (content?: string) => {
 | 
			
		||||
  }))
 | 
			
		||||
  return invokeOptions
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function toHex(str: string) {
 | 
			
		||||
  var result = ''
 | 
			
		||||
  for (var i = 0; i < str.length; i++) {
 | 
			
		||||
    const hex = str.charCodeAt(i).toString(16)
 | 
			
		||||
    result += hex.padStart(2, '0')
 | 
			
		||||
  }
 | 
			
		||||
  return result.toUpperCase()
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function fromHex(hex: string) {
 | 
			
		||||
  var str = ''
 | 
			
		||||
  for (var i = 0; i < hex.length; i += 2) {
 | 
			
		||||
    str += String.fromCharCode(parseInt(hex.substring(i, i + 2), 16))
 | 
			
		||||
  }
 | 
			
		||||
  return str
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user