Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Thunnini committed Jul 10, 2023
2 parents b6ea30b + cd9bf6e commit c89f71d
Show file tree
Hide file tree
Showing 149 changed files with 28,449 additions and 804 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.12.14",
"version": "0.12.15-rc.1",
"useWorkspaces": true,
"npmClient": "yarn",
"command": {
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keplr-wallet/analytics",
"version": "0.12.14",
"version": "0.12.15-rc.1",
"main": "build/index.js",
"author": "chainapsis",
"license": "Apache-2.0",
Expand Down
24 changes: 12 additions & 12 deletions packages/background/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keplr-wallet/background",
"version": "0.12.14",
"version": "0.12.15-rc.1",
"main": "build/index.js",
"author": "chainapsis",
"license": "Apache-2.0",
Expand Down Expand Up @@ -28,17 +28,17 @@
"@ethersproject/hash": "^5.7.0",
"@ethersproject/transactions": "^5.7.0",
"@ethersproject/wallet": "^5.7.0",
"@keplr-wallet/chain-validator": "0.12.14",
"@keplr-wallet/common": "0.12.14",
"@keplr-wallet/cosmos": "0.12.14",
"@keplr-wallet/crypto": "0.12.14",
"@keplr-wallet/ledger-cosmos": "0.12.14",
"@keplr-wallet/popup": "0.12.14",
"@keplr-wallet/proto-types": "0.12.14",
"@keplr-wallet/router": "0.12.14",
"@keplr-wallet/simple-fetch": "0.12.14",
"@keplr-wallet/types": "0.12.14",
"@keplr-wallet/unit": "0.12.14",
"@keplr-wallet/chain-validator": "0.12.15-rc.1",
"@keplr-wallet/common": "0.12.15-rc.1",
"@keplr-wallet/cosmos": "0.12.15-rc.1",
"@keplr-wallet/crypto": "0.12.15-rc.1",
"@keplr-wallet/ledger-cosmos": "0.12.15-rc.1",
"@keplr-wallet/popup": "0.12.15-rc.1",
"@keplr-wallet/proto-types": "0.12.15-rc.1",
"@keplr-wallet/router": "0.12.15-rc.1",
"@keplr-wallet/simple-fetch": "0.12.15-rc.1",
"@keplr-wallet/types": "0.12.15-rc.1",
"@keplr-wallet/unit": "0.12.15-rc.1",
"@keystonehq/base-eth-keyring": "^0.6.4",
"@keystonehq/bc-ur-registry": "^0.5.1",
"@keystonehq/bc-ur-registry-cosmos": "^0.1.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/chain-validator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keplr-wallet/chain-validator",
"version": "0.12.14",
"version": "0.12.15-rc.1",
"main": "build/index.js",
"author": "chainapsis",
"license": "Apache-2.0",
Expand All @@ -16,9 +16,9 @@
"lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
},
"dependencies": {
"@keplr-wallet/cosmos": "0.12.14",
"@keplr-wallet/simple-fetch": "0.12.14",
"@keplr-wallet/types": "0.12.14",
"@keplr-wallet/cosmos": "0.12.15-rc.1",
"@keplr-wallet/simple-fetch": "0.12.15-rc.1",
"@keplr-wallet/types": "0.12.15-rc.1",
"joi": "^17.5.0",
"utility-types": "^3.10.0"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keplr-wallet/common",
"version": "0.12.14",
"version": "0.12.15-rc.1",
"main": "build/index.js",
"author": "chainapsis",
"license": "Apache-2.0",
Expand All @@ -16,8 +16,8 @@
"lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
},
"dependencies": {
"@keplr-wallet/crypto": "0.12.14",
"@keplr-wallet/types": "0.12.14",
"@keplr-wallet/crypto": "0.12.15-rc.1",
"@keplr-wallet/types": "0.12.15-rc.1",
"buffer": "^6.0.3",
"delay": "^4.4.0",
"mobx": "^6.1.7"
Expand Down
4 changes: 2 additions & 2 deletions packages/cosmjs-test/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cosmjs-test",
"version": "0.12.14",
"version": "0.12.15-rc.1",
"author": "chainapsis",
"license": "Apache-2.0",
"private": true,
Expand All @@ -12,7 +12,7 @@
},
"devDependencies": {
"@cosmjs/stargate": "^0.29.3",
"@keplr-wallet/provider-mock": "0.12.14",
"@keplr-wallet/provider-mock": "0.12.15-rc.1",
"secretjs": "^1.6.0"
}
}
14 changes: 7 additions & 7 deletions packages/cosmos/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keplr-wallet/cosmos",
"version": "0.12.14",
"version": "0.12.15-rc.1",
"main": "build/index.js",
"author": "chainapsis",
"license": "Apache-2.0",
Expand All @@ -17,12 +17,12 @@
},
"dependencies": {
"@ethersproject/address": "^5.6.0",
"@keplr-wallet/common": "0.12.14",
"@keplr-wallet/crypto": "0.12.14",
"@keplr-wallet/proto-types": "0.12.14",
"@keplr-wallet/simple-fetch": "0.12.14",
"@keplr-wallet/types": "0.12.14",
"@keplr-wallet/unit": "0.12.14",
"@keplr-wallet/common": "0.12.15-rc.1",
"@keplr-wallet/crypto": "0.12.15-rc.1",
"@keplr-wallet/proto-types": "0.12.15-rc.1",
"@keplr-wallet/simple-fetch": "0.12.15-rc.1",
"@keplr-wallet/types": "0.12.15-rc.1",
"@keplr-wallet/unit": "0.12.15-rc.1",
"bech32": "^1.1.4",
"buffer": "^6.0.3",
"long": "^4.0.0",
Expand Down
8 changes: 8 additions & 0 deletions packages/cosmos/src/stargate/wrapper/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,14 @@ export class SignDocWrapper {
return this.aminoSignDoc.fee.amount;
}

get payer(): string | undefined {
if (this.mode === "direct") {
return this.protoSignDoc.authInfo.fee?.payer;
}

return this.aminoSignDoc.fee.payer;
}

get granter(): string | undefined {
if (this.mode === "direct") {
return this.protoSignDoc.authInfo.fee?.granter;
Expand Down
2 changes: 1 addition & 1 deletion packages/crypto/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keplr-wallet/crypto",
"version": "0.12.14",
"version": "0.12.15-rc.1",
"main": "build/index.js",
"author": "chainapsis",
"license": "Apache-2.0",
Expand Down
38 changes: 19 additions & 19 deletions packages/extension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keplr-wallet/extension",
"version": "0.12.14",
"version": "0.12.15-rc.1",
"author": "chainapsis",
"license": "Apache-2.0",
"private": true,
Expand All @@ -25,24 +25,24 @@
"@ethersproject/transactions": "^5.7.0",
"@floating-ui/react": "^0.23.0",
"@floating-ui/react-dom": "^1.3.0",
"@keplr-wallet/analytics": "0.12.14",
"@keplr-wallet/background": "0.12.14",
"@keplr-wallet/chain-validator": "0.12.14",
"@keplr-wallet/common": "0.12.14",
"@keplr-wallet/cosmos": "0.12.14",
"@keplr-wallet/crypto": "0.12.14",
"@keplr-wallet/hooks": "0.12.14",
"@keplr-wallet/ledger-cosmos": "0.12.14",
"@keplr-wallet/popup": "0.12.14",
"@keplr-wallet/proto-types": "0.12.14",
"@keplr-wallet/provider": "0.12.14",
"@keplr-wallet/router": "0.12.14",
"@keplr-wallet/router-extension": "0.12.14",
"@keplr-wallet/simple-fetch": "0.12.14",
"@keplr-wallet/stores": "0.12.14",
"@keplr-wallet/stores-etc": "0.12.14",
"@keplr-wallet/types": "0.12.14",
"@keplr-wallet/unit": "0.12.14",
"@keplr-wallet/analytics": "0.12.15-rc.1",
"@keplr-wallet/background": "0.12.15-rc.1",
"@keplr-wallet/chain-validator": "0.12.15-rc.1",
"@keplr-wallet/common": "0.12.15-rc.1",
"@keplr-wallet/cosmos": "0.12.15-rc.1",
"@keplr-wallet/crypto": "0.12.15-rc.1",
"@keplr-wallet/hooks": "0.12.15-rc.1",
"@keplr-wallet/ledger-cosmos": "0.12.15-rc.1",
"@keplr-wallet/popup": "0.12.15-rc.1",
"@keplr-wallet/proto-types": "0.12.15-rc.1",
"@keplr-wallet/provider": "0.12.15-rc.1",
"@keplr-wallet/router": "0.12.15-rc.1",
"@keplr-wallet/router-extension": "0.12.15-rc.1",
"@keplr-wallet/simple-fetch": "0.12.15-rc.1",
"@keplr-wallet/stores": "0.12.15-rc.1",
"@keplr-wallet/stores-etc": "0.12.15-rc.1",
"@keplr-wallet/types": "0.12.15-rc.1",
"@keplr-wallet/unit": "0.12.15-rc.1",
"@keystonehq/animated-qr": "^0.4.1",
"@ledgerhq/devices": "^6.20.0",
"@react-spring/web": "^9.6.1",
Expand Down
20 changes: 12 additions & 8 deletions packages/extension/src/components/address-book-modal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { Bleed } from "../bleed";
import { RecentSendHistory } from "@keplr-wallet/background";
import { AddressItem } from "../address-item";
import SimpleBar from "simplebar-react";
import styled from "styled-components";
import styled, { useTheme } from "styled-components";
import { FormattedMessage, useIntl } from "react-intl";

type Type = "recent" | "contacts" | "accounts";
Expand Down Expand Up @@ -48,6 +48,7 @@ export const AddressBookModal: FunctionComponent<{
}) => {
const { analyticsStore, uiConfigStore, keyRingStore } = useStore();
const intl = useIntl();
const theme = useTheme();

const [type, setType] = useState<Type>("recent");

Expand Down Expand Up @@ -143,16 +144,16 @@ export const AddressBookModal: FunctionComponent<{
return (
<Modal isOpen={isOpen} close={close} align="bottom">
<Box
backgroundColor={ColorPalette["gray-600"]}
backgroundColor={
theme.mode === "light"
? ColorPalette.white
: ColorPalette["gray-600"]
}
paddingX="0.75rem"
paddingTop="1rem"
>
<Box paddingX="0.5rem" paddingY="0.375rem">
<Subtitle1
style={{
color: ColorPalette["white"],
}}
>
<Subtitle1>
<FormattedMessage id="components.address-book-modal.title" />
</Subtitle1>
</Box>
Expand Down Expand Up @@ -276,7 +277,10 @@ export const AddressBookModal: FunctionComponent<{
alignY="center"
style={{
height: "14.875rem",
color: ColorPalette["gray-400"],
color:
theme.mode === "light"
? ColorPalette["gray-200"]
: ColorPalette["gray-400"],
}}
>
<Bleed top="3rem">
Expand Down
60 changes: 51 additions & 9 deletions packages/extension/src/components/address-item/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { FormattedMessage, useIntl } from "react-intl";
import { Gutter } from "../gutter";
import { IconButton } from "../icon-button";
import { XAxis, YAxis } from "../axis";
import { useTheme } from "styled-components";

export const AddressItem: FunctionComponent<{
timestamp?: number;
Expand All @@ -34,14 +35,23 @@ export const AddressItem: FunctionComponent<{
highlight,
}) => {
const intl = useIntl();
const theme = useTheme();
const [isMenuOpen, setIsMenuOpen] = useState<boolean>(false);

return (
<Box
padding="1rem"
backgroundColor={ColorPalette["gray-600"]}
backgroundColor={
theme.mode === "light"
? ColorPalette["gray-50"]
: ColorPalette["gray-600"]
}
hover={{
backgroundColor: onClick ? ColorPalette["gray-550"] : undefined,
backgroundColor: onClick
? theme.mode === "light"
? ColorPalette["gray-100"]
: ColorPalette["gray-550"]
: undefined,
}}
borderRadius="0.375rem"
borderWidth={highlight ? "1px" : undefined}
Expand All @@ -61,7 +71,10 @@ export const AddressItem: FunctionComponent<{
<React.Fragment>
<H5
style={{
color: ColorPalette["gray-10"],
color:
theme.mode === "light"
? ColorPalette["gray-700"]
: ColorPalette["gray-10"],
}}
>
<FormattedMessage
Expand All @@ -83,7 +96,10 @@ export const AddressItem: FunctionComponent<{
<React.Fragment>
<H5
style={{
color: ColorPalette["gray-10"],
color:
theme.mode === "light"
? ColorPalette["gray-700"]
: ColorPalette["gray-10"],
width: "16rem",
whiteSpace: "nowrap",
overflow: "hidden",
Expand All @@ -97,11 +113,22 @@ export const AddressItem: FunctionComponent<{
) : null}

<XAxis alignY="center">
<ProfileIcon width="0.75rem" height="0.75rem" />
<ProfileIcon
width="0.75rem"
height="0.75rem"
color={
theme.mode === "light"
? ColorPalette["gray-300"]
: ColorPalette["gray-200"]
}
/>
<Gutter size="0.25rem" />
<Body2
style={{
color: ColorPalette["gray-200"],
color:
theme.mode === "light"
? ColorPalette["gray-300"]
: ColorPalette["gray-200"],
}}
>
{Bech32Address.shortenAddress(address, 30)}
Expand All @@ -111,12 +138,23 @@ export const AddressItem: FunctionComponent<{
<Gutter size="0.25rem" />
{isShowMemo ? (
<XAxis alignY="center">
<DocumentTextIcon width="0.75rem" height="0.75rem" />
<DocumentTextIcon
width="0.75rem"
height="0.75rem"
color={
theme.mode === "light"
? ColorPalette["gray-300"]
: ColorPalette["gray-200"]
}
/>
<Gutter size="0.25rem" />
{memo ? (
<Body2
style={{
color: ColorPalette["gray-200"],
color:
theme.mode === "light"
? ColorPalette["gray-300"]
: ColorPalette["gray-200"],
width: "15rem",
whiteSpace: "nowrap",
overflow: "hidden",
Expand Down Expand Up @@ -147,7 +185,11 @@ export const AddressItem: FunctionComponent<{
>
<IconButton
onClick={() => setIsMenuOpen(!isMenuOpen)}
color={ColorPalette["gray-10"]}
color={
theme.mode === "light"
? ColorPalette["gray-300"]
: ColorPalette["gray-10"]
}
>
<EllipsisIcon width="1.5rem" height="1.5rem" />
</IconButton>
Expand Down
Loading

0 comments on commit c89f71d

Please sign in to comment.