Skip to content

Commit e87118a

Browse files
committed
fix: merge conflicts with main
2 parents 96e76d9 + a4d3c48 commit e87118a

File tree

11 files changed

+296
-198
lines changed

11 files changed

+296
-198
lines changed

README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
<p align="center">
2+
<img src="./src/docs/banner.png" width="100%" alt="OpenZeppelin Logo">
3+
</p>
4+
15
# Deploy with Defender - Remix Plugin
26

3-
Remix plugin to deploy smart contracts using OpenZeppelin Defender.
7+
Remix plugin to deploy smart contracts using OpenZeppelin Defender. For documentation about usage please visit the [Defender Docs](https://docs.openzeppelin.com/defender/remix-plugin).
48

59
## Getting Started
610

@@ -16,8 +20,8 @@ The interface is ugly, but don't worry! it's not meant to be used directly, it's
1620

1721
## Testing in Remix
1822

19-
1. Go to https://remix.ethereum.org/
20-
2. Click on plugin manager.
23+
1. Go to (https://remix.ethereum.org/)[Remix IDE].
24+
2. Click on Plugin Manager (bottom left corner - above settings).
2125
3. At the top, click on `Connect to a Local Plugin` button.
2226
4. Set following values
2327
```bash
@@ -27,4 +31,4 @@ Url: http://localhost:5173 # or live version https://defeder-remix-deploy.netlif
2731
Type of connection: Iframe
2832
Location in Remix: Side Panel
2933
```
30-
5. You should see the plugin added to the sidebar.
34+
5. You should see the plugin added to the sidebar (new icon with ? symbol).

src/docs/banner.png

38.8 KB
Loading

src/lib/remix/components/ApprovalProcess.svelte

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<script lang="ts">
22
import { globalState } from "$lib/remix/state/state.svelte";
33
import Dropdown from "./shared/Dropdown.svelte";
4-
import { abbreviateAddress } from "$lib/utils";
4+
import { abbreviateAddress } from "$lib/utils/helpers";
55
import { approvalProcessTypes, type ApprovalProcess, type ApprovalProcessType } from "$lib/models/approval-process";
66
import type { DropdownItem, GlobalState } from "$lib/models/ui";
77
import type { Relayer } from "$lib/models/relayer";
8+
import { getNetworkLiteral } from "$lib/models/network";
89
910
function approvalProcessByNetworkAndComponent(ap: ApprovalProcess) {
1011
const networkName = typeof globalState.form.network === 'string'
@@ -58,6 +59,7 @@
5859
viaType: "Relayer",
5960
via: relayer.value.address,
6061
relayerId: relayer.value.relayerId,
62+
network: globalState.form.network && getNetworkLiteral(globalState.form.network),
6163
};
6264
}
6365
};
@@ -69,6 +71,7 @@
6971
globalState.form.approvalProcessToCreate = {
7072
viaType: approvalProcessType as "EOA" | "Safe" | "Relayer",
7173
via: element.value,
74+
network: globalState.form.network && getNetworkLiteral(globalState.form.network),
7275
};
7376
};
7477

0 commit comments

Comments
 (0)