Skip to content

fix: Use Memo type to submit/display multi-sig transactions #110

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.

Sign up for GitHub

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

Merged
stanleyjones merged 12 commits into from
Mar 1, 2023
Merged

fix: Use Memo type to submit/display multi-sig transactions #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3297981
0.1.1-alpha.0
stanleyjones Feb 13, 2023
ff80600
0.1.0-alpha.8
stanleyjones Feb 13, 2023
407a588
0.1.0-alpha.8
stanleyjones Feb 13, 2023
b2c36fc
fix: Use Memo type to send/read
stanleyjones Mar 1, 2023
6d7e75c
fix: Better comparison
stanleyjones Mar 1, 2023
6fe99a2
fix: Better comparison
stanleyjones Mar 1, 2023
2ac450c
Merge branch 'main' into fix-memo-type
stanleyjones Mar 1, 2023
1a3bed6
fix: Only add memo if it's not empty
stanleyjones Mar 1, 2023
1b0193b
Merge branch 'fix-memo-type' of github.com:stanleyjones/albert into f…
stanleyjones Mar 1, 2023
bcbfb52
build: Use latest ManyJS version
stanleyjones Mar 1, 2023
35dd0d7
Empty commit
stanleyjones Mar 1, 2023
4f791d9
build: Update lock file
stanleyjones Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@emotion/react": "^11.8.2",
"@emotion/styled": "^11.8.1",
"@fontsource/roboto": "^4.5.8",
"@liftedinit/many-js": "^0.1.0-alpha.8",
"@liftedinit/many-js": "^0.1.0-alpha.9",
"@liftedinit/ui": "github:liftedinit/lifted-ui",
"@web3auth/openlogin-adapter": "^2.1.3",
"@web3auth/web3auth": "^2.1.3",
Expand Down
4 changes: 2 additions & 2 deletions src/features/accounts/api/multisig-submit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { useMutation } from "react-query"
import { useNetworkContext } from "features/network"
import { EventType } from "@liftedinit/many-js"
import { EventType, Memo } from "@liftedinit/many-js"

type SubmitData = {
from: string
to: string
amount: bigint
symbol: string
memo?: string
memo?: Memo
threshold?: number
executeAutomatically?: boolean
expireInSecs?: number
Expand Down
32 changes: 17 additions & 15 deletions src/features/transactions/components/send-asset/send-asset.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,22 +207,24 @@ export function useSendAssetForm({
multisigSettings as Map<string, unknown>,
formValues.multisigSettings,
)
doCreateMultisigSubmitTxn(
{
from: address,
to: formValues.to,
amount: bigIntAmount,
symbol: asset!.identity,
memo: formValues?.memo?.trim(),
...newMultisigSettings,
},
{
onSuccess: () => {
onSendSuccess()
onSuccess?.()
},
const txn = {
from: address,
to: formValues.to,
amount: bigIntAmount,
symbol: asset!.identity,
...newMultisigSettings,
}
if (formValues.memo) {
//@ts-ignore
txn.memo = [formValues.memo.trim()]
}

doCreateMultisigSubmitTxn(txn, {
onSuccess: () => {
onSendSuccess()
onSuccess?.()
},
)
})
return
}
doCreateSendTxn(
Expand Down
4 changes: 3 additions & 1 deletion src/features/transactions/components/txn-list/txn-list-item/multisig-txn-list-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,8 @@ export function SubmittedMultisigTxnDetails({
const { memo, executeAutomatically, threshold, transaction, submitter } =
(multisigTxnInfoData?.info ?? {}) as MultisigTransactionInfo

const memoStr = memo && typeof memo[0] === "string" ? memo[0] : ""
Copy link
Copy Markdown
Contributor Author

@stanleyjones stanleyjones Mar 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could also do a map here. Depends on how many human-readable memos we expect transactions to have.

Copy link
Copy Markdown
Contributor

@hansl hansl Mar 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just the 1 from the UI for now so I think that's fine.


const submitterContactName = getContactName(submitter)

const approvers = makeApproversMap(
Expand Down Expand Up @@ -271,7 +273,7 @@ export function SubmittedMultisigTxnDetails({

<DataField label="Required Approvers" value={threshold} />

<DataField label="Memo" value={memo} />
<DataField label="Memo" value={memoStr} />

<DataField
label="Execute Automatically"
Expand Down