Page MenuHomePhabricator
Files F12945037

D17453.diff
No OneTemporary
Actions

D17453.diff
View Options

diff --git a/cashtab/package-lock.json b/cashtab/package-lock.json
--- a/cashtab/package-lock.json
+++ b/cashtab/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "cashtab",
- "version": "3.8.5",
+ "version": "3.8.6",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "cashtab",
- "version": "3.8.5",
+ "version": "3.8.6",
"dependencies": {
"@bitgo/utxo-lib": "^11.0.0",
"@zxing/browser": "^0.1.4",
diff --git a/cashtab/package.json b/cashtab/package.json
--- a/cashtab/package.json
+++ b/cashtab/package.json
@@ -1,6 +1,6 @@
{
"name": "cashtab",
- "version": "3.8.5",
+ "version": "3.8.6",
"private": true,
"scripts": {
"start": "node scripts/start.js",
diff --git a/cashtab/src/assets/styles/theme.ts b/cashtab/src/assets/styles/theme.ts
--- a/cashtab/src/assets/styles/theme.ts
+++ b/cashtab/src/assets/styles/theme.ts
@@ -13,6 +13,7 @@
secondaryText: string;
border: string;
agoraDepthBar: string;
+ agoraDepthBarOwnOffer: string;
toastText: string;
error: string;
genesisGreen: string;
@@ -46,6 +47,7 @@
secondaryText: '#838d91',
border: '#586161',
agoraDepthBar: 'rgba(255, 255, 255, 0.2)',
+ agoraDepthBarOwnOffer: 'rgba(179, 33, 144, 0.2)',
toastText: '#111313',
error: '#DC143C',
genesisGreen: '#00e781',
diff --git a/cashtab/src/components/Agora/OrderBook/index.tsx b/cashtab/src/components/Agora/OrderBook/index.tsx
--- a/cashtab/src/components/Agora/OrderBook/index.tsx
+++ b/cashtab/src/components/Agora/OrderBook/index.tsx
@@ -933,9 +933,7 @@
{typeof tokenName !== 'string' ? (
<InlineLoader />
) : (
- <a
- href={`#/token/${tokenId}`}
- >
+ <a href={`#/token/${tokenId}`}>
{tokenName}
{tokenTicker !== ''
? ` (${tokenTicker})`
@@ -979,6 +977,9 @@
const { makerPk } =
activeOffer.variant.params;
+ const isMakerThisOffer =
+ toHex(activePk as Uint8Array) ===
+ toHex(makerPk);
const makerHash = shaRmd160(makerPk);
const makerOutputScript =
Address.p2pkh(makerHash).toScriptHex();
@@ -999,6 +1000,7 @@
depthPercent={
depthPercent as number
}
+ isMaker={isMakerThisOffer}
></DepthBar>
{index === selectedIndex && (
<TentativeAcceptBar
diff --git a/cashtab/src/components/Agora/OrderBook/styled.ts b/cashtab/src/components/Agora/OrderBook/styled.ts
--- a/cashtab/src/components/Agora/OrderBook/styled.ts
+++ b/cashtab/src/components/Agora/OrderBook/styled.ts
@@ -122,13 +122,17 @@
z-index: 1;
`;
-export const DepthBar = styled.div<{ depthPercent: number }>`
+export const DepthBar = styled.div<{ depthPercent: number; isMaker: boolean }>`
display: flex;
flex-direction: row;
position: absolute;
top: 0;
right: 0;
- background-color: ${props => props.theme.agoraDepthBar};
+ background-color: ${props =>
+ props.isMaker
+ ? props.theme.agoraDepthBarOwnOffer
+ : props.theme.agoraDepthBar};
+
height: 100%;
width: ${props => props.depthPercent}%;
`;

File Metadata

Mime Type
text/plain
Expires
Thu, Feb 6, 17:18 (21 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5082768
Default Alt Text
D17453.diff (4 KB)

Event Timeline