From 56a1cfe277011be41f8bfb9260a3aa74010db809 Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Mon, 21 Jun 2021 20:26:37 -0400
Subject: [PATCH] Redefine cipher "share" to "move to organization" (#961)

* Redefine cipher "share" to "move to organization"

* Update jslib

* PR review
---
 jslib                                 |  2 +-
 src/app/vault/add-edit.component.html |  4 ++--
 src/app/vault/ciphers.component.html  |  2 +-
 src/app/vault/share.component.html    |  8 ++++----
 src/locales/en/messages.json          | 22 ++++++++++++++++------
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/jslib b/jslib
index 1f83c3c1ba..f568c87289 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 1f83c3c1ba14d2cdbc319ac060a08cc7c0911b5c
+Subproject commit f568c872898c86b3cf8b5a99f8b5b377cb5b49e7
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index a18556843b..cd026986e7 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -374,9 +374,9 @@
             {{'cancel' | i18n}}
         </button>
         <div class="right">
-            <button appBlurClick type="button" (click)="share()" appA11yTitle="{{'shareItem' | i18n}}"
+            <button appBlurClick type="button" (click)="share()" appA11yTitle="{{'moveToOrganization' | i18n}}"
                 *ngIf="editMode && cipher && !cipher.organizationId && !cloneMode">
-                <i class="fa fa-share-alt fa-lg fa-fw" aria-hidden="true"></i>
+                <i class="fa fa-arrow-circle-o-right fa-lg fa-fw" aria-hidden="true"></i>
             </button>
             <button #deleteBtn appBlurClick type="button" (click)="delete()" class="danger"
                 appA11yTitle="{{'delete' | i18n}}" *ngIf="editMode && !cloneMode" [disabled]="deleteBtn.loading"
diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html
index 28e7ed4bfd..5b87432d11 100644
--- a/src/app/vault/ciphers.component.html
+++ b/src/app/vault/ciphers.component.html
@@ -18,7 +18,7 @@
                     <span class="text">
                         {{c.name}}
                         <ng-container *ngIf="c.organizationId">
-                            <i class="fa fa-share-alt text-muted" title="{{'shared' | i18n}}" aria-hidden="true"></i>
+                            <i class="fa fa-cube text-muted" title="{{'shared' | i18n}}" aria-hidden="true"></i>
                             <span class="sr-only">{{'shared' | i18n}}</span>
                         </ng-container>
                         <ng-container *ngIf="c.hasAttachments">
diff --git a/src/app/vault/share.component.html b/src/app/vault/share.component.html
index 012d094ff3..0a120dc30e 100644
--- a/src/app/vault/share.component.html
+++ b/src/app/vault/share.component.html
@@ -1,10 +1,10 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="shareTitle">
+<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="moveToOrgTitle">
     <div class="modal-dialog" role="document">
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
             <div class="modal-body">
                 <div class="box">
-                    <div class="box-header" id="shareTitle">
-                        {{'share' | i18n}}
+                    <div class="box-header" id="moveToOrgTitle">
+                        {{'moveToOrganization' | i18n}}
                     </div>
                     <div class="box-content" *ngIf="!organizations || !organizations.length">
                         <div class="box-content-row">
@@ -21,7 +21,7 @@
                         </div>
                     </div>
                     <div class="box-footer">
-                        {{'shareDesc' | i18n}}
+                        {{'moveToOrgDesc' | i18n}}
                     </div>
                 </div>
                 <div class="box" *ngIf="organizations && organizations.length">
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index a14f3d8413..21e82378cd 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -44,14 +44,24 @@
   "share": {
     "message": "Share"
   },
-  "shareItem": {
-    "message": "Share Item"
+  "moveToOrganization": {
+    "message": "Move to Organization"
   },
-  "sharedItem": {
-    "message": "Shared Item"
+  "movedItemToOrg": {
+    "message": "$ITEMNAME$ moved to $ORGNAME$",
+    "placeholders": {
+      "itemname": {
+        "content": "$1",
+        "example": "Secret Item"
+      },
+      "orgname": {
+        "content": "$2",
+        "example": "Company Name"
+      }
+    }
   },
-  "shareDesc": {
-    "message": "Choose an organization that you wish to share this item with. Sharing transfers ownership of the item to the organization. You will no longer be the direct owner of this item once it has been shared."
+  "moveToOrgDesc": {
+    "message": "Choose an organization that you wish to move this item to. Moving to an organization transfers ownership of the item to that organization. You will no longer be the direct owner of this item once it has been moved."
   },
   "attachments": {
     "message": "Attachments"