Skip to content

Commit

Permalink
Merge branch 'main' into doc
Browse files Browse the repository at this point in the history
  • Loading branch information
tnowacki committed Jul 9, 2024
2 parents 9698647 + 95140e9 commit 2a195ef
Show file tree
Hide file tree
Showing 149 changed files with 11,650 additions and 11,748 deletions.
17 changes: 17 additions & 0 deletions .changeset/shaggy-cows-decide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
'@mysten/ledgerjs-hw-app-sui': patch
'@mysten/graphql-transport': patch
'@mysten/wallet-standard': patch
'@mysten/suins-toolkit': patch
'@mysten/create-dapp': patch
'@mysten/sui': patch
'@mysten/dapp-kit': patch
'@mysten/deepbook': patch
'@mysten/zklogin': patch
'@mysten/zksend': patch
'@mysten/enoki': patch
'@mysten/kiosk': patch
'@mysten/bcs': patch
---

Update dependencies
1 change: 1 addition & 0 deletions Cargo.lock

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

28 changes: 14 additions & 14 deletions apps/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,29 +25,29 @@
"@amplitude/analytics-core": "^0.13.3",
"@amplitude/analytics-types": "^0.20.0",
"@growthbook/growthbook-react": "^0.15.0",
"@hookform/resolvers": "^3.1.1",
"@hookform/resolvers": "^3.9.0",
"@mysten/dapp-kit": "workspace:*",
"@mysten/kiosk": "workspace:*",
"@mysten/sui": "workspace:*",
"@sentry/react": "^7.59.2",
"@tanstack/react-query": "^5.0.0",
"@tanstack/react-query": "^5.50.1",
"bignumber.js": "^9.1.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.45.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.52.1",
"vanilla-cookieconsent": "^2.9.1",
"zod": "^3.21.4"
"zod": "^3.23.8"
},
"devDependencies": {
"@headlessui/tailwindcss": "^0.1.3",
"@tailwindcss/aspect-ratio": "^0.4.2",
"@tailwindcss/forms": "^0.5.4",
"@types/react": "^18.2.15",
"@vanilla-extract/vite-plugin": "^3.9.0",
"postcss": "^8.4.31",
"tailwindcss": "^3.3.3",
"typescript": "^5.3.3",
"vite": "^4.4.4",
"vitest": "^1.6.0"
"@tailwindcss/forms": "^0.5.7",
"@types/react": "^18.3.3",
"@vanilla-extract/vite-plugin": "^4.0.13",
"postcss": "^8.4.39",
"tailwindcss": "^3.4.4",
"typescript": "^5.5.3",
"vite": "^5.3.3",
"vitest": "^2.0.1"
}
}
10 changes: 5 additions & 5 deletions apps/core/src/hooks/useGetTransferAmount.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ export function useGetTransferAmount(txnData: SuiTransactionBlockResponse) {
owner === 'Immutable'
? 'Immutable'
: 'AddressOwner' in owner
? owner.AddressOwner
: 'ObjectOwner' in owner
? owner.ObjectOwner
: '',
? owner.AddressOwner
: 'ObjectOwner' in owner
? owner.ObjectOwner
: '',
amount:
coinType === SUI_TYPE_ARG && BigInt(amount) < 0n
? BigInt(amount) + BigInt(gas ?? 0n)
: BigInt(amount),
}))
}))
: [],
[balanceChanges, gas],
);
Expand Down
2 changes: 1 addition & 1 deletion apps/core/src/utils/kiosk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export function getKioskIdFromOwnerCap(object: SuiObjectResponse | SuiObjectData
for?: string;
kiosk?: string;
cap?: { fields: { for: string } };
})
})
: null;
return fields?.for ?? fields?.kiosk ?? fields?.cap?.fields.for!;
}
4 changes: 2 additions & 2 deletions apps/core/src/utils/transaction/getGasSummary.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ export function getGasSummary(
'transaction' in transaction
? transaction.transaction?.data.gasData.owner
: typeof effects.gasObject.owner === 'object' && 'AddressOwner' in effects.gasObject.owner
? effects.gasObject.owner.AddressOwner
: '';
? effects.gasObject.owner.AddressOwner
: '';

return {
...effects.gasUsed,
Expand Down
6 changes: 3 additions & 3 deletions apps/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"devDependencies": {
"@svgr/cli": "^7.0.0",
"@svgr/core": "^7.0.0",
"@types/react": "^18.2.15",
"react": "^18.2.0",
"@types/react": "^18.3.3",
"react": "^18.3.1",
"rimraf": "^5.0.1",
"typescript": "^5.3.3"
"typescript": "^5.5.3"
}
}
1 change: 1 addition & 0 deletions apps/wallet/.prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ yarn-error.log*
.next/
.swc/
out/
playwright-report/
CHANGELOG.md
2 changes: 1 addition & 1 deletion apps/wallet/configs/webpack/webpack.config.common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ const commonConfig: () => Promise<Configuration> = async () => {
...(IS_DEV
? {
key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2HTQu/66edl64fM/SKDnHJmCz9SIYqM/QK7NM3vD1LTE2UNXzHX5Clj8geuoWAYS6HE/aFcd//qPnAh8TnPgqTS3IX+IbZsY/+kcokxIEWHly3eKEHWB32tQsGdJx6tgDzx8TRkFZEcCCdE4pFqQO68W3I/+8AQPosdd5fsIoF6OGKZ/i29mpGkYJSmMroCN5zYCQqvpjTBIkiTkI9TTjxmBid77pHyG4TsHz0wda4KxHV9ZtzZQXB4vexTku/Isczdtif7pDqFEDCAqEkpiGPyKoIuqrxc75IfpzIGFsIylycBr0fZellSsl2M6FM34R99/vUrGj5iWcjNmhYvZ8QIDAQAB',
}
}
: undefined),
};
return JSON.stringify(manifestJson, null, 4);
Expand Down
58 changes: 30 additions & 28 deletions apps/wallet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,47 +55,49 @@
"@storybook/addon-links": "^7.1.0",
"@storybook/addons": "^7.1.0",
"@storybook/blocks": "^7.1.0",
"@storybook/client-api": "^7.6.17",
"@storybook/react": "^7.1.0",
"@storybook/react-webpack5": "^7.1.0",
"@storybook/theming": "^7.1.0",
"@svgr/webpack": "^7.0.0",
"@types/dotenv-webpack": "^7.0.4",
"@types/git-rev-sync": "^2.0.0",
"@types/node": "^20.4.2",
"@types/react": "^18.2.15",
"@types/react-dom": "^18.2.7",
"@types/node": "^20.14.10",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/semver": "^7.5.0",
"@types/throttle-debounce": "^5.0.0",
"@types/uuid": "^9.0.2",
"@types/webextension-polyfill": "^0.10.1",
"@types/webpack": "^5.28.1",
"@types/zxcvbn": "^4.4.1",
"@vitejs/plugin-react": "^4.0.3",
"@vitejs/plugin-react": "^4.3.1",
"copy-webpack-plugin": "^11.0.0",
"cross-env": "^7.0.3",
"css-loader": "^6.7.3",
"dotenv-webpack": "^8.0.0",
"eslint": "^8.45.0",
"eslint-webpack-plugin": "^4.0.1",
"git-rev-sync": "^3.0.2",
"happy-dom": "^14.11.0",
"html-webpack-plugin": "^5.5.3",
"mini-css-extract-plugin": "^2.7.6",
"onchange": "^7.1.0",
"postcss": "^8.4.31",
"postcss": "^8.4.39",
"postcss-loader": "^7.3.3",
"postcss-preset-env": "^9.0.0",
"sass": "^1.63.6",
"sass-loader": "^13.3.2",
"storybook": "^7.1.0",
"tailwindcss": "^3.3.3",
"tailwindcss-animate": "^1.0.6",
"tailwindcss": "^3.4.4",
"tailwindcss-animate": "^1.0.7",
"ts-loader": "^9.4.4",
"ts-node": "^10.9.1",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.3.3",
"vite": "^4.4.4",
"vite-tsconfig-paths": "^4.2.0",
"vitest": "^1.6.0",
"typescript": "^5.5.3",
"vite": "^5.3.3",
"vite-tsconfig-paths": "^4.3.2",
"vitest": "^2.0.1",
"web-ext": "^7.6.2",
"webpack": "^5.79.0",
"webpack-cli": "^5.0.1",
Expand All @@ -104,13 +106,13 @@
"dependencies": {
"@amplitude/analytics-browser": "^1.10.3",
"@floating-ui/react": "^0.23.0",
"@fontsource-variable/inter": "^5.0.5",
"@fontsource-variable/red-hat-mono": "^5.0.6",
"@fontsource-variable/inter": "^5.0.19",
"@fontsource-variable/red-hat-mono": "^5.0.19",
"@growthbook/growthbook": "^0.25.0",
"@growthbook/growthbook-react": "^0.15.0",
"@headlessui/react": "^1.7.15",
"@ledgerhq/errors": "^6.12.4",
"@ledgerhq/hw-transport": "^6.28.2",
"@ledgerhq/hw-transport": "^6.31.0",
"@ledgerhq/hw-transport-webhid": "^6.27.15",
"@ledgerhq/hw-transport-webusb": "^6.27.13",
"@metamask/browser-passworder": "^4.1.0",
Expand All @@ -123,40 +125,40 @@
"@mysten/sui": "workspace:*",
"@mysten/wallet-standard": "workspace:*",
"@mysten/zklogin": "workspace:*",
"@noble/hashes": "^1.3.1",
"@noble/hashes": "^1.4.0",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-collapsible": "^1.0.3",
"@radix-ui/react-dialog": "^1.0.4",
"@radix-ui/react-dialog": "^1.1.1",
"@radix-ui/react-select": "^1.2.2",
"@radix-ui/react-toggle-group": "^1.0.4",
"@reduxjs/toolkit": "^1.9.5",
"@scure/bip32": "^1.3.1",
"@scure/bip39": "^1.2.1",
"@scure/bip32": "^1.4.0",
"@scure/bip39": "^1.3.0",
"@sentry/browser": "^7.61.0",
"@tanstack/react-query": "^5.0.0",
"@tanstack/react-query": "^5.50.1",
"@tanstack/react-query-persist-client": "^4.29.25",
"bech32": "^2.0.0",
"bignumber.js": "^9.1.1",
"bootstrap-icons": "^1.10.5",
"buffer": "^6.0.3",
"class-variance-authority": "^0.7.0",
"clsx": "^2.0.0",
"clsx": "^2.1.1",
"dexie": "^3.2.4",
"dexie-export-import": "^4.0.7",
"formik": "^2.4.2",
"framer-motion": "^10.12.22",
"idb-keyval": "^6.2.1",
"jose": "^5.2.3",
"jose": "^5.6.3",
"mitt": "^3.0.1",
"poseidon-lite": "^0.2.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-error-boundary": "^4.0.10",
"react-hook-form": "^7.45.2",
"react-hook-form": "^7.52.1",
"react-hot-toast": "^2.4.1",
"react-number-format": "^5.2.2",
"react-redux": "^8.1.1",
"react-router-dom": "^6.14.2",
"react-router-dom": "^6.24.1",
"react-textarea-autosize": "^8.5.2",
"rxjs": "^7.8.1",
"semver": "^7.5.4",
Expand All @@ -166,8 +168,8 @@
"uuid": "^9.0.0",
"webextension-polyfill": "^0.10.0",
"yup": "^1.1.1",
"zod": "^3.21.4",
"zustand": "^4.4.1",
"zod": "^3.23.8",
"zustand": "^4.5.4",
"zxcvbn": "^4.4.2"
}
}
2 changes: 1 addition & 1 deletion apps/wallet/src/shared/sentry-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function getSentryConfig({
? [
'ehndjpedolgphielnhnpnkomdhgpaaei', // chrome beta
'opcgpfmipidbgpenhmajoajpbobppdil', // chrome prod
]
]
: undefined,
};
}
2 changes: 1 addition & 1 deletion apps/wallet/src/ui/app/components/HideShowDisplayBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export function HideShowDisplayBox({
? value
: value.map((aValue, index) => (
<span key={index}>{(index > 0 ? ' ' : '') + aValue}</span>
))}
))}
</Text>
</div>
)}
Expand Down
2 changes: 1 addition & 1 deletion apps/wallet/src/ui/app/components/filters-tags/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function FiltersPortal({ tags, callback, firstLastMargin }: Tags) {
})}
</div>,
element,
)
)
: null}
</>
);
Expand Down
6 changes: 3 additions & 3 deletions apps/wallet/src/ui/app/components/sui-apps/DisconnectApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ function DisconnectApp({
connectedAccounts.length === 1
? 'Disconnect'
: accountsToDisconnect.length === 0 ||
connectedAccounts.length === accountsToDisconnect.length
? 'Disconnect All'
: 'Disconnect Selected'
connectedAccounts.length === accountsToDisconnect.length
? 'Disconnect All'
: 'Disconnect Selected'
}
loading={disconnectMutation.isPending}
onClick={() => disconnectMutation.mutate()}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ export function UserApproveContainer({
requestType: message
? RequestType.SIGN_MESSAGE
: transaction
? RequestType.SIGN_TRANSACTION
: RequestType.CONNECT,
? RequestType.SIGN_TRANSACTION
: RequestType.CONNECT,
transaction,
requestId: requestID!,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ export function GasFees({ sender, transaction }: Props) {
{isPending
? 'Estimating...'
: isError
? 'Gas estimation failed'
: `${isSponsored ? 0 : gasBudget} ${GAS_SYMBOL}`}
? 'Gas estimation failed'
: `${isSponsored ? 0 : gasBudget} ${GAS_SYMBOL}`}
</DescriptionItem>
{isSponsored && (
<>
Expand Down
4 changes: 2 additions & 2 deletions apps/wallet/src/ui/app/pages/home/hidden-assets/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ function HiddenNftsPage() {
isKioskOwnerToken(kioskClient.network, nft.data)
? `/kiosk?${new URLSearchParams({
kioskId: getKioskIdFromOwnerCap(nft.data!),
})}`
})}`
: `/nft-details?${new URLSearchParams({
objectId,
}).toString()}`
}).toString()}`
}
onClick={() => {
ampli.clickedCollectibleCard({
Expand Down
4 changes: 2 additions & 2 deletions apps/wallet/src/ui/app/pages/home/nfts/VisualAssets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ export default function VisualAssets({ items }: { items: SuiObjectData[] }) {
isKioskOwnerToken(kioskClient.network, object)
? `/kiosk?${new URLSearchParams({
kioskId: getKioskIdFromOwnerCap(object),
})}`
})}`
: `/nft-details?${new URLSearchParams({
objectId: object.objectId,
}).toString()}`
}).toString()}`
}
onClick={() => {
ampli.clickedCollectibleCard({
Expand Down
4 changes: 2 additions & 2 deletions apps/wallet/src/ui/app/pages/home/tokens/TokensDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ function TokenDetails({ coinType }: TokenDetailsProps) {
coinBalance?.coinType
? `?${new URLSearchParams({
type: coinBalance.coinType,
}).toString()}`
}).toString()}`
: ''
}`}
disabled={!tokenBalance}
Expand All @@ -503,7 +503,7 @@ function TokenDetails({ coinType }: TokenDetailsProps) {
coinBalance?.coinType
? `?${new URLSearchParams({
type: coinBalance.coinType,
}).toString()}`
}).toString()}`
: ''
}`}
onClick={() => {
Expand Down
2 changes: 1 addition & 1 deletion apps/wallet/src/ui/app/shared/PageTitle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function PageTitle({ title = '', back, after }: PageTitleProps) {
return;
}
navigate(-1);
}
}
: undefined;
return (
<div className="flex items-center relative gap-5 w-full">
Expand Down
Loading

0 comments on commit 2a195ef

Please sign in to comment.